modules/enterprise/agent/src/etc/rhq-agent-env.bat | 347 +++++++++---------
modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh | 11
2 files changed, 192 insertions(+), 166 deletions(-)
New commits:
commit 31181a36083618aba7a0a35fae572aa9b8221083
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Feb 15 14:26:26 2012 -0500
[BZ 768707] fix bug where passing agent command-line options via start script/environment prevents agent from starting via wrapper script (https://bugzilla.redhat.com/show_bug.cgi?id=768707)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-env.bat b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
index 62d727b..bd9b722 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent-env.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
@@ -1,164 +1,183 @@
-rem ===========================================================================
-rem RHQ Agent Windows Startup Script Configuration File
-rem ===========================================================================
-rem
-
-rem RHQ_AGENT_DEBUG - If this is defined, the script will emit debug
-rem messages. It will also enable debug
-rem messages to be emitted from the agent itself.
-rem If not set or set to "false", debug is turned off.
-rem This does not implicitly enable Sigar native system
-rem debug mode. You must explicitly enable
-rem RHQ_AGENT_SIGAR_DEBUG in addition to enabling
-rem RHQ_AGENT_DEBUG for Sigar logging to be enabled.
-rem
-rem set RHQ_AGENT_DEBUG=true
-
-rem RHQ_AGENT_SIGAR_DEBUG - Enables Sigar debug mode but only if agent debug
-rem is also enabled. See RHQ_AGENT_DEBUG for more.
-rem set RHQ_AGENT_SIGAR_DEBUG=false
-
-rem RHQ_AGENT_HOME - Defines where the agent's home install directory is.
-rem If not defined, it will be assumed to be the parent
-rem directory of the directory where this script lives.
-rem
-rem set RHQ_AGENT_HOME=C:\opt\rhq-agent
-
-rem RHQ_AGENT_JAVA_HOME - The location of the JRE that the agent will
-rem use. This will be ignored if
-rem RHQ_AGENT_JAVA_EXE_FILE_PATH is set.
-rem If this and RHQ_AGENT_JAVA_EXE_FILE_PATH are
-rem not set, the agent's embedded JRE will be used.
-rem
-rem set RHQ_AGENT_JAVA_HOME=C:\opt\java
-
-rem RHQ_AGENT_JAVA_EXE_FILE_PATH - Defines the full path to the Java
-rem executable to use. If this is set,
-rem RHQ_AGENT_JAVA_HOME is ignored.
-rem If this is not set, then
-rem %RHQ_AGENT_JAVA_HOME%\bin\java.exe
-rem is used. If this and
-rem RHQ_AGENT_JAVA_HOME are not set, the
-rem agent's embedded JRE will be used.
-rem
-rem set RHQ_AGENT_JAVA_EXE_FILE_PATH=C:\WINDOWS\system32\java.exe
-
-rem ===========================================================================
-rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent.bat SCRIPT
-rem THESE ARE NOT USED/IGNORED BY rhq-agent-wrapper.bat SCRIPT
-
-rem RHQ_AGENT_JAVA_OPTS - Java VM command line options to be
-rem passed into the agent's VM. If this is not defined
-rem this script will pass in a default set of options.
-rem If this is set, it completely overrides the
-rem agent's defaults. If you only want to add options
-rem to the agent's defaults, then you will want to
-rem use RHQ_AGENT_ADDITIONAL_JAVA_OPTS instead.
-rem
-rem set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
-
-rem RHQ_AGENT_JAVA_ENDORSED_DIRS - Java VM command line option to set the
-rem endorsed dirs for the agent's VM. If this
-rem is not defined this script will pass in a
-rem default value. If this is set, it
-rem completely overrides the agent's default.
-rem However, if this is set to "none", the
-rem agent will not be passed the VM argument
-rem to set the endorsed dirs.
-rem
-rem set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
-
-rem RHQ_AGENT_JAVA_LIBRARY_PATH - The RHQ Agent has a JNI library that
-rem it needs to find in order to do things
-rem like execute PIQL queries and access
-rem low-level operating system data. This
-rem is the native system layer (SIGAR).
-rem If you deploy a custom plugin that also
-rem requires JNI libraries, you must add to
-rem the library path here, but you must ensure
-rem not to remove the RHQ Agent library path.
-rem If this variable is set, it completely
-rem overrides the agent's default.
-rem However, if this is set to "none", the
-rem agent will not be passed the VM argument
-rem to set the library paths.
-rem
-rem set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
-
-rem RHQ_AGENT_ADDITIONAL_JAVA_OPTS - additional Java VM command line options
-rem to be passed into the agent's VM. This
-rem is added to RHQ_AGENT_JAVA_OPTS; it
-rem is mainly used to augment the agent's
-rem default set of options. This can be
-rem left unset if it is not needed.
-rem
-rem set RHQ_AGENT_ADDITIONAL_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,address=9797,server=y,suspend=n
-
-rem RHQ_AGENT_CMDLINE_OPTS - If this is defined, these are the command line
-rem arguments that will be passed to the RHQ Agent.
-rem Any arguments specified on the command line
-rem will be ignored. If this is not defined, the
-rem command line arguments given to the script are
-rem passed through to the RHQ Agent.
-rem If you want to have command line arguments
-rem added to the arguments specified here, append
-rem '%*' to the end of this option. For example,
-rem "--nonative %*". In this case, both the command
-rem line options and the ones specified here will
-rem be passed to the Agent. Note, the --daemon option
-rem should generally not be included here, since it
-rem would cause the Agent to always start in daemon
-rem mode, even when started via rhq-agent.bat.
-rem
-rem set RHQ_AGENT_CMDLINE_OPTS=--nonative %*
-
-rem ===========================================================================
-rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent-wrapper.bat SCRIPT
-
-rem RHQ_AGENT_INSTANCE_NAME - The name of the Windows Service; it must
-rem conform to the Windows Service naming
-rem conventions. By default, this is the
-rem name "rhqagent-%COMPUTERNAME%"
-rem
-rem set RHQ_AGENT_INSTANCE_NAME=rhqagent-%COMPUTERNAME%
-
-rem RHQ_AGENT_WRAPPER_LOG_DIR_PATH - The full path to the location where
-rem the wrapper log file will go.
-rem
-rem set RHQ_AGENT_WRAPPER_LOG_DIR_PATH=%RHQ_AGENT_HOME%\logs
-
-rem RHQ_AGENT_RUN_AS - if defined, then when the Windows Service is
-rem installed, the value is the domain\username of the
-rem user that the Windows Service will run as
-rem
-rem set RHQ_AGENT_RUN_AS=.\%USERNAME%
-
-rem RHQ_AGENT_RUN_AS_ME - if defined, then when the Windows Service is
-rem installed, the domain\username of the
-rem user that the Windows Service will run as will
-rem be the current user (.\%USERNAME%). This takes
-rem precedence over RHQ_AGENT_RUN_AS.
-rem
-rem set RHQ_AGENT_RUN_AS_ME=true
-
-rem RHQ_AGENT_PASSWORD_PROMPT - if "true", the user that is to run the
-rem service (as defined by RHQ_AGENT_RUN_AS or
-rem RHQ_AGENT_RUN_AS_ME) must type the password
-rem on the console in order to install service.
-rem If "false", you must provide the password
-rem in RHQ_AGENT_PASSWORD. Default is "true".
-rem This is only used when installing the
-rem service; it is not needed to be set when
-rem starting, stopping or removing the service.
-rem
-rem set RHQ_AGENT_PASSWORD_PROMPT=true
-
-rem RHQ_AGENT_PASSWORD - if RHQ_AGENT_PASSWORD_PROMPT is "false", this
-rem is the password of the user that is to
-rem run the service. If RHQ_AGENT_PASSWORD_PROMPT
-rem is undefined or "true", this is ignored.
-rem This is only used when installing the
-rem service; it is not needed to be set when
-rem starting, stopping or removing the service.
-rem
-rem set RHQ_AGENT_PASSWORD=password_here
+rem ===========================================================================
+rem RHQ Agent Windows Startup Script Configuration File
+rem ===========================================================================
+rem
+
+rem RHQ_AGENT_DEBUG - If this is defined, the script will emit debug
+rem messages. It will also enable debug
+rem messages to be emitted from the agent itself.
+rem If not set or set to "false", debug is turned off.
+rem This does not implicitly enable Sigar native system
+rem debug mode. You must explicitly enable
+rem RHQ_AGENT_SIGAR_DEBUG in addition to enabling
+rem RHQ_AGENT_DEBUG for Sigar logging to be enabled.
+rem
+rem set RHQ_AGENT_DEBUG=true
+
+rem RHQ_AGENT_SIGAR_DEBUG - Enables Sigar debug mode but only if agent debug
+rem is also enabled. See RHQ_AGENT_DEBUG for more.
+rem set RHQ_AGENT_SIGAR_DEBUG=false
+
+rem RHQ_AGENT_HOME - Defines where the agent's home install directory is.
+rem If not defined, it will be assumed to be the parent
+rem directory of the directory where this script lives.
+rem
+rem set RHQ_AGENT_HOME=C:\opt\rhq-agent
+
+rem RHQ_AGENT_JAVA_HOME - The location of the JRE that the agent will
+rem use. This will be ignored if
+rem RHQ_AGENT_JAVA_EXE_FILE_PATH is set.
+rem If this and RHQ_AGENT_JAVA_EXE_FILE_PATH are
+rem not set, the agent's embedded JRE will be used.
+rem
+rem set RHQ_AGENT_JAVA_HOME=C:\opt\java
+
+rem RHQ_AGENT_JAVA_EXE_FILE_PATH - Defines the full path to the Java
+rem executable to use. If this is set,
+rem RHQ_AGENT_JAVA_HOME is ignored.
+rem If this is not set, then
+rem %RHQ_AGENT_JAVA_HOME%\bin\java.exe
+rem is used. If this and
+rem RHQ_AGENT_JAVA_HOME are not set, the
+rem agent's embedded JRE will be used.
+rem
+rem set RHQ_AGENT_JAVA_EXE_FILE_PATH=C:\WINDOWS\system32\java.exe
+
+rem ===========================================================================
+rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent.bat SCRIPT
+rem THESE ARE NOT USED/IGNORED BY rhq-agent-wrapper.bat SCRIPT
+
+rem RHQ_AGENT_JAVA_OPTS - Java VM command line options to be
+rem passed into the agent's VM. If this is not defined
+rem this script will pass in a default set of options.
+rem If this is set, it completely overrides the
+rem agent's defaults. If you only want to add options
+rem to the agent's defaults, then you will want to
+rem use RHQ_AGENT_ADDITIONAL_JAVA_OPTS instead.
+rem
+rem NOTE: This variable is only used by
+rem rhq-agent.bat; it is NOT used by
+rem rhq-agent-wrapper.bat. The Java VM command line
+rem options used by rhq-agent-wrapper.bat are set in
+rem wrapper\rhq-agent-wrapper.conf.
+rem
+rem set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
+
+rem RHQ_AGENT_JAVA_ENDORSED_DIRS - Java VM command line option to set the
+rem endorsed dirs for the agent's VM. If this
+rem is not defined this script will pass in a
+rem default value. If this is set, it
+rem completely overrides the agent's default.
+rem However, if this is set to "none", the
+rem agent will not be passed the VM argument
+rem to set the endorsed dirs.
+rem
+rem set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
+
+rem RHQ_AGENT_JAVA_LIBRARY_PATH - The RHQ Agent has a JNI library that
+rem it needs to find in order to do things
+rem like execute PIQL queries and access
+rem low-level operating system data. This
+rem is the native system layer (SIGAR).
+rem If you deploy a custom plugin that also
+rem requires JNI libraries, you must add to
+rem the library path here, but you must ensure
+rem not to remove the RHQ Agent library path.
+rem If this variable is set, it completely
+rem overrides the agent's default.
+rem However, if this is set to "none", the
+rem agent will not be passed the VM argument
+rem to set the library paths.
+rem
+rem set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
+
+rem RHQ_AGENT_ADDITIONAL_JAVA_OPTS - additional Java VM command line options
+rem to be passed into the agent's VM. This
+rem is added to RHQ_AGENT_JAVA_OPTS; it
+rem is mainly used to augment the agent's
+rem default set of options. This can be
+rem left unset if it is not needed.
+rem
+rem NOTE: This variable is only used by
+rem rhq-agent.bat; it is NOT used by
+rem rhq-agent-wrapper.bat. The Java VM
+rem command line options used by
+rem rhq-agent-wrapper.bat are set in
+rem wrapper\rhq-agent-wrapper.conf.
+rem
+rem set RHQ_AGENT_ADDITIONAL_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,address=9797,server=y,suspend=n
+
+rem RHQ_AGENT_CMDLINE_OPTS - If this is defined, these are the command line
+rem arguments that will be passed to the RHQ Agent.
+rem Any arguments specified on the command line
+rem will be ignored. If this is not defined, the
+rem command line arguments given to the script are
+rem passed through to the RHQ Agent.
+rem If you want to have command line arguments
+rem added to the arguments specified here, append
+rem '%*' to the end of this option. For example,
+rem "--nonative %*". In this case, both the command
+rem line options and the ones specified here will
+rem be passed to the Agent. Note, the --daemon option
+rem should generally not be included here, since it
+rem would cause the Agent to always start in daemon
+rem mode, when started via rhq-agent.bat.
+rem
+rem NOTE: This variable is only used by
+rem rhq-agent.bat; it is NOT used by
+rem rhq-agent-wrapper.bat. The Agent command line
+rem options used by rhq-agent-wrapper.bat are set in
+rem wrapper\rhq-agent-wrapper.conf.
+rem
+rem set RHQ_AGENT_CMDLINE_OPTS=--nonative %*
+
+rem ===========================================================================
+rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent-wrapper.bat SCRIPT
+
+rem RHQ_AGENT_INSTANCE_NAME - The name of the Windows Service; it must
+rem conform to the Windows Service naming
+rem conventions. By default, this is the
+rem name "rhqagent-%COMPUTERNAME%"
+rem
+rem set RHQ_AGENT_INSTANCE_NAME=rhqagent-%COMPUTERNAME%
+
+rem RHQ_AGENT_WRAPPER_LOG_DIR_PATH - The full path to the location where
+rem the wrapper log file will go.
+rem
+rem set RHQ_AGENT_WRAPPER_LOG_DIR_PATH=%RHQ_AGENT_HOME%\logs
+
+rem RHQ_AGENT_RUN_AS - if defined, then when the Windows Service is
+rem installed, the value is the domain\username of the
+rem user that the Windows Service will run as
+rem
+rem set RHQ_AGENT_RUN_AS=.\%USERNAME%
+
+rem RHQ_AGENT_RUN_AS_ME - if defined, then when the Windows Service is
+rem installed, the domain\username of the
+rem user that the Windows Service will run as will
+rem be the current user (.\%USERNAME%). This takes
+rem precedence over RHQ_AGENT_RUN_AS.
+rem
+rem set RHQ_AGENT_RUN_AS_ME=true
+
+rem RHQ_AGENT_PASSWORD_PROMPT - if "true", the user that is to run the
+rem service (as defined by RHQ_AGENT_RUN_AS or
+rem RHQ_AGENT_RUN_AS_ME) must type the password
+rem on the console in order to install service.
+rem If "false", you must provide the password
+rem in RHQ_AGENT_PASSWORD. Default is "true".
+rem This is only used when installing the
+rem service; it is not needed to be set when
+rem starting, stopping or removing the service.
+rem
+rem set RHQ_AGENT_PASSWORD_PROMPT=true
+
+rem RHQ_AGENT_PASSWORD - if RHQ_AGENT_PASSWORD_PROMPT is "false", this
+rem is the password of the user that is to
+rem run the service. If RHQ_AGENT_PASSWORD_PROMPT
+rem is undefined or "true", this is ignored.
+rem This is only used when installing the
+rem service; it is not needed to be set when
+rem starting, stopping or removing the service.
+rem
+rem set RHQ_AGENT_PASSWORD=password_here
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh b/modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh
index 2bb861c..3e8109a 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh
@@ -136,8 +136,15 @@ fi
# -------------------------------
# The --daemon argument is required
-if [ "x$RHQ_AGENT_CMDLINE_OPTS" = "x" ]; then
- RHQ_AGENT_CMDLINE_OPTS=--daemon
+found_daemon_option=0
+for opt in $RHQ_AGENT_CMDLINE_OPTS; do
+ if [ "$opt" = "-d" ] || [ "$opt" = "--daemon" ]; then
+ found_daemon_option=1
+ break
+ fi
+done
+if [ "$found_daemon_option" = "0" ]; then
+ RHQ_AGENT_CMDLINE_OPTS="--daemon $RHQ_AGENT_CMDLINE_OPTS"
fi
export RHQ_AGENT_CMDLINE_OPTS
1
0
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java | 22 -
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java | 5
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 4
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 161 +++++-----
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java | 13
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java | 8
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 10
9 files changed, 124 insertions(+), 103 deletions(-)
New commits:
commit 097bcd786afe718d5c8316152580956c009ed9b1
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Feb 14 15:26:09 2012 -0500
[BZ 788638] Removing extra call to fetch managed object
We were making an extra call to getManagedCompoment in
AbstractEjbComponent during metric collection. I discovered this while
doing some profiling. With this change execution time for
AbstractEjbBeanComponent.getValues is reduced by about 50% Also adding
some logging in ManagedComponentComponent.getAvailability to indicate
when an availability refresh is needed. This could be useful for tuning
the interval.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
index c28dad2..a0fccc5 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
@@ -54,7 +54,8 @@ import org.rhq.core.pluginapi.operation.OperationResult;
* @author Lukas Krejci
* @author Ian Springer
*/
-public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent implements OperationFacet {
+public abstract class
+ AbstractEjbBeanComponent extends ManagedComponentComponent implements OperationFacet {
private final Log log = LogFactory.getLog(this.getClass());
private static final String VIEW_INVOCATION_STATS_OPERATION_NAME = "viewInvocationStats";
@@ -83,7 +84,7 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
}
}
// Let our superclass handle any metrics we didn't collect.
- super.getValues(report, remainingRequests);
+ super.getValues(managedComponent, report, remainingRequests);
}
@Override
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 201484e..f4ebef0 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -127,6 +127,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
if (timeSinceComponentRefresh > availRefreshInterval) {
+ if (log.isDebugEnabled()) {
+ log.debug("The availability refresh interval for [resourceKey: " + getResourceContext().getResourceKey()
+ + ", type: " + componentType + ", name: " + componentName + "] has been exceeded by " +
+ (timeSinceComponentRefresh - availRefreshInterval) + " ms. Reloading managed component.");
+ }
getManagedComponent();
}
@@ -249,7 +254,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent managedComponent = getManagedComponent();
+ getValues(getManagedComponent(), report, metrics);
+ }
+
+ protected void getValues(ManagedComponent managedComponent, MeasurementReport report,
+ Set<MeasurementScheduleRequest> metrics) throws Exception {
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
try {
@@ -260,7 +269,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
log.error("Failed to collect metric for " + request, e);
} else {
log.debug("Failed to collect metric for " + request
- + ", but managed component is not in the RUNNING state.", e);
+ + ", but managed component is not in the RUNNING state.", e);
}
}
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 440c1e2..dd03491 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -999,13 +999,13 @@
<c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
default="15" type="integer"
- description="The amount of time, in minutes, that can elapse for service availability checks
- without having to refresh the managed object from the server. Services cache information
- used to perform availability checks. This property determines how frequently that
- data needs to be reloaded from the server. Any time the managed object is
- loaded from the server, like for collecting metrics, the availability information
- is updated and the interval is reset. Note that this property does not effect the
- frequency of availability scans performed by the agent."/>
+ description="The amount of time, in minutes, that can elapse for service resource
+ (e.g., EJBs, data sources) availability checks without having to refresh the
+ managed object from the JBoss server. The information used to perform availability
+ checks is cached. This property determines how frequently that data needs to be
+ reloaded from the JBoss server. Any time the managed object is loaded from the
+ server, like for collecting metrics, the availability information is updated and
+ the interval is reset."/>
<c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
readOnly="true" required="false"
commit ec9ea86edbfa45e1fcb739d8788e919557630ebd
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 10 21:50:04 2012 -0500
[BZ 788638] Make service availability refresh interval configurable
The refresh interval is now configurable from the application server
component. The interval setting then applies to all descendant services.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 374ae95..201484e 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -99,11 +99,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
private final Log log = LogFactory.getLog(this.getClass());
/**
- * The availability watermark specifies a duration that if exceeded means a managed
+ * The availability refresh interval specifies a duration that if exceeded means a managed
* component refresh is needed to perform an availability check. That duration is set
* to 15 minutes.
*/
- private static final long AVAIL_WATERMARK = 1000 * 60 * 15; // 15 minutes
+ private static final long AVAIL_REFRESH_INTERVAL = 1000 * 60 * 15; // 15 minutes
/**
* The ManagedComponent is fetched from the server in {@link #getManagedComponent} throughout
@@ -114,6 +114,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
* perform an availability check.
*/
private long lastComponentRefresh = 0L;
+
+ private long availRefreshInterval = AVAIL_REFRESH_INTERVAL;
private RunState runState = RunState.UNKNOWN;
@@ -124,7 +126,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
- if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
+ if (timeSinceComponentRefresh > availRefreshInterval) {
getManagedComponent();
}
@@ -141,11 +143,14 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public void start(ResourceContext<ProfileServiceComponent<?>> resourceContext) throws Exception {
super.start(resourceContext);
- this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType());
+ componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType());
Configuration pluginConfig = resourceContext.getPluginConfiguration();
- this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue();
- log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType
- + " component '" + this.componentName + "'.");
+ componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue();
+ initAvailRefreshInterval(resourceContext);
+ if (log.isTraceEnabled()) {
+ log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType
+ + " component '" + this.componentName + "'.");
+ }
}
public void stop() {
@@ -476,4 +481,26 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
return value.toString();
}
}
+
+ private void initAvailRefreshInterval(ResourceContext<ProfileServiceComponent<?>> context) {
+ ProfileServiceComponent<?> component = context.getParentResourceComponent();
+ while (component != null) {
+ if (component instanceof ApplicationServerComponent) {
+ break;
+ }
+ component = (ProfileServiceComponent<?>) component.getResourceContext().getParentResourceComponent();
+ }
+
+ if (component == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to find parent " + ApplicationServerComponent.class.getSimpleName() +
+ ". Using default component refresh interval, " + AVAIL_REFRESH_INTERVAL + " ms");
+ }
+ return;
+ }
+
+ String interval = component.getResourceContext().getPluginConfiguration().getSimpleValue(
+ "serviceAvailabilityRefreshInterval", Long.toString(AVAIL_REFRESH_INTERVAL));
+ availRefreshInterval = Long.parseLong(interval) * 1000 * 60;
+ }
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 2d1e86a..440c1e2 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -997,6 +997,16 @@
</c:constraint>
</c:simple-property>
+ <c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
+ default="15" type="integer"
+ description="The amount of time, in minutes, that can elapse for service availability checks
+ without having to refresh the managed object from the server. Services cache information
+ used to perform availability checks. This property determines how frequently that
+ data needs to be reloaded from the server. Any time the managed object is
+ loaded from the server, like for collecting metrics, the availability information
+ is updated and the interval is reset. Note that this property does not effect the
+ frequency of availability scans performed by the agent."/>
+
<c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
readOnly="true" required="false"
description="The name of the JBoss AS JVM resource."/>
commit d274464f1b3901b97d74838db4fc0fb8db715f13
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 10 11:56:54 2012 -0500
[BZ 788638] Remove extra calls to getManagedComponent
There are several places where getManagedComponent was called from
within the same method. This was fine previously since the managed
object was cached, but we do not want to make those extra calls any more
since the managed object is no longer cached.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
index 5f63261..c28dad2 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.values.CompositeValue;
@@ -60,17 +61,18 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
+ ManagedComponent managedComponent = getManagedComponent();
Set<MeasurementScheduleRequest> remainingRequests = new LinkedHashSet();
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
try {
if (metricName.equals("methodInvocationTime")) {
// Convert the method stats CompositeValues into nice strongly typed objects.
- InvocationStats invocationStats = getInvocationStats();
+ InvocationStats invocationStats = getInvocationStats(managedComponent);
if (!invocationStats.methodStats.isEmpty()) {
CallTimeData callTimeData = createCallTimeData(request, invocationStats);
report.addData(callTimeData);
- resetInvocationStats();
+ resetInvocationStats(managedComponent);
}
} else {
remainingRequests.add(request);
@@ -87,13 +89,14 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
@Override
public OperationResult invokeOperation(String name, Configuration parameters) throws Exception {
OperationResult result;
+ ManagedComponent managedComponent = getManagedComponent();
if (VIEW_INVOCATION_STATS_OPERATION_NAME.equals(name)) {
result = new OperationResult();
PropertyList methodList = new PropertyList("methods");
result.getComplexResults().put(methodList);
// Convert the invocation stats CompositeValues into a nice strongly typed object.
- List<MethodStats> allMethodStats = getInvocationStats().methodStats;
+ List<MethodStats> allMethodStats = getInvocationStats(managedComponent).methodStats;
for (MethodStats methodStats : allMethodStats) {
PropertyMap method = new PropertyMap("method", new PropertySimple("methodName", methodStats.name),
@@ -108,12 +111,12 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
return result;
}
- private InvocationStats getInvocationStats() {
+ private InvocationStats getInvocationStats(ManagedComponent managedComponent) {
InvocationStats invocationStats = new InvocationStats();
List<MethodStats> allMethodStats = new ArrayList<MethodStats>();
Configuration pluginConfig = getResourceContext().getPluginConfiguration();
String propName = pluginConfig.getSimple("invocationStatsPropertyName").getStringValue();
- ManagedProperty detypedInvokedStatsProp = this.getManagedComponent().getProperty(propName);
+ ManagedProperty detypedInvokedStatsProp = managedComponent.getProperty(propName);
invocationStats.endTime = System.currentTimeMillis();
CompositeValue detypedInvokeStatsMetaValue = (CompositeValue) detypedInvokedStatsProp.getValue();
CompositeValue allMethodStatsMetaValue = (CompositeValue) detypedInvokeStatsMetaValue.get("methodStats");
@@ -157,8 +160,8 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
return callTimeData;
}
- private void resetInvocationStats() {
- Set<ManagedOperation> operations = getManagedComponent().getOperations();
+ private void resetInvocationStats(ManagedComponent managedComponent) {
+ Set<ManagedOperation> operations = managedComponent.getOperations();
for (ManagedOperation operation : operations) {
if (operation.getName().equals("resetInvocationStats")) {
operation.invoke();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
index b89eb10..ebbf9bb 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
@@ -45,9 +45,6 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
//we need to reload the management view here, because the MDBs might have changed since
//the last call, because the @object-id is part of their names.
ManagementView mv = getConnection().getManagementView();
- // TODO Review with ips to see if we need the following, commented out call
- // jsanda
- //mv.load();
Set<ManagedComponent> mdbs = mv.getComponentsForType(MDB_COMPONENT_TYPE);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
index e864117..e5656f5 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
@@ -43,10 +43,6 @@ public class JBossMessagingComponent extends ManagedComponentComponent implement
MeasurementFacet {
private CreateChildResourceFacetDelegate createChildResourceDelegate;
- public AvailabilityType getAvailability() {
- return super.getAvailability();
- }
-
public void start(ResourceContext<ProfileServiceComponent<?>> resourceContext) throws Exception {
super.start(resourceContext);
this.createChildResourceDelegate = new CreateChildResourceFacetDelegate(this);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 9637954..374ae95 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -125,15 +125,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
- try {
- getManagedComponent();
- } catch (Throwable t) {
- if (log.isDebugEnabled()) {
- log.debug("Could not get component state for " + componentType + " component '" + componentName +
- "', cause: " + t.getMessage(), t);
- return AvailabilityType.DOWN;
- }
- }
+ getManagedComponent();
}
if (runState == RunState.RUNNING) {
@@ -164,8 +156,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public Configuration loadResourceConfiguration() {
Configuration resourceConfig;
+ ManagedComponent managedComponent = getManagedComponent();
try {
- ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext()
.getPluginConfiguration());
@@ -174,7 +166,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, customProps,
getResourceContext().getResourceType());
} catch (Exception e) {
- RunState runState = getManagedComponent().getRunState();
+ RunState runState = managedComponent.getRunState();
if (runState == RunState.RUNNING) {
this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e);
} else {
@@ -252,7 +244,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
-// ManagedComponent managedComponent = prepareForMetricCollection(metrics);
ManagedComponent managedComponent = getManagedComponent();
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
@@ -270,39 +261,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
}
-// protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
-// // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
-// // than once, it will settle down near immediately
-// Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
-// if (null == runtimeMetricMap) {
-// //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
-// runtimeMetricMap = new HashMap<String, Boolean>();
-// runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
-// }
-//
-// // determine whether we can use the cachedComponent or if we need to force a component fetch to
-// // gather the requested metrics.
-// boolean forceRefresh = false;
-// for (MeasurementScheduleRequest request : metrics) {
-// Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
-// // if this is the first time we've seen this metric find out if it's a runtime prop
-// if (null == isRuntimeMetric) {
-// //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
-// ManagedProperty managedProp = getManagedProperty(managedComponent, request);
-// runtimeMetricMap.put(request.getName(),
-// Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
-// }
-//
-// if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
-// //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
-// forceRefresh = true;
-// break;
-// }
-// }
-//
-// return getManagedComponent();
-// }
-
protected String getMeasurement(ManagedComponent component, String metricName) throws Exception {
if ("runState".equals(metricName)) {
return component.getRunState().name();
@@ -461,7 +419,9 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named ["
+ this.componentName + "].");
}
- log.trace("Retrieved " + toString(managedComponent) + ".");
+ if (log.isTraceEnabled()) {
+ log.trace("Retrieved " + toString(managedComponent) + ".");
+ }
lastComponentRefresh = System.currentTimeMillis();
runState = managedComponent.getRunState();
return managedComponent;
@@ -490,7 +450,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
return operation;
}
throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName()
- + "' not found on ManagedComponent [" + getManagedComponent() + "].");
+ + "' not found on ManagedComponent [" + managedComponent + "].");
}
private static String toString(ManagedComponent managedComponent) {
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
index 2926a95..ba2a4c9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
@@ -74,9 +74,10 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
public AvailabilityType getAvailability() {
RunState runState = getManagedComponent().getRunState();
return (runState == RunState.RUNNING || runState == RunState.UNKNOWN) ? AvailabilityType.UP
- : AvailabilityType.DOWN;
+ : AvailabilityType.DOWN;
}
+
// ConfigurationFacet -----------------------------
@Override
@@ -189,16 +190,16 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
public CreateResourceReport createResource(CreateResourceReport report) {
try {
+ ManagedComponent bindingManagerComponent = getBindingManager();
if (BINDING_SET_SERVICE_NAME.equals(report.getResourceType().getName())) {
Configuration bindingConfiguration = report.getResourceConfiguration();
checkValidity(bindingConfiguration);
- CompositeValue newBindingSet = Util.getBindingSetFromConfiguration(getBindingSetValueMetaType(),
- bindingConfiguration);
+ CompositeValue newBindingSet = Util.getBindingSetFromConfiguration(
+ getBindingSetValueMetaType(bindingManagerComponent), bindingConfiguration);
//ok, now we can update the bindingSets property with the update set of binding sets
- ManagedComponent bindingManagerComponent = getBindingManager();
ManagedProperty bindingSetsProperty = bindingManagerComponent.getProperty(Util.BINDING_SETS_PROPERTY);
//check that the provided binding set name is unique
@@ -242,8 +243,8 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
return report;
}
- public MetaType getBindingSetValueMetaType() {
- CollectionMetaType bindingSetsMetaType = (CollectionMetaType) getBindingManager().getProperty(
+ public MetaType getBindingSetValueMetaType(ManagedComponent bindingManager) {
+ CollectionMetaType bindingSetsMetaType = (CollectionMetaType) bindingManager.getProperty(
Util.BINDING_SETS_PROPERTY).getMetaType();
return bindingSetsMetaType.getElementType();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
index 024d60d..8303464 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
@@ -106,19 +106,19 @@ public class SetComponent implements ResourceComponent<ManagerComponent>, Config
public void updateResourceConfiguration(ConfigurationUpdateReport report) {
try {
ManagerComponent managerResourceComponent = context.getParentResourceComponent();
+ ManagedComponent bindingManager = managerResourceComponent.getBindingManager();
Configuration updatedConfiguration = report.getConfiguration();
managerResourceComponent.checkValidity(updatedConfiguration);
- MetaType bindingSetValueMetaType = context.getParentResourceComponent().getBindingSetValueMetaType();
+ MetaType bindingSetValueMetaType = managerResourceComponent.getBindingSetValueMetaType(bindingManager);
CompositeValue currentBindingSet = Util.getBindingSetFromConfiguration(bindingSetValueMetaType,
updatedConfiguration);
//ok, now we can update the bindingSets property with the update set of binding sets
- ManagedComponent bindingManagerComponent = managerResourceComponent.getBindingManager();
- ManagedProperty bindingSetsProperty = bindingManagerComponent.getProperty(Util.BINDING_SETS_PROPERTY);
+ ManagedProperty bindingSetsProperty = bindingManager.getProperty(Util.BINDING_SETS_PROPERTY);
String thisBindingSetName = managerResourceComponent.getBindingSetNameFromResourceKey(context.getResourceKey());
//create new set of binding sets
@@ -130,7 +130,7 @@ public class SetComponent implements ResourceComponent<ManagerComponent>, Config
bindingSetsProperty.setValue(newBindingSetsValue);
- context.getParentResourceComponent().updateBindingManager(bindingManagerComponent);
+ context.getParentResourceComponent().updateBindingManager(bindingManager);
report.setStatus(ConfigurationUpdateStatus.SUCCESS);
} catch (Exception e) {
commit dbd357d545896e61bdaaebba273dee93703aefb6
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Feb 9 12:31:44 2012 -0500
[BZ 788638] Do not cache ManagedComponent objects to avoid high memory usage.
With this commit we no longer cache the ManagedComponent objects we get
back from the profile service. Even when we were caching them, we still
regularly fetched them for metric collections.
The caching was introduced to address high CPU utilization during
availability checks. The logic in
ManagedComponentComponent.getAvailability has been refactored so that we
do not necessarily fetch the component on every availability check.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
index 15ffea3..b89eb10 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
@@ -39,13 +39,15 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
private static final ComponentType MDB_COMPONENT_TYPE = new ComponentType("EJB", "MDB");
@Override
- protected ManagedComponent getManagedComponent(boolean forceRefresh) {
+ protected ManagedComponent getManagedComponent() {
if (MDB_COMPONENT_TYPE.equals(getComponentType())) {
try {
//we need to reload the management view here, because the MDBs might have changed since
//the last call, because the @object-id is part of their names.
ManagementView mv = getConnection().getManagementView();
- mv.load();
+ // TODO Review with ips to see if we need the following, commented out call
+ // jsanda
+ //mv.load();
Set<ManagedComponent> mdbs = mv.getComponentsForType(MDB_COMPONENT_TYPE);
@@ -59,7 +61,7 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
throw new IllegalStateException(e);
}
} else {
- return super.getManagedComponent(forceRefresh);
+ return super.getManagedComponent();
}
return null;
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 23f8b2d..9637954 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -23,11 +23,7 @@
package org.rhq.plugins.jbossas5;
import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,7 +40,6 @@ import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.RunState;
-import org.jboss.managed.api.annotation.ViewUse;
import org.jboss.metatype.api.values.ArrayValue;
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.CompositeValue;
@@ -103,8 +98,24 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
private final Log log = LogFactory.getLog(this.getClass());
- // Cache the ManagedComponent since it can be re-used to request any ViewUse.RUNTIME property values
- private ManagedComponent managedComponent = null;
+ /**
+ * The availability watermark specifies a duration that if exceeded means a managed
+ * component refresh is needed to perform an availability check. That duration is set
+ * to 15 minutes.
+ */
+ private static final long AVAIL_WATERMARK = 1000 * 60 * 15; // 15 minutes
+
+ /**
+ * The ManagedComponent is fetched from the server in {@link #getManagedComponent} throughout
+ * the life cycle of this resource component. For example during metrics collections
+ * when getValues is invoked, getManagedComponent is called. Any time getManagedComponent
+ * is called the lastComponentRefresh timestamp is updated. This timestamp is used in
+ * {@link #getAvailability} to determine whether or not a component is needed to
+ * perform an availability check.
+ */
+ private long lastComponentRefresh = 0L;
+
+ private RunState runState = RunState.UNKNOWN;
private String componentName;
private ComponentType componentType;
@@ -112,19 +123,26 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// ResourceComponent Implementation --------------------------------------------
public AvailabilityType getAvailability() {
- RunState runState;
- try {
- runState = getManagedComponent().getRunState();
- } catch (Throwable t) {
- log.debug("Could not get component state for " + this.componentType + " component '" + this.componentName
- + "', cause: ", t);
- return AvailabilityType.DOWN;
+ long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
+ if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
+ try {
+ getManagedComponent();
+ } catch (Throwable t) {
+ if (log.isDebugEnabled()) {
+ log.debug("Could not get component state for " + componentType + " component '" + componentName +
+ "', cause: " + t.getMessage(), t);
+ return AvailabilityType.DOWN;
+ }
+ }
}
+
if (runState == RunState.RUNNING) {
return AvailabilityType.UP;
} else {
- log.debug(this.componentType + " component '" + this.componentName + "' was not running, state" + " was: "
- + runState);
+ if (log.isDebugEnabled()) {
+ log.debug(componentType + " component '" + componentName + "' was not running, state was : " +
+ runState);
+ }
return AvailabilityType.DOWN;
}
}
@@ -139,7 +157,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
public void stop() {
- managedComponent = null;
super.stop();
}
@@ -148,7 +165,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public Configuration loadResourceConfiguration() {
Configuration resourceConfig;
try {
- ManagedComponent managedComponent = getManagedComponent(true);
+ ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext()
.getPluginConfiguration());
@@ -173,7 +190,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
Configuration resourceConfig = configurationUpdateReport.getConfiguration();
Configuration pluginConfig = getResourceContext().getPluginConfiguration();
try {
- ManagedComponent managedComponent = getManagedComponent(true);
+ ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig);
if (this.log.isDebugEnabled())
@@ -235,7 +252,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent managedComponent = prepareForMetricCollection(metrics);
+// ManagedComponent managedComponent = prepareForMetricCollection(metrics);
+ ManagedComponent managedComponent = getManagedComponent();
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
try {
@@ -252,44 +270,44 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
}
- protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
- // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
- // than once, it will settle down near immediately
- Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
- if (null == runtimeMetricMap) {
- //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
- runtimeMetricMap = new HashMap<String, Boolean>();
- runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
- }
-
- // determine whether we can use the cachedComponent or if we need to force a component fetch to
- // gather the requested metrics.
- boolean forceRefresh = false;
- for (MeasurementScheduleRequest request : metrics) {
- Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
- // if this is the first time we've seen this metric find out if it's a runtime prop
- if (null == isRuntimeMetric) {
- //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
- ManagedProperty managedProp = getManagedProperty(managedComponent, request);
- runtimeMetricMap.put(request.getName(),
- Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
- }
-
- if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
- //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
- forceRefresh = true;
- break;
- }
- }
-
- return getManagedComponent(forceRefresh);
- }
+// protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
+// // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
+// // than once, it will settle down near immediately
+// Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
+// if (null == runtimeMetricMap) {
+// //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
+// runtimeMetricMap = new HashMap<String, Boolean>();
+// runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
+// }
+//
+// // determine whether we can use the cachedComponent or if we need to force a component fetch to
+// // gather the requested metrics.
+// boolean forceRefresh = false;
+// for (MeasurementScheduleRequest request : metrics) {
+// Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
+// // if this is the first time we've seen this metric find out if it's a runtime prop
+// if (null == isRuntimeMetric) {
+// //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
+// ManagedProperty managedProp = getManagedProperty(managedComponent, request);
+// runtimeMetricMap.put(request.getName(),
+// Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
+// }
+//
+// if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
+// //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
+// forceRefresh = true;
+// break;
+// }
+// }
+//
+// return getManagedComponent();
+// }
protected String getMeasurement(ManagedComponent component, String metricName) throws Exception {
if ("runState".equals(metricName)) {
return component.getRunState().name();
} else {
- Object value = getSimpleValue(managedComponent, metricName);
+ Object value = getSimpleValue(component, metricName);
return value == null ? null : toString(value);
}
}
@@ -429,26 +447,23 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
protected ManagedComponent getManagedComponent() {
- return getManagedComponent(false);
- }
-
- protected ManagedComponent getManagedComponent(boolean forceRefresh) {
-
- if (!forceRefresh && null != this.managedComponent) {
- return this.managedComponent;
- }
-
+ ManagedComponent managedComponent = null;
try {
ManagementView managementView = getConnection().getManagementView();
managedComponent = managementView.getComponent(this.componentName, this.componentType);
} catch (Exception e) {
+ runState = RunState.UNKNOWN;
throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent ["
- + this.componentName + "].", e);
+ + this.componentName + "].", e);
}
- if (managedComponent == null)
+ if (managedComponent == null) {
+ runState = RunState.UNKNOWN;
throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named ["
- + this.componentName + "].");
+ + this.componentName + "].");
+ }
log.trace("Retrieved " + toString(managedComponent) + ".");
+ lastComponentRefresh = System.currentTimeMillis();
+ runState = managedComponent.getRunState();
return managedComponent;
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
index cdfa98b..852b594 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
@@ -46,7 +46,7 @@ public class TxConnectionFactoryComponent extends ManagedComponentComponent {
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent mc = getManagedComponent(true);
+ ManagedComponent mc = getManagedComponent();
Set<MeasurementScheduleRequest> uncollectedMetrics = new HashSet<MeasurementScheduleRequest>();
for (MeasurementScheduleRequest request : metrics) {
try {
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
index 0d96b2b..6eb7e7e 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
@@ -115,7 +115,7 @@ public class WebApplicationContextComponent extends ManagedComponentComponent {
ProfileServiceComponent warComponent = getResourceContext().getParentResourceComponent();
ManagementView managementView = warComponent.getConnection().getManagementView();
- ManagedComponent component = prepareForMetricCollection(requests);
+ ManagedComponent component = getManagedComponent();
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
try {
1
0
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 183 ++++++----
1 file changed, 120 insertions(+), 63 deletions(-)
New commits:
commit 11d405fe3de2c55d8d525d5fc736825e0dc8a67c
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Feb 15 18:16:36 2012 +0100
[BZ 790859] - Do not expect standard input when the CLI runs in non-interactive mode.
* restore the printing out of the CLI version on startup
* specifying only the "-v" option will yet again just print the version and exit
* specifying an invalid port will cause the CLI to fail startup
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
index 0444c3b..308d6c1 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -60,6 +60,8 @@ public class ClientMain {
// Stored command map. Key to instance that handles that command.
private static Map<String, ClientCommand> commands = new HashMap<String, ClientCommand>();
+ public static final int DEFAULT_CONSOLE_WIDTH = 80;
+
/**
* This is the thread that is running the input loop; it accepts prompt commands from the user.
*/
@@ -80,7 +82,6 @@ public class ClientMain {
private String user;
private String pass;
private ArrayList<String> notes = new ArrayList<String>();
- private boolean showDetailedVersion;
// reference to the webservice reference factory
private RemoteClient remoteClient;
@@ -94,6 +95,55 @@ public class ClientMain {
private Recorder recorder = new NoOpRecorder();
+ private class StartupConfiguration {
+ public boolean askForPassword;
+ public boolean displayUsage;
+ public List<String> commandsToExec;
+ public boolean invalidArgs;
+ public boolean showVersionAndExit;
+ public boolean showDetailedVersion;
+
+ public void process() throws Exception {
+ if (invalidArgs) {
+ displayUsage();
+ throw new IllegalArgumentException(MSG.getMsg(ClientI18NResourceKeys.BAD_ARGS));
+ }
+
+ if (displayUsage) {
+ displayUsage();
+ }
+
+ if (askForPassword) {
+ setPass(getConsoleReader().readLine("password: ", (char) 0));
+ }
+
+ if (isInteractiveMode()) {
+ String version = showDetailedVersion ? Version.getProductNameAndVersionBuildInfo() : Version.getProductNameAndVersion();
+ outputWriter.println(version);
+ if (showVersionAndExit) {
+ // If -v was the only option specified, exit after printing the version.
+ System.exit(0);
+ }
+ }
+
+ if (getUser() != null && getPass() != null) {
+ ClientCommand loginCmd = getCommands().get("login");
+ if (getHost() != null) {
+ loginCmd.execute(ClientMain.this, new String[] { "login", getUser(), getPass(), getHost(), String.valueOf(getPort()), getTransport() });
+ } else {
+ loginCmd.execute(ClientMain.this, new String[] { "login", getUser(), getPass() });
+ }
+ if (!loggedIn()) {
+ return;
+ }
+ }
+
+ if (commandsToExec != null && !commandsToExec.isEmpty()) {
+ getCommands().get("exec").execute(ClientMain.this, commandsToExec.toArray(new String[commandsToExec.size()]));
+ }
+ }
+ }
+
// Entrance to main.
public static void main(String[] args) throws Exception {
initCommands();
@@ -101,10 +151,17 @@ public class ClientMain {
// instantiate
ClientMain main = new ClientMain();
- // process startup arguments
- main.processArguments(args);
-
- if (main.interactiveMode) {
+ // capture startup arguments and setup the properties
+ //from them
+ StartupConfiguration config = main.processArguments(args);
+
+ //initialize the CLI
+ main.initialize();
+
+ //process the arguments now that we are initialized
+ config.process();
+
+ if (main.isInteractiveMode()) {
// begin client access loop
main.inputLoop();
}
@@ -124,10 +181,13 @@ public class ClientMain {
}
}
- private void initScriptCommandAndServiceCompletor() {
+ private void initScriptCommand() {
+ ScriptCommand sc = (ScriptCommand) commands.get("exec");
+ sc.initClient(this);
+ }
+
+ private void initServiceCompletor() {
ScriptCommand sc = (ScriptCommand) commands.get("exec");
- sc.initClient(this);
-
this.serviceCompletor.setContext(sc.getContext());
if (remoteClient != null) {
@@ -135,35 +195,43 @@ public class ClientMain {
}
}
- public ClientMain() throws Exception {
-
+ public ClientMain() {
+ // initialize the printwriter to system.out for console conversations
+ outputWriter = new PrintWriter(System.out, true);
+ }
+
+ private void initialize() throws IOException {
// this.inputReader = new BufferedReader(new
// InputStreamReader(System.in));
// initialize the printwriter to system.out for console conversations
this.outputWriter = new PrintWriter(System.out, true);
- // Initialize JLine console elements.
- consoleReader = new jline.ConsoleReader();
-
- // Setup the command line completers for listed actions for the user before login
- // completes initial commands available
- Completor commandCompletor = new SimpleCompletor(commands.keySet().toArray(new String[commands.size()]));
- // completes help arguments (basically, help <command>)
- Completor helpCompletor = new ArgumentCompletor(new Completor[] { new SimpleCompletor("help"),
- new SimpleCompletor(commands.keySet().toArray(new String[commands.size()])) });
-
- this.serviceCompletor = new InteractiveJavascriptCompletor(consoleReader);
- consoleReader.addCompletor(new MultiCompletor(new Completor[] { serviceCompletor, helpCompletor,
- commandCompletor }));
-
//ScriptCommand is super special because it handles executing all the code for us
- initScriptCommandAndServiceCompletor();
-
- // enable pagination
- consoleReader.setUsePagination(true);
+ initScriptCommand();
+
+ if (isInteractiveMode()) {
+ // Initialize JLine console elements.
+ consoleReader = new jline.ConsoleReader();
+
+ // Setup the command line completers for listed actions for the user before login
+ // completes initial commands available
+ Completor commandCompletor = new SimpleCompletor(commands.keySet().toArray(new String[commands.size()]));
+ // completes help arguments (basically, help <command>)
+ Completor helpCompletor = new ArgumentCompletor(new Completor[] { new SimpleCompletor("help"),
+ new SimpleCompletor(commands.keySet().toArray(new String[commands.size()])) });
+
+ this.serviceCompletor = new InteractiveJavascriptCompletor(consoleReader);
+ consoleReader.addCompletor(new MultiCompletor(new Completor[] { serviceCompletor, helpCompletor,
+ commandCompletor }));
+
+ initServiceCompletor();
+
+ // enable pagination
+ consoleReader.setUsePagination(true);
+ }
}
-
+
public String getUserInput(String prompt) {
String input_string = "";
@@ -378,7 +446,9 @@ public class ClientMain {
.println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-v] [-f file]|[-c command]");
}
- void processArguments(String[] args) throws IllegalArgumentException, IOException {
+ StartupConfiguration processArguments(String[] args) throws IllegalArgumentException, IOException {
+ StartupConfiguration config = new StartupConfiguration();
+
String sopts = "-:hu:p:Ps:t:r:c:f:v";
LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("user", LongOpt.REQUIRED_ARGUMENT, null, 'u'),
@@ -402,9 +472,8 @@ public class ClientMain {
switch (code) {
case ':':
case '?': {
- // for now both of these should exit
- displayUsage();
- throw new IllegalArgumentException(MSG.getMsg(ClientI18NResourceKeys.BAD_ARGS));
+ config.invalidArgs = true;
+ break;
}
case 1: {
@@ -415,7 +484,7 @@ public class ClientMain {
}
case 'h': {
- displayUsage();
+ config.displayUsage = true;
break;
}
@@ -428,7 +497,7 @@ public class ClientMain {
break;
}
case 'P': {
- this.pass = this.consoleReader.readLine("password: ", (char) 0);
+ config.askForPassword = true;
break;
}
case 'c': {
@@ -460,42 +529,25 @@ public class ClientMain {
setPort(Integer.parseInt(portArg));
} catch (Exception e) {
outputWriter.println("Invalid port [" + portArg + "]");
+ System.exit(1);
}
break;
}
- case 'v': {
- String versionString = Version.getProductNameAndVersionBuildInfo();
- outputWriter.println(versionString);
+ case 'v': {
+ config.showDetailedVersion = true;
+ if (args.length == 1) {
+ config.showVersionAndExit = true;
+ }
break;
}
}
}
- if (interactiveMode) {
- String version = (showDetailedVersion) ? Version.getProductNameAndVersionBuildInfo() : Version
- .getProductNameAndVersion();
- outputWriter.println(version);
- if (showDetailedVersion && args.length == 1) {
- // If -v was the only option specified, exit after printing the version.
- System.exit(0);
- }
- }
-
- if (user != null && pass != null) {
- ClientCommand loginCmd = commands.get("login");
- if (host != null) {
- loginCmd.execute(this, new String[] { "login", user, pass, host, String.valueOf(port), transport });
- } else {
- loginCmd.execute(this, new String[] { "login", user, pass });
- }
- if (!loggedIn()) {
- return;
- }
- }
-
if (!interactiveMode) {
- commands.get("exec").execute(this, execCmdLine.toArray(new String[execCmdLine.size()]));
+ config.commandsToExec = execCmdLine;
}
+
+ return config;
}
public RemoteClient getRemoteClient() {
@@ -505,7 +557,10 @@ public class ClientMain {
public void setRemoteClient(RemoteClient remoteClient) {
this.remoteClient = remoteClient;
- initScriptCommandAndServiceCompletor();
+ initScriptCommand();
+ if (isInteractiveMode()) {
+ initServiceCompletor();
+ }
}
public Subject getSubject() {
@@ -565,7 +620,9 @@ public class ClientMain {
}
public int getConsoleWidth() {
- return this.consoleReader.getTermwidth();
+ //the console reader might be null when this method is asked for the output
+ //width in non-interactive mode where we don't attach to stdin.
+ return this.consoleReader == null ? DEFAULT_CONSOLE_WIDTH : this.consoleReader.getTermwidth();
}
public Map<String, ClientCommand> getCommands() {
1
0
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java | 22 -
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java | 5
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 4
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 161 +++++-----
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java | 13
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java | 8
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 10
9 files changed, 124 insertions(+), 103 deletions(-)
New commits:
commit 14308d11b3f86e51dd505d7711c79c8e043ab7c9
Merge: b93446c b973af8
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Feb 15 11:47:41 2012 -0500
Merge branch 'bug/788638'
commit b973af82febbaba656e06209af7922fcb1891df8
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Feb 14 15:26:09 2012 -0500
[BZ 788638] Removing extra call to fetch managed object
We were making an extra call to getManagedCompoment in
AbstractEjbComponent during metric collection. I discovered this while
doing some profiling. With this change execution time for
AbstractEjbBeanComponent.getValues is reduced by about 50% Also adding
some logging in ManagedComponentComponent.getAvailability to indicate
when an availability refresh is needed. This could be useful for tuning
the interval.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
index c28dad2..a0fccc5 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
@@ -54,7 +54,8 @@ import org.rhq.core.pluginapi.operation.OperationResult;
* @author Lukas Krejci
* @author Ian Springer
*/
-public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent implements OperationFacet {
+public abstract class
+ AbstractEjbBeanComponent extends ManagedComponentComponent implements OperationFacet {
private final Log log = LogFactory.getLog(this.getClass());
private static final String VIEW_INVOCATION_STATS_OPERATION_NAME = "viewInvocationStats";
@@ -83,7 +84,7 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
}
}
// Let our superclass handle any metrics we didn't collect.
- super.getValues(report, remainingRequests);
+ super.getValues(managedComponent, report, remainingRequests);
}
@Override
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 201484e..f4ebef0 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -127,6 +127,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
if (timeSinceComponentRefresh > availRefreshInterval) {
+ if (log.isDebugEnabled()) {
+ log.debug("The availability refresh interval for [resourceKey: " + getResourceContext().getResourceKey()
+ + ", type: " + componentType + ", name: " + componentName + "] has been exceeded by " +
+ (timeSinceComponentRefresh - availRefreshInterval) + " ms. Reloading managed component.");
+ }
getManagedComponent();
}
@@ -249,7 +254,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent managedComponent = getManagedComponent();
+ getValues(getManagedComponent(), report, metrics);
+ }
+
+ protected void getValues(ManagedComponent managedComponent, MeasurementReport report,
+ Set<MeasurementScheduleRequest> metrics) throws Exception {
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
try {
@@ -260,7 +269,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
log.error("Failed to collect metric for " + request, e);
} else {
log.debug("Failed to collect metric for " + request
- + ", but managed component is not in the RUNNING state.", e);
+ + ", but managed component is not in the RUNNING state.", e);
}
}
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 38ae6b4..ab12497 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -999,13 +999,13 @@
<c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
default="15" type="integer"
- description="The amount of time, in minutes, that can elapse for service availability checks
- without having to refresh the managed object from the server. Services cache information
- used to perform availability checks. This property determines how frequently that
- data needs to be reloaded from the server. Any time the managed object is
- loaded from the server, like for collecting metrics, the availability information
- is updated and the interval is reset. Note that this property does not effect the
- frequency of availability scans performed by the agent."/>
+ description="The amount of time, in minutes, that can elapse for service resource
+ (e.g., EJBs, data sources) availability checks without having to refresh the
+ managed object from the JBoss server. The information used to perform availability
+ checks is cached. This property determines how frequently that data needs to be
+ reloaded from the JBoss server. Any time the managed object is loaded from the
+ server, like for collecting metrics, the availability information is updated and
+ the interval is reset."/>
<c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
readOnly="true" required="false"
commit 4ad3388b4081b9689699c2d705f9162ab33fc37e
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 10 21:50:04 2012 -0500
[BZ 788638] Make service availability refresh interval configurable
The refresh interval is now configurable from the application server
component. The interval setting then applies to all descendant services.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 374ae95..201484e 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -99,11 +99,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
private final Log log = LogFactory.getLog(this.getClass());
/**
- * The availability watermark specifies a duration that if exceeded means a managed
+ * The availability refresh interval specifies a duration that if exceeded means a managed
* component refresh is needed to perform an availability check. That duration is set
* to 15 minutes.
*/
- private static final long AVAIL_WATERMARK = 1000 * 60 * 15; // 15 minutes
+ private static final long AVAIL_REFRESH_INTERVAL = 1000 * 60 * 15; // 15 minutes
/**
* The ManagedComponent is fetched from the server in {@link #getManagedComponent} throughout
@@ -114,6 +114,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
* perform an availability check.
*/
private long lastComponentRefresh = 0L;
+
+ private long availRefreshInterval = AVAIL_REFRESH_INTERVAL;
private RunState runState = RunState.UNKNOWN;
@@ -124,7 +126,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
- if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
+ if (timeSinceComponentRefresh > availRefreshInterval) {
getManagedComponent();
}
@@ -141,11 +143,14 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public void start(ResourceContext<ProfileServiceComponent<?>> resourceContext) throws Exception {
super.start(resourceContext);
- this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType());
+ componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType());
Configuration pluginConfig = resourceContext.getPluginConfiguration();
- this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue();
- log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType
- + " component '" + this.componentName + "'.");
+ componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue();
+ initAvailRefreshInterval(resourceContext);
+ if (log.isTraceEnabled()) {
+ log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType
+ + " component '" + this.componentName + "'.");
+ }
}
public void stop() {
@@ -476,4 +481,26 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
return value.toString();
}
}
+
+ private void initAvailRefreshInterval(ResourceContext<ProfileServiceComponent<?>> context) {
+ ProfileServiceComponent<?> component = context.getParentResourceComponent();
+ while (component != null) {
+ if (component instanceof ApplicationServerComponent) {
+ break;
+ }
+ component = (ProfileServiceComponent<?>) component.getResourceContext().getParentResourceComponent();
+ }
+
+ if (component == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to find parent " + ApplicationServerComponent.class.getSimpleName() +
+ ". Using default component refresh interval, " + AVAIL_REFRESH_INTERVAL + " ms");
+ }
+ return;
+ }
+
+ String interval = component.getResourceContext().getPluginConfiguration().getSimpleValue(
+ "serviceAvailabilityRefreshInterval", Long.toString(AVAIL_REFRESH_INTERVAL));
+ availRefreshInterval = Long.parseLong(interval) * 1000 * 60;
+ }
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index bac3e20..38ae6b4 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -997,6 +997,16 @@
</c:constraint>
</c:simple-property>
+ <c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
+ default="15" type="integer"
+ description="The amount of time, in minutes, that can elapse for service availability checks
+ without having to refresh the managed object from the server. Services cache information
+ used to perform availability checks. This property determines how frequently that
+ data needs to be reloaded from the server. Any time the managed object is
+ loaded from the server, like for collecting metrics, the availability information
+ is updated and the interval is reset. Note that this property does not effect the
+ frequency of availability scans performed by the agent."/>
+
<c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
readOnly="true" required="false"
description="The name of the JBoss AS JVM resource."/>
commit 9000b42add980e17274a7ec30b76a883ba38f300
Merge: 16e393e af24373
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Feb 10 15:33:48 2012 -0500
Merge branch 'master' into bug/788638
commit 16e393eea505f38dac2e29c72d3ebaec6a477fdd
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 10 11:56:54 2012 -0500
[BZ 788638] Remove extra calls to getManagedComponent
There are several places where getManagedComponent was called from
within the same method. This was fine previously since the managed
object was cached, but we do not want to make those extra calls any more
since the managed object is no longer cached.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
index 5f63261..c28dad2 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.values.CompositeValue;
@@ -60,17 +61,18 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
+ ManagedComponent managedComponent = getManagedComponent();
Set<MeasurementScheduleRequest> remainingRequests = new LinkedHashSet();
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
try {
if (metricName.equals("methodInvocationTime")) {
// Convert the method stats CompositeValues into nice strongly typed objects.
- InvocationStats invocationStats = getInvocationStats();
+ InvocationStats invocationStats = getInvocationStats(managedComponent);
if (!invocationStats.methodStats.isEmpty()) {
CallTimeData callTimeData = createCallTimeData(request, invocationStats);
report.addData(callTimeData);
- resetInvocationStats();
+ resetInvocationStats(managedComponent);
}
} else {
remainingRequests.add(request);
@@ -87,13 +89,14 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
@Override
public OperationResult invokeOperation(String name, Configuration parameters) throws Exception {
OperationResult result;
+ ManagedComponent managedComponent = getManagedComponent();
if (VIEW_INVOCATION_STATS_OPERATION_NAME.equals(name)) {
result = new OperationResult();
PropertyList methodList = new PropertyList("methods");
result.getComplexResults().put(methodList);
// Convert the invocation stats CompositeValues into a nice strongly typed object.
- List<MethodStats> allMethodStats = getInvocationStats().methodStats;
+ List<MethodStats> allMethodStats = getInvocationStats(managedComponent).methodStats;
for (MethodStats methodStats : allMethodStats) {
PropertyMap method = new PropertyMap("method", new PropertySimple("methodName", methodStats.name),
@@ -108,12 +111,12 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
return result;
}
- private InvocationStats getInvocationStats() {
+ private InvocationStats getInvocationStats(ManagedComponent managedComponent) {
InvocationStats invocationStats = new InvocationStats();
List<MethodStats> allMethodStats = new ArrayList<MethodStats>();
Configuration pluginConfig = getResourceContext().getPluginConfiguration();
String propName = pluginConfig.getSimple("invocationStatsPropertyName").getStringValue();
- ManagedProperty detypedInvokedStatsProp = this.getManagedComponent().getProperty(propName);
+ ManagedProperty detypedInvokedStatsProp = managedComponent.getProperty(propName);
invocationStats.endTime = System.currentTimeMillis();
CompositeValue detypedInvokeStatsMetaValue = (CompositeValue) detypedInvokedStatsProp.getValue();
CompositeValue allMethodStatsMetaValue = (CompositeValue) detypedInvokeStatsMetaValue.get("methodStats");
@@ -157,8 +160,8 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
return callTimeData;
}
- private void resetInvocationStats() {
- Set<ManagedOperation> operations = getManagedComponent().getOperations();
+ private void resetInvocationStats(ManagedComponent managedComponent) {
+ Set<ManagedOperation> operations = managedComponent.getOperations();
for (ManagedOperation operation : operations) {
if (operation.getName().equals("resetInvocationStats")) {
operation.invoke();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
index b89eb10..ebbf9bb 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
@@ -45,9 +45,6 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
//we need to reload the management view here, because the MDBs might have changed since
//the last call, because the @object-id is part of their names.
ManagementView mv = getConnection().getManagementView();
- // TODO Review with ips to see if we need the following, commented out call
- // jsanda
- //mv.load();
Set<ManagedComponent> mdbs = mv.getComponentsForType(MDB_COMPONENT_TYPE);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
index e864117..e5656f5 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
@@ -43,10 +43,6 @@ public class JBossMessagingComponent extends ManagedComponentComponent implement
MeasurementFacet {
private CreateChildResourceFacetDelegate createChildResourceDelegate;
- public AvailabilityType getAvailability() {
- return super.getAvailability();
- }
-
public void start(ResourceContext<ProfileServiceComponent<?>> resourceContext) throws Exception {
super.start(resourceContext);
this.createChildResourceDelegate = new CreateChildResourceFacetDelegate(this);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 9637954..374ae95 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -125,15 +125,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
- try {
- getManagedComponent();
- } catch (Throwable t) {
- if (log.isDebugEnabled()) {
- log.debug("Could not get component state for " + componentType + " component '" + componentName +
- "', cause: " + t.getMessage(), t);
- return AvailabilityType.DOWN;
- }
- }
+ getManagedComponent();
}
if (runState == RunState.RUNNING) {
@@ -164,8 +156,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public Configuration loadResourceConfiguration() {
Configuration resourceConfig;
+ ManagedComponent managedComponent = getManagedComponent();
try {
- ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext()
.getPluginConfiguration());
@@ -174,7 +166,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, customProps,
getResourceContext().getResourceType());
} catch (Exception e) {
- RunState runState = getManagedComponent().getRunState();
+ RunState runState = managedComponent.getRunState();
if (runState == RunState.RUNNING) {
this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e);
} else {
@@ -252,7 +244,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
-// ManagedComponent managedComponent = prepareForMetricCollection(metrics);
ManagedComponent managedComponent = getManagedComponent();
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
@@ -270,39 +261,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
}
-// protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
-// // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
-// // than once, it will settle down near immediately
-// Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
-// if (null == runtimeMetricMap) {
-// //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
-// runtimeMetricMap = new HashMap<String, Boolean>();
-// runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
-// }
-//
-// // determine whether we can use the cachedComponent or if we need to force a component fetch to
-// // gather the requested metrics.
-// boolean forceRefresh = false;
-// for (MeasurementScheduleRequest request : metrics) {
-// Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
-// // if this is the first time we've seen this metric find out if it's a runtime prop
-// if (null == isRuntimeMetric) {
-// //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
-// ManagedProperty managedProp = getManagedProperty(managedComponent, request);
-// runtimeMetricMap.put(request.getName(),
-// Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
-// }
-//
-// if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
-// //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
-// forceRefresh = true;
-// break;
-// }
-// }
-//
-// return getManagedComponent();
-// }
-
protected String getMeasurement(ManagedComponent component, String metricName) throws Exception {
if ("runState".equals(metricName)) {
return component.getRunState().name();
@@ -461,7 +419,9 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named ["
+ this.componentName + "].");
}
- log.trace("Retrieved " + toString(managedComponent) + ".");
+ if (log.isTraceEnabled()) {
+ log.trace("Retrieved " + toString(managedComponent) + ".");
+ }
lastComponentRefresh = System.currentTimeMillis();
runState = managedComponent.getRunState();
return managedComponent;
@@ -490,7 +450,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
return operation;
}
throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName()
- + "' not found on ManagedComponent [" + getManagedComponent() + "].");
+ + "' not found on ManagedComponent [" + managedComponent + "].");
}
private static String toString(ManagedComponent managedComponent) {
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
index 2926a95..ba2a4c9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
@@ -74,9 +74,10 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
public AvailabilityType getAvailability() {
RunState runState = getManagedComponent().getRunState();
return (runState == RunState.RUNNING || runState == RunState.UNKNOWN) ? AvailabilityType.UP
- : AvailabilityType.DOWN;
+ : AvailabilityType.DOWN;
}
+
// ConfigurationFacet -----------------------------
@Override
@@ -189,16 +190,16 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
public CreateResourceReport createResource(CreateResourceReport report) {
try {
+ ManagedComponent bindingManagerComponent = getBindingManager();
if (BINDING_SET_SERVICE_NAME.equals(report.getResourceType().getName())) {
Configuration bindingConfiguration = report.getResourceConfiguration();
checkValidity(bindingConfiguration);
- CompositeValue newBindingSet = Util.getBindingSetFromConfiguration(getBindingSetValueMetaType(),
- bindingConfiguration);
+ CompositeValue newBindingSet = Util.getBindingSetFromConfiguration(
+ getBindingSetValueMetaType(bindingManagerComponent), bindingConfiguration);
//ok, now we can update the bindingSets property with the update set of binding sets
- ManagedComponent bindingManagerComponent = getBindingManager();
ManagedProperty bindingSetsProperty = bindingManagerComponent.getProperty(Util.BINDING_SETS_PROPERTY);
//check that the provided binding set name is unique
@@ -242,8 +243,8 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
return report;
}
- public MetaType getBindingSetValueMetaType() {
- CollectionMetaType bindingSetsMetaType = (CollectionMetaType) getBindingManager().getProperty(
+ public MetaType getBindingSetValueMetaType(ManagedComponent bindingManager) {
+ CollectionMetaType bindingSetsMetaType = (CollectionMetaType) bindingManager.getProperty(
Util.BINDING_SETS_PROPERTY).getMetaType();
return bindingSetsMetaType.getElementType();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
index 024d60d..8303464 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
@@ -106,19 +106,19 @@ public class SetComponent implements ResourceComponent<ManagerComponent>, Config
public void updateResourceConfiguration(ConfigurationUpdateReport report) {
try {
ManagerComponent managerResourceComponent = context.getParentResourceComponent();
+ ManagedComponent bindingManager = managerResourceComponent.getBindingManager();
Configuration updatedConfiguration = report.getConfiguration();
managerResourceComponent.checkValidity(updatedConfiguration);
- MetaType bindingSetValueMetaType = context.getParentResourceComponent().getBindingSetValueMetaType();
+ MetaType bindingSetValueMetaType = managerResourceComponent.getBindingSetValueMetaType(bindingManager);
CompositeValue currentBindingSet = Util.getBindingSetFromConfiguration(bindingSetValueMetaType,
updatedConfiguration);
//ok, now we can update the bindingSets property with the update set of binding sets
- ManagedComponent bindingManagerComponent = managerResourceComponent.getBindingManager();
- ManagedProperty bindingSetsProperty = bindingManagerComponent.getProperty(Util.BINDING_SETS_PROPERTY);
+ ManagedProperty bindingSetsProperty = bindingManager.getProperty(Util.BINDING_SETS_PROPERTY);
String thisBindingSetName = managerResourceComponent.getBindingSetNameFromResourceKey(context.getResourceKey());
//create new set of binding sets
@@ -130,7 +130,7 @@ public class SetComponent implements ResourceComponent<ManagerComponent>, Config
bindingSetsProperty.setValue(newBindingSetsValue);
- context.getParentResourceComponent().updateBindingManager(bindingManagerComponent);
+ context.getParentResourceComponent().updateBindingManager(bindingManager);
report.setStatus(ConfigurationUpdateStatus.SUCCESS);
} catch (Exception e) {
commit ebdd56accf88ec9dda033ad313139832204f3e42
Merge: 088d622 07bdfe9
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Feb 9 14:48:51 2012 -0500
Merge branch 'master' into bug/788638
commit 088d622f5f695a84f0f60d7ecfe087182d52b7df
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Feb 9 12:31:44 2012 -0500
[BZ 788638] Do not cache ManagedComponent objects to avoid high memory usage.
With this commit we no longer cache the ManagedComponent objects we get
back from the profile service. Even when we were caching them, we still
regularly fetched them for metric collections.
The caching was introduced to address high CPU utilization during
availability checks. The logic in
ManagedComponentComponent.getAvailability has been refactored so that we
do not necessarily fetch the component on every availability check.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
index 15ffea3..b89eb10 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
@@ -39,13 +39,15 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
private static final ComponentType MDB_COMPONENT_TYPE = new ComponentType("EJB", "MDB");
@Override
- protected ManagedComponent getManagedComponent(boolean forceRefresh) {
+ protected ManagedComponent getManagedComponent() {
if (MDB_COMPONENT_TYPE.equals(getComponentType())) {
try {
//we need to reload the management view here, because the MDBs might have changed since
//the last call, because the @object-id is part of their names.
ManagementView mv = getConnection().getManagementView();
- mv.load();
+ // TODO Review with ips to see if we need the following, commented out call
+ // jsanda
+ //mv.load();
Set<ManagedComponent> mdbs = mv.getComponentsForType(MDB_COMPONENT_TYPE);
@@ -59,7 +61,7 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
throw new IllegalStateException(e);
}
} else {
- return super.getManagedComponent(forceRefresh);
+ return super.getManagedComponent();
}
return null;
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 23f8b2d..9637954 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -23,11 +23,7 @@
package org.rhq.plugins.jbossas5;
import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,7 +40,6 @@ import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.RunState;
-import org.jboss.managed.api.annotation.ViewUse;
import org.jboss.metatype.api.values.ArrayValue;
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.CompositeValue;
@@ -103,8 +98,24 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
private final Log log = LogFactory.getLog(this.getClass());
- // Cache the ManagedComponent since it can be re-used to request any ViewUse.RUNTIME property values
- private ManagedComponent managedComponent = null;
+ /**
+ * The availability watermark specifies a duration that if exceeded means a managed
+ * component refresh is needed to perform an availability check. That duration is set
+ * to 15 minutes.
+ */
+ private static final long AVAIL_WATERMARK = 1000 * 60 * 15; // 15 minutes
+
+ /**
+ * The ManagedComponent is fetched from the server in {@link #getManagedComponent} throughout
+ * the life cycle of this resource component. For example during metrics collections
+ * when getValues is invoked, getManagedComponent is called. Any time getManagedComponent
+ * is called the lastComponentRefresh timestamp is updated. This timestamp is used in
+ * {@link #getAvailability} to determine whether or not a component is needed to
+ * perform an availability check.
+ */
+ private long lastComponentRefresh = 0L;
+
+ private RunState runState = RunState.UNKNOWN;
private String componentName;
private ComponentType componentType;
@@ -112,19 +123,26 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// ResourceComponent Implementation --------------------------------------------
public AvailabilityType getAvailability() {
- RunState runState;
- try {
- runState = getManagedComponent().getRunState();
- } catch (Throwable t) {
- log.debug("Could not get component state for " + this.componentType + " component '" + this.componentName
- + "', cause: ", t);
- return AvailabilityType.DOWN;
+ long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
+ if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
+ try {
+ getManagedComponent();
+ } catch (Throwable t) {
+ if (log.isDebugEnabled()) {
+ log.debug("Could not get component state for " + componentType + " component '" + componentName +
+ "', cause: " + t.getMessage(), t);
+ return AvailabilityType.DOWN;
+ }
+ }
}
+
if (runState == RunState.RUNNING) {
return AvailabilityType.UP;
} else {
- log.debug(this.componentType + " component '" + this.componentName + "' was not running, state" + " was: "
- + runState);
+ if (log.isDebugEnabled()) {
+ log.debug(componentType + " component '" + componentName + "' was not running, state was : " +
+ runState);
+ }
return AvailabilityType.DOWN;
}
}
@@ -139,7 +157,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
public void stop() {
- managedComponent = null;
super.stop();
}
@@ -148,7 +165,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public Configuration loadResourceConfiguration() {
Configuration resourceConfig;
try {
- ManagedComponent managedComponent = getManagedComponent(true);
+ ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext()
.getPluginConfiguration());
@@ -173,7 +190,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
Configuration resourceConfig = configurationUpdateReport.getConfiguration();
Configuration pluginConfig = getResourceContext().getPluginConfiguration();
try {
- ManagedComponent managedComponent = getManagedComponent(true);
+ ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig);
if (this.log.isDebugEnabled())
@@ -235,7 +252,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent managedComponent = prepareForMetricCollection(metrics);
+// ManagedComponent managedComponent = prepareForMetricCollection(metrics);
+ ManagedComponent managedComponent = getManagedComponent();
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
try {
@@ -252,44 +270,44 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
}
- protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
- // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
- // than once, it will settle down near immediately
- Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
- if (null == runtimeMetricMap) {
- //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
- runtimeMetricMap = new HashMap<String, Boolean>();
- runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
- }
-
- // determine whether we can use the cachedComponent or if we need to force a component fetch to
- // gather the requested metrics.
- boolean forceRefresh = false;
- for (MeasurementScheduleRequest request : metrics) {
- Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
- // if this is the first time we've seen this metric find out if it's a runtime prop
- if (null == isRuntimeMetric) {
- //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
- ManagedProperty managedProp = getManagedProperty(managedComponent, request);
- runtimeMetricMap.put(request.getName(),
- Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
- }
-
- if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
- //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
- forceRefresh = true;
- break;
- }
- }
-
- return getManagedComponent(forceRefresh);
- }
+// protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
+// // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
+// // than once, it will settle down near immediately
+// Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
+// if (null == runtimeMetricMap) {
+// //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
+// runtimeMetricMap = new HashMap<String, Boolean>();
+// runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
+// }
+//
+// // determine whether we can use the cachedComponent or if we need to force a component fetch to
+// // gather the requested metrics.
+// boolean forceRefresh = false;
+// for (MeasurementScheduleRequest request : metrics) {
+// Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
+// // if this is the first time we've seen this metric find out if it's a runtime prop
+// if (null == isRuntimeMetric) {
+// //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
+// ManagedProperty managedProp = getManagedProperty(managedComponent, request);
+// runtimeMetricMap.put(request.getName(),
+// Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
+// }
+//
+// if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
+// //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
+// forceRefresh = true;
+// break;
+// }
+// }
+//
+// return getManagedComponent();
+// }
protected String getMeasurement(ManagedComponent component, String metricName) throws Exception {
if ("runState".equals(metricName)) {
return component.getRunState().name();
} else {
- Object value = getSimpleValue(managedComponent, metricName);
+ Object value = getSimpleValue(component, metricName);
return value == null ? null : toString(value);
}
}
@@ -429,26 +447,23 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
protected ManagedComponent getManagedComponent() {
- return getManagedComponent(false);
- }
-
- protected ManagedComponent getManagedComponent(boolean forceRefresh) {
-
- if (!forceRefresh && null != this.managedComponent) {
- return this.managedComponent;
- }
-
+ ManagedComponent managedComponent = null;
try {
ManagementView managementView = getConnection().getManagementView();
managedComponent = managementView.getComponent(this.componentName, this.componentType);
} catch (Exception e) {
+ runState = RunState.UNKNOWN;
throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent ["
- + this.componentName + "].", e);
+ + this.componentName + "].", e);
}
- if (managedComponent == null)
+ if (managedComponent == null) {
+ runState = RunState.UNKNOWN;
throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named ["
- + this.componentName + "].");
+ + this.componentName + "].");
+ }
log.trace("Retrieved " + toString(managedComponent) + ".");
+ lastComponentRefresh = System.currentTimeMillis();
+ runState = managedComponent.getRunState();
return managedComponent;
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
index cdfa98b..852b594 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
@@ -46,7 +46,7 @@ public class TxConnectionFactoryComponent extends ManagedComponentComponent {
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent mc = getManagedComponent(true);
+ ManagedComponent mc = getManagedComponent();
Set<MeasurementScheduleRequest> uncollectedMetrics = new HashSet<MeasurementScheduleRequest>();
for (MeasurementScheduleRequest request : metrics) {
try {
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
index 0d96b2b..6eb7e7e 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
@@ -115,7 +115,7 @@ public class WebApplicationContextComponent extends ManagedComponentComponent {
ProfileServiceComponent warComponent = getResourceContext().getParentResourceComponent();
ManagementView managementView = warComponent.getConnection().getManagementView();
- ManagedComponent component = prepareForMetricCollection(requests);
+ ManagedComponent component = getManagedComponent();
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
try {
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 11 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewChangedException.java | 43 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 11 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 13 ++-
6 files changed, 75 insertions(+), 7 deletions(-)
New commits:
commit b93446cd53a86b48fa2d9a397d5af84ff0e9c799
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Feb 15 10:23:07 2012 -0500
[BZ 754521] prevent NPE when user navigates away from a Resource detail view before that view has finished loading
(https://bugzilla.redhat.com/show_bug.cgi?id=754521)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index d331365..89d9099 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -154,7 +154,14 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String>, Event.Na
GWT.setUncaughtExceptionHandler(new GWT.UncaughtExceptionHandler() {
public void onUncaughtException(Throwable e) {
- getErrorHandler().handleError(MSG.view_core_uncaught(), e);
+ if (e instanceof ViewChangedException) {
+ ViewChangedException viewChangedException = (ViewChangedException) e;
+ String obsoleteView = viewChangedException.getObsoleteView();
+ Log.debug("User navigated to view [" + currentView + "] before view [" + obsoleteView
+ + "] was done rendering - rendering of view [" + obsoleteView + "] has been aborted.");
+ } else {
+ getErrorHandler().handleError(MSG.view_core_uncaught(), e);
+ }
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewChangedException.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewChangedException.java
new file mode 100644
index 0000000..b51c45e
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewChangedException.java
@@ -0,0 +1,43 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client;
+
+/**
+ * If a view X is in the process of rendering itself and realizes that the user has navigated to view Y, it should
+ * throw this exception, rather than unnecessarily continuing to render itself.
+ *
+ * @author Ian Springer
+ */
+public class ViewChangedException extends RuntimeException {
+
+ private String obsoleteView;
+
+ public ViewChangedException() {
+ }
+
+ public ViewChangedException(String obsoleteView) {
+ super();
+ this.obsoleteView = (obsoleteView != null) ? obsoleteView : "?";
+ }
+
+ public String getObsoleteView() {
+ return obsoleteView;
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
index cade8fe..1756aa5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2010-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Set;
import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.user.client.History;
import com.smartgwt.client.types.Side;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.layout.Layout;
@@ -34,6 +35,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.RefreshableView;
+import org.rhq.enterprise.gui.coregui.client.ViewChangedException;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tab.SubTab;
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTab;
@@ -97,7 +99,12 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
*/
protected abstract void loadSelectedItem(int itemId, ViewPath viewPath);
- protected abstract void updateTabContent(T selectedItem);
+ protected void updateTabContent(T selectedItem) {
+ String currentViewPath = History.getToken();
+ if (!currentViewPath.startsWith(this.baseViewPath)) {
+ throw new ViewChangedException(this.baseViewPath + "/" + getSelectedItemId());
+ }
+ }
// ---------------------------------------------------------
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 0085454..61751c8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -242,6 +242,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
}
protected void updateTabContent(ResourceGroupComposite groupComposite) {
+ super.updateTabContent(groupComposite);
+
try {
this.groupComposite = groupComposite;
getTitleBar().setGroup(groupComposite);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index e17575e..8a37e65 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -273,6 +273,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
}
protected void updateTabContent(ResourceComposite resourceComposite) {
+ super.updateTabContent(resourceComposite);
+
try {
this.resourceComposite = resourceComposite;
for (ResourceSelectListener selectListener : this.selectListeners) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
index a1544fa..3b9a846 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -36,6 +36,7 @@ import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
+import com.smartgwt.client.widgets.tree.Tree;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
@@ -46,6 +47,7 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
+import org.rhq.enterprise.gui.coregui.client.ViewChangedException;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
@@ -188,6 +190,10 @@ public class ResourceTreeDatasource extends DataSource {
* @return
*/
public static TreeNode[] buildNodes(List<Resource> resources, List<Resource> lockedData, TreeGrid treeGrid) {
+ if (treeGrid == null || treeGrid.getTree() == null) {
+ throw new ViewChangedException(ResourceTopView.VIEW_ID.getName() + "/*");
+ }
+
List<ResourceTreeNode> resourceNodes = new ArrayList<ResourceTreeNode>(resources.size());
for (Resource resource : resources) {
ResourceTreeNode node = new ResourceTreeNode(resource, lockedData.contains(resource));
@@ -241,7 +247,8 @@ public class ResourceTreeDatasource extends DataSource {
// anything more than the id.
Resource parentResource = resource.getParentResource();
String parentResourceNodeId = ResourceTreeNode.idOf(parentResource);
- TreeNode parentResourceNode = treeGrid.getTree().findById(parentResourceNodeId);
+ Tree tree = treeGrid.getTree();
+ TreeNode parentResourceNode = tree.findById(parentResourceNodeId);
if (null != parentResourceNode) {
parentResource = ((ResourceTreeNode) parentResourceNode).getResource();
resource.setParentResource(parentResource);
@@ -428,7 +435,7 @@ public class ResourceTreeDatasource extends DataSource {
private boolean parentSubcategory = false;
/**
- * @param resource.id must be set. resource.parentResource.id, .name must be set.
+ * @param resource resource.id must be set. resource.parentResource.id, .name must be set.
* resource.resourceType.id, .name, .description, .subCategory must be set.
*/
private AutoGroupTreeNode(Resource resource) {
1
0
[rhq] 7 commits - modules/enterprise modules/plugins pom.xml publish_release.sh publish.sh release.sh
by snegrea 15 Feb '12
by snegrea 15 Feb '12
15 Feb '12
modules/enterprise/server/jar/pom.xml | 1
modules/enterprise/server/plugins/disk/pom.xml | 4
modules/plugins/jboss-as-5/pom.xml | 1
modules/plugins/jboss-as/pom.xml | 4
modules/plugins/tomcat/pom.xml | 4
pom.xml | 1
publish.sh | 381 +++++++++++++++++++++++++
publish_release.sh | 191 ------------
release.sh | 3
9 files changed, 383 insertions(+), 207 deletions(-)
New commits:
commit 4dee15c7f0e7504a4dcce8d296ec61f915d6f6fc
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 14 16:48:54 2012 -0600
Move powermock version to root pom file.
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index b47f0e2..5649c5f 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -23,7 +23,6 @@
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
<clean.db>true</clean.db>
- <powermock.version>1.4.11</powermock.version>
</properties>
<dependencies>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index c6f3ced..2f3e0ea 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -12,10 +12,6 @@
<artifactId>rhq-serverplugin-disk</artifactId>
<packaging>jar</packaging>
- <properties>
- <powermock.version>1.4.11</powermock.version>
- </properties>
-
<name>RHQ Enterprise Server Disk Content Source Plugin</name>
<description>JBoss Operations Network Enterprise Server Disk Content Source Plugin</description>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 6e5fb9b..a8b8f5f 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -21,7 +21,6 @@
<properties>
<jbossas.version>6.0.0.M1</jbossas.version>
- <powermock.version>1.4.11</powermock.version>
</properties>
<dependencyManagement>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index d9113f9..a49b17e 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -15,10 +15,6 @@
<name>RHQ JBossAS 3.2.x/4.x Plugin</name>
<description>A plugin for managing JBoss Application Server 3.2.x/4.x</description>
- <properties>
- <powermock.version>1.4.11</powermock.version>
- </properties>
-
<dependencies>
<!-- internal -->
<!-- TODO: Move this up to the parent pom. -->
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index ce258a9..7b9473d 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -14,10 +14,6 @@
<name>RHQ Tomcat Plugin</name>
<description>A plugin for managing standalone JBoss EWS and Apache Tomcat Servers</description>
-
- <properties>
- <powermock.version>1.4.11</powermock.version>
- </properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 5d55bae..e70cc34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@
<ant.contrib.version>1.0b3</ant.contrib.version>
<resteasy.version>2.3.1.GA</resteasy.version>
<freemarker.version>2.3.18</freemarker.version>
+ <powermock.version>1.4.11</powermock.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
<rhq.db.admin.password>rhqadmin</rhq.db.admin.password>
commit 59635d68d8c396fea3ee2bb4e4100be1d2583d9a
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 14 16:14:13 2012 -0600
Prelim code to scp sourceforge files.
diff --git a/publish.sh b/publish.sh
index a102e21..a1b1c1e 100755
--- a/publish.sh
+++ b/publish.sh
@@ -72,8 +72,10 @@ parse_and_validate_options()
EXTRA_MAVEN_PROFILE=
DEBUG_MODE=false
+ SOURCEFORGE=false
+
short_options="h"
- long_options="help,release-version:,release-tag:,release-type:,test-mode,production-mode,mode:,branch,tag,extra-profile:,debug::,workspace:"
+ long_options="help,release-version:,release-tag:,release-type:,test-mode,production-mode,mode:,branch,tag,extra-profile:,debug::,workspace:,sourceforge"
PROGNAME=${0##*/}
ARGS=$(getopt -s bash --options $short_options --longoptions $long_options --name $PROGNAME -- "$@" )
@@ -143,6 +145,10 @@ parse_and_validate_options()
WORKSPACE=$1
shift
;;
+ --sourceforge)
+ SOURCEFORGE=true
+ shift
+ ;;
--)
shift
break
@@ -175,11 +181,13 @@ parse_and_validate_options()
usage "Release tag not specified!"
fi
- if [ "$RELEASE_TYPE" != "community" ] && [ "$RELEASE_TYPE" != "enterprise" ]; then
+ if [ "$RELEASE_TYPE" != "community" ] && [ "$RELEASE_TYPE" != "enterprise" ];
+ then
usage "Invalid release type: $RELEASE_TYPE (valid release types are 'community' or 'enterprise')"
fi
- if [ "$MODE" != "test" ] && [ "$MODE" != "production" ]; then
+ if [ "$MODE" != "test" ] && [ "$MODE" != "production" ];
+ then
usage "Invalid script mode: $MODE (valid modes are 'test' or 'production')"
fi
@@ -343,7 +351,11 @@ publish_external_maven_repository()
#========================================================================================
publish_sourceforge()
{
- #scp FILE jsmith,rhq@frs.sourceforge.net:/home/frs/project/r/rh/rhq/rhq_4.3
+ if [ -n "SOURCEFORGE"];
+ then
+ $FILE_PATH="modules/enterprise/server/container/target/rhq-server*.zip"
+ scp $FILE_PATH frs.sourceforge.net:/home/frs/project/r/rh/rhq/rhq_4.3
+ fi
}
commit 480730e248cc09aabc01368d93a6bc6b25cdeb53
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 14 14:51:33 2012 -0600
Clip unused and unneeded variable.
diff --git a/release.sh b/release.sh
index 5878ef9..51ff163 100755
--- a/release.sh
+++ b/release.sh
@@ -311,8 +311,7 @@ set_local_and_environment_variables()
print_variables "${environment_variables[@]}"
print_centered "Local Variables"
- local_variables=( "MAVEN_LOCAL_REPO_DIR" "MAVEN_SETTINGS_FILE" "MAVEN_ARGS" \
- "JBOSS_ORG_USERNAME" )
+ local_variables=( "MAVEN_LOCAL_REPO_DIR" "MAVEN_SETTINGS_FILE" "MAVEN_ARGS" )
print_variables "${local_variables[@]}"
}
commit 0a8569bfb5f038b386ea93d73f852848218a4a41
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 14 14:50:45 2012 -0600
Updates to the script in preparation for the sourceforge publishing code.
diff --git a/publish.sh b/publish.sh
index c5b853f..a102e21 100755
--- a/publish.sh
+++ b/publish.sh
@@ -19,9 +19,42 @@ source `dirname $0`/rhq_bash.lib
#========================================================================================
usage()
{
- EXE=`basename $0`
+ USAGE=$(
+cat << EOF
+USAGE: publish.sh OPTIONS
- abort "$@" "Usage: $EXE community|enterprise RELEASE_BRANCH test|production" "Example: $EXE enterprise release-3.0.0 test"
+ --release-version=version [REQUIRED]
+ The release version to be tagged by this script.
+
+ --release-tag=git_tag [REQUIRED]
+ Git branch to be used as base for tagging and/or branching.
+
+ --release-type=community|enterprise [REQUIRED]
+ Type of release.
+
+ --test-mode [OPTIONAL, DEFAULT]
+ Run this script in test mode. Create a test branch from release branch and perform tagging and version updates on this test branch.
+
+ --production-mode [OPTIONAL]
+ Run this script in production mode. Follow the official branching and tagging model.
+
+ --mode=test|production [OPTIONAL]
+ Used to directly set the script mode.
+
+ --extra-profile=extra_profile [OPTIONAL]
+ An extra maven profile to be used for all the maven commands.
+
+ --debug=[true|false] [OPTIONAL]
+ Set maven in debug mode. Default is false; true if option specified without argument.
+
+ --workspace=workspace_to_use [OPTIONAL]
+ Override the workspace used by default by the script.
+EOF
+)
+
+ EXAMPLE="publish.sh --release-type=\"enterprise\" --release-version=\"5.0.0.GA\" --release_tag=\"release_test_tag\""
+
+ abort "$@" "$USAGE" "$EXAMPLE"
}
@@ -33,15 +66,14 @@ parse_and_validate_options()
print_function_information $FUNCNAME
RELEASE_VERSION=
- RELEASE_BRANCH=
+ RELEASE_TAG=
RELEASE_TYPE="community"
MODE="test"
- SCM_STRATEGY="tag"
EXTRA_MAVEN_PROFILE=
DEBUG_MODE=false
short_options="h"
- long_options="help,release-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,extra-profile:,debug::,workspace:"
+ long_options="help,release-version:,release-tag:,release-type:,test-mode,production-mode,mode:,branch,tag,extra-profile:,debug::,workspace:"
PROGNAME=${0##*/}
ARGS=$(getopt -s bash --options $short_options --longoptions $long_options --name $PROGNAME -- "$@" )
@@ -57,9 +89,9 @@ parse_and_validate_options()
RELEASE_VERSION="$1"
shift
;;
- --release-branch)
+ --release-tag)
shift
- RELEASE_BRANCH="$1"
+ RELEASE_TAG="$1"
shift
;;
--release-type)
@@ -138,9 +170,9 @@ parse_and_validate_options()
usage "Development version not specified!"
fi
- if [ -z "$RELEASE_BRANCH" ];
+ if [ -z "$RELEASE_TAG" ];
then
- usage "Release branch not specified!"
+ usage "Release tag not specified!"
fi
if [ "$RELEASE_TYPE" != "community" ] && [ "$RELEASE_TYPE" != "enterprise" ]; then
@@ -152,7 +184,7 @@ parse_and_validate_options()
fi
print_centered "Script Options"
- script_options=( "RELEASE_VERSION" "RELEASE_BRANCH" "RELEASE_TYPE" \
+ script_options=( "RELEASE_VERSION" "RELEASE_TAG" "RELEASE_TYPE" \
"MODE" )
print_variables "${script_options[@]}"
}
@@ -163,36 +195,34 @@ parse_and_validate_options()
#========================================================================================
set_local_and_environment_variables()
{
- PROJECT_NAME="rhq"
- PROJECT_DISPLAY_NAME="RHQ"
- PROJECT_GIT_WEB_URL="http://git.fedorahosted.org/git/?p=rhq/rhq.git"
- TAG_PREFIX="RHQ"
- MINIMUM_MAVEN_VERSION="2.1.0"
+ print_function_information $FUNCNAME
# Set various environment variables.
MAVEN_OPTS="-Xms512M -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M"
export MAVEN_OPTS
-
- # Set various local variables.
-
- if [ -n "$HUDSON_URL" ] && [ -n "$WORKSPACE" ]; then
- echo "We appear to be running in a Hudson job."
- WORKING_DIR="$WORKSPACE"
+ # Set various local variables
+ if [ -n "$WORKSPACE" ]; then
+ echo "Running script in a Hudson job."
MAVEN_LOCAL_REPO_DIR="$WORKSPACE/.m2/repository"
+ if [ ! -d "$MAVEN_LOCAL_REPO_DIR" ]; then
+ mkdir -p "$MAVEN_LOCAL_REPO_DIR"
+ fi
MAVEN_SETTINGS_FILE="$WORKSPACE/.m2/settings.xml"
- elif [ -z "$WORKING_DIR" ]; then
- WORKING_DIR="$HOME/release/rhq"
- MAVEN_LOCAL_REPO_DIR="$HOME/release/m2-repository"
- #MAVEN_LOCAL_REPO_DIR="$HOME/.m2/repository"
- MAVEN_SETTINGS_FILE="$HOME/release/m2-settings.xml"
+ else
+ MAVEN_LOCAL_REPO_DIR="$HOME/.m2/repository"
+ MAVEN_SETTINGS_FILE="$HOME/.m2/settings.xml"
fi
- #MAVEN_SETTINGS_FILE="$WORKSPACE/settings.xml"
+ MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR --batch-mode --errors"
- PROJECT_GIT_URL="git://git.fedorahosted.org/rhq/rhq.git"
- MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors -Prhq-publish-release,enterprise,dist -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR"
+ if [ -n "$EXTRA_MAVEN_PROFILE" ];
+ then
+ MAVEN_ARGS="$MAVEN_ARGS --activate-profiles $EXTRA_MAVEN_PROFILE,enterprise,dist"
+ else
+ MAVEN_ARGS="$MAVEN_ARGS --activate-profiles enterprise,dist"
+ fi
if [ "$MODE" = "test" ]; then
MAVEN_ARGS="$MAVEN_ARGS -DskipTests=true"
@@ -200,14 +230,12 @@ set_local_and_environment_variables()
if [ "$RELEASE_TYPE" = "enterprise" ]; then
MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav "
- #MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav -Djava5.home=$JAVA5_HOME/jre"
fi
- if [ -n "$RELEASE_DEBUG" ]; then
+
+ if [ -n "$DEBUG_MODE" ]; then
+ echo "Maven debug enabled"
MAVEN_ARGS="$MAVEN_ARGS --debug"
fi
- if [ -n "$RELEASE_ADDITIONAL_MAVEN_ARGS" ]; then
- MAVEN_ARGS="$MAVEN_ARGS $RELEASE_ADDITIONAL_MAVEN_ARGS"
- fi
if [ "$MODE" = "production" ] && [ "$RELEASE_TYPE" = "community" ]; then
MAVEN_RELEASE_PERFORM_GOAL="deploy"
@@ -225,13 +253,13 @@ set_local_and_environment_variables()
# Print out a summary of the environment.
print_centered "Environment Variables"
- environment_variables=("JAVA_HOME" "M2_HOME" "MAVEN_OPTS" "PATH" "LANG" "RELEASE_TYPE")
+ environment_variables=("JAVA_HOME" "M2_HOME" "MAVEN_OPTS" "PATH" "LANG")
print_variables "${environment_variables[@]}"
print_centered "Local Variables"
- local_variables=("WORKING_DIR" "PROJECT_NAME" "PROJECT_GIT_URL" "RELEASE_TYPE" "DEVELOPMENT_VERSION" \
- "RELEASE_BRANCH" "MODE" "MAVEN_LOCAL_REPO_DIR" \
- "MAVEN_SETTINGS_FILE" "MAVEN_ARGS" "MAVEN_RELEASE_PERFORM_GOAL" "JBOSS_ORG_USERNAME")
+ local_variables=("WORKING_DIR" "RELEASE_TYPE" \
+ "RELEASE_TAG" "MODE" "MAVEN_LOCAL_REPO_DIR" \
+ "MAVEN_SETTINGS_FILE" "MAVEN_ARGS" "MAVEN_RELEASE_PERFORM_GOAL" )
print_variables "${local_variables[@]}"
}
@@ -263,7 +291,7 @@ validate_system_utilities()
#========================================================================================
# Description: Checkout release branch.
#========================================================================================
-checkout_release_branch()
+checkout_release_tag()
{
print_function_information $FUNCNAME
@@ -275,25 +303,12 @@ checkout_release_branch()
# is truly a git working copy.
if [ "$GIT_STATUS_EXIT_CODE" -le 1 ];
then
- echo "Checking out a clean copy of the release branch ($RELEASE_BRANCH)..."
- git fetch origin "$RELEASE_BRANCH"
- [ "$?" -ne 0 ] && abort "Failed to fetch release branch ($RELEASE_BRANCH)."
-
- git checkout --track "origin/$RELEASE_BRANCH"
- if [ "$?" -ne 0 ];
- then
- git checkout "$RELEASE_BRANCH"
- fi
- [ "$?" -ne 0 ] && abort "Failed to checkout release branch ($RELEASE_BRANCH)."
-
- git reset --hard "origin/$RELEASE_BRANCH"
- [ "$?" -ne 0 ] && abort "Failed to reset release branch ($RELEASE_BRANCH)."
-
- git clean -dxf
- [ "$?" -ne 0 ] && abort "Failed to clean release branch ($RELEASE_BRANCH)."
+ echo "Checking out a clean copy of the release branch ($RELEASE_TAG)..."
+ git fetch origin "refs/tags/$RELEASE_TAG"
+ [ "$?" -ne 0 ] && abort "Failed to fetch release branch ($RELEASE_TAG)."
- git pull origin $RELEASE_BRANCH
- [ "$?" -ne 0 ] && abort "Failed to update release branch ($RELEASE_BRANCH)."
+ git checkout "refs/tags/$RELEASE_TAG"
+ [ "$?" -ne 0 ] && abort "Failed to checkout release branch ($RELEASE_TAG)."
else
echo "Current folder does not appear to be a git working directory ('git status' returned $GIT_STATUS_EXIT_CODE) - removing it so we can freshly clone the repo..."
fi
@@ -305,8 +320,8 @@ checkout_release_branch()
#========================================================================================
build_from_source()
{
- echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
- mvn $MAVEN_RELEASE_PERFORM_GOAL $MAVEN_ARGS -Ddbreset
+ echo "Building release from tag"
+ mvn clean install $MAVEN_ARGS -Ddbreset
[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
echo
echo "Release build succeeded!"
@@ -318,7 +333,7 @@ build_from_source()
#========================================================================================
publish_external_maven_repository()
{
- mvn -Ddbsetup-do-not-check-schema=true -Dmaven.test.skip=true -P publish deploy
+ mvn -Ddbsetup-do-not-check-schema=true -Dmaven.test.skip=true -P publish $MAVEN_RELEASE_PERFORM_GOAL
[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
}
@@ -328,7 +343,7 @@ publish_external_maven_repository()
#========================================================================================
publish_sourceforge()
{
- #future code here
+ #scp FILE jsmith,rhq@frs.sourceforge.net:/home/frs/project/r/rh/rhq/rhq_4.3
}
@@ -343,7 +358,7 @@ validate_system_utilities
set_local_and_environment_variables
-checkout_release_branch
+checkout_release_tag
build_from_source
commit 79763301270b7dd7a3cf0851c8d325197d205acc
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 14 13:56:09 2012 -0600
Add publishing to maven repositories specified in the project pom. Also included argument parsing.
diff --git a/publish.sh b/publish.sh
index f8ecf68..c5b853f 100755
--- a/publish.sh
+++ b/publish.sh
@@ -30,27 +30,131 @@ usage()
#========================================================================================
parse_and_validate_options()
{
+ print_function_information $FUNCNAME
+
+ RELEASE_VERSION=
+ RELEASE_BRANCH=
+ RELEASE_TYPE="community"
+ MODE="test"
+ SCM_STRATEGY="tag"
+ EXTRA_MAVEN_PROFILE=
DEBUG_MODE=false
- if [ "$#" -ne 3 ]; then
- usage
+ short_options="h"
+ long_options="help,release-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,extra-profile:,debug::,workspace:"
+
+ PROGNAME=${0##*/}
+ ARGS=$(getopt -s bash --options $short_options --longoptions $long_options --name $PROGNAME -- "$@" )
+ eval set -- "$ARGS"
+
+ while true; do
+ case $1 in
+ -h|--help)
+ usage
+ ;;
+ --release-version)
+ shift
+ RELEASE_VERSION="$1"
+ shift
+ ;;
+ --release-branch)
+ shift
+ RELEASE_BRANCH="$1"
+ shift
+ ;;
+ --release-type)
+ shift
+ RELEASE_TYPE="$1"
+ shift
+ ;;
+ --test-mode)
+ MODE="test"
+ shift
+ ;;
+ --production-mode)
+ MODE="production"
+ shift
+ ;;
+ --mode)
+ shift
+ MODE="$1"
+ shift
+ ;;
+ --extra-profile)
+ shift
+ EXTRA_MAVEN_PROFILE="$1"
+ shift
+ ;;
+ --debug)
+ shift
+ case "$1" in
+ true)
+ DEBUG_MODE=true
+ shift
+ ;;
+ false)
+ DEBUG_MODE=false
+ shift
+ ;;
+ "")
+ DEBUG_MODE=true
+ shift
+ ;;
+ *)
+ DEBUG_MODE=false
+ shift
+ ;;
+ esac
+ ;;
+ --workspace)
+ shift
+ WORKSPACE=$1
+ shift
+ ;;
+ --)
+ shift
+ break
+ ;;
+ *)
+ usage
+ ;;
+ esac
+ done
+
+ if [ "$MODE" = "production" ]; then
+ if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
+ usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
+ fi
+ fi
+
+
+ if [ -z "$RELEASE_VERSION" ];
+ then
+ usage "Release version not specified!"
+ fi
+
+ if [ -z "$DEVELOPMENT_VERSION" ];
+ then
+ usage "Development version not specified!"
+ fi
+
+ if [ -z "$RELEASE_BRANCH" ];
+ then
+ usage "Release branch not specified!"
fi
- RELEASE_TYPE="$1"
+
if [ "$RELEASE_TYPE" != "community" ] && [ "$RELEASE_TYPE" != "enterprise" ]; then
usage "Invalid release type: $RELEASE_TYPE (valid release types are 'community' or 'enterprise')"
fi
- RELEASE_BRANCH="$2"
- MODE="$3"
if [ "$MODE" != "test" ] && [ "$MODE" != "production" ]; then
- usage "Invalid mode: $MODE (valid modes are 'test' or 'production')"
+ usage "Invalid script mode: $MODE (valid modes are 'test' or 'production')"
fi
- if [ "$MODE" = "production" ]; then
- if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
- usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
- fi
- fi
+ print_centered "Script Options"
+ script_options=( "RELEASE_VERSION" "RELEASE_BRANCH" "RELEASE_TYPE" \
+ "MODE" )
+ print_variables "${script_options[@]}"
}
@@ -214,16 +318,8 @@ build_from_source()
#========================================================================================
publish_external_maven_repository()
{
- # 5) Publish release artifacts - **FUTURE IMPROVEMENT**
- #echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
- #mvn deploy $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true
- #[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
-
- #if [ "$MODE" = "production" ]; then
- # if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
- # usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
- # fi
- #fi
+ mvn -Ddbsetup-do-not-check-schema=true -Dmaven.test.skip=true -P publish deploy
+ [ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
}
commit ee879a4baec6d5d519b9578ffc3d002a320c816d
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Feb 13 17:25:29 2012 -0600
Renamed publish script file to match actual purpose.
diff --git a/publish.sh b/publish.sh
new file mode 100755
index 0000000..f8ecf68
--- /dev/null
+++ b/publish.sh
@@ -0,0 +1,258 @@
+#!/bin/bash
+#========================================================================================
+# Usage:
+# See usage function.
+#
+# Description:
+# RHQ publish script. Supports publishing of artifacts to maven and sourceforge.
+#
+# Options:
+# See usage function.
+#========================================================================================
+
+#include the utility library
+source `dirname $0`/rhq_bash.lib
+
+
+#========================================================================================
+# Description: Display usage information then abort the script.
+#========================================================================================
+usage()
+{
+ EXE=`basename $0`
+
+ abort "$@" "Usage: $EXE community|enterprise RELEASE_BRANCH test|production" "Example: $EXE enterprise release-3.0.0 test"
+}
+
+
+#========================================================================================
+# Description: Validate and parse input arguments
+#========================================================================================
+parse_and_validate_options()
+{
+ DEBUG_MODE=false
+
+ if [ "$#" -ne 3 ]; then
+ usage
+ fi
+ RELEASE_TYPE="$1"
+ if [ "$RELEASE_TYPE" != "community" ] && [ "$RELEASE_TYPE" != "enterprise" ]; then
+ usage "Invalid release type: $RELEASE_TYPE (valid release types are 'community' or 'enterprise')"
+ fi
+ RELEASE_BRANCH="$2"
+ MODE="$3"
+
+ if [ "$MODE" != "test" ] && [ "$MODE" != "production" ]; then
+ usage "Invalid mode: $MODE (valid modes are 'test' or 'production')"
+ fi
+
+ if [ "$MODE" = "production" ]; then
+ if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
+ usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
+ fi
+ fi
+}
+
+
+#========================================================================================
+# Description: Set all the local and environment variables required by the script.
+#========================================================================================
+set_local_and_environment_variables()
+{
+ PROJECT_NAME="rhq"
+ PROJECT_DISPLAY_NAME="RHQ"
+ PROJECT_GIT_WEB_URL="http://git.fedorahosted.org/git/?p=rhq/rhq.git"
+ TAG_PREFIX="RHQ"
+ MINIMUM_MAVEN_VERSION="2.1.0"
+
+ # Set various environment variables.
+ MAVEN_OPTS="-Xms512M -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M"
+ export MAVEN_OPTS
+
+
+ # Set various local variables.
+
+ if [ -n "$HUDSON_URL" ] && [ -n "$WORKSPACE" ]; then
+ echo "We appear to be running in a Hudson job."
+ WORKING_DIR="$WORKSPACE"
+ MAVEN_LOCAL_REPO_DIR="$WORKSPACE/.m2/repository"
+ MAVEN_SETTINGS_FILE="$WORKSPACE/.m2/settings.xml"
+ elif [ -z "$WORKING_DIR" ]; then
+ WORKING_DIR="$HOME/release/rhq"
+ MAVEN_LOCAL_REPO_DIR="$HOME/release/m2-repository"
+ #MAVEN_LOCAL_REPO_DIR="$HOME/.m2/repository"
+ MAVEN_SETTINGS_FILE="$HOME/release/m2-settings.xml"
+ fi
+
+ #MAVEN_SETTINGS_FILE="$WORKSPACE/settings.xml"
+
+ PROJECT_GIT_URL="git://git.fedorahosted.org/rhq/rhq.git"
+
+ MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors -Prhq-publish-release,enterprise,dist -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR"
+
+ if [ "$MODE" = "test" ]; then
+ MAVEN_ARGS="$MAVEN_ARGS -DskipTests=true"
+ fi
+
+ if [ "$RELEASE_TYPE" = "enterprise" ]; then
+ MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav "
+ #MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav -Djava5.home=$JAVA5_HOME/jre"
+ fi
+ if [ -n "$RELEASE_DEBUG" ]; then
+ MAVEN_ARGS="$MAVEN_ARGS --debug"
+ fi
+ if [ -n "$RELEASE_ADDITIONAL_MAVEN_ARGS" ]; then
+ MAVEN_ARGS="$MAVEN_ARGS $RELEASE_ADDITIONAL_MAVEN_ARGS"
+ fi
+
+ if [ "$MODE" = "production" ] && [ "$RELEASE_TYPE" = "community" ]; then
+ MAVEN_RELEASE_PERFORM_GOAL="deploy"
+ else
+ MAVEN_RELEASE_PERFORM_GOAL="install"
+ fi
+
+ # Set the system character encoding to ISO-8859-1 to ensure i18log reads its
+ # messages and writes its resource bundle properties files in that encoding,
+ # since that is how the German and French I18NMessage annotation values are
+ # encoded and the encoding used by i18nlog to read in resource bundle
+ # property files.
+ LANG=en_US.iso8859
+ export LANG
+
+ # Print out a summary of the environment.
+ print_centered "Environment Variables"
+ environment_variables=("JAVA_HOME" "M2_HOME" "MAVEN_OPTS" "PATH" "LANG" "RELEASE_TYPE")
+ print_variables "${environment_variables[@]}"
+
+ print_centered "Local Variables"
+ local_variables=("WORKING_DIR" "PROJECT_NAME" "PROJECT_GIT_URL" "RELEASE_TYPE" "DEVELOPMENT_VERSION" \
+ "RELEASE_BRANCH" "MODE" "MAVEN_LOCAL_REPO_DIR" \
+ "MAVEN_SETTINGS_FILE" "MAVEN_ARGS" "MAVEN_RELEASE_PERFORM_GOAL" "JBOSS_ORG_USERNAME")
+ print_variables "${local_variables[@]}"
+}
+
+
+#========================================================================================
+# Description: Run the validation process for all the system utilities needed by
+# the script. At the end print the version of each utility.
+#========================================================================================
+validate_system_utilities()
+{
+ print_function_information $FUNCNAME
+
+ # TODO: Check that JDK version is < 1.7.
+
+ validate_java_6
+
+ validate_java_5
+
+ validate_maven
+
+ validate_git
+
+ print_centered "Program Versions"
+ program_versions=("git --version" "java -version" "mvn --version")
+ print_program_versions "${program_versions[@]}"
+}
+
+
+#========================================================================================
+# Description: Checkout release branch.
+#========================================================================================
+checkout_release_branch()
+{
+ print_function_information $FUNCNAME
+
+ # Checkout the source from git, assume that the git repo is already cloned
+ git status >/dev/null 2>&1
+ GIT_STATUS_EXIT_CODE=$?
+ # Note, git 1.6 and earlier returns an exit code of 1, rather than 0, if there are any uncommitted changes,
+ # and git 1.7 returns 0, so we check if the exit code is less than or equal to 1 to determine if current folder
+ # is truly a git working copy.
+ if [ "$GIT_STATUS_EXIT_CODE" -le 1 ];
+ then
+ echo "Checking out a clean copy of the release branch ($RELEASE_BRANCH)..."
+ git fetch origin "$RELEASE_BRANCH"
+ [ "$?" -ne 0 ] && abort "Failed to fetch release branch ($RELEASE_BRANCH)."
+
+ git checkout --track "origin/$RELEASE_BRANCH"
+ if [ "$?" -ne 0 ];
+ then
+ git checkout "$RELEASE_BRANCH"
+ fi
+ [ "$?" -ne 0 ] && abort "Failed to checkout release branch ($RELEASE_BRANCH)."
+
+ git reset --hard "origin/$RELEASE_BRANCH"
+ [ "$?" -ne 0 ] && abort "Failed to reset release branch ($RELEASE_BRANCH)."
+
+ git clean -dxf
+ [ "$?" -ne 0 ] && abort "Failed to clean release branch ($RELEASE_BRANCH)."
+
+ git pull origin $RELEASE_BRANCH
+ [ "$?" -ne 0 ] && abort "Failed to update release branch ($RELEASE_BRANCH)."
+ else
+ echo "Current folder does not appear to be a git working directory ('git status' returned $GIT_STATUS_EXIT_CODE) - removing it so we can freshly clone the repo..."
+ fi
+}
+
+
+#========================================================================================
+# Description: Build source code.
+#========================================================================================
+build_from_source()
+{
+ echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
+ mvn $MAVEN_RELEASE_PERFORM_GOAL $MAVEN_ARGS -Ddbreset
+ [ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
+ echo
+ echo "Release build succeeded!"
+}
+
+
+#========================================================================================
+# Description: Publish artifacts to external maven repostory.
+#========================================================================================
+publish_external_maven_repository()
+{
+ # 5) Publish release artifacts - **FUTURE IMPROVEMENT**
+ #echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
+ #mvn deploy $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true
+ #[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
+
+ #if [ "$MODE" = "production" ]; then
+ # if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
+ # usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
+ # fi
+ #fi
+}
+
+
+#========================================================================================
+# Description: Publish artifacts to RHQ website.
+#========================================================================================
+publish_sourceforge()
+{
+ #future code here
+}
+
+
+
+############ MAIN SCRIPT ############
+
+parse_and_validate_options $@
+
+set_script_debug_mode $DEBUG_MODE
+
+validate_system_utilities
+
+set_local_and_environment_variables
+
+checkout_release_branch
+
+build_from_source
+
+publish_external_maven_repository
+
+publish_sourceforge
+
+unset_script_debug_mode $DEBUG_MODE
diff --git a/publish_release.sh b/publish_release.sh
deleted file mode 100755
index f8ecf68..0000000
--- a/publish_release.sh
+++ /dev/null
@@ -1,258 +0,0 @@
-#!/bin/bash
-#========================================================================================
-# Usage:
-# See usage function.
-#
-# Description:
-# RHQ publish script. Supports publishing of artifacts to maven and sourceforge.
-#
-# Options:
-# See usage function.
-#========================================================================================
-
-#include the utility library
-source `dirname $0`/rhq_bash.lib
-
-
-#========================================================================================
-# Description: Display usage information then abort the script.
-#========================================================================================
-usage()
-{
- EXE=`basename $0`
-
- abort "$@" "Usage: $EXE community|enterprise RELEASE_BRANCH test|production" "Example: $EXE enterprise release-3.0.0 test"
-}
-
-
-#========================================================================================
-# Description: Validate and parse input arguments
-#========================================================================================
-parse_and_validate_options()
-{
- DEBUG_MODE=false
-
- if [ "$#" -ne 3 ]; then
- usage
- fi
- RELEASE_TYPE="$1"
- if [ "$RELEASE_TYPE" != "community" ] && [ "$RELEASE_TYPE" != "enterprise" ]; then
- usage "Invalid release type: $RELEASE_TYPE (valid release types are 'community' or 'enterprise')"
- fi
- RELEASE_BRANCH="$2"
- MODE="$3"
-
- if [ "$MODE" != "test" ] && [ "$MODE" != "production" ]; then
- usage "Invalid mode: $MODE (valid modes are 'test' or 'production')"
- fi
-
- if [ "$MODE" = "production" ]; then
- if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
- usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
- fi
- fi
-}
-
-
-#========================================================================================
-# Description: Set all the local and environment variables required by the script.
-#========================================================================================
-set_local_and_environment_variables()
-{
- PROJECT_NAME="rhq"
- PROJECT_DISPLAY_NAME="RHQ"
- PROJECT_GIT_WEB_URL="http://git.fedorahosted.org/git/?p=rhq/rhq.git"
- TAG_PREFIX="RHQ"
- MINIMUM_MAVEN_VERSION="2.1.0"
-
- # Set various environment variables.
- MAVEN_OPTS="-Xms512M -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M"
- export MAVEN_OPTS
-
-
- # Set various local variables.
-
- if [ -n "$HUDSON_URL" ] && [ -n "$WORKSPACE" ]; then
- echo "We appear to be running in a Hudson job."
- WORKING_DIR="$WORKSPACE"
- MAVEN_LOCAL_REPO_DIR="$WORKSPACE/.m2/repository"
- MAVEN_SETTINGS_FILE="$WORKSPACE/.m2/settings.xml"
- elif [ -z "$WORKING_DIR" ]; then
- WORKING_DIR="$HOME/release/rhq"
- MAVEN_LOCAL_REPO_DIR="$HOME/release/m2-repository"
- #MAVEN_LOCAL_REPO_DIR="$HOME/.m2/repository"
- MAVEN_SETTINGS_FILE="$HOME/release/m2-settings.xml"
- fi
-
- #MAVEN_SETTINGS_FILE="$WORKSPACE/settings.xml"
-
- PROJECT_GIT_URL="git://git.fedorahosted.org/rhq/rhq.git"
-
- MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors -Prhq-publish-release,enterprise,dist -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR"
-
- if [ "$MODE" = "test" ]; then
- MAVEN_ARGS="$MAVEN_ARGS -DskipTests=true"
- fi
-
- if [ "$RELEASE_TYPE" = "enterprise" ]; then
- MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav "
- #MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav -Djava5.home=$JAVA5_HOME/jre"
- fi
- if [ -n "$RELEASE_DEBUG" ]; then
- MAVEN_ARGS="$MAVEN_ARGS --debug"
- fi
- if [ -n "$RELEASE_ADDITIONAL_MAVEN_ARGS" ]; then
- MAVEN_ARGS="$MAVEN_ARGS $RELEASE_ADDITIONAL_MAVEN_ARGS"
- fi
-
- if [ "$MODE" = "production" ] && [ "$RELEASE_TYPE" = "community" ]; then
- MAVEN_RELEASE_PERFORM_GOAL="deploy"
- else
- MAVEN_RELEASE_PERFORM_GOAL="install"
- fi
-
- # Set the system character encoding to ISO-8859-1 to ensure i18log reads its
- # messages and writes its resource bundle properties files in that encoding,
- # since that is how the German and French I18NMessage annotation values are
- # encoded and the encoding used by i18nlog to read in resource bundle
- # property files.
- LANG=en_US.iso8859
- export LANG
-
- # Print out a summary of the environment.
- print_centered "Environment Variables"
- environment_variables=("JAVA_HOME" "M2_HOME" "MAVEN_OPTS" "PATH" "LANG" "RELEASE_TYPE")
- print_variables "${environment_variables[@]}"
-
- print_centered "Local Variables"
- local_variables=("WORKING_DIR" "PROJECT_NAME" "PROJECT_GIT_URL" "RELEASE_TYPE" "DEVELOPMENT_VERSION" \
- "RELEASE_BRANCH" "MODE" "MAVEN_LOCAL_REPO_DIR" \
- "MAVEN_SETTINGS_FILE" "MAVEN_ARGS" "MAVEN_RELEASE_PERFORM_GOAL" "JBOSS_ORG_USERNAME")
- print_variables "${local_variables[@]}"
-}
-
-
-#========================================================================================
-# Description: Run the validation process for all the system utilities needed by
-# the script. At the end print the version of each utility.
-#========================================================================================
-validate_system_utilities()
-{
- print_function_information $FUNCNAME
-
- # TODO: Check that JDK version is < 1.7.
-
- validate_java_6
-
- validate_java_5
-
- validate_maven
-
- validate_git
-
- print_centered "Program Versions"
- program_versions=("git --version" "java -version" "mvn --version")
- print_program_versions "${program_versions[@]}"
-}
-
-
-#========================================================================================
-# Description: Checkout release branch.
-#========================================================================================
-checkout_release_branch()
-{
- print_function_information $FUNCNAME
-
- # Checkout the source from git, assume that the git repo is already cloned
- git status >/dev/null 2>&1
- GIT_STATUS_EXIT_CODE=$?
- # Note, git 1.6 and earlier returns an exit code of 1, rather than 0, if there are any uncommitted changes,
- # and git 1.7 returns 0, so we check if the exit code is less than or equal to 1 to determine if current folder
- # is truly a git working copy.
- if [ "$GIT_STATUS_EXIT_CODE" -le 1 ];
- then
- echo "Checking out a clean copy of the release branch ($RELEASE_BRANCH)..."
- git fetch origin "$RELEASE_BRANCH"
- [ "$?" -ne 0 ] && abort "Failed to fetch release branch ($RELEASE_BRANCH)."
-
- git checkout --track "origin/$RELEASE_BRANCH"
- if [ "$?" -ne 0 ];
- then
- git checkout "$RELEASE_BRANCH"
- fi
- [ "$?" -ne 0 ] && abort "Failed to checkout release branch ($RELEASE_BRANCH)."
-
- git reset --hard "origin/$RELEASE_BRANCH"
- [ "$?" -ne 0 ] && abort "Failed to reset release branch ($RELEASE_BRANCH)."
-
- git clean -dxf
- [ "$?" -ne 0 ] && abort "Failed to clean release branch ($RELEASE_BRANCH)."
-
- git pull origin $RELEASE_BRANCH
- [ "$?" -ne 0 ] && abort "Failed to update release branch ($RELEASE_BRANCH)."
- else
- echo "Current folder does not appear to be a git working directory ('git status' returned $GIT_STATUS_EXIT_CODE) - removing it so we can freshly clone the repo..."
- fi
-}
-
-
-#========================================================================================
-# Description: Build source code.
-#========================================================================================
-build_from_source()
-{
- echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
- mvn $MAVEN_RELEASE_PERFORM_GOAL $MAVEN_ARGS -Ddbreset
- [ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
- echo
- echo "Release build succeeded!"
-}
-
-
-#========================================================================================
-# Description: Publish artifacts to external maven repostory.
-#========================================================================================
-publish_external_maven_repository()
-{
- # 5) Publish release artifacts - **FUTURE IMPROVEMENT**
- #echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
- #mvn deploy $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true
- #[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
-
- #if [ "$MODE" = "production" ]; then
- # if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
- # usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
- # fi
- #fi
-}
-
-
-#========================================================================================
-# Description: Publish artifacts to RHQ website.
-#========================================================================================
-publish_sourceforge()
-{
- #future code here
-}
-
-
-
-############ MAIN SCRIPT ############
-
-parse_and_validate_options $@
-
-set_script_debug_mode $DEBUG_MODE
-
-validate_system_utilities
-
-set_local_and_environment_variables
-
-checkout_release_branch
-
-build_from_source
-
-publish_external_maven_repository
-
-publish_sourceforge
-
-unset_script_debug_mode $DEBUG_MODE
commit 39eeb3defbae933f297d9d0d6402c24f4bdaf812
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Feb 13 15:10:20 2012 -0600
Cleanup the script to match the release.sh structure.
diff --git a/publish_release.sh b/publish_release.sh
index 949f940..f8ecf68 100755
--- a/publish_release.sh
+++ b/publish_release.sh
@@ -1,9 +1,22 @@
-#!/bin/sh
-
+#!/bin/bash
+#========================================================================================
+# Usage:
+# See usage function.
+#
+# Description:
+# RHQ publish script. Supports publishing of artifacts to maven and sourceforge.
+#
+# Options:
+# See usage function.
+#========================================================================================
+
+#include the utility library
source `dirname $0`/rhq_bash.lib
-# Functions
+#========================================================================================
+# Description: Display usage information then abort the script.
+#========================================================================================
usage()
{
EXE=`basename $0`
@@ -11,8 +24,14 @@ usage()
abort "$@" "Usage: $EXE community|enterprise RELEASE_BRANCH test|production" "Example: $EXE enterprise release-3.0.0 test"
}
-validate_arguments()
+
+#========================================================================================
+# Description: Validate and parse input arguments
+#========================================================================================
+parse_and_validate_options()
{
+ DEBUG_MODE=false
+
if [ "$#" -ne 3 ]; then
usage
fi
@@ -34,7 +53,11 @@ validate_arguments()
fi
}
-set_variables()
+
+#========================================================================================
+# Description: Set all the local and environment variables required by the script.
+#========================================================================================
+set_local_and_environment_variables()
{
PROJECT_NAME="rhq"
PROJECT_DISPLAY_NAME="RHQ"
@@ -95,97 +118,141 @@ set_variables()
# property files.
LANG=en_US.iso8859
export LANG
+
+ # Print out a summary of the environment.
+ print_centered "Environment Variables"
+ environment_variables=("JAVA_HOME" "M2_HOME" "MAVEN_OPTS" "PATH" "LANG" "RELEASE_TYPE")
+ print_variables "${environment_variables[@]}"
+
+ print_centered "Local Variables"
+ local_variables=("WORKING_DIR" "PROJECT_NAME" "PROJECT_GIT_URL" "RELEASE_TYPE" "DEVELOPMENT_VERSION" \
+ "RELEASE_BRANCH" "MODE" "MAVEN_LOCAL_REPO_DIR" \
+ "MAVEN_SETTINGS_FILE" "MAVEN_ARGS" "MAVEN_RELEASE_PERFORM_GOAL" "JBOSS_ORG_USERNAME")
+ print_variables "${local_variables[@]}"
}
-#### THE RELEASE SCRIPT ######
+#========================================================================================
+# Description: Run the validation process for all the system utilities needed by
+# the script. At the end print the version of each utility.
+#========================================================================================
+validate_system_utilities()
+{
+ print_function_information $FUNCNAME
+
+ # TODO: Check that JDK version is < 1.7.
+
+ validate_java_6
+
+ validate_java_5
-if [ -n "$RELEASE_DEBUG" ]; then
- echo "Debug output is enabled."
- set -x
-fi
+ validate_maven
-# Process command line args.
-validate_arguments $@
+ validate_git
-# TODO: Check that JDK version is < 1.7.
+ print_centered "Program Versions"
+ program_versions=("git --version" "java -version" "mvn --version")
+ print_program_versions "${program_versions[@]}"
+}
-validate_java_6
-validate_java_5
+#========================================================================================
+# Description: Checkout release branch.
+#========================================================================================
+checkout_release_branch()
+{
+ print_function_information $FUNCNAME
+
+ # Checkout the source from git, assume that the git repo is already cloned
+ git status >/dev/null 2>&1
+ GIT_STATUS_EXIT_CODE=$?
+ # Note, git 1.6 and earlier returns an exit code of 1, rather than 0, if there are any uncommitted changes,
+ # and git 1.7 returns 0, so we check if the exit code is less than or equal to 1 to determine if current folder
+ # is truly a git working copy.
+ if [ "$GIT_STATUS_EXIT_CODE" -le 1 ];
+ then
+ echo "Checking out a clean copy of the release branch ($RELEASE_BRANCH)..."
+ git fetch origin "$RELEASE_BRANCH"
+ [ "$?" -ne 0 ] && abort "Failed to fetch release branch ($RELEASE_BRANCH)."
+
+ git checkout --track "origin/$RELEASE_BRANCH"
+ if [ "$?" -ne 0 ];
+ then
+ git checkout "$RELEASE_BRANCH"
+ fi
+ [ "$?" -ne 0 ] && abort "Failed to checkout release branch ($RELEASE_BRANCH)."
+
+ git reset --hard "origin/$RELEASE_BRANCH"
+ [ "$?" -ne 0 ] && abort "Failed to reset release branch ($RELEASE_BRANCH)."
+
+ git clean -dxf
+ [ "$?" -ne 0 ] && abort "Failed to clean release branch ($RELEASE_BRANCH)."
+
+ git pull origin $RELEASE_BRANCH
+ [ "$?" -ne 0 ] && abort "Failed to update release branch ($RELEASE_BRANCH)."
+ else
+ echo "Current folder does not appear to be a git working directory ('git status' returned $GIT_STATUS_EXIT_CODE) - removing it so we can freshly clone the repo..."
+ fi
+}
-validate_maven
-validate_git
+#========================================================================================
+# Description: Build source code.
+#========================================================================================
+build_from_source()
+{
+ echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
+ mvn $MAVEN_RELEASE_PERFORM_GOAL $MAVEN_ARGS -Ddbreset
+ [ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
+ echo
+ echo "Release build succeeded!"
+}
-set_variables
-# Print out a summary of the environment.
-echo "========================== Environment Variables =============================="
-environment_variables=("JAVA_HOME" "M2_HOME" "MAVEN_OPTS" "PATH" "LANG" "RELEASE_TYPE")
-print_variables "${environment_variables[@]}"
+#========================================================================================
+# Description: Publish artifacts to external maven repostory.
+#========================================================================================
+publish_external_maven_repository()
+{
+ # 5) Publish release artifacts - **FUTURE IMPROVEMENT**
+ #echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
+ #mvn deploy $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true
+ #[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
+ #if [ "$MODE" = "production" ]; then
+ # if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
+ # usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
+ # fi
+ #fi
+}
-echo "============================= Local Variables ================================="
-local_variables=("WORKING_DIR" "PROJECT_NAME" "PROJECT_GIT_URL" "RELEASE_TYPE" "DEVELOPMENT_VERSION" \
- "RELEASE_BRANCH" "MODE" "MAVEN_LOCAL_REPO_DIR" \
- "MAVEN_SETTINGS_FILE" "MAVEN_ARGS" "MAVEN_RELEASE_PERFORM_GOAL" "JBOSS_ORG_USERNAME")
-print_variables "${local_variables[@]}"
+#========================================================================================
+# Description: Publish artifacts to RHQ website.
+#========================================================================================
+publish_sourceforge()
+{
+ #future code here
+}
-echo "============================= Program Versions ================================"
-program_versions=("git --version" "java -version" "mvn --version")
-print_program_versions "${program_versions[@]}"
-echo "==============================================================================="
-# Checkout the source from git.
-git status >/dev/null 2>&1
-GIT_STATUS_EXIT_CODE=$?
-# Note, git 1.6 and earlier returns an exit code of 1, rather than 0, if there are any uncommitted changes,
-# and git 1.7 returns 0, so we check if the exit code is less than or equal to 1 to determine if $WORKING_DIR
-# is truly a git working copy.
-if [ "$GIT_STATUS_EXIT_CODE" -le 1 ]; then
- echo "Checking out a clean copy of the release branch ($RELEASE_BRANCH)..."
- git fetch origin "$RELEASE_BRANCH"
- [ "$?" -ne 0 ] && abort "Failed to fetch release branch ($RELEASE_BRANCH)."
- git checkout "$RELEASE_BRANCH" 2>/dev/null
- if [ "$?" -ne 0 ]; then
- git checkout --track -b "$RELEASE_BRANCH" "origin/$RELEASE_BRANCH"
- fi
- [ "$?" -ne 0 ] && abort "Failed to checkout release branch ($RELEASE_BRANCH)."
- git reset --hard "origin/$RELEASE_BRANCH"
- [ "$?" -ne 0 ] && abort "Failed to reset release branch ($RELEASE_BRANCH)."
- git clean -dxf
- [ "$?" -ne 0 ] && abort "Failed to clean release branch ($RELEASE_BRANCH)."
- git pull
- [ "$?" -ne 0 ] && abort "Failed to update release branch ($RELEASE_BRANCH)."
-else
- echo "$WORKING_DIR does not appear to be a git working directory ('git status' returned $GIT_STATUS_EXIT_CODE) - removing it so we can freshly clone the repo..."
- cd ..
- rm -rf "$WORKING_DIR"
- [ "$?" -ne 0 ] && abort "Failed to remove bogus working directory ($WORKING_DIR)."
-fi
+############ MAIN SCRIPT ############
+parse_and_validate_options $@
-echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
-mvn $MAVEN_RELEASE_PERFORM_GOAL $MAVEN_ARGS -Ddbreset
-[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
-echo
-echo "Release build succeeded!"
+set_script_debug_mode $DEBUG_MODE
+validate_system_utilities
+set_local_and_environment_variables
-# 5) Publish release artifacts - **FUTURE IMPROVEMENT**
-#echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
-#mvn deploy $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true
-#[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
+checkout_release_branch
+build_from_source
+publish_external_maven_repository
- #if [ "$MODE" = "production" ]; then
- # if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
- # usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
- # fi
- #fi
+publish_sourceforge
+unset_script_debug_mode $DEBUG_MODE
1
0
[rhq] Branch 'feature/rest' - 205 commits - .classpath etc/scripts modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/jopr modules/plugins modules/pom.xml pom.xml
by Heiko W. Rupp 15 Feb '12
by Heiko W. Rupp 15 Feb '12
15 Feb '12
.classpath | 13
dev/null |binary
etc/scripts/jboss-as-spawn.sh | 37
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js | 9
modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java | 20
modules/core/dbutils/pom.xml | 20
modules/core/dbutils/src/main/scripts/dbsetup-build.xml | 4
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 185 ++
modules/core/domain/pom.xml | 2
modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackage.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java | 18
modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageListItemComposite.java | 17
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 35
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 2
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java | 7
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessor.java | 26
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java | 112 +
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java | 160 +-
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DiscoveredResourceDetails.java | 94 -
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java | 5
modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java | 111 +
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java | 78 -
modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java | 3
modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java | 7
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 292 ++--
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 4
modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java | 17
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java | 10
modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java | 72 +
modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java | 139 +-
modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java | 98 +
modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java | 49
modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java | 187 ++
modules/enterprise/agent/src/etc/rhq-agent-env.bat | 325 ++---
modules/enterprise/agent/src/etc/rhq-agent-env.sh | 9
modules/enterprise/agent/src/etc/rhq-agent.bat | 446 +++----
modules/enterprise/agent/src/etc/rhq-agent.sh | 13
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 119 +
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 9
modules/enterprise/binding/pom.xml | 2
modules/enterprise/binding/src/main/java/org/rhq/bindings/SandboxedScriptEngine.java | 3
modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java | 80 +
modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java | 35
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java | 8
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java | 61
modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java | 32
modules/enterprise/binding/src/test/java/org/rhq/bindings/ScriptEngineTest.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 388 +++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 45
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java | 93 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java | 151 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java | 277 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 32
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 57
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java | 32
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 23
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 4
modules/enterprise/gui/installer-war/pom.xml | 4
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java | 193 +--
modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 8
modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp | 1
modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java | 26
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 57
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java | 17
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 5
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp | 5
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml | 7
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/view-plain.xhtml | 2
modules/enterprise/gui/rest-war/src/main/webapp/index.html | 8
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html | 83 -
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html | 225 +++
modules/enterprise/gui/rest-war/src/main/webapp/stacked3.html | 95 +
modules/enterprise/remoting/cli/pom.xml | 8
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 212 +--
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ClientCommand.java | 2
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java | 36
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java | 37
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java | 11
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java | 5
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java | 21
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java | 54
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java | 51
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsRepoManagerTest.java | 2
modules/enterprise/server/client-api/pom.xml | 381 ------
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 274 +++-
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java | 198 ---
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java | 101 +
modules/enterprise/server/client-api/src/test/resources/hibernate.properties | 26
modules/enterprise/server/client-api/src/test/resources/security.policy | 10
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java | 104 -
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java | 77 -
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java | 10
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java | 75 +
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java | 162 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java | 10
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java | 71 +
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java | 2
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java | 55
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java | 195 +++
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java | 59
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java | 145 ++
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java | 180 ++
modules/enterprise/server/container/pom.xml | 2
modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh | 19
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 2
modules/enterprise/server/ear/pom.xml | 10
modules/enterprise/server/itests/pom.xml | 46
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java | 216 +++
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java | 13
modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml | 10
modules/enterprise/server/itests/src/test/resources/security.policy | 10
modules/enterprise/server/jar/pom.xml | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 81 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java | 53
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 80 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java | 23
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 41
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 43
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java | 21
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 129 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java | 31
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 46
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AvailabilityRest.java | 21
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java | 58
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/StringValue.java | 28
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 20
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/DeleteAlertsTest.java | 26
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 30
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java | 14
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 58
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java | 456 +++++++
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java | 19
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 538 ++++++++
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 221 +--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java | 76 +
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 30
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.java | 83 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 128 +-
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java | 112 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java | 107 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java | 28
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java | 137 --
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java | 75 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 50
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 43
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 103 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 37
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java | 22
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java | 35
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java | 214 +--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java | 55
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 53
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java | 12
modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java | 16
modules/enterprise/server/plugins/disk/pom.xml | 18
modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java | 35
modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java | 263 ++++
modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java | 17
modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/test/RssFeedParserTest.java | 13
modules/enterprise/server/plugins/pom.xml | 1
modules/enterprise/server/plugins/rhnhosted/.gitignore | 1
modules/enterprise/server/plugins/rhnhosted/README.testing | 24
modules/enterprise/server/plugins/rhnhosted/pom.xml | 339 -----
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXML.java | 369 -----
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivator.java | 155 --
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNConstants.java | 33
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelper.java | 492 -------
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java | 386 ------
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReader.java | 138 --
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactory.java | 78 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSummary.java | 65 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/Certificate.java | 438 ------
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/CertificateFactory.java | 145 --
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyDescriptor.java | 84 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyExtractor.java | 58
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/FieldExtractor.java | 41
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/PublicKeyRing.java | 145 --
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/RhnSecurityProvider.java | 67 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/SimpleExtractor.java | 97 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/XmlTag.java | 210 ---
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/ApacheXmlRpcExecutor.java | 43
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransport.java | 174 --
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransportFactory.java | 82 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnComm.java | 120 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnDownloader.java | 179 --
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java | 55
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransport.java | 114 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransportFactory.java | 29
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java | 75 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransportFactory.java | 75 -
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutor.java | 44
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutorFactory.java | 100 -
modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml | 42
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/genSchema.sh | 4
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channel_families.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channels.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.errata.xml | 74 -
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.kickstartable_trees.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages.xml | 431 ------
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages_short.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.product_names.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.source_packages.xml | 5
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/schema0.xsd | 403 ------
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/BaseRHNTest.java | 107 -
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXMLTest.java | 154 --
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivatorTest.java | 75 -
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelperTest.java | 83 -
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProviderTest.java | 233 ---
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReaderTest.java | 83 -
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactoryTest.java | 104 -
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/BasicRHNTest.java | 627 ----------
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnHttpURLConnection.java | 51
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnXmlRpcExecutor.java | 274 ----
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnCommTest.java | 399 ------
modules/enterprise/server/plugins/rhnhosted/src/test/resources/test-log4j.xml | 464 -------
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java | 4
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java | 12
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java | 52
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java | 6
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java | 69 -
modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java | 8
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 1
modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java | 5
modules/enterprise/server/pom.xml | 2
modules/helpers/inventory-serializer/pom.xml | 4
modules/helpers/jeeGen/pom.xml | 97 +
modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java | 71 +
modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java | 623 +++++++++
modules/helpers/jeeGen/src/main/java/test/ejb/EntityBean.java | 64 +
modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBHome.java | 27
modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBObject.java | 20
modules/helpers/jeeGen/src/main/java/test/ejb/MessageDrivenBean.java | 109 +
modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionBean.java | 71 +
modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBHome.java | 15
modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBObject.java | 16
modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionBean.java | 35
modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBHome.java | 14
modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBObject.java | 13
modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl | 110 +
modules/helpers/pom.xml | 1
modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 5
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 16
modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java | 21
modules/jopr/etc/jbas5-jnp-client/client.sh | 24
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 152 ++
modules/plugins/ant-bundle/src/test/resources/test-bundle-manage-root-dir.xml | 16
modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableComponent.java | 11
modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableRowDiscoveryComponent.java | 17
modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubComponent.java | 11
modules/plugins/jboss-as-5/pom.xml | 16
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 1
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java | 82 -
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java | 12
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java | 6
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java | 172 ++
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java | 37
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 14
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/FileContentDelegateTest.java | 263 ++++
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/JarContentDelegateTest.java | 86 +
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ScriptComponentTest.java | 110 +
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/StandaloneManagedDeploymentComponentTest.java | 92 +
modules/plugins/jboss-as-5/src/test/resources/sampleWithImplementation.war |binary
modules/plugins/jboss-as-5/src/test/resources/sampleWithManifest.war |binary
modules/plugins/jboss-as-5/src/test/resources/sampleWithSpecification.war |binary
modules/plugins/jboss-as-5/src/test/resources/sampleWithSpecificationImplementation.war |binary
modules/plugins/jboss-as-5/src/test/resources/sampleWithoutManifest.war |binary
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 39
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java | 13
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 40
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 51
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 167 ++
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 65 -
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java | 38
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 106 +
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 77 -
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java | 212 +++
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java | 23
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java | 6
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java | 53
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java | 41
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 280 +---
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java | 92 +
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java | 19
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java | 17
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 318 ++---
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java | 19
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java | 16
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java | 129 ++
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java | 27
modules/plugins/jboss-as-7/src/test/resources/system-props.json | 10
modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 26
modules/plugins/jboss-as/pom.xml | 18
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java | 58
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 7
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java | 8
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java | 13
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java | 4
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java | 187 ++
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java | 139 +-
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java | 3
modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/ApplicationComponentTest.java | 113 +
modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java | 269 ++++
modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JarContentDelegateTest.java | 86 +
modules/plugins/jboss-as/src/test/resources/sampleWithImplementation.war |binary
modules/plugins/jboss-as/src/test/resources/sampleWithManifest.war |binary
modules/plugins/jboss-as/src/test/resources/sampleWithSpecification.war |binary
modules/plugins/jboss-as/src/test/resources/sampleWithSpecificationImplementation.war |binary
modules/plugins/jboss-as/src/test/resources/sampleWithoutManifest.war |binary
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java | 2
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java | 2
modules/plugins/jmx/pom.xml | 65 -
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java | 1
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java | 30
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 599 ++++++---
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java | 181 --
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java | 6
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java | 218 ---
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java | 57
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java | 218 +++
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java | 179 ++
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java | 118 +
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java | 218 +++
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java | 57
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/Socket.java | 120 +
modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 8
modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java | 211 ++-
modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java | 2
modules/plugins/oracle/pom.xml | 358 ++---
modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java | 25
modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleUserComponent.java | 30
modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml | 15
modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java | 281 ++++
modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java | 95 +
modules/plugins/oracle/src/test/resources/log4j.xml | 35
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformDiscoveryComponent.java | 4
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessDiscoveryComponent.java | 11
modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java | 12
modules/plugins/tomcat/pom.xml | 18
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java | 2
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java | 2
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceComponent.java | 35
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceDiscoveryComponent.java | 63 +
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 53
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java | 13
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java | 108 -
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java | 176 ++
modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 99 +
modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java | 246 +++
modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatVHostComponentTest.java | 155 ++
modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java | 270 ++++
modules/plugins/tomcat/src/test/resources/sampleWithImplementation.war |binary
modules/plugins/tomcat/src/test/resources/sampleWithManifest.war |binary
modules/plugins/tomcat/src/test/resources/sampleWithSpecification.war |binary
modules/plugins/tomcat/src/test/resources/sampleWithSpecificationImplementation.war |binary
modules/plugins/tomcat/src/test/resources/sampleWithoutManifest.war |binary
modules/pom.xml | 10
pom.xml | 19
392 files changed, 16186 insertions(+), 13627 deletions(-)
New commits:
commit 3aeaa42624bc42faa5d3cf070f54d83468cbad11
Merge: 1ea538e 01c6420
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 15 14:38:21 2012 +0100
Merge branch 'master' into feature/rest
Conflicts:
modules/enterprise/gui/rest-war/src/main/webapp/index.html
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
diff --cc modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java
index e38e1be,78d98ce..fa93805
--- a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java
+++ b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java
@@@ -1,92 -1,159 +1,159 @@@
- /*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.pluginapi.event.log;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.StringReader;
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.testng.annotations.Test;
-
-import org.rhq.core.domain.event.Event;
-import org.rhq.core.domain.event.EventSeverity;
-
-/**
- * @author Ian Springer
- */
-@Test
-public class Log4JLogEntryProcessorTest {
- private static final String LINE_SEPARATOR = System.getProperty("line.separator");
- private static final StringBuilder TEST_LOG = new StringBuilder();
- static {
- TEST_LOG.append(
- "2007-12-09 15:32:49,909 DEBUG [com.example.FooBar] run: IdleRemover notifying pools, interval: 450000")
- .append(LINE_SEPARATOR);
- TEST_LOG.append("2008-02-09 02:10:11,909 INFO [com.example.FooBar] a multi-line entry").append(LINE_SEPARATOR);
- TEST_LOG.append("\tyada yada yada").append(LINE_SEPARATOR);
- TEST_LOG.append("\twocka wocka").append(LINE_SEPARATOR);
- }
-
- public void testProcessLine() throws Exception {
- String eventType = "logEntry";
- File logFile = new File("C:/test.log");
- System.out.println("Testing with no includes pattern...");
- Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
- BufferedReader bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
- Set<Event> events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 2;
- Iterator<Event> eventIterator = events.iterator();
- Event event1 = eventIterator.next();
- assert eventType.equals(event1.getType());
- assert new File(event1.getSourceLocation()).equals(logFile);
- Calendar calendar = Calendar.getInstance();
- calendar.set(2007, 11, 9, 15, 32, 49);
- calendar.set(Calendar.MILLISECOND, 909);
- long expectedTimestamp = calendar.getTimeInMillis();
- assert event1.getTimestamp() == expectedTimestamp;
- assert event1.getSeverity().equals(EventSeverity.DEBUG);
- assert event1.getDetail().equals("[com.example.FooBar] run: IdleRemover notifying pools, interval: 450000");
- Event event2 = eventIterator.next();
- assert event2.getDetail().startsWith("[com.example.FooBar] a multi-line entry\n");
- assert event2.getDetail().endsWith("\twocka wocka");
- System.out.println("SUCCESS!");
- System.out.println("Testing with matching includes pattern...");
- processor.setIncludesPattern(Pattern.compile("wocka wocka"));
- bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
- events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 1;
- event1 = events.iterator().next();
- assert event1.getDetail().endsWith("\twocka wocka");
- System.out.println("SUCCESS!");
- System.out.println("Testing with non-matching includes pattern...");
- processor.setIncludesPattern(Pattern.compile("hubba bubba"));
- bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
- events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 0;
- System.out.println("SUCCESS!");
- }
-
- public void testProcessLineBracketDelimitedSeverity() throws Exception {
- String eventType = "logEntry";
- File logFile = new File("C:/test.log");
- Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
-
- String logEntry = "2007-12-09 15:32:49,909 [DEBUG] [com.example.FooBar] test message";
- BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
- Set<Event> events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 1;
- Iterator<Event> eventIterator = events.iterator();
- Event event1 = eventIterator.next();
- assert eventType.equals(event1.getType());
- assert new File(event1.getSourceLocation()).equals(logFile);
- Calendar calendar = Calendar.getInstance();
- calendar.set(2007, 11, 9, 15, 32, 49);
- calendar.set(Calendar.MILLISECOND, 909);
- long expectedTimestamp = calendar.getTimeInMillis();
- assert event1.getTimestamp() == expectedTimestamp;
- assert event1.getSeverity().equals(EventSeverity.DEBUG);
- assert event1.getDetail().equals("[com.example.FooBar] test message");
- }
-
- public void testProcessLineParenDelimitedSeverity() throws Exception {
- String eventType = "logEntry";
- File logFile = new File("C:/test.log");
- Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
-
- String logEntry = "2007-12-09 15:32:49,909 (DEBUG) [com.example.FooBar] test message";
- BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
- Set<Event> events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 1;
- Iterator<Event> eventIterator = events.iterator();
- Event event1 = eventIterator.next();
- assert eventType.equals(event1.getType());
- assert new File(event1.getSourceLocation()).equals(logFile);
- Calendar calendar = Calendar.getInstance();
- calendar.set(2007, 11, 9, 15, 32, 49);
- calendar.set(Calendar.MILLISECOND, 909);
- long expectedTimestamp = calendar.getTimeInMillis();
- assert event1.getTimestamp() == expectedTimestamp;
- assert event1.getSeverity().equals(EventSeverity.DEBUG);
- assert event1.getDetail().equals("[com.example.FooBar] test message");
- }
-
- public void testProcessLineSpacedDelimitedSeverity() throws Exception {
- String eventType = "logEntry";
- File logFile = new File("C:/test.log");
- Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
-
- String logEntry = "2007-12-09 15:32:49,909 [ DEBUG ) [com.example.FooBar] test message";
- BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
- Set<Event> events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 1;
- Iterator<Event> eventIterator = events.iterator();
- Event event1 = eventIterator.next();
- assert eventType.equals(event1.getType());
- assert new File(event1.getSourceLocation()).equals(logFile);
- Calendar calendar = Calendar.getInstance();
- calendar.set(2007, 11, 9, 15, 32, 49);
- calendar.set(Calendar.MILLISECOND, 909);
- long expectedTimestamp = calendar.getTimeInMillis();
- assert event1.getTimestamp() == expectedTimestamp;
- assert event1.getSeverity().equals(EventSeverity.DEBUG);
- assert event1.getDetail().equals("[com.example.FooBar] test message");
- }
-
-}
++/*
++ * RHQ Management Platform
++ * Copyright (C) 2005-2008 Red Hat, Inc.
++ * All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License, version 2, as
++ * published by the Free Software Foundation, and/or the GNU Lesser
++ * General Public License, version 2.1, also as published by the Free
++ * Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License and the GNU Lesser General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * and the GNU Lesser General Public License along with this program;
++ * if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ */
+package org.rhq.core.pluginapi.event.log;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.StringReader;
+import java.util.Calendar;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.event.Event;
+import org.rhq.core.domain.event.EventSeverity;
+
+/**
+ * @author Ian Springer
+ */
+@Test
+public class Log4JLogEntryProcessorTest {
+ private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+ private static final StringBuilder TEST_LOG = new StringBuilder();
+ static {
+ TEST_LOG.append(
+ "2007-12-09 15:32:49,909 DEBUG [com.example.FooBar] run: IdleRemover notifying pools, interval: 450000")
+ .append(LINE_SEPARATOR);
+ TEST_LOG.append("2008-02-09 02:10:11,909 INFO [com.example.FooBar] a multi-line entry").append(LINE_SEPARATOR);
+ TEST_LOG.append("\tyada yada yada").append(LINE_SEPARATOR);
+ TEST_LOG.append("\twocka wocka").append(LINE_SEPARATOR);
+ }
+
+ public void testProcessLine() throws Exception {
+ String eventType = "logEntry";
+ File logFile = new File("C:/test.log");
+ System.out.println("Testing with no includes pattern...");
+ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
+ BufferedReader bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
+ Set<Event> events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 2;
+ Iterator<Event> eventIterator = events.iterator();
+ Event event1 = eventIterator.next();
+ assert eventType.equals(event1.getType());
+ assert new File(event1.getSourceLocation()).equals(logFile);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(2007, 11, 9, 15, 32, 49);
+ calendar.set(Calendar.MILLISECOND, 909);
+ long expectedTimestamp = calendar.getTimeInMillis();
+ assert event1.getTimestamp() == expectedTimestamp;
+ assert event1.getSeverity().equals(EventSeverity.DEBUG);
+ assert event1.getDetail().equals("[com.example.FooBar] run: IdleRemover notifying pools, interval: 450000");
+ Event event2 = eventIterator.next();
+ assert event2.getDetail().startsWith("[com.example.FooBar] a multi-line entry\n");
+ assert event2.getDetail().endsWith("\twocka wocka");
+ System.out.println("SUCCESS!");
+ System.out.println("Testing with matching includes pattern...");
+ processor.setIncludesPattern(Pattern.compile("wocka wocka"));
+ bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
+ events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 1;
+ event1 = events.iterator().next();
+ assert event1.getDetail().endsWith("\twocka wocka");
+ System.out.println("SUCCESS!");
+ System.out.println("Testing with non-matching includes pattern...");
+ processor.setIncludesPattern(Pattern.compile("hubba bubba"));
+ bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
+ events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 0;
+ System.out.println("SUCCESS!");
+ }
++
++ public void testProcessLineBracketDelimitedSeverity() throws Exception {
++ String eventType = "logEntry";
++ File logFile = new File("C:/test.log");
++ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
++
++ String logEntry = "2007-12-09 15:32:49,909 [DEBUG] [com.example.FooBar] test message";
++ BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
++ Set<Event> events = processor.processLines(bufferedReader);
++ assert events != null && events.size() == 1;
++ Iterator<Event> eventIterator = events.iterator();
++ Event event1 = eventIterator.next();
++ assert eventType.equals(event1.getType());
++ assert new File(event1.getSourceLocation()).equals(logFile);
++ Calendar calendar = Calendar.getInstance();
++ calendar.set(2007, 11, 9, 15, 32, 49);
++ calendar.set(Calendar.MILLISECOND, 909);
++ long expectedTimestamp = calendar.getTimeInMillis();
++ assert event1.getTimestamp() == expectedTimestamp;
++ assert event1.getSeverity().equals(EventSeverity.DEBUG);
++ assert event1.getDetail().equals("[com.example.FooBar] test message");
++ }
++
++ public void testProcessLineParenDelimitedSeverity() throws Exception {
++ String eventType = "logEntry";
++ File logFile = new File("C:/test.log");
++ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
++
++ String logEntry = "2007-12-09 15:32:49,909 (DEBUG) [com.example.FooBar] test message";
++ BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
++ Set<Event> events = processor.processLines(bufferedReader);
++ assert events != null && events.size() == 1;
++ Iterator<Event> eventIterator = events.iterator();
++ Event event1 = eventIterator.next();
++ assert eventType.equals(event1.getType());
++ assert new File(event1.getSourceLocation()).equals(logFile);
++ Calendar calendar = Calendar.getInstance();
++ calendar.set(2007, 11, 9, 15, 32, 49);
++ calendar.set(Calendar.MILLISECOND, 909);
++ long expectedTimestamp = calendar.getTimeInMillis();
++ assert event1.getTimestamp() == expectedTimestamp;
++ assert event1.getSeverity().equals(EventSeverity.DEBUG);
++ assert event1.getDetail().equals("[com.example.FooBar] test message");
++ }
++
++ public void testProcessLineSpacedDelimitedSeverity() throws Exception {
++ String eventType = "logEntry";
++ File logFile = new File("C:/test.log");
++ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
++
++ String logEntry = "2007-12-09 15:32:49,909 [ DEBUG ) [com.example.FooBar] test message";
++ BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
++ Set<Event> events = processor.processLines(bufferedReader);
++ assert events != null && events.size() == 1;
++ Iterator<Event> eventIterator = events.iterator();
++ Event event1 = eventIterator.next();
++ assert eventType.equals(event1.getType());
++ assert new File(event1.getSourceLocation()).equals(logFile);
++ Calendar calendar = Calendar.getInstance();
++ calendar.set(2007, 11, 9, 15, 32, 49);
++ calendar.set(Calendar.MILLISECOND, 909);
++ long expectedTimestamp = calendar.getTimeInMillis();
++ assert event1.getTimestamp() == expectedTimestamp;
++ assert event1.getSeverity().equals(EventSeverity.DEBUG);
++ assert event1.getDetail().equals("[com.example.FooBar] test message");
++ }
++
+}
diff --cc modules/enterprise/agent/src/etc/rhq-agent-env.bat
index 7116516,62d727b..6b37580
--- a/modules/enterprise/agent/src/etc/rhq-agent-env.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
@@@ -1,161 -1,164 +1,164 @@@
--rem ===========================================================================
--rem RHQ Agent Windows Startup Script Configuration File
--rem ===========================================================================
--rem
--
--rem RHQ_AGENT_DEBUG - If this is defined, the script will emit debug
--rem messages. It will also enable debug
--rem messages to be emitted from the agent itself.
--rem If not set or set to "false", debug is turned off.
--rem This does not implicitly enable Sigar native system
--rem debug mode. You must explicitly enable
--rem RHQ_AGENT_SIGAR_DEBUG in addition to enabling
--rem RHQ_AGENT_DEBUG for Sigar logging to be enabled.
--rem
--rem set RHQ_AGENT_DEBUG=true
--
--rem RHQ_AGENT_SIGAR_DEBUG - Enables Sigar debug mode but only if agent debug
--rem is also enabled. See RHQ_AGENT_DEBUG for more.
--rem set RHQ_AGENT_SIGAR_DEBUG=false
--
--rem RHQ_AGENT_HOME - Defines where the agent's home install directory is.
--rem If not defined, it will be assumed to be the parent
--rem directory of the directory where this script lives.
--rem
--rem set RHQ_AGENT_HOME=C:\opt\rhq-agent
--
--rem RHQ_AGENT_JAVA_HOME - The location of the JRE that the agent will
--rem use. This will be ignored if
--rem RHQ_AGENT_JAVA_EXE_FILE_PATH is set.
--rem If this and RHQ_AGENT_JAVA_EXE_FILE_PATH are
--rem not set, the agent's embedded JRE will be used.
--rem
--rem set RHQ_AGENT_JAVA_HOME=C:\opt\java
--
--rem RHQ_AGENT_JAVA_EXE_FILE_PATH - Defines the full path to the Java
--rem executable to use. If this is set,
--rem RHQ_AGENT_JAVA_HOME is ignored.
--rem If this is not set, then
--rem %RHQ_AGENT_JAVA_HOME%\bin\java.exe
--rem is used. If this and
--rem RHQ_AGENT_JAVA_HOME are not set, the
--rem agent's embedded JRE will be used.
--rem
--rem set RHQ_AGENT_JAVA_EXE_FILE_PATH=C:\WINDOWS\system32\java.exe
--
--rem ===========================================================================
--rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent.bat SCRIPT
--rem THESE ARE NOT USED/IGNORED BY rhq-agent-wrapper.bat SCRIPT
--
--rem RHQ_AGENT_JAVA_OPTS - Java VM command line options to be
--rem passed into the agent's VM. If this is not defined
--rem this script will pass in a default set of options.
--rem If this is set, it completely overrides the
--rem agent's defaults. If you only want to add options
--rem to the agent's defaults, then you will want to
--rem use RHQ_AGENT_ADDITIONAL_JAVA_OPTS instead.
--rem
--rem set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
--
--rem RHQ_AGENT_JAVA_ENDORSED_DIRS - Java VM command line option to set the
--rem endorsed dirs for the agent's VM. If this
--rem is not defined this script will pass in a
--rem default value. If this is set, it
--rem completely overrides the agent's default.
--rem However, if this is set to "none", the
--rem agent will not be passed the VM argument
--rem to set the endorsed dirs.
--rem
--rem set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
--
--rem RHQ_AGENT_JAVA_LIBRARY_PATH - The RHQ Agent has a JNI library that
--rem it needs to find in order to do things
--rem like execute PIQL queries and access
--rem low-level operating system data. This
--rem is the native system layer (SIGAR).
--rem If you deploy a custom plugin that also
--rem requires JNI libraries, you must add to
--rem the library path here, but you must ensure
--rem not to remove the RHQ Agent library path.
--rem If this variable is set, it completely
--rem overrides the agent's default.
--rem However, if this is set to "none", the
--rem agent will not be passed the VM argument
--rem to set the library paths.
--rem
--rem set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
--
--rem RHQ_AGENT_ADDITIONAL_JAVA_OPTS - additional Java VM command line options
--rem to be passed into the agent's VM. This
--rem is added to RHQ_AGENT_JAVA_OPTS; it
--rem is mainly used to augment the agent's
--rem default set of options. This can be
--rem left unset if it is not needed.
--rem
--rem set RHQ_AGENT_ADDITIONAL_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,address=9797,server=y,suspend=n
--
--rem RHQ_AGENT_CMDLINE_OPTS - If this is defined, these are the command line
--rem arguments that will be passed to the RHQ Agent.
--rem Any arguments specified on the command line
--rem will be ignored. If this is not defined, the
--rem command line arguments given to the script are
--rem passed through to the RHQ Agent.
--rem If you want to have command line arguments
--rem added to the arguments specified here, append
--rem '%*' to the end of this option. For example,
- rem "--daemon %*". In this case, both the command
- rem line options and the ones specified here will
- rem be passed to the agent.
- rem
- rem set RHQ_AGENT_CMDLINE_OPTS=--nonative
-
- rem ===========================================================================
- rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent-wrapper.bat SCRIPT
-
- rem RHQ_AGENT_INSTANCE_NAME - The name of the Windows Service; it must
- rem conform to the Windows Service naming
- rem conventions. By default, this is the
- rem name "rhqagent-%COMPUTERNAME%"
- rem
- rem set RHQ_AGENT_INSTANCE_NAME=rhqagent-%COMPUTERNAME%
-
- rem RHQ_AGENT_WRAPPER_LOG_DIR_PATH - The full path to the location where
- rem the wrapper log file will go.
- rem
- rem set RHQ_AGENT_WRAPPER_LOG_DIR_PATH=%RHQ_AGENT_HOME%\logs
-
- rem RHQ_AGENT_RUN_AS - if defined, then when the Windows Service is
- rem installed, the value is the domain\username of the
- rem user that the Windows Service will run as
- rem
- rem set RHQ_AGENT_RUN_AS=.\%USERNAME%
-
- rem RHQ_AGENT_RUN_AS_ME - if defined, then when the Windows Service is
- rem installed, the domain\username of the
- rem user that the Windows Service will run as will
- rem be the current user (.\%USERNAME%). This takes
- rem precedence over RHQ_AGENT_RUN_AS.
- rem
- rem set RHQ_AGENT_RUN_AS_ME=true
-
- rem RHQ_AGENT_PASSWORD_PROMPT - if "true", the user that is to run the
- rem service (as defined by RHQ_AGENT_RUN_AS or
- rem RHQ_AGENT_RUN_AS_ME) must type the password
- rem on the console in order to install service.
- rem If "false", you must provide the password
- rem in RHQ_AGENT_PASSWORD. Default is "true".
- rem This is only used when installing the
- rem service; it is not needed to be set when
- rem starting, stopping or removing the service.
- rem
- rem set RHQ_AGENT_PASSWORD_PROMPT=true
-
- rem RHQ_AGENT_PASSWORD - if RHQ_AGENT_PASSWORD_PROMPT is "false", this
- rem is the password of the user that is to
- rem run the service. If RHQ_AGENT_PASSWORD_PROMPT
- rem is undefined or "true", this is ignored.
- rem This is only used when installing the
- rem service; it is not needed to be set when
- rem starting, stopping or removing the service.
- rem
- rem set RHQ_AGENT_PASSWORD=password_here
-rem "--nonative %*". In this case, both the command
-rem line options and the ones specified here will
-rem be passed to the Agent. Note, the --daemon option
-rem should generally not be included here, since it
-rem would cause the Agent to always start in daemon
-rem mode, even when started via rhq-agent.bat.
-rem
-rem set RHQ_AGENT_CMDLINE_OPTS=--nonative %*
-
-rem ===========================================================================
-rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent-wrapper.bat SCRIPT
-
-rem RHQ_AGENT_INSTANCE_NAME - The name of the Windows Service; it must
-rem conform to the Windows Service naming
-rem conventions. By default, this is the
-rem name "rhqagent-%COMPUTERNAME%"
-rem
-rem set RHQ_AGENT_INSTANCE_NAME=rhqagent-%COMPUTERNAME%
-
-rem RHQ_AGENT_WRAPPER_LOG_DIR_PATH - The full path to the location where
-rem the wrapper log file will go.
-rem
-rem set RHQ_AGENT_WRAPPER_LOG_DIR_PATH=%RHQ_AGENT_HOME%\logs
-
-rem RHQ_AGENT_RUN_AS - if defined, then when the Windows Service is
-rem installed, the value is the domain\username of the
-rem user that the Windows Service will run as
-rem
-rem set RHQ_AGENT_RUN_AS=.\%USERNAME%
-
-rem RHQ_AGENT_RUN_AS_ME - if defined, then when the Windows Service is
-rem installed, the domain\username of the
-rem user that the Windows Service will run as will
-rem be the current user (.\%USERNAME%). This takes
-rem precedence over RHQ_AGENT_RUN_AS.
-rem
-rem set RHQ_AGENT_RUN_AS_ME=true
-
-rem RHQ_AGENT_PASSWORD_PROMPT - if "true", the user that is to run the
-rem service (as defined by RHQ_AGENT_RUN_AS or
-rem RHQ_AGENT_RUN_AS_ME) must type the password
-rem on the console in order to install service.
-rem If "false", you must provide the password
-rem in RHQ_AGENT_PASSWORD. Default is "true".
-rem This is only used when installing the
-rem service; it is not needed to be set when
-rem starting, stopping or removing the service.
-rem
-rem set RHQ_AGENT_PASSWORD_PROMPT=true
-
-rem RHQ_AGENT_PASSWORD - if RHQ_AGENT_PASSWORD_PROMPT is "false", this
-rem is the password of the user that is to
-rem run the service. If RHQ_AGENT_PASSWORD_PROMPT
-rem is undefined or "true", this is ignored.
-rem This is only used when installing the
-rem service; it is not needed to be set when
-rem starting, stopping or removing the service.
-rem
-rem set RHQ_AGENT_PASSWORD=password_here
++rem ===========================================================================
++rem RHQ Agent Windows Startup Script Configuration File
++rem ===========================================================================
++rem
++
++rem RHQ_AGENT_DEBUG - If this is defined, the script will emit debug
++rem messages. It will also enable debug
++rem messages to be emitted from the agent itself.
++rem If not set or set to "false", debug is turned off.
++rem This does not implicitly enable Sigar native system
++rem debug mode. You must explicitly enable
++rem RHQ_AGENT_SIGAR_DEBUG in addition to enabling
++rem RHQ_AGENT_DEBUG for Sigar logging to be enabled.
++rem
++rem set RHQ_AGENT_DEBUG=true
++
++rem RHQ_AGENT_SIGAR_DEBUG - Enables Sigar debug mode but only if agent debug
++rem is also enabled. See RHQ_AGENT_DEBUG for more.
++rem set RHQ_AGENT_SIGAR_DEBUG=false
++
++rem RHQ_AGENT_HOME - Defines where the agent's home install directory is.
++rem If not defined, it will be assumed to be the parent
++rem directory of the directory where this script lives.
++rem
++rem set RHQ_AGENT_HOME=C:\opt\rhq-agent
++
++rem RHQ_AGENT_JAVA_HOME - The location of the JRE that the agent will
++rem use. This will be ignored if
++rem RHQ_AGENT_JAVA_EXE_FILE_PATH is set.
++rem If this and RHQ_AGENT_JAVA_EXE_FILE_PATH are
++rem not set, the agent's embedded JRE will be used.
++rem
++rem set RHQ_AGENT_JAVA_HOME=C:\opt\java
++
++rem RHQ_AGENT_JAVA_EXE_FILE_PATH - Defines the full path to the Java
++rem executable to use. If this is set,
++rem RHQ_AGENT_JAVA_HOME is ignored.
++rem If this is not set, then
++rem %RHQ_AGENT_JAVA_HOME%\bin\java.exe
++rem is used. If this and
++rem RHQ_AGENT_JAVA_HOME are not set, the
++rem agent's embedded JRE will be used.
++rem
++rem set RHQ_AGENT_JAVA_EXE_FILE_PATH=C:\WINDOWS\system32\java.exe
++
++rem ===========================================================================
++rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent.bat SCRIPT
++rem THESE ARE NOT USED/IGNORED BY rhq-agent-wrapper.bat SCRIPT
++
++rem RHQ_AGENT_JAVA_OPTS - Java VM command line options to be
++rem passed into the agent's VM. If this is not defined
++rem this script will pass in a default set of options.
++rem If this is set, it completely overrides the
++rem agent's defaults. If you only want to add options
++rem to the agent's defaults, then you will want to
++rem use RHQ_AGENT_ADDITIONAL_JAVA_OPTS instead.
++rem
++rem set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
++
++rem RHQ_AGENT_JAVA_ENDORSED_DIRS - Java VM command line option to set the
++rem endorsed dirs for the agent's VM. If this
++rem is not defined this script will pass in a
++rem default value. If this is set, it
++rem completely overrides the agent's default.
++rem However, if this is set to "none", the
++rem agent will not be passed the VM argument
++rem to set the endorsed dirs.
++rem
++rem set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
++
++rem RHQ_AGENT_JAVA_LIBRARY_PATH - The RHQ Agent has a JNI library that
++rem it needs to find in order to do things
++rem like execute PIQL queries and access
++rem low-level operating system data. This
++rem is the native system layer (SIGAR).
++rem If you deploy a custom plugin that also
++rem requires JNI libraries, you must add to
++rem the library path here, but you must ensure
++rem not to remove the RHQ Agent library path.
++rem If this variable is set, it completely
++rem overrides the agent's default.
++rem However, if this is set to "none", the
++rem agent will not be passed the VM argument
++rem to set the library paths.
++rem
++rem set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
++
++rem RHQ_AGENT_ADDITIONAL_JAVA_OPTS - additional Java VM command line options
++rem to be passed into the agent's VM. This
++rem is added to RHQ_AGENT_JAVA_OPTS; it
++rem is mainly used to augment the agent's
++rem default set of options. This can be
++rem left unset if it is not needed.
++rem
++rem set RHQ_AGENT_ADDITIONAL_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,address=9797,server=y,suspend=n
++
++rem RHQ_AGENT_CMDLINE_OPTS - If this is defined, these are the command line
++rem arguments that will be passed to the RHQ Agent.
++rem Any arguments specified on the command line
++rem will be ignored. If this is not defined, the
++rem command line arguments given to the script are
++rem passed through to the RHQ Agent.
++rem If you want to have command line arguments
++rem added to the arguments specified here, append
++rem '%*' to the end of this option. For example,
++rem "--nonative %*". In this case, both the command
++rem line options and the ones specified here will
++rem be passed to the Agent. Note, the --daemon option
++rem should generally not be included here, since it
++rem would cause the Agent to always start in daemon
++rem mode, even when started via rhq-agent.bat.
++rem
++rem set RHQ_AGENT_CMDLINE_OPTS=--nonative %*
++
++rem ===========================================================================
++rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent-wrapper.bat SCRIPT
++
++rem RHQ_AGENT_INSTANCE_NAME - The name of the Windows Service; it must
++rem conform to the Windows Service naming
++rem conventions. By default, this is the
++rem name "rhqagent-%COMPUTERNAME%"
++rem
++rem set RHQ_AGENT_INSTANCE_NAME=rhqagent-%COMPUTERNAME%
++
++rem RHQ_AGENT_WRAPPER_LOG_DIR_PATH - The full path to the location where
++rem the wrapper log file will go.
++rem
++rem set RHQ_AGENT_WRAPPER_LOG_DIR_PATH=%RHQ_AGENT_HOME%\logs
++
++rem RHQ_AGENT_RUN_AS - if defined, then when the Windows Service is
++rem installed, the value is the domain\username of the
++rem user that the Windows Service will run as
++rem
++rem set RHQ_AGENT_RUN_AS=.\%USERNAME%
++
++rem RHQ_AGENT_RUN_AS_ME - if defined, then when the Windows Service is
++rem installed, the domain\username of the
++rem user that the Windows Service will run as will
++rem be the current user (.\%USERNAME%). This takes
++rem precedence over RHQ_AGENT_RUN_AS.
++rem
++rem set RHQ_AGENT_RUN_AS_ME=true
++
++rem RHQ_AGENT_PASSWORD_PROMPT - if "true", the user that is to run the
++rem service (as defined by RHQ_AGENT_RUN_AS or
++rem RHQ_AGENT_RUN_AS_ME) must type the password
++rem on the console in order to install service.
++rem If "false", you must provide the password
++rem in RHQ_AGENT_PASSWORD. Default is "true".
++rem This is only used when installing the
++rem service; it is not needed to be set when
++rem starting, stopping or removing the service.
++rem
++rem set RHQ_AGENT_PASSWORD_PROMPT=true
++
++rem RHQ_AGENT_PASSWORD - if RHQ_AGENT_PASSWORD_PROMPT is "false", this
++rem is the password of the user that is to
++rem run the service. If RHQ_AGENT_PASSWORD_PROMPT
++rem is undefined or "true", this is ignored.
++rem This is only used when installing the
++rem service; it is not needed to be set when
++rem starting, stopping or removing the service.
++rem
++rem set RHQ_AGENT_PASSWORD=password_here
diff --cc modules/enterprise/agent/src/etc/rhq-agent.bat
index 59b7676,005e535..fc8bdf1
--- a/modules/enterprise/agent/src/etc/rhq-agent.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent.bat
@@@ -1,219 -1,227 +1,227 @@@
--@echo off
--
--rem ===========================================================================
--rem RHQ Agent Windows Startup Script
--rem
--rem This file is used to execute the RHQ Agent on a Windows platform.
--rem Run this script with the --help option for the runtime options.
--rem
--rem Note that this script can also be used to simply set environment variables
--rem that define the agent's environment but it will not actually run the agent.
--rem Pass in _SETENV_ONLY as the first argument to this script if you want this
--rem behavior.
--rem
--rem This script is customizable by setting certain environment variables, which
--rem are described in comments in rhq-agent-env.bat. The variables can also be
--rem set via rhq-agent-env.bat, which is sourced by this script.
--rem
--rem If the embedded JRE is to be used but is not available, the fallback
--rem JRE to be used will be determined by the JAVA_HOME environment variable.
--rem ===========================================================================
--
--setlocal
--
--if "%1"=="_SETENV_ONLY" (
-- set _SETENV_ONLY=true
--) else (
-- title RHQ Agent
--)
--
--rem if debug variable is set, it is assumed to be on, unless its value is false
--if "%RHQ_AGENT_DEBUG%" == "false" (
-- set RHQ_AGENT_DEBUG=
--)
--
--rem ----------------------------------------------------------------------
--rem Change directory so the current directory is the Agent home.
--rem Here we assume this script is a child directory of the Agent home
--rem We also assume our custom environment script is located in the same
--rem place as this script.
--rem ----------------------------------------------------------------------
--
--set RHQ_AGENT_BIN_DIR_PATH=%~dp0
--
--if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" (
-- if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
-- call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %*
--) else (
-- if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
--)
--
--rem if debug variable is set, it is assumed to be on, unless its value is false
--if "%RHQ_AGENT_DEBUG%" == "false" (
-- set RHQ_AGENT_DEBUG=
--)
--
--rem if sigar debug variable is set, it is assumed to be on, unless its value is false
--if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" (
-- set RHQ_AGENT_SIGAR_DEBUG=
--)
--
--if not defined RHQ_AGENT_HOME (
-- cd "%RHQ_AGENT_BIN_DIR_PATH%\.."
--) else (
-- cd "%RHQ_AGENT_HOME%" || (
-- echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME%
-- exit /B 1
-- )
--)
--
--set RHQ_AGENT_HOME=%CD%
--
--if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME%
--
--rem ----------------------------------------------------------------------
--rem Find the Java executable and verify we have a VM available
--rem ----------------------------------------------------------------------
--
--if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
-- if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre
--)
--
--if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
-- set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe
--)
--
--if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME%
--if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH%
--
--if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" (
-- echo There is no JVM available.
-- echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately.
-- exit /B 1
--)
--
--rem ----------------------------------------------------------------------
--rem Prepare the classpath
--rem ----------------------------------------------------------------------
--
--set CLASSPATH=
--call :append_classpath "%RHQ_AGENT_HOME%\conf"
--for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do (
-- call :append_classpath "%%G"
-- if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
--)
-
- rem ----------------------------------------------------------------------
- rem Prepare the VM command line options to be passed in
- rem ----------------------------------------------------------------------
-
- if not defined RHQ_AGENT_JAVA_OPTS (
- set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
- )
- if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS%
-
- if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" (
- if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs
- goto :skip_java_endorsed_dirs
- )
- if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
- if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS%
- set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%"
- :skip_java_endorsed_dirs
-
- if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" (
- if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path
- goto :skip_java_library_path
- )
- if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
- if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH%
- set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%"
- :skip_java_library_path
-
- if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
-
- rem ----------------------------------------------------------------------
- rem Prepare the command line arguments passed to the RHQ Agent
- rem ----------------------------------------------------------------------
-
- if not defined RHQ_AGENT_CMDLINE_OPTS (
- set RHQ_AGENT_CMDLINE_OPTS=%*
- )
-
- if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS%
-
- rem ----------------------------------------------------------------------
- rem Execute the VM which starts the agent
- rem ----------------------------------------------------------------------
-
- if defined RHQ_AGENT_DEBUG (
- set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true
- ) else (
- set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml
- )
-
- rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so its got its own debug var
- if defined RHQ_AGENT_SIGAR_DEBUG (
- set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true
- )
-
- rem to support other agents/plugin containers, allow the caller to override the main classname
- if not defined RHQ_AGENT_MAINCLASS (
- set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
- )
-
- set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
-
- if not defined _SETENV_ONLY (
- rem log4j 1.2.8 does not create the directory for us (later versions do)
- if not exist "%RHQ_AGENT_HOME%\logs" (
- mkdir "%RHQ_AGENT_HOME%\logs"
- )
- if defined RHQ_AGENT_DEBUG (
- echo Executing the agent with this command line:
- echo %CMD%
- )
- cmd.exe /S /C "%CMD%"
- )
-
- goto :done
-
- rem ----------------------------------------------------------------------
- rem CALL subroutine that appends the first argument to CLASSPATH
- rem ----------------------------------------------------------------------
-
- :append_classpath
- set _entry=%1
- if not defined CLASSPATH (
- set CLASSPATH=%_entry:"=%
- ) else (
- set CLASSPATH=%CLASSPATH%;%_entry:"=%
- )
- goto :eof
-
- rem ----------------------------------------------------------------------
- rem CALL subroutine that prepares to use the embedded JRE
- rem ----------------------------------------------------------------------
-
- :prepare_embedded_jre
- set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre
- if defined RHQ_AGENT_DEBUG echo Using the embedded JRE
- if not exist "%RHQ_AGENT_JAVA_HOME%" (
- if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
- set RHQ_AGENT_JAVA_HOME=%JAVA_HOME%
- )
- goto :eof
-
- rem ----------------------------------------------------------------------
- rem CALL subroutine that exits this script normally
- rem ----------------------------------------------------------------------
-
- :done
- if defined RHQ_AGENT_DEBUG echo %0 done.
- if defined _SETENV_ONLY (
- endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%"
- ) else (
- endlocal
- )
-
- exit /B 0
-for %%G in ("%RHQ_AGENT_JAVA_HOME%\lib\tools.jar" "%RHQ_AGENT_JAVA_HOME%\..\lib\tools.jar") do (
- if exist "%%G" (
- call :append_classpath "%%G"
- if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
- goto end_classpath
- )
-)
-:end_classpath
-
-rem ----------------------------------------------------------------------
-rem Prepare the VM command line options to be passed in
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_AGENT_JAVA_OPTS (
- set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
-)
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS%
-
-if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" (
- if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs
- goto :skip_java_endorsed_dirs
-)
-if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS%
-set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%"
-:skip_java_endorsed_dirs
-
-if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" (
- if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path
- goto :skip_java_library_path
-)
-if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH%
-set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%"
-:skip_java_library_path
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
-
-rem ----------------------------------------------------------------------
-rem Prepare the command line arguments passed to the RHQ Agent
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_AGENT_CMDLINE_OPTS (
- set RHQ_AGENT_CMDLINE_OPTS=%*
-)
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS%
-
-rem ----------------------------------------------------------------------
-rem Execute the VM which starts the agent
-rem ----------------------------------------------------------------------
-
-if defined RHQ_AGENT_DEBUG (
- set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true
-) else (
- set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml
-)
-
-rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var
-if defined RHQ_AGENT_SIGAR_DEBUG (
- set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true
-)
-
-rem to support other agents/plugin containers, allow the caller to override the main classname
-if not defined RHQ_AGENT_MAINCLASS (
- set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
-)
-
-set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
-
-if not defined _SETENV_ONLY (
- rem log4j 1.2.8 does not create the directory for us (later versions do)
- if not exist "%RHQ_AGENT_HOME%\logs" (
- mkdir "%RHQ_AGENT_HOME%\logs"
- )
- if defined RHQ_AGENT_DEBUG (
- echo Executing the agent with this command line:
- echo %CMD%
- )
- cmd.exe /S /C "%CMD%"
-)
-
-goto :done
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that appends the first argument to CLASSPATH
-rem ----------------------------------------------------------------------
-
-:append_classpath
-set _entry=%1
-if not defined CLASSPATH (
- set CLASSPATH=%_entry:"=%
-) else (
- set CLASSPATH=%CLASSPATH%;%_entry:"=%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that prepares to use the embedded JRE
-rem ----------------------------------------------------------------------
-
-:prepare_embedded_jre
-set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre
-if defined RHQ_AGENT_DEBUG echo Using the embedded JRE
-if not exist "%RHQ_AGENT_JAVA_HOME%" (
- if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
- set RHQ_AGENT_JAVA_HOME=%JAVA_HOME%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that exits this script normally
-rem ----------------------------------------------------------------------
-
-:done
-if defined RHQ_AGENT_DEBUG echo %0 done.
-if defined _SETENV_ONLY (
-endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%"
-) else (
-endlocal
-)
-
-exit /B 0
++@echo off
++
++rem ===========================================================================
++rem RHQ Agent Windows Startup Script
++rem
++rem This file is used to execute the RHQ Agent on a Windows platform.
++rem Run this script with the --help option for the runtime options.
++rem
++rem Note that this script can also be used to simply set environment variables
++rem that define the agent's environment but it will not actually run the agent.
++rem Pass in _SETENV_ONLY as the first argument to this script if you want this
++rem behavior.
++rem
++rem This script is customizable by setting certain environment variables, which
++rem are described in comments in rhq-agent-env.bat. The variables can also be
++rem set via rhq-agent-env.bat, which is sourced by this script.
++rem
++rem If the embedded JRE is to be used but is not available, the fallback
++rem JRE to be used will be determined by the JAVA_HOME environment variable.
++rem ===========================================================================
++
++setlocal
++
++if "%1"=="_SETENV_ONLY" (
++ set _SETENV_ONLY=true
++) else (
++ title RHQ Agent
++)
++
++rem if debug variable is set, it is assumed to be on, unless its value is false
++if "%RHQ_AGENT_DEBUG%" == "false" (
++ set RHQ_AGENT_DEBUG=
++)
++
++rem ----------------------------------------------------------------------
++rem Change directory so the current directory is the Agent home.
++rem Here we assume this script is a child directory of the Agent home
++rem We also assume our custom environment script is located in the same
++rem place as this script.
++rem ----------------------------------------------------------------------
++
++set RHQ_AGENT_BIN_DIR_PATH=%~dp0
++
++if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" (
++ if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
++ call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %*
++) else (
++ if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
++)
++
++rem if debug variable is set, it is assumed to be on, unless its value is false
++if "%RHQ_AGENT_DEBUG%" == "false" (
++ set RHQ_AGENT_DEBUG=
++)
++
++rem if sigar debug variable is set, it is assumed to be on, unless its value is false
++if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" (
++ set RHQ_AGENT_SIGAR_DEBUG=
++)
++
++if not defined RHQ_AGENT_HOME (
++ cd "%RHQ_AGENT_BIN_DIR_PATH%\.."
++) else (
++ cd "%RHQ_AGENT_HOME%" || (
++ echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME%
++ exit /B 1
++ )
++)
++
++set RHQ_AGENT_HOME=%CD%
++
++if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME%
++
++rem ----------------------------------------------------------------------
++rem Find the Java executable and verify we have a VM available
++rem ----------------------------------------------------------------------
++
++if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
++ if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre
++)
++
++if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
++ set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe
++)
++
++if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME%
++if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH%
++
++if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" (
++ echo There is no JVM available.
++ echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately.
++ exit /B 1
++)
++
++rem ----------------------------------------------------------------------
++rem Prepare the classpath
++rem ----------------------------------------------------------------------
++
++set CLASSPATH=
++call :append_classpath "%RHQ_AGENT_HOME%\conf"
++for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do (
++ call :append_classpath "%%G"
++ if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
++)
++for %%G in ("%RHQ_AGENT_JAVA_HOME%\lib\tools.jar" "%RHQ_AGENT_JAVA_HOME%\..\lib\tools.jar") do (
++ if exist "%%G" (
++ call :append_classpath "%%G"
++ if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
++ goto end_classpath
++ )
++)
++:end_classpath
++
++rem ----------------------------------------------------------------------
++rem Prepare the VM command line options to be passed in
++rem ----------------------------------------------------------------------
++
++if not defined RHQ_AGENT_JAVA_OPTS (
++ set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
++)
++if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS%
++
++if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" (
++ if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs
++ goto :skip_java_endorsed_dirs
++)
++if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
++if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS%
++set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%"
++:skip_java_endorsed_dirs
++
++if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" (
++ if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path
++ goto :skip_java_library_path
++)
++if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
++if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH%
++set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%"
++:skip_java_library_path
++
++if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
++
++rem ----------------------------------------------------------------------
++rem Prepare the command line arguments passed to the RHQ Agent
++rem ----------------------------------------------------------------------
++
++if not defined RHQ_AGENT_CMDLINE_OPTS (
++ set RHQ_AGENT_CMDLINE_OPTS=%*
++)
++
++if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS%
++
++rem ----------------------------------------------------------------------
++rem Execute the VM which starts the agent
++rem ----------------------------------------------------------------------
++
++if defined RHQ_AGENT_DEBUG (
++ set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true
++) else (
++ set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml
++)
++
++rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var
++if defined RHQ_AGENT_SIGAR_DEBUG (
++ set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true
++)
++
++rem to support other agents/plugin containers, allow the caller to override the main classname
++if not defined RHQ_AGENT_MAINCLASS (
++ set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
++)
++
++set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
++
++if not defined _SETENV_ONLY (
++ rem log4j 1.2.8 does not create the directory for us (later versions do)
++ if not exist "%RHQ_AGENT_HOME%\logs" (
++ mkdir "%RHQ_AGENT_HOME%\logs"
++ )
++ if defined RHQ_AGENT_DEBUG (
++ echo Executing the agent with this command line:
++ echo %CMD%
++ )
++ cmd.exe /S /C "%CMD%"
++)
++
++goto :done
++
++rem ----------------------------------------------------------------------
++rem CALL subroutine that appends the first argument to CLASSPATH
++rem ----------------------------------------------------------------------
++
++:append_classpath
++set _entry=%1
++if not defined CLASSPATH (
++ set CLASSPATH=%_entry:"=%
++) else (
++ set CLASSPATH=%CLASSPATH%;%_entry:"=%
++)
++goto :eof
++
++rem ----------------------------------------------------------------------
++rem CALL subroutine that prepares to use the embedded JRE
++rem ----------------------------------------------------------------------
++
++:prepare_embedded_jre
++set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre
++if defined RHQ_AGENT_DEBUG echo Using the embedded JRE
++if not exist "%RHQ_AGENT_JAVA_HOME%" (
++ if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
++ set RHQ_AGENT_JAVA_HOME=%JAVA_HOME%
++)
++goto :eof
++
++rem ----------------------------------------------------------------------
++rem CALL subroutine that exits this script normally
++rem ----------------------------------------------------------------------
++
++:done
++if defined RHQ_AGENT_DEBUG echo %0 done.
++if defined _SETENV_ONLY (
++endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%"
++) else (
++endlocal
++)
++
++exit /B 0
diff --cc modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
index b91665f,44c42a5..616cc8b
--- a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
@@@ -64,20 -76,15 +76,13 @@@ $.getJSON('/rest/1/resource/platforms.j
var w = 960,
h = 600;
- // compute min/max values for x and y a
- var minTsD = Number.MAX_VALUE;
- var maxTsD = Number.MIN_VALUE;
- var minVal = Number.MAX_VALUE;
- var maxVal = Number.MIN_VALUE;
- for (i = 0; i < jsondata.length; i++) {
- var v = jsondata[i].value;
- minVal = Math.min(v, minVal);
- maxVal = Math.max(v, maxVal);
- var td = jsondata[i].timeStamp;
- minTsD = Math.min(td, minTsD);
- maxTsD = Math.max(td, maxTsD);
- }
+ // compute min/max values for x and y
+ var minVal = d3.min(jsondata,function(d) { return d.value;});
+ var maxVal = d3.max(jsondata,function(d) { return d.value;});
+ var minTsD = d3.min(jsondata,function(d) { return d.timeStamp;});
+ var maxTsD = d3.max(jsondata,function(d) { return d.timeStamp;});
+ var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
-
-
WIDTH = w;
HEIGHT = h;
MARGINS = {top: 10, right: 10, bottom: 20, left: 10};
diff --cc modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceComponent.java
index 0000000,df74483..a11169f
mode 000000,100644..100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceComponent.java
@@@ -1,0 -1,35 +1,35 @@@
-/*
- * RHQ Management Platform
- * Copyright (C) 2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.jboss.on.plugins.tomcat;
-
-import org.rhq.plugins.jmx.MBeanResourceComponent;
-
-/**
- * Handle generic information about an application cache
- *
- * @author Jay Shaughnessy
- *
- */
-public class TomcatDatasourceComponent extends MBeanResourceComponent<TomcatWarComponent> {
-
- public static final String PROPERTY_HOST = "host";
- public static final String PROPERTY_PATH = "path";
-
-}
++/*
++ * RHQ Management Platform
++ * Copyright (C) 2012 Red Hat, Inc.
++ * All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation version 2 of the License.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++package org.jboss.on.plugins.tomcat;
++
++import org.rhq.plugins.jmx.MBeanResourceComponent;
++
++/**
++ * Handle generic information about an application cache
++ *
++ * @author Jay Shaughnessy
++ *
++ */
++public class TomcatDatasourceComponent extends MBeanResourceComponent<TomcatWarComponent> {
++
++ public static final String PROPERTY_HOST = "host";
++ public static final String PROPERTY_PATH = "path";
++
++}
commit 01c6420c5e4578b943f89f3130daddfe20488ab5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 15 13:06:55 2012 +0100
BZ 708293 - allow modification of xa-properties.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
index fbf0509..008884b 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
@@ -44,6 +44,7 @@ import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
import org.rhq.modules.plugins.jbossas7.json.ReadChildrenResources;
+import org.rhq.modules.plugins.jbossas7.json.Remove;
import org.rhq.modules.plugins.jbossas7.json.Result;
import org.rhq.modules.plugins.jbossas7.json.WriteAttribute;
@@ -57,6 +58,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
private String namePropLocator;
private String type;
private boolean addNewChildren;
+ private boolean addDeleteModifiedChildren;
/**
* Create a new configuration delegate, that reads the attributes for the resource at address.
@@ -124,6 +126,11 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
namePropLocator=namePropLocator.substring(0,namePropLocator.length()-1);
addNewChildren = true;
}
+ else if (namePropLocator.endsWith("+-")) { // ending in +- -> we need to :add new entries and remove/add to modify
+ namePropLocator=namePropLocator.substring(0,namePropLocator.length()-2);
+ addNewChildren = true;
+ addDeleteModifiedChildren = true;
+ }
else {
addNewChildren = false;
}
@@ -239,25 +246,36 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
if (prop.get(namePropLocator)==null) {
throw new IllegalArgumentException("There is no element in the map with the name " + namePropLocator);
}
- String addrVal= ((PropertySimple)prop.get(namePropLocator)).getStringValue();
+ String key= ((PropertySimple)prop.get(namePropLocator)).getStringValue();
- // determine key from map as propDefName
- String key = prop.getSimpleValue(namePropLocator, null);
- if (key==null) {
- throw new IllegalArgumentException("Map contains no entry with name '" + namePropLocator + "'");
- }
-
Address addr = new Address(address);
- addr.add(type,addrVal);
+ addr.add(type,key);
for (Map.Entry<String,Object> entry : results.entrySet()) {
+
+ if (entry.getValue().equals(key))
+ continue; // skip TODO always or only in the case of degenerated props?
+
+
Operation operation;
- if (!addNewChildren || existingPropNames.contains(key))
- operation = new WriteAttribute(addr,entry.getKey(),entry.getValue());
+ if (!addNewChildren || existingPropNames.contains(key)) {
+ // update existing entry
+ if (addDeleteModifiedChildren) {
+ operation = new Remove(addr);
+ cop.addStep(operation);
+ operation = new Operation("add",addr);
+ operation.addAdditionalProperty("name",key);
+ operation.addAdditionalProperty("value",entry.getValue());
+
+ }
+ else {
+ operation = new WriteAttribute(addr,entry.getKey(),entry.getValue());
+ }
+ }
else {
- Address tmpAddr = new Address(address);
- tmpAddr.add(type, key);
- operation = new Operation("add",tmpAddr);
+ // write new child ( :name+ case )
+
+ operation = new Operation("add",addr);
operation.addAdditionalProperty("name",key);
operation.addAdditionalProperty("value",entry.getValue());
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
index 0543b81..7301824 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
@@ -152,12 +152,11 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
Operation op = new Operation("disable",getAddress());
Result res = getASConnection().execute(op);
if (!res.isSuccess()) {
- report.setErrorMessage("Was not able to disable the datasource for config changes");
+ report.setErrorMessage("Was not able to disable the datasource for config changes: " + res.getFailureDescription());
return;
}
-
- super.updateResourceConfiguration(report); // TODO: Customise this generated block
+ super.updateResourceConfiguration(report);
op = new Operation("enable",getAddress());
res = getASConnection().execute(op);
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 94fe410..4b98af9 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1358,11 +1358,11 @@
<c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="if true no recovery are tried for this connection pool"/>
- <c:group name="children:xa-datasource-properties:key+" displayName="XA Datasource Properties">
- <c:list-property name="*2" displayName="Properties" required="false" readOnly="true">
- <c:map-property name="*:key" displayName="Name" readOnly="true">
- <c:simple-property name="key" displayName="Property-Name" readOnly="true"/>
- <c:simple-property name="value" displayName="Value" readOnly="true"/>
+ <c:group name="children:xa-datasource-properties:key+-" displayName="XA Datasource Properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:key" displayName="Name" readOnly="false">
+ <c:simple-property name="key" displayName="Property-Name" readOnly="false"/>
+ <c:simple-property name="value" displayName="Value" readOnly="false"/>
</c:map-property>
</c:list-property>
</c:group>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index 703722a..97ec48d 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -423,4 +423,72 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
assert step3.getAdditionalProperties().isEmpty();
}
+
+ public void test11() throws Exception {
+
+ ConfigurationDefinition definition = loadDescriptor("test11");
+
+ FakeConnection connection = new FakeConnection();
+ String resultString = loadJsonFromFile("system-props.json");
+
+ ObjectMapper mapper = new ObjectMapper();
+ ComplexResult result = mapper.readValue(resultString,ComplexResult.class);
+ JsonNode json = mapper.valueToTree(result);
+
+ connection.setContent(json);
+
+
+ ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition,connection,null);
+
+ Configuration conf = new Configuration();
+
+ // We have properties 'bar' and 'hello' on the server
+ // bar has a value of 44
+ // update 'bar', add 'hulla' and remove 'hello'
+
+ PropertyList propertyList = new PropertyList("*2");
+ PropertyMap propertyMap = new PropertyMap("*");
+ // add 'hulla'
+ propertyMap.put(new PropertySimple("name","hulla"));
+ propertyMap.put(new PropertySimple("value","hopp"));
+ propertyList.add(propertyMap);
+ propertyMap = new PropertyMap("*");
+ // update 'bar' -> needs to trigger a remove + an :add
+ propertyMap.put(new PropertySimple("name","bar"));
+ propertyMap.put(new PropertySimple("value","42!"));
+ propertyList.add(propertyMap);
+ conf.put(propertyList);
+ // 'hello' is not present -> needs to trigger a :remove for it
+
+
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
+
+ assert cop.numberOfSteps() == 4 : "#Steps should be 4 but were " + cop.numberOfSteps();
+
+ Operation step1 = cop.step(0);
+ Operation step2 = cop.step(1);
+ Operation step3 = cop.step(2);
+ Operation step4 = cop.step(3);
+
+ assert step1.getAddress().size()==1;
+ assert step2.getAddress().size()==1;
+ assert step3.getAddress().size()==1;
+ assert step4.getAddress().size()==1;
+ assert step1.getAddress().get(0).equals("system-property=hulla");
+ assert step2.getAddress().get(0).equals("system-property=bar");
+ assert step3.getAddress().get(0).equals("system-property=bar");
+ assert step4.getAddress().get(0).equals("system-property=hello");
+ assert step1.getOperation().equals("add");
+ assert step2.getOperation().equals("remove");
+ assert step3.getOperation().equals("add");
+ assert step4.getOperation().equals("remove");
+
+ assert step1.getAdditionalProperties().get("name").equals("hulla");
+ assert step1.getAdditionalProperties().get("value").equals("hopp");
+ assert step2.getAdditionalProperties().isEmpty();
+ assert step3.getAdditionalProperties().get("name").equals("bar"); // This is the name of the property
+ assert step3.getAdditionalProperties().get("value").equals("42!");
+ assert step4.getAdditionalProperties().isEmpty();
+
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
index 173d2be..913bcb2 100644
--- a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
@@ -117,6 +117,19 @@
</resource-configuration>
</server>
+ <server class="foo" discovery="foo" name="test11">
+ <resource-configuration>
+ <c:group name="children:system-property:name+-" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ </resource-configuration>
+ </server>
+
<server class="foo" discovery="foo" name="simple1">
<resource-configuration>
commit 2357b9df42a6a646d1aec93341e6c0893afe87a5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Feb 14 14:33:30 2012 +0100
Improved detection for layered products.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
index 46a65a5..a9b41c6 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -59,6 +59,9 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
{
static final String DORG_JBOSS_BOOT_LOG_FILE = "-Dorg.jboss.boot.log.file=";
private static final String JBOSS_EAP_6 = "JBoss Enterprise Application Platform 6";
+ private static final String JBOSS_EDG_6 = "JBoss Enterprise Data Grid 6";
+ private static final String JBOSS_EPP_6 = "JBoss Enterprise Portal Platform 6";
+ private static final String JBOSS_SOA_6 = "JBoss Service Oriented Architecture Platform 6";
private static final String AS7 = "AS7";
private final Log log = LogFactory.getLog(this.getClass());
@@ -84,6 +87,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String homeDir = getHomeDirFromCommandLine(commandLine);
String version = determineServerVersionFromHomeDir(homeDir);
boolean isEAP = false;
+ boolean isEDG = false;
//retrieve specific boot log file. Override for Standalone as server.log is more appropriate
String bootLogFile = getLogFileFromCommandLine(commandLine);
@@ -92,6 +96,10 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
if (homeDir.contains("eap")) {
isEAP=true;
}
+ if (homeDir.contains("edg")) {
+ isEDG=true;
+ }
+
if (psName.equals("HostController")) {
@@ -133,6 +141,8 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
if (isEAP)
description = "Standalone " + JBOSS_EAP_6 + " server";
+ else if (isEDG)
+ description = "Standalone " + JBOSS_EDG_6 + " server";
else
description = "Standalone " + AS7 + " server";
@@ -172,6 +182,12 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
serverName = "EAP " + serverName;
version="EAP " + version;
}
+ else if (isEDG) {
+ serverName = "EDG " + serverName;
+ version="EDG " + version;
+
+ }
+
initLogEventSourcesConfigProp(logFile, config);
@@ -180,6 +196,15 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
config.put(new PropertySimple("port", managmentPort.port));
config.put(new PropertySimple("realm",getManagementSecurtiyRealmFromHostXml()));
+ ProductInfo productInfo = new ProductInfo(managmentPort.host,config.getSimpleValue("user",null),config.getSimpleValue("password",null),managmentPort.port);
+ productInfo = productInfo.getFromRemote();
+ if (productInfo.fromRemote) {
+ version = productInfo.productName + " " + productInfo.productVersion;
+ serverName = productInfo.productName + " " + productInfo.serverName;
+ String tmp = getServerDescr(productInfo.getProductName());
+ description = "Standalone " + tmp +" server";
+ }
+
// String javaClazz = psr.getProcessInfo().getName();
/*
@@ -198,7 +223,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
DiscoveredResourceDetails detail = new DiscoveredResourceDetails(discoveryContext.getResourceType(), // ResourceType
serverNameFull, // key TODO distinguish per domain?
serverName, // Name
- version, // TODO get via API ?
+ version,
description, // Description
config, psr.getProcessInfo());
@@ -214,6 +239,18 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
+ private String getServerDescr(String productName) {
+ if (productName.equals("EAP"))
+ return JBOSS_EAP_6;
+ if (productName.equals("EDG"))
+ return JBOSS_EDG_6;
+ if (productName.equals("SOA"))
+ return JBOSS_SOA_6;
+ if (productName.equals("EPP"))
+ return JBOSS_EPP_6;
+ return AS7;
+ }
+
/**
* Allow to manually add a (remote) AS7
* @param pluginConfiguration the plugin configuration that describes how to discover the Resource being manually
@@ -236,14 +273,9 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
int port = Integer.valueOf(portS);
- ASConnection connection = new ASConnection(hostname,port, user,pass);
- String productVersion = getServerAttribute(connection, "product-version");
- String productName = getServerAttribute(connection,"product-name");
- String releaseVersion = getServerAttribute(connection,"release-version");
- if (productVersion == null)
- productVersion = releaseVersion;
- if (productName==null)
- productName = "AS7";
+ ProductInfo productInfo = new ProductInfo(hostname, user, pass, port).getFromRemote();
+ String productName = productInfo.getProductName();
+ String productVersion = productInfo.getProductVersion();
String resourceKey = hostname + ":" + portS + ":" + productName;
String description;
@@ -393,4 +425,65 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
}
+ private class ProductInfo {
+ private String hostname;
+ private String user;
+ private String pass;
+ private int port;
+ private String productVersion;
+ private String productName;
+ private String releaseVersion;
+ private String releaseCodeName;
+ private boolean fromRemote = false;
+ private String serverName;
+
+ public ProductInfo(String hostname, String user, String pass, int port) {
+ this.hostname = hostname;
+ this.user = user;
+ this.pass = pass;
+ this.port = port;
+ }
+
+ public String getProductVersion() {
+ return productVersion;
+ }
+
+ public String getProductName() {
+ return productName;
+ }
+
+ public ProductInfo getFromRemote() {
+ ASConnection connection = new ASConnection(hostname, port, user, pass);
+ try {
+ productVersion = getServerAttribute(connection, "product-version");
+ productName = getServerAttribute(connection, "product-name");
+ releaseVersion = getServerAttribute(connection,"release-version");
+ releaseCodeName = getServerAttribute(connection,"release-codename");
+ serverName = getServerAttribute(connection,"name");
+ if (productVersion == null)
+ productVersion = releaseVersion;
+ if (productName ==null)
+ productName = "AS7";
+
+ fromRemote = true;
+ }
+ catch (InvalidPluginConfigurationException e) {
+ log.debug("Could not get the product info from [" + hostname + ":" + port +"] - probably a connection failure");
+ }
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return "ProductInfo{" +
+ "hostname='" + hostname + '\'' +
+ ", port=" + port +
+ ", productVersion='" + productVersion + '\'' +
+ ", productName='" + productName + '\'' +
+ ", releaseVersion='" + releaseVersion + '\'' +
+ ", releaseCodeName='" + releaseCodeName + '\'' +
+ ", fromRemote=" + fromRemote +
+ '}';
+ }
+ }
}
commit a45b19cfdf4ef57fd33d620117bcfc4807531899
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Feb 14 17:13:09 2012 -0500
[Bug 789454 - Drift detection fails for whole directory if special-file is present]
Fix an issue in the original commit for this bug.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index c8845fe..e381593 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -378,7 +378,7 @@ public class DriftDetector implements Runnable {
long lastModified = file.lastModified();
long length = file.length();
- result = addedFileEntry(relativePath(basedir, file), sha256(file), file.lastModified(), file.length());
+ result = addedFileEntry(relativePath, sha256, lastModified, length);
} catch (FileNotFoundException e) {
if (log.isDebugEnabled()) {
commit c5fa93a259f43fd4728231f680316ecfb719950f
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Feb 14 17:08:28 2012 -0500
[BZ 789529] fix ClassCastException in ensureNoPluginConfigurationUpdatesInProgress() that would occur when one or more member Resources had individual plugin config updates in progress (https://bugzilla.redhat.com/show_bug.cgi?id=789529)
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 980d9e9..9888496 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -758,19 +758,22 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
countQuery.setParameter("groupId", compatibleGroup.getId());
countQuery.setParameter("status", ConfigurationUpdateStatus.INPROGRESS);
long count = (Long) countQuery.getSingleResult();
- if (count != 0) {
+ if (count > 0) {
Query query = entityManager.createNamedQuery(PluginConfigurationUpdate.QUERY_FIND_BY_GROUP_ID_AND_STATUS);
query.setParameter("groupId", compatibleGroup.getId());
query.setParameter("status", ConfigurationUpdateStatus.INPROGRESS);
- List<Resource> resources = query.getResultList();
- List<String> names = new ArrayList<String>();
- for (Resource resource : resources) {
- names.add(resource.getName());
+ List<PluginConfigurationUpdate> pluginConfigUpdates = query.getResultList();
+ if (!pluginConfigUpdates.isEmpty()) {
+ List<Integer> resourceIds = new ArrayList(pluginConfigUpdates.size());
+ for (PluginConfigurationUpdate pluginConfigUpdate : pluginConfigUpdates) {
+ resourceIds.add(pluginConfigUpdate.getResource().getId());
+ }
+ throw new ConfigurationUpdateStillInProgressException("Current group plugin configuration for "
+ + compatibleGroup
+ + " cannot be calculated, because plugin configuration updates are currently in progress for the"
+ + " member Resources with the following ID's (please wait for these updates to complete): "
+ + resourceIds);
}
- throw new ConfigurationUpdateStillInProgressException("Current group plugin configuration for "
- + compatibleGroup
- + " cannot be calculated, because plugin configuration updates are currently in progress for the"
- + " following Resources (please wait for these updates to complete): " + names);
}
}
commit 19362746ed3f2e8d460322c313d3432b87d9878b
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Feb 14 16:43:15 2012 -0500
consistently use -n/-z for checking if variables have non-zero/zero-length values; several other minor changes
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh b/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh
index fd88242..1a38161 100644
--- a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh
+++ b/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh
@@ -118,10 +118,8 @@ unset JBOSS_CLASSPATH
debug_msg ()
{
# if debug variable is set, it is assumed to be on, unless its value is false
- if [ "x$RHQ_SERVER_DEBUG" != "x" ]; then
- if [ "$RHQ_SERVER_DEBUG" != "false" ]; then
- echo $1
- fi
+ if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then
+ echo $1
fi
}
@@ -202,7 +200,7 @@ esac
# ----------------------------------------------------------------------
if [ -z "$RHQ_SERVER_HOME" ]; then
- if [ "x${_LINUX}${_SOLARIS}${_CYGWIN}" != "x" ]; then
+ if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
# only certain platforms support the -e argument for readlink
_READLINK_ARG="-e"
fi
@@ -253,9 +251,10 @@ fi
if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then
if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then
- RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre"
- debug_msg "Using the embedded JRE"
- if [ ! -d "$RHQ_SERVER_JAVA_HOME" ]; then
+ RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre"
+ if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then
+ debug_msg "Using the embedded JRE"
+ else
debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME"
RHQ_SERVER_JAVA_HOME="$JAVA_HOME"
fi
@@ -381,8 +380,7 @@ case "$1" in
_JBOSS_STATUS=$?
- rm "$_SERVER_PIDFILE"
- rm "$_JVM_PIDFILE"
+ remove_pid_files
exit $_JBOSS_STATUS
;;
@@ -484,3 +482,4 @@ case "$1" in
exit 1
;;
esac
+
commit 736d874761ee9c37a894974669960107fa2494a8
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Feb 14 16:01:40 2012 -0500
[Bug 789454 - Drift detection fails for whole directory if special-file is present]
File.canRead() returning true means that the process has read access to
a file, it is a security check. It does not mean that the file can be
parsed as a Stream. In particular, FileInputStream(File) can throw
FileNotFoundException on a file it can't actually handle, like a
socket file.
I added more protection for this situation, for files which drift monitoring
can not and should not be performed. They will be skipped (and logged in
debug). Moreover, taking Heiko's suggestion, don't fail drift detection
dur to a problematic file, even if the problem is unexpected.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 76d7afb..c8845fe 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -27,6 +27,7 @@ import static org.rhq.core.util.file.FileUtil.copyFile;
import static org.rhq.core.util.file.FileUtil.forEachFile;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.Collection;
@@ -282,15 +283,17 @@ public class DriftDetector implements Runnable {
log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
}
- FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file), file.lastModified(),
- file.length());
-
- addedEntries.add(newEntry);
+ FileEntry addedFileEntry = getAddedFileEntry(basedir, file);
+ if (null != addedFileEntry) {
+ addedEntries.add(addedFileEntry);
+ }
- } catch (IOException e) {
- log.error("An error occurred while generating a drift change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException("An error occurred while generating a drift change set", e);
+ } catch (Throwable t) {
+ // report the error but keep going, perhaps it is specific to a single file, try to
+ // finish the change set generation.
+ log.error(
+ "An unexpected error occurred while generating a drift change set for file " + file.getPath()
+ + " in schedule " + schedule + ". Skipping file.", t);
}
}
@@ -353,6 +356,39 @@ public class DriftDetector implements Runnable {
}
}
+ /**
+ * File.canRead() is basically a security check and does not guarantee that the file contents can truly be read.
+ * Certain files, like socket files on linux, can not be processed and it's not known until actually trying to
+ * construct a FileInputStream, as is done when we actually try to generate the digest. These files will generate
+ * a FileNotFoundException. This method will catch, log and suppress that issue, and return null
+ * indicating the file is not suitable for drift detection.
+ *
+ * @param basedir the drift def base directory
+ * @param file the new file to add
+ * @return the new FileEntry, or null if this file is not appropriate for drift detection (typically if the
+ * underlying file does not support the needed File operations.
+ * @throws Will throw unexpected IOExceptions, outside of the FileNotFoundException it looks for.
+ */
+ private FileEntry getAddedFileEntry(File basedir, File file) throws IOException {
+ FileEntry result = null;
+
+ try {
+ String sha256 = sha256(file);
+ String relativePath = relativePath(basedir, file);
+ long lastModified = file.lastModified();
+ long length = file.length();
+
+ result = addedFileEntry(relativePath(basedir, file), sha256(file), file.lastModified(), file.length());
+
+ } catch (FileNotFoundException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("Skipping " + file.getPath() + " since it is missing or is not a physically readable file.");
+ }
+ }
+
+ return result;
+ }
+
static private void safeClear(Collection<?>... collections) {
if (null == collections) {
return;
@@ -431,8 +467,8 @@ public class DriftDetector implements Runnable {
}
if (isChanged) {
- FileEntry changedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA, file
- .lastModified(), file.length());
+ FileEntry changedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA,
+ file.lastModified(), file.length());
changedEntries.add(changedEntry);
if (null != changedPinnedEntries) {
@@ -456,7 +492,6 @@ public class DriftDetector implements Runnable {
return result;
}
- @SuppressWarnings("unused")
private boolean isPreviousChangeSetEmpty(int resourceId, DriftDefinition definition) throws IOException {
File changeSet = changeSetMgr.findChangeSet(resourceId, definition.getName(), DRIFT);
if (!changeSet.exists()) {
@@ -652,20 +687,25 @@ public class DriftDetector implements Runnable {
try {
if (!file.canRead()) {
if (log.isDebugEnabled()) {
- log.debug("Skipping " + file.getPath() + " since it is not readable.");
+ log.debug("Skipping " + file.getPath() + " since we do not have read access.");
}
return;
}
+
if (log.isDebugEnabled()) {
log.debug("Adding " + file.getPath() + " to coverage change set for " + schedule);
}
- writer.write(addedFileEntry(relativePath(basedir, file), sha256(file), file.lastModified(),
- file.length()));
- } catch (IOException e) {
- log.error("An error occurred while generating a coverage change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException(
- "An error occurred while generating a coverage change set for " + schedule, e);
+
+ FileEntry addedFileEntry = getAddedFileEntry(basedir, file);
+ if (null != addedFileEntry) {
+ writer.write(addedFileEntry);
+ }
+
+ } catch (Throwable t) {
+ // report the error but keep going, perhaps it is specific to a single file, try to
+ // finish the detection.
+ log.error("An unexpected error occurred while generating a coverage change set for file "
+ + file.getPath() + " in schedule " + schedule + ". Skipping file.", t);
}
}
}));
commit 41504527a89ace2855d580989c07b6ead4e3e39b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Feb 14 14:07:10 2012 -0500
[BZ 784656] fix platform util portlet
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
index 69ed9f5..da7ad19 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
@@ -167,7 +167,6 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
record.setAttribute(FIELD_SWAP, MSG.common_val_na());
setSortField(1);
- refreshFields();
markForRedraw();
}
@@ -179,7 +178,6 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
}
setSortField(1);
- refreshFields();
markForRedraw();
}
});
commit ff54dedcfdefb994c8390d6f68393134b3842e8e
Author: Elias Ross <elias_ross(a)apple.com>
Date: Thu Jan 12 21:51:51 2012 -0800
[BZ 766959] fix possible memory leak in plugins
diff --git a/modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubComponent.java b/modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubComponent.java
index 2d957ce..fda0abc 100644
--- a/modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubComponent.java
+++ b/modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubComponent.java
@@ -99,8 +99,6 @@ public class GrubComponent implements ResourceComponent, ConfigurationFacet {
String lensesPath = lensesPathProperty.getStringValue();
String rootPath = rootPathProperty.getStringValue();
- Augeas augeas = new Augeas(rootPath, lensesPath, Augeas.NONE);
-
// Find out where to look for the grub tree
PropertySimple augeasTreeNodeProperty = pluginConfiguration.getSimple("augeas-grub-path");
@@ -115,6 +113,15 @@ public class GrubComponent implements ResourceComponent, ConfigurationFacet {
// Load default properties
String grubTreeNode = augeasTreeNodeProperty.getStringValue();
+ Augeas augeas = new Augeas(rootPath, lensesPath, Augeas.NONE);
+ try {
+ return getConfig(configuration, grubTreeNode, augeas);
+ } finally {
+ augeas.close();
+ }
+ }
+
+ protected Configuration getConfig(Configuration configuration, String grubTreeNode, Augeas augeas) {
List<String> generalMatches = augeas.match(grubTreeNode);
if (generalMatches.size() > 0) {
diff --git a/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java b/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
index c84beb5..1aeb0ca 100644
--- a/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
+++ b/modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java
@@ -120,8 +120,6 @@ public class OpenSSHDComponent implements ResourceComponent, ConfigurationFacet,
String lensesPath = lensesPathProperty.getStringValue();
String rootPath = rootPathProperty.getStringValue();
- Augeas augeas = new Augeas(rootPath, lensesPath, Augeas.NONE);
-
// Find out where to look for sshd configuration files
PropertySimple sshdPathProperty = pluginConfiguration.getSimple("config-path");
@@ -137,6 +135,16 @@ public class OpenSSHDComponent implements ResourceComponent, ConfigurationFacet,
sshdPath += "/";
}
+ Augeas augeas = new Augeas(rootPath, lensesPath, Augeas.NONE);
+ try {
+ return getConfig(resourceConfigurationDefinition, sshdPath, augeas);
+ } finally {
+ augeas.close();
+ }
+ }
+
+ protected Configuration getConfig(ConfigurationDefinition resourceConfigurationDefinition,
+ String sshdPath, Augeas augeas) throws Exception {
List<String> matches = augeas.match(sshdPath + "*");
if (matches.size() == 0) {
throw new Exception("Unable to load sshd_config data from augeas");
commit 1fcca6baf6272cfdc833cc00a25f48b1cd144a14
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Feb 13 22:59:54 2012 -0500
[BZ 736737] log a detailed DEBUG message if an exception occurs during an avail check (https://bugzilla.redhat.com/show_bug.cgi?id=736737)
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
index 98f861b..f1e2c51 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
@@ -350,20 +350,27 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
}
public AvailabilityType getAvailability() {
+ AvailabilityType avail;
try {
EmsConnection connection = loadConnection();
EmsBean bean = connection.getBean("Catalina:type=Server");
// this is necessary to prove that that not only the connection exists but is servicing requests.
bean.getAttribute("serverInfo").refresh();
- return AvailabilityType.UP;
+ avail = AvailabilityType.UP;
} catch (Exception e) {
- // If the connection is not servicing requests then close it. this seems necessary for the
- // Tomcat connection as when Tomcat does come up again it seems a new EMS connection is required,
- // otherwise we're not seeing EMS be able to pick up the new process.
+ if (log.isDebugEnabled()) {
+ log.debug("An exception occurred during availability check for Tomcat Server Resource with key ["
+ + this.getResourceContext().getResourceKey() + "] and plugin config ["
+ + this.getPluginConfiguration().getAllProperties() + "].", e);
+ }
+ // If the connection is not servicing requests, then close it. this seems necessary for the
+ // Tomcat connection, as, when Tomcat does come up again, it seems a new EMS connection is required,
+ // otherwise EMS is not able to pick up the new process.
closeConnection();
- return AvailabilityType.DOWN;
+ avail = AvailabilityType.DOWN;
}
+ return avail;
}
ResourceContext<T> getResourceContext() {
commit f353bcb47dc425f4753ef2afd61879a31cf6b698
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Feb 13 16:26:10 2012 -0500
a shell script for spawning n JBoss AS or EAP instances
diff --git a/etc/scripts/jboss-as-spawn.sh b/etc/scripts/jboss-as-spawn.sh
new file mode 100755
index 0000000..1174707
--- /dev/null
+++ b/etc/scripts/jboss-as-spawn.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+######### begin config ##########
+
+# the number of instances to start
+INSTANCES=5
+
+# the JBoss AS home directory
+JBOSS_HOME=${HOME}/Applications/jboss-eap-5.1.2/jboss-as
+
+# the name of the config to be cloned
+JBOSS_CONFIG=production
+
+# options to pass to the JBoss AS JVM
+JAVA_OPTS="-Xms200M -Xmx400M -XX:MaxPermSize=150M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true"
+
+########## end config ###########
+
+echo "JBOSS_HOME=${JBOSS_HOME}"
+echo "JAVA_OPTS=${JAVA_OPTS}"
+
+# export these, since they are used by the forked run.sh processes.
+export JBOSS_HOME JAVA_OPTS
+
+cd "${JBOSS_HOME}"
+for (( i = 1 ; i <= ${INSTANCES}; i++ )); do
+ JBOSS_CONFIG_COPY="${JBOSS_CONFIG}${i}"
+ if [ ! -d "server/${JBOSS_CONFIG_COPY}" ]; then
+ echo "Creating new config dir '${JBOSS_HOME}/server/${JBOSS_CONFIG_COPY}'..."
+ cp -pr server/${JBOSS_CONFIG} server/${JBOSS_CONFIG_COPY}
+ ( cd server/${JBOSS_CONFIG_COPY} ; rm -rf data log tmp work )
+ fi
+ BIND_ADDRESS="127.0.0.$(($i + 1))"
+ echo "Starting instance with config '${JBOSS_CONFIG_COPY}' and bind address '${BIND_ADDRESS}'..."
+ nohup $JBOSS_HOME/bin/run.sh -c ${JBOSS_CONFIG_COPY} -b ${BIND_ADDRESS} >$JBOSS_HOME/bin/${JBOSS_CONFIG_COPY}.out 2>&1 &
+done
+
commit cf4407c4f5b77323777758f8e9d2e9d54151f604
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Feb 13 15:41:54 2012 -0500
[BZ 790179] temptoray workaround for https://bugzilla.redhat.com/show_bug.cgi?id=790179 that makes list-o-map members
always editable
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index c1fb328..1fc8349 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -600,19 +600,13 @@ public class ConfigurationEditor extends LocatableVLayout {
return;
}
- public void addItemsForPropertyRecursively(String locatorId, PropertyDefinition propertyDefinition,
+ private void addItemsForPropertyRecursively(String locatorId, PropertyDefinition propertyDefinition,
Property property, boolean oddRow, List<FormItem> fields) {
List<FormItem> fieldsForThisProperty;
if (propertyDefinition instanceof PropertyDefinitionSimple) {
final PropertyDefinitionSimple propertyDefinitionSimple = (PropertyDefinitionSimple) propertyDefinition;
PropertySimple propertySimple = (PropertySimple) property;
-
- if (propertySimple == null) {
- propertySimple = new PropertySimple(propertyDefinitionSimple.getName(), null);
- configuration.put(propertySimple);
- }
-
fieldsForThisProperty = buildFieldsForPropertySimple(propertyDefinition, propertyDefinitionSimple,
propertySimple);
} else if (propertyDefinition instanceof PropertyDefinitionList) {
@@ -1067,14 +1061,20 @@ public class ConfigurationEditor extends LocatableVLayout {
}
private static boolean isAllReadOnly(List<PropertyDefinition> propertyDefinitions) {
- boolean allPropsDefsReadOnly = true;
+ // TODO (ips, 02/13/12): If we are going to do this correctly, we need to call isPropertyReadOnly() on each
+ // member property to determine whether that particular property is read-only or not,
+ // rather than relying solely on whether the member property definition is read-only; this
+ // is because, for a couple special cases, isPropertyReadOnly() returns false even when
+ // the prop def is read-only.
+ /*boolean allPropsDefsReadOnly = true;
for (PropertyDefinition subDef : propertyDefinitions) {
if (!subDef.isReadOnly()) {
allPropsDefsReadOnly = false;
break;
}
}
- return allPropsDefsReadOnly;
+ return allPropsDefsReadOnly;*/
+ return false;
}
private PropertyMapListGridRecord[] buildSummaryRecords(PropertyList propertyList,
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java
index f5e7993..2142764 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java
@@ -155,10 +155,18 @@ public abstract class TestConfigurationFactory {
PropertyDefinitionMap mapInReadOnlyListPropDef =
new PropertyDefinitionMap("MapOfSimplesInReadOnlyList", "a map of simples in a list", false);
- mapInReadOnlyListPropDef.put(createStringPropDef1());
- mapInReadOnlyListPropDef.put(createStringPropDef2());
- mapInReadOnlyListPropDef.put(createBooleanPropDef());
- mapInReadOnlyListPropDef.put(createIntegerPropDef());
+ PropertyDefinitionSimple propDef = createStringPropDef1();
+ propDef.setReadOnly(true);
+ mapInReadOnlyListPropDef.put(propDef);
+ propDef = createStringPropDef2();
+ propDef.setReadOnly(true);
+ mapInReadOnlyListPropDef.put(propDef);
+ propDef = createBooleanPropDef();
+ propDef.setReadOnly(true);
+ mapInReadOnlyListPropDef.put(propDef);
+ propDef = createIntegerPropDef();
+ propDef.setReadOnly(true);
+ mapInReadOnlyListPropDef.put(propDef);
mapInReadOnlyListPropDef.setDisplayName(mapInReadOnlyListPropDef.getName());
PropertyDefinitionList readOnlyListPropDef = new PropertyDefinitionList("ReadOnlyListOfMaps",
commit 7f05ccc7383a0a8fd767da0a2a8c688b7c3bcb40
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Feb 13 11:42:47 2012 -0500
[BZ 790073] do not allow keys or names with values of "", since Oracle would ultimately normalize those values to null; normalize values of "" for version or description to null, since Oracle would ultimately do that same normalization; fix several errors in Javadoc (https://bugzilla.redhat.com/show_bug.cgi?id=790073)
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DiscoveredResourceDetails.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DiscoveredResourceDetails.java
index d178390..f04c757 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DiscoveredResourceDetails.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DiscoveredResourceDetails.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -62,8 +62,9 @@ public class DiscoveredResourceDetails {
/**
* This creates a new instance that provides details for a newly discovered resource.
*
- * <p>Both resource key and resource name must be non-<code>null</code>; otherwise, an exception is thrown. If
- * resource version or resource description are <code>null</code>, their values will be set to an empty string.</p>
+ * <p>The Resource type, key, and name must not be <code>null</code>. Additionally the key and name must not be "",
+ * and the key must not be longer than 500 characters. If any of these requirements are not met, an exception will
+ * be thrown.</p>
*
* @param resourceType the type of resource that was discovered (must not be <code>null</code>)
* @param resourceKey the discovered resource's key where the key must be unique among the resource's
@@ -82,8 +83,8 @@ public class DiscoveredResourceDetails {
* @param processInfo information on the process in which the newly discovered resource is running (this
* may be <code>null</code> if unknown or not applicable)
*
- * @throws IllegalArgumentException if the resource type, key or name is <code>null</code> or one of the String
- * values are too long
+ * @throws IllegalArgumentException if the resource type, key, or name is <code>null</code>; the key or name is "";
+ * or the key is longer than 500 characters
*/
public DiscoveredResourceDetails(ResourceType resourceType, String resourceKey, String resourceName,
String resourceVersion, String resourceDescription, Configuration pluginConfiguration, ProcessInfo processInfo) {
@@ -128,14 +129,18 @@ public class DiscoveredResourceDetails {
* is, a parent's direct child resources must all have unique resource keys, but those keys need not be unique
* across the entire inventory of all resources.
*
- * @param resourceKey the discovered resource's key (must not be <code>null</code>)
+ * @param resourceKey the discovered resource's key (must not be <code>null</code> or "")
*
- * @throws IllegalArgumentException if <code>resourceKey</code> is <code>null</code> or too long
+ * @throws IllegalArgumentException if <code>resourceKey</code> is <code>null</code>, "", or more than 500
+ * characters long
*/
public void setResourceKey(String resourceKey) {
if (resourceKey == null) {
throw new IllegalArgumentException("resourceKey==null");
}
+ if (resourceKey.length() == 0) {
+ throw new IllegalArgumentException("resourceKey==\"\"");
+ }
if (resourceKey.length() > RESOURCE_KEY_MAX_LENGTH) {
throw new IllegalArgumentException("Plugin error: Resource key [" + resourceKey + "] specified by ["
@@ -158,17 +163,20 @@ public class DiscoveredResourceDetails {
/**
* Sets the name of the discovered resource, which is used mainly for UI display purposes. The name can be anything
- * (other than <code>null</code>); it has no uniqueness requirements (that is, even sibling resources can have the
- * same name).
+ * (other than <code>null</code> or ""); it has no uniqueness requirements (that is, even sibling resources can have
+ * the same name). If the name is longer than 500 characters, it will automatically be truncated to 500 characters.
*
- * @param resourceName the discovered resource's name (must not be <code>null</code>)
+ * @param resourceName the discovered resource's name (must not be <code>null</code> or "")
*
- * @throws IllegalArgumentException if <code>resourceName</code> is <code>null</code>
+ * @throws IllegalArgumentException if <code>resourceName</code> is <code>null</code> or ""
*/
public void setResourceName(String resourceName) {
if (resourceName == null) {
throw new IllegalArgumentException("resourceName==null");
}
+ if (resourceName.length() == 0) {
+ throw new IllegalArgumentException("resourceName==\"\"");
+ }
if (resourceName.length() > RESOURCE_NAME_MAX_LENGTH) {
log.warn("Plugin error: Resource name [" + resourceName + "] specified by [" + this.resourceType
@@ -192,25 +200,24 @@ public class DiscoveredResourceDetails {
/**
* Sets the discovered resource's version string (which may have any form or syntax that is appropriate for the
- * resource and may be <code>null</code> which correlates to an empty version string).
- *
- * @param resourceVersion the discovered resource's version string (may be <code>null</code>, which correlates to
- * an empty string)
+ * resource and may be <code>null</code> which correlates to an empty version string). If the version is longer than
+ * 100 characters, it will automatically be truncated to 100 characters.
*
- * @throws IllegalArgumentException if the version string is too long
+ * @param resourceVersion the discovered resource's version string; may be <code>null</code>, if the Resource
+ * does not have a version or if its version could not be determined
*/
public void setResourceVersion(String resourceVersion) {
- if (resourceVersion == null) {
- resourceVersion = "";
- }
-
- if (resourceVersion.length() > RESOURCE_VERSION_MAX_LENGTH) {
- log.warn("Plugin error: Resource version [" + resourceVersion + "] specified by [" + this.resourceType
- + "] discovery component is longer than the maximum length (" + RESOURCE_VERSION_MAX_LENGTH
- + ") - truncating it to " + RESOURCE_VERSION_MAX_LENGTH + " characters...");
- this.resourceVersion = resourceVersion.substring(0, RESOURCE_VERSION_MAX_LENGTH);
+ if (resourceVersion != null && (resourceVersion.length() == 0)) {
+ this.resourceVersion = null;
} else {
- this.resourceVersion = resourceVersion;
+ if (resourceVersion != null && (resourceVersion.length() > RESOURCE_VERSION_MAX_LENGTH)) {
+ log.warn("Plugin error: Resource version [" + resourceVersion + "] specified by [" + this.resourceType
+ + "] discovery component is longer than the maximum length (" + RESOURCE_VERSION_MAX_LENGTH
+ + ") - truncating it to " + RESOURCE_VERSION_MAX_LENGTH + " characters...");
+ this.resourceVersion = resourceVersion.substring(0, RESOURCE_VERSION_MAX_LENGTH);
+ } else {
+ this.resourceVersion = resourceVersion;
+ }
}
}
@@ -224,25 +231,23 @@ public class DiscoveredResourceDetails {
}
/**
- * Sets a simple description of the resource, which may or may not be an internationalized string
- *
- * @param resourceDescription the discovered resource's description (may be <code>null</code>, which correlates to
- * an empty string)
+ * Sets a simple description of the resource, which may or may not be an internationalized string. If the
+ * description is longer than 1000 characters, it will automatically be truncated to 1000 characters.
*
- * @throws IllegalArgumentException if the description string is too long
+ * @param resourceDescription the discovered resource's description; may be <code>null</code>
*/
public void setResourceDescription(String resourceDescription) {
- if (resourceDescription == null) {
- resourceDescription = "";
- }
-
- if (resourceDescription.length() > RESOURCE_DESCRIPTION_MAX_LENGTH) {
- log.warn("Plugin error: Resource description [" + resourceDescription + "] specified by [" + this.resourceType
- + "] discovery component is longer than the maximum length (" + RESOURCE_DESCRIPTION_MAX_LENGTH
- + " - truncating it to " + RESOURCE_DESCRIPTION_MAX_LENGTH + " characters...");
- this.resourceDescription = resourceDescription.substring(0, RESOURCE_DESCRIPTION_MAX_LENGTH);
+ if ((resourceDescription != null) && (resourceDescription.length() == 0)) {
+ this.resourceDescription = null;
} else {
- this.resourceDescription = resourceDescription;
+ if ((resourceDescription != null) && (resourceDescription.length() > RESOURCE_DESCRIPTION_MAX_LENGTH)) {
+ log.warn("Plugin error: Resource description [" + resourceDescription + "] specified by [" + this.resourceType
+ + "] discovery component is longer than the maximum length (" + RESOURCE_DESCRIPTION_MAX_LENGTH
+ + " - truncating it to " + RESOURCE_DESCRIPTION_MAX_LENGTH + " characters...");
+ this.resourceDescription = resourceDescription.substring(0, RESOURCE_DESCRIPTION_MAX_LENGTH);
+ } else {
+ this.resourceDescription = resourceDescription;
+ }
}
}
@@ -255,7 +260,7 @@ public class DiscoveredResourceDetails {
*/
public Configuration getPluginConfiguration() {
if (pluginConfiguration == null) {
- pluginConfiguration = getDefaultPluginConfiguration();
+ pluginConfiguration = createDefaultPluginConfiguration();
}
return pluginConfiguration;
@@ -264,7 +269,8 @@ public class DiscoveredResourceDetails {
/**
* Returns the information on the operating system process in which the resource is running.
*
- * @return resource's process information or <code>null</code> if not known
+ * @return resource's process information or <code>null</code> if not known or not applicable (e.g. a platform
+ * resource)
*/
public ProcessInfo getProcessInfo() {
return processInfo;
@@ -341,7 +347,7 @@ public class DiscoveredResourceDetails {
*
* @return copy of the resource's default plugin configuration
*/
- private Configuration getDefaultPluginConfiguration() {
+ private Configuration createDefaultPluginConfiguration() {
ConfigurationDefinition definition = resourceType.getPluginConfigurationDefinition();
if (definition != null) {
ConfigurationTemplate template = definition.getDefaultTemplate();
commit af24373f392f36b77988e5015a9754f506cbb236
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Feb 10 10:52:00 2012 -0500
jeegen: add support for generating message-driven beans, as well as
support for configurability via command line
diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml
index 67fdf05..df620a0 100644
--- a/modules/helpers/jeeGen/pom.xml
+++ b/modules/helpers/jeeGen/pom.xml
@@ -85,6 +85,12 @@
<version>3.0</version>
</dependency>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms-api</artifactId>
+ <version>1.1-rev-1</version>
+ </dependency>
+
</dependencies>
</project>
diff --git a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java
index e1fdda9..d17001f 100644
--- a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java
+++ b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java
@@ -33,9 +33,39 @@ import org.rhq.helpers.jeegen.ejb.EjbArchive;
public class JeeGen {
public static void main(String[] args) throws Exception {
- EjbArchive ejbArchive = new EjbArchive(ShrinkWrap.create(JavaArchive.class), "2.1", 10, 10, 10);
+ if (args.length != 5) {
+ printUsageAndExit();
+ }
+
+ String ejbVersion = args[0];
+ int entityBeanCount = 0;
+ int statelessSessionBeanCount = 0;
+ int statefulSessionBeanCount = 0;
+ int messageDrivenBeanCount = 0;
+ try {
+ entityBeanCount = Integer.parseInt(args[1]);
+ statelessSessionBeanCount = Integer.parseInt(args[2]);
+ statefulSessionBeanCount = Integer.parseInt(args[3]);
+ messageDrivenBeanCount = Integer.parseInt(args[4]);
+ } catch (NumberFormatException e) {
+ printUsageAndExit();
+ }
+
+ if (entityBeanCount < 0 || statelessSessionBeanCount < 0 || statefulSessionBeanCount < 0 || messageDrivenBeanCount < 0) {
+ printUsageAndExit();
+ }
+
+ EjbArchive ejbArchive = new EjbArchive(ShrinkWrap.create(JavaArchive.class), ejbVersion, entityBeanCount,
+ statelessSessionBeanCount, statefulSessionBeanCount, messageDrivenBeanCount);
File ejbJarFile = new File("test-ejb.jar");
ejbArchive.as(ZipExporter.class).exportTo(ejbJarFile, true);
}
+ private static void printUsageAndExit() {
+ System.err.println("Usage: " + JeeGen.class.getName() +
+ " EJB_VERSION ENTITY_BEAN_COUNT STATELESS_SESSION_BEAN_COUNT STATEFUL_SESSION_BEAN_COUNT MESSAGE_DRIVEN_BEAN_COUNT");
+ System.err.println("Example: " + JeeGen.class.getName() + " 3.0 10 10 10 10");
+ System.exit(1);
+ }
+
}
diff --git a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java
index e53cdb5..1bfac72 100644
--- a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java
+++ b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java
@@ -53,65 +53,17 @@ import org.jboss.shrinkwrap.impl.base.path.BasicPath;
*/
public class EjbArchive implements JavaArchive {
- public static final String TEST_EJB_RESOURCE_PATH = "test/ejb";
+ private static final String TEST_EJB_RESOURCE_PATH = "test/ejb";
private JavaArchive delegate;
- enum EjbVersionInfo {
- v2_0("2.0", "<!DOCTYPE ejb-jar PUBLIC \"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\" \"http://java.sun.com/dtd/ejb-jar_2_0.dtd\">\n<ejb-jar>"),
- v2_1("2.1", "<ejb-jar version=\"2.1\"\n" +
- " xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n" +
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
- " xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd\">"),
- v3_0("3.0", "<ejb-jar version=\"3.0\"\n" + "" +
- " xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
- " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\">"),
- v3_1("3.1", "<ejb-jar version=\"3.1\"\n" +
- " xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
- " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd\">");
-
- private String version;
- private String rootElement;
-
- EjbVersionInfo(String version, String rootElement) {
- this.version = version;
- this.rootElement = rootElement;
- }
-
- private static final Map<String, EjbVersionInfo> VERSION_TO_VALUE_MAP =
- new HashMap<String, EjbVersionInfo>(values().length);
- static {
- for (EjbVersionInfo value : values()) {
- VERSION_TO_VALUE_MAP.put(value.getVersion(), value);
- }
- }
-
- public String getVersion() {
- return version;
- }
-
- public String getRootElement() {
- return rootElement;
- }
-
- public static EjbVersionInfo forVersion(String version) {
- if (!VERSION_TO_VALUE_MAP.containsKey(version)) {
- throw new IllegalArgumentException("Unsupported version: \"" + version +
- "\". The following versions are supported: " + VERSION_TO_VALUE_MAP.keySet());
- }
- return VERSION_TO_VALUE_MAP.get(version);
- }
- }
-
/**
* Create a new JavaArchive with any type storage engine as backing.
*
* @param delegate The storage backing.
*/
public EjbArchive(JavaArchive delegate, String ejbVersion, int entityBeanCount, int statelessSessionBeanCount,
- int statefulSessionBeanCount) {
+ int statefulSessionBeanCount, int messageDrivenBeanCount) {
EjbVersionInfo ejbVersionInfo = EjbVersionInfo.forVersion(ejbVersion);
this.delegate = delegate;
@@ -124,13 +76,15 @@ public class EjbArchive implements JavaArchive {
try {
Template template = config.getTemplate("v2/ejb-jar.xml.ftl");
- Map dataModel = new HashMap();
+ Map<String, Object> dataModel = new HashMap<String, Object>();
dataModel.put("name", "Test");
dataModel.put("rootElement", ejbVersionInfo.getRootElement());
- dataModel.put("package", "test.ejb");
- dataModel.put("entityBeanCount", statelessSessionBeanCount);
+ dataModel.put("mdbElements", ejbVersionInfo.getMdbElements());
+ dataModel.put("package", TEST_EJB_RESOURCE_PATH.replace('/', '.'));
+ dataModel.put("entityBeanCount", entityBeanCount);
dataModel.put("statelessSessionBeanCount", statelessSessionBeanCount);
dataModel.put("statefulSessionBeanCount", statefulSessionBeanCount);
+ dataModel.put("messageDrivenBeanCount", messageDrivenBeanCount);
byteArrayOutputStream = new ByteArrayOutputStream();
Writer out = new OutputStreamWriter(byteArrayOutputStream);
@@ -158,6 +112,9 @@ public class EjbArchive implements JavaArchive {
addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatefulSessionEJBHome.class"), TEST_EJB_RESOURCE_PATH + "/StatefulSessionEJBHome.class");
addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatefulSessionEJBObject.class"),TEST_EJB_RESOURCE_PATH + "/StatefulSessionEJBObject.class");
addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatefulSessionBean.class"), TEST_EJB_RESOURCE_PATH + "/StatefulSessionBean.class");
+
+ // add message-driven bean classes
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/MessageDrivenBean.class"), TEST_EJB_RESOURCE_PATH + "/MessageDrivenBean.class");
}
@Override
@@ -584,4 +541,83 @@ public class EjbArchive implements JavaArchive {
public JavaArchive addAsResource(Package resourcePackage, String resourceName, ArchivePath target) throws IllegalArgumentException {
return delegate.addAsResource(resourcePackage, resourceName, target);
}
+
+ private static final String v2_1_AND_3_x_MDB_ELEMENTS =
+ " <activation-config>\n" +
+ " <activation-config-property>\n" +
+ " <activation-config-property-name>messageSelector</activation-config-property-name>\n" +
+ " <activation-config-property-value>RECIPIENT='MDB'</activation-config-property-value>\n" +
+ " </activation-config-property>\n" +
+ " <activation-config-property>\n" +
+ " <activation-config-property-name>destinationType</activation-config-property-name>\n" +
+ " <activation-config-property-value>javax.jms.Queue</activation-config-property-value>\n" +
+ " </activation-config-property>\n" +
+ " <activation-config-property>\n" +
+ " <activation-config-property-name>destination</activation-config-property-name>\n" +
+ " <activation-config-property-value>jms/persistentQueue</activation-config-property-value>\n" +
+ " </activation-config-property>\n" +
+ " </activation-config>";
+
+ private enum EjbVersionInfo {
+ v2_0("2.0", "<!DOCTYPE ejb-jar PUBLIC \"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\"\n" +
+ " \"http://java.sun.com/dtd/ejb-jar_2_0.dtd\">\n<ejb-jar>",
+ " <message-selector>RECIPIENT='MDB'</message-selector>\n" +
+ " <message-driven-destination>\n" +
+ " <destination-type>javax.jms.Queue</destination-type>\n" +
+ " </message-driven-destination>"),
+ v2_1("2.1", "<ejb-jar version=\"2.1\"\n" +
+ " xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd\">",
+ v2_1_AND_3_x_MDB_ELEMENTS),
+ v3_0("3.0", "<ejb-jar version=\"3.0\"\n" + "" +
+ " xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\">",
+ v2_1_AND_3_x_MDB_ELEMENTS),
+ v3_1("3.1", "<ejb-jar version=\"3.1\"\n" +
+ " xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd\">",
+ v2_1_AND_3_x_MDB_ELEMENTS);
+
+ private String version;
+ private String rootElement;
+ private String mdbElements;
+
+ EjbVersionInfo(String version, String rootElement, String mdbElements) {
+ this.version = version;
+ this.rootElement = rootElement;
+ this.mdbElements = mdbElements;
+ }
+
+ private static final Map<String, EjbVersionInfo> VERSION_TO_VALUE_MAP =
+ new HashMap<String, EjbVersionInfo>(values().length);
+ static {
+ for (EjbVersionInfo value : values()) {
+ VERSION_TO_VALUE_MAP.put(value.getVersion(), value);
+ }
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public String getRootElement() {
+ return rootElement;
+ }
+
+ public String getMdbElements() {
+ return mdbElements;
+ }
+
+ public static EjbVersionInfo forVersion(String version) {
+ if (!VERSION_TO_VALUE_MAP.containsKey(version)) {
+ throw new IllegalArgumentException("Unsupported version: \"" + version +
+ "\". The following versions are supported: " + VERSION_TO_VALUE_MAP.keySet());
+ }
+ return VERSION_TO_VALUE_MAP.get(version);
+ }
+ }
+
}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/MessageDrivenBean.java b/modules/helpers/jeeGen/src/main/java/test/ejb/MessageDrivenBean.java
new file mode 100644
index 0000000..780984f
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/MessageDrivenBean.java
@@ -0,0 +1,109 @@
+package test.ejb;
+
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+/**
+ * Message-driven bean - impl.
+ */
+public class MessageDrivenBean implements javax.ejb.MessageDrivenBean, MessageListener {
+
+ private MessageDrivenContext context;
+
+ // Constructor, which is public and takes no arguments
+ public MessageDrivenBean() {
+ }
+
+ /**
+ * Begin EJB-required methods. The following methods are called
+ * by the container, and never called by client code.
+ */
+
+ /**
+ * ejbCreate method, declared as public (but not final or
+ * static), with a return type of void, and with no arguments.
+ */
+ public void ejbCreate() {
+ }
+
+ public void setMessageDrivenContext(MessageDrivenContext context) {
+ // As with all enterprise beans, you must set the context in order to be
+ // able to use it at another time within the MDB methods
+ this.context = context;
+ }
+
+ // life cycle Methods
+
+ public void ejbRemove() {
+ }
+
+ /**
+ * JMS MessageListener-required methods. The following
+ * methods are called by the container, and never called by
+ * client code.
+ */
+
+ // Receives the incoming Message and displays the text.
+ public void onMessage(Message message) {
+ // MDB does not carry state for an individual client
+
+ try {
+ Context namingContext = new InitialContext();
+ // 1. Retrieve the QueueConnectionFactory using a
+ // resource reference defined in the ejb-jar.xml file.
+ QueueConnectionFactory qcf = (QueueConnectionFactory)
+ namingContext.lookup("java:comp/env/jms/myQueueConnectionFactory");
+ namingContext.close();
+
+ // 2. Create the queue connection
+ QueueConnection queueConnection = qcf.createQueueConnection();
+ // 3. Create the session over the queue connection.
+ QueueSession queueSession = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ // 4. Create the sender to send messages over the session.
+ QueueSender queueSender = queueSession.createSender(null);
+
+ // When the onMessage method is called, a message has been sent.
+ // You can retrieve attributes of the message using the Message object.
+ String txt = ("mdb rcv: " + message.getJMSMessageID());
+ System.out.println(txt + " redel="
+ + message.getJMSRedelivered() + " cnt="
+ + message.getIntProperty("JMSXDeliveryCount"));
+
+ // Create a new message using the createMessage method.
+ // To send it back to the originator of the other message,
+ // set the String property of "RECIPIENT" to "CLIENT."
+ // The client only looks for messages with string property CLIENT.
+ // Copy the original message ID into new message's Correlation ID for
+ // tracking purposes using the setJMSCorrelationID method. Finally,
+ // set the destination for the message using the getJMSReplyTo method
+ // on the previously received message. Send the message using the
+ // send method on the queue sender.
+
+ // 5. Create a message using the createMessage method
+ Message returnMessage = queueSession.createMessage();
+ // 6. Set properties of the message.
+ returnMessage.setStringProperty("RECIPIENT", "CLIENT");
+ returnMessage.setIntProperty("count", message.getIntProperty("JMSXDeliveryCount"));
+ returnMessage.setJMSCorrelationID(message.getJMSMessageID());
+ // 7. Retrieve the reply destination.
+ Destination destination = message.getJMSReplyTo();
+ // 8. Send the message using the send method of the sender.
+ queueSender.send((Queue) destination, returnMessage);
+ System.out.println(txt + " snd: " + returnMessage.getJMSMessageID());
+ // close the connection
+ queueConnection.close();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to process message [" + message + "].", e);
+ }
+ }
+}
diff --git a/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl b/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl
index efc5ceb..aa2ecae 100644
--- a/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl
+++ b/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl
@@ -76,5 +76,35 @@ ${rootElement}
</session>
</#list>
+<!-- Stateful Session Beans -->
+
+<#list 1..messageDrivenBeanCount as index>
+ <message-driven>
+ <description>a very simple message-driven bean</description>
+ <display-name>Simple Message-Driven Bean</display-name>
+
+ <ejb-name>${name}MessageDrivenBean${index?c}</ejb-name>
+ <ejb-class>${package}.MessageDrivenBean</ejb-class>
+ <transaction-type>Container</transaction-type>
+
+${mdbElements}
+<!--
+ <resource-ref>
+ <description>description</description>
+ <res-ref-name>jms/myQueueConnectionFactory</res-ref-name>
+ <res-type>javax.jms.QueueConnectionFactory</res-type>
+ <res-auth>Application</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+-->
+<!--
+ <resource-env-ref>
+ <resource-env-ref-name>jms/persistentQueue</resource-env-ref-name>
+ <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+ </resource-env-ref>
+-->
+ </message-driven>
+</#list>
+
</enterprise-beans>
</ejb-jar>
commit a469ad14ddf692f9b3662179ec5070868e35f547
Author: Torben Jaeger <torben(a)jit-central.com>
Date: Fri Feb 10 11:21:39 2012 +0100
Enable gathering of server logs.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index bc0374a..d62c55b 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -41,6 +41,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.content.ContentContext;
import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
@@ -93,6 +94,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
String managementUser;
String managementPassword;
+ private LogFileEventResourceComponentHelper logFileEventDelegate;
+
/**
* Return availability of this resource
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
@@ -121,6 +124,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
managementUser = pluginConfiguration.getSimpleValue("user","-unset-");
managementPassword = pluginConfiguration.getSimpleValue("password","-unset-");
connection = new ASConnection(host,port, managementUser, managementPassword);
+ logFileEventDelegate = new LogFileEventResourceComponentHelper(context);
+ logFileEventDelegate.startLogFileEventPollers();
}
else {
connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection();
@@ -141,8 +146,9 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
*/
public void stop() {
-
-
+ if (!(context.getParentResourceComponent() instanceof BaseComponent)) {
+ logFileEventDelegate.stopLogFileEventPollers();
+ }
}
commit e4f70659839387e27d6622c6a59d82a02705974e
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Feb 10 11:20:11 2012 +0100
Revert "Enable gathering of server logs."
This reverts commit a8c8969068a0e365782f29306998e990b67890d0.
as the author is wrong.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index d62c55b..bc0374a 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -41,7 +41,6 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.content.ContentContext;
import org.rhq.core.pluginapi.content.ContentServices;
-import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
@@ -94,8 +93,6 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
String managementUser;
String managementPassword;
- private LogFileEventResourceComponentHelper logFileEventDelegate;
-
/**
* Return availability of this resource
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
@@ -124,8 +121,6 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
managementUser = pluginConfiguration.getSimpleValue("user","-unset-");
managementPassword = pluginConfiguration.getSimpleValue("password","-unset-");
connection = new ASConnection(host,port, managementUser, managementPassword);
- logFileEventDelegate = new LogFileEventResourceComponentHelper(context);
- logFileEventDelegate.startLogFileEventPollers();
}
else {
connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection();
@@ -146,9 +141,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
*/
public void stop() {
- if (!(context.getParentResourceComponent() instanceof BaseComponent)) {
- logFileEventDelegate.stopLogFileEventPollers();
- }
+
+
}
commit a8c8969068a0e365782f29306998e990b67890d0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Feb 10 10:55:04 2012 +0100
Enable gathering of server logs.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index bc0374a..d62c55b 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -41,6 +41,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.content.ContentContext;
import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
@@ -93,6 +94,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
String managementUser;
String managementPassword;
+ private LogFileEventResourceComponentHelper logFileEventDelegate;
+
/**
* Return availability of this resource
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
@@ -121,6 +124,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
managementUser = pluginConfiguration.getSimpleValue("user","-unset-");
managementPassword = pluginConfiguration.getSimpleValue("password","-unset-");
connection = new ASConnection(host,port, managementUser, managementPassword);
+ logFileEventDelegate = new LogFileEventResourceComponentHelper(context);
+ logFileEventDelegate.startLogFileEventPollers();
}
else {
connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection();
@@ -141,8 +146,9 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
*/
public void stop() {
-
-
+ if (!(context.getParentResourceComponent() instanceof BaseComponent)) {
+ logFileEventDelegate.stopLogFileEventPollers();
+ }
}
commit 1e86ecca83abe38bcd47356220c6d97b68eca1dc
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Feb 9 16:38:05 2012 -0600
Add pom setting to correctly set the hibernate dialect for embedded container.
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index d69050c..54b193c 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -307,6 +307,7 @@
<systemPropertyVariables>
<embeddedDeployment>true</embeddedDeployment>
<deploymentDirectory>target/test-classes</deploymentDirectory>
+ <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
</systemPropertyVariables>
<argLine>-Djava.security.manager -Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
<additionalClasspathElements>
commit 07bdfe956b475c44ef2fe50ebe0e7adc333bc0e3
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Feb 9 13:12:42 2012 -0500
add support to jeegen for entity beans and for ejb 3.0 and 3.1
diff --git a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java
index 7a03e6b..e1fdda9 100644
--- a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java
+++ b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java
@@ -33,7 +33,7 @@ import org.rhq.helpers.jeegen.ejb.EjbArchive;
public class JeeGen {
public static void main(String[] args) throws Exception {
- EjbArchive ejbArchive = new EjbArchive(ShrinkWrap.create(JavaArchive.class), 100, 100);
+ EjbArchive ejbArchive = new EjbArchive(ShrinkWrap.create(JavaArchive.class), "2.1", 10, 10, 10);
File ejbJarFile = new File("test-ejb.jar");
ejbArchive.as(ZipExporter.class).exportTo(ejbJarFile, true);
}
diff --git a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java
index c6456f7..e53cdb5 100644
--- a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java
+++ b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java
@@ -53,33 +53,88 @@ import org.jboss.shrinkwrap.impl.base.path.BasicPath;
*/
public class EjbArchive implements JavaArchive {
+ public static final String TEST_EJB_RESOURCE_PATH = "test/ejb";
+
private JavaArchive delegate;
+ enum EjbVersionInfo {
+ v2_0("2.0", "<!DOCTYPE ejb-jar PUBLIC \"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\" \"http://java.sun.com/dtd/ejb-jar_2_0.dtd\">\n<ejb-jar>"),
+ v2_1("2.1", "<ejb-jar version=\"2.1\"\n" +
+ " xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd\">"),
+ v3_0("3.0", "<ejb-jar version=\"3.0\"\n" + "" +
+ " xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\">"),
+ v3_1("3.1", "<ejb-jar version=\"3.1\"\n" +
+ " xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd\">");
+
+ private String version;
+ private String rootElement;
+
+ EjbVersionInfo(String version, String rootElement) {
+ this.version = version;
+ this.rootElement = rootElement;
+ }
+
+ private static final Map<String, EjbVersionInfo> VERSION_TO_VALUE_MAP =
+ new HashMap<String, EjbVersionInfo>(values().length);
+ static {
+ for (EjbVersionInfo value : values()) {
+ VERSION_TO_VALUE_MAP.put(value.getVersion(), value);
+ }
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public String getRootElement() {
+ return rootElement;
+ }
+
+ public static EjbVersionInfo forVersion(String version) {
+ if (!VERSION_TO_VALUE_MAP.containsKey(version)) {
+ throw new IllegalArgumentException("Unsupported version: \"" + version +
+ "\". The following versions are supported: " + VERSION_TO_VALUE_MAP.keySet());
+ }
+ return VERSION_TO_VALUE_MAP.get(version);
+ }
+ }
+
/**
* Create a new JavaArchive with any type storage engine as backing.
*
* @param delegate The storage backing.
*/
- public EjbArchive(JavaArchive delegate, int statelessSessionBeanCount, int statefulSessionBeanCount) {
+ public EjbArchive(JavaArchive delegate, String ejbVersion, int entityBeanCount, int statelessSessionBeanCount,
+ int statefulSessionBeanCount) {
+ EjbVersionInfo ejbVersionInfo = EjbVersionInfo.forVersion(ejbVersion);
+
this.delegate = delegate;
- Configuration cfg = new Configuration();
- cfg.setClassForTemplateLoading(getClass(), "");
- cfg.setObjectWrapper(new DefaultObjectWrapper());
+ Configuration config = new Configuration();
+ config.setClassForTemplateLoading(getClass(), "");
+ config.setObjectWrapper(new DefaultObjectWrapper());
ByteArrayOutputStream byteArrayOutputStream;
try {
- Template temp = cfg.getTemplate("v2/ejb-jar.xml.ftl");
+ Template template = config.getTemplate("v2/ejb-jar.xml.ftl");
Map dataModel = new HashMap();
dataModel.put("name", "Test");
- dataModel.put("package", "test.ejb.v2");
+ dataModel.put("rootElement", ejbVersionInfo.getRootElement());
+ dataModel.put("package", "test.ejb");
+ dataModel.put("entityBeanCount", statelessSessionBeanCount);
dataModel.put("statelessSessionBeanCount", statelessSessionBeanCount);
dataModel.put("statefulSessionBeanCount", statefulSessionBeanCount);
byteArrayOutputStream = new ByteArrayOutputStream();
Writer out = new OutputStreamWriter(byteArrayOutputStream);
- temp.process(dataModel, out);
+ template.process(dataModel, out);
} catch (Exception e) {
throw new RuntimeException("Failed to add ejb-jar.xml to EJB-JAR.", e);
}
@@ -89,15 +144,20 @@ public class EjbArchive implements JavaArchive {
// add deployment descriptor
addAsManifestResource(ejbJarXml, new BasicPath("ejb-jar.xml"));
+ // add entity bean classes
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/EntityEJBHome.class"), TEST_EJB_RESOURCE_PATH + "/EntityEJBHome.class");
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/EntityEJBObject.class"),TEST_EJB_RESOURCE_PATH + "/EntityEJBObject.class");
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/EntityBean.class"), TEST_EJB_RESOURCE_PATH + "/EntityBean.class");
+
// add stateless session bean classes
- addAsResource(new ClassLoaderAsset("test/ejb/v2/StatelessSessionEJBHome.class"), "test/ejb/v2/StatelessSessionEJBHome.class");
- addAsResource(new ClassLoaderAsset("test/ejb/v2/StatelessSessionEJBObject.class"),"test/ejb/v2/StatelessSessionEJBObject.class");
- addAsResource(new ClassLoaderAsset("test/ejb/v2/StatelessSessionBean.class"), "test/ejb/v2/StatelessSessionBean.class");
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatelessSessionEJBHome.class"), TEST_EJB_RESOURCE_PATH + "/StatelessSessionEJBHome.class");
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatelessSessionEJBObject.class"),TEST_EJB_RESOURCE_PATH + "/StatelessSessionEJBObject.class");
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatelessSessionBean.class"), TEST_EJB_RESOURCE_PATH + "/StatelessSessionBean.class");
// add stateful session bean classes
- addAsResource(new ClassLoaderAsset("test/ejb/v2/StatefulSessionEJBHome.class"), "test/ejb/v2/StatefulSessionEJBHome.class");
- addAsResource(new ClassLoaderAsset("test/ejb/v2/StatefulSessionEJBObject.class"),"test/ejb/v2/StatefulSessionEJBObject.class");
- addAsResource(new ClassLoaderAsset("test/ejb/v2/StatefulSessionBean.class"), "test/ejb/v2/StatefulSessionBean.class");
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatefulSessionEJBHome.class"), TEST_EJB_RESOURCE_PATH + "/StatefulSessionEJBHome.class");
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatefulSessionEJBObject.class"),TEST_EJB_RESOURCE_PATH + "/StatefulSessionEJBObject.class");
+ addAsResource(new ClassLoaderAsset(TEST_EJB_RESOURCE_PATH + "/StatefulSessionBean.class"), TEST_EJB_RESOURCE_PATH + "/StatefulSessionBean.class");
}
@Override
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/EntityBean.java b/modules/helpers/jeeGen/src/main/java/test/ejb/EntityBean.java
new file mode 100644
index 0000000..000158a
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/EntityBean.java
@@ -0,0 +1,64 @@
+package test.ejb;
+
+import javax.ejb.CreateException;
+import javax.ejb.EntityContext;
+
+/**
+ * Entity bean - impl.
+ */
+public abstract class EntityBean implements javax.ejb.EntityBean {
+
+ private EntityContext context;
+
+ public abstract Integer getKey();
+ public abstract void setKey(Integer key);
+
+ public abstract String getName();
+ public abstract void setName(String name);
+
+ public void EmployeeBean() {
+ // Empty constructor, don't initialize here but in the create().
+ // passivate() may destroy these attributes in the case of pooling
+ }
+
+ public Integer ejbCreate(Integer key, String name)
+ throws CreateException {
+ setKey(key);
+ setName(name);
+ return key;
+ }
+
+ public void ejbPostCreate(Integer key, String name)
+ throws CreateException {
+ // when bean has just bean created
+ }
+
+ public void ejbStore() {
+ // when bean persisted
+ }
+
+ public void ejbLoad() {
+ // when bean loaded
+ }
+
+ public void ejbRemove() {
+ // when bean removed
+ }
+
+ public void ejbActivate() {
+ // when bean activated
+ }
+
+ public void ejbPassivate() {
+ // when bean deactivated
+ }
+
+ public void setEntityContext(EntityContext context) {
+ this.context = context;
+ }
+
+ public void unsetEntityContext() {
+ this.context = null;
+ }
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBHome.java b/modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBHome.java
new file mode 100644
index 0000000..d837297
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBHome.java
@@ -0,0 +1,27 @@
+package test.ejb;
+
+import java.rmi.RemoteException;
+import java.util.Collection;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+import javax.ejb.FinderException;
+
+/**
+ * Entity bean - home interface.
+ */
+public interface EntityEJBHome extends EJBHome {
+
+ public EntityEJBObject create(Integer key, String name)
+ throws CreateException, RemoteException;
+
+ public EntityEJBObject findByPrimaryKey(Integer key)
+ throws FinderException, RemoteException;
+
+ public Collection<EntityEJBObject> findByName(String name)
+ throws FinderException, RemoteException;
+
+ public Collection<EntityEJBObject> findAll()
+ throws FinderException, RemoteException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBObject.java b/modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBObject.java
new file mode 100644
index 0000000..c2e7a14
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBObject.java
@@ -0,0 +1,20 @@
+package test.ejb;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Entity bean - remote interface.
+ */
+public interface EntityEJBObject extends EJBObject {
+
+ Integer getKey() throws RemoteException;
+
+ void setKey(Integer key) throws RemoteException;
+
+ String getName() throws RemoteException;
+
+ void setName(String empName) throws RemoteException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionBean.java b/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionBean.java
new file mode 100644
index 0000000..2b2a494
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionBean.java
@@ -0,0 +1,71 @@
+package test.ejb;
+
+import java.rmi.RemoteException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.ejb.SessionSynchronization;
+
+/**
+ * Stateful session bean - impl.
+ */
+public class StatefulSessionBean implements SessionBean, SessionSynchronization {
+
+ private static final long serialVersionUID = 1L;
+
+ private SessionContext context;
+
+ private AtomicInteger newValue; // value inside Tx, not yet committed
+ private int value; // actual state of the bean
+
+ public int increment() {
+ return newValue.incrementAndGet();
+ }
+
+ public int decrement() {
+ return newValue.decrementAndGet();
+ }
+
+ public void ejbCreate() {
+ this.value = 0;
+ this.newValue = new AtomicInteger(this.value);
+ }
+
+ public void ejbActivate() {
+ return;
+ }
+
+ public void ejbPassivate() {
+ return;
+ }
+
+ public void ejbRemove() {
+ return;
+ }
+
+ public void setSessionContext(SessionContext context) {
+ this.context = context;
+ }
+
+ @Override
+ public void afterBegin() throws EJBException, RemoteException {
+ return;
+ }
+
+ @Override
+ public void beforeCompletion() throws EJBException, RemoteException {
+ return;
+ }
+
+ @Override
+ public void afterCompletion(boolean committed) throws EJBException, RemoteException {
+ if (committed) {
+ this.value = this.newValue.get();
+ } else {
+ this.newValue.set(this.value);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBHome.java b/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBHome.java
new file mode 100644
index 0000000..3d0a45f
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBHome.java
@@ -0,0 +1,15 @@
+package test.ejb;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * Stateful session bean - home interface.
+ */
+public interface StatefulSessionEJBHome extends EJBHome {
+
+ StatefulSessionEJBObject create() throws RemoteException, CreateException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBObject.java b/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBObject.java
new file mode 100644
index 0000000..f8f743a
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBObject.java
@@ -0,0 +1,16 @@
+package test.ejb;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Stateful session bean - remote interface.
+ */
+public interface StatefulSessionEJBObject extends EJBObject {
+
+ int increment() throws RemoteException;
+
+ int decrement() throws RemoteException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionBean.java b/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionBean.java
new file mode 100644
index 0000000..3ad357d
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionBean.java
@@ -0,0 +1,35 @@
+package test.ejb;
+
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * Stateless session bean - impl.
+ */
+public class StatelessSessionBean implements SessionBean {
+
+ private static final long serialVersionUID = 1L;
+
+ private SessionContext context;
+
+ public String echo(String string) {
+ return string;
+ }
+
+ public void ejbCreate() {
+ }
+
+ public void ejbActivate() {
+ }
+
+ public void ejbPassivate() {
+ }
+
+ public void ejbRemove() {
+ }
+
+ public void setSessionContext(SessionContext context) {
+ this.context = context;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBHome.java b/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBHome.java
new file mode 100644
index 0000000..7071502
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBHome.java
@@ -0,0 +1,14 @@
+package test.ejb;
+
+import java.rmi.RemoteException;
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * Stateless session bean - home interface.
+ */
+public interface StatelessSessionEJBHome extends EJBHome {
+
+ StatelessSessionEJBObject create() throws RemoteException, CreateException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBObject.java b/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBObject.java
new file mode 100644
index 0000000..09dfc67
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBObject.java
@@ -0,0 +1,13 @@
+package test.ejb;
+
+import java.rmi.RemoteException;
+import javax.ejb.EJBObject;
+
+/**
+ * Stateless session bean - remote interface.
+ */
+public interface StatelessSessionEJBObject extends EJBObject {
+
+ String echo(String string) throws RemoteException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionBean.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionBean.java
deleted file mode 100644
index f037aa7..0000000
--- a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package test.ejb.v2;
-
-import java.rmi.RemoteException;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionSynchronization;
-
-/**
- * Stateful session bean - impl.
- */
-public class StatefulSessionBean implements SessionBean, SessionSynchronization {
-
- private static final long serialVersionUID = 1L;
-
- private SessionContext context;
-
- private AtomicInteger newValue; // value inside Tx, not yet committed
- private int value; // actual state of the bean
-
- public int increment() {
- return newValue.incrementAndGet();
- }
-
- public int decrement() {
- return newValue.decrementAndGet();
- }
-
- public void ejbCreate() {
- this.value = 0;
- this.newValue = new AtomicInteger(this.value);
- }
-
- public void ejbActivate() {
- return;
- }
-
- public void ejbPassivate() {
- return;
- }
-
- public void ejbRemove() {
- return;
- }
-
- public void setSessionContext(SessionContext context) {
- this.context = context;
- }
-
- @Override
- public void afterBegin() throws EJBException, RemoteException {
- return;
- }
-
- @Override
- public void beforeCompletion() throws EJBException, RemoteException {
- return;
- }
-
- @Override
- public void afterCompletion(boolean committed) throws EJBException, RemoteException {
- if (committed) {
- this.value = this.newValue.get();
- } else {
- this.newValue.set(this.value);
- }
- }
-
-}
\ No newline at end of file
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBHome.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBHome.java
deleted file mode 100644
index dbbcf1e..0000000
--- a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBHome.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package test.ejb.v2;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-/**
- * Stateful session bean - home interface.
- */
-public interface StatefulSessionEJBHome extends EJBHome {
-
- StatefulSessionEJBObject create() throws RemoteException, CreateException;
-
-}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBObject.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBObject.java
deleted file mode 100644
index 69b8c05..0000000
--- a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBObject.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package test.ejb.v2;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBObject;
-
-/**
- * Stateful session bean - remote interface.
- */
-public interface StatefulSessionEJBObject extends EJBObject {
-
- int increment() throws RemoteException;
-
- int decrement() throws RemoteException;
-
-}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionBean.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionBean.java
deleted file mode 100644
index 6540236..0000000
--- a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionBean.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package test.ejb.v2;
-
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-
-/**
- * Stateless session bean - impl.
- */
-public class StatelessSessionBean implements SessionBean {
-
- private static final long serialVersionUID = 1L;
-
- private SessionContext context;
-
- public String echo(String string) {
- return string;
- }
-
- public void ejbCreate() {
- }
-
- public void ejbActivate() {
- }
-
- public void ejbPassivate() {
- }
-
- public void ejbRemove() {
- }
-
- public void setSessionContext(SessionContext context) {
- this.context = context;
- }
-
-}
\ No newline at end of file
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBHome.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBHome.java
deleted file mode 100644
index dedc7b7..0000000
--- a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBHome.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package test.ejb.v2;
-
-import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-/**
- * Stateless session bean - home interface.
- */
-public interface StatelessSessionEJBHome extends EJBHome {
-
- StatelessSessionEJBObject create() throws RemoteException, CreateException;
-
-}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBObject.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBObject.java
deleted file mode 100644
index d267268..0000000
--- a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBObject.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package test.ejb.v2;
-
-import java.rmi.RemoteException;
-import javax.ejb.EJBObject;
-
-/**
- * Stateless session bean - remote interface.
- */
-public interface StatelessSessionEJBObject extends EJBObject {
-
- String echo(String string) throws RemoteException;
-
-}
diff --git a/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl b/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl
index 5516b9c..efc5ceb 100644
--- a/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl
+++ b/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl
@@ -1,16 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" version="2.1"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
+${rootElement}
<enterprise-beans>
+ <!-- Entity Beans -->
+
+<#list 1..entityBeanCount as index>
+ <entity>
+ <description>a very simple entity bean</description>
+ <display-name>Simple Entity Bean</display-name>
+
+ <ejb-name>${name}EntityBean${index?c}</ejb-name>
+ <home>${package}.EntityEJBHome</home>
+ <remote>${package}.EntityEJBObject</remote>
+ <ejb-class>${package}.EntityBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>false</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>Entity${index?c}</abstract-schema-name>
+ <cmp-field><field-name>key</field-name></cmp-field>
+ <cmp-field><field-name>name</field-name></cmp-field>
+ <primkey-field>key</primkey-field>
+
+ <query>
+ <query-method>
+ <method-name>findAll</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>Select OBJECT(e) From Entity${index?c} e</ejb-ql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findByName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>Select OBJECT(e) From Entity${index?c} e where e.name = ?1</ejb-ql>
+ </query>
+ </entity>
+</#list>
+
<!-- Stateless Session Beans -->
<#list 1..statelessSessionBeanCount as index>
<session>
+ <description>a very simple stateless session bean</description>
+ <display-name>Simple Stateless Session Bean</display-name>
+
<ejb-name>${name}StatelessSessionBean${index?c}</ejb-name>
<home>${package}.StatelessSessionEJBHome</home>
<remote>${package}.StatelessSessionEJBObject</remote>
@@ -24,6 +64,9 @@
<#list 1..statefulSessionBeanCount as index>
<session>
+ <description>a very simple stateful session bean</description>
+ <display-name>Simple Stateful Session Bean</display-name>
+
<ejb-name>${name}StatefulSessionBean${index?c}</ejb-name>
<home>${package}.StatefulSessionEJBHome</home>
<remote>${package}.StatefulSessionEJBObject</remote>
commit 34d9cc0624bc871b6092acc27a734751c7823566
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Feb 9 11:28:30 2012 -0500
[Bug 789039 - unwanted jars being pulled into rhq ear lib directory]
Changes to the rhq-server-client-api deps caused unwanted libs to be
pulled into rhq.ear.
Added dep exclusions in the ear pom to keep out the unwanted transitive
deps.
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 941c88a..429f446 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -100,6 +100,16 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- 3rd Party Deps -->
commit 24aff88ad572c843e5817b6e3798a55e1b20be24
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 9 16:12:22 2012 +0100
BZ 742705 - make JNDIView result sensible data again.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index 14022d0..bc0374a 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -579,11 +579,6 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
((CompositeOperation)operation).addStep(step);
}
}
- } else if (what.equals("naming")) {
- if (op.equals("jndi-view")) {
- theAddress.add(address);
- operation = new Operation("jndi-view",theAddress);
- }
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java
new file mode 100644
index 0000000..e95c512
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java
@@ -0,0 +1,92 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.util.Map;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.operation.OperationFacet;
+import org.rhq.core.pluginapi.operation.OperationResult;
+import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.Result;
+
+/**
+ * Component for the naming subsystem
+ * @author Heiko W. Rupp
+ */
+public class NamingComponent extends BaseComponent implements OperationFacet {
+
+ @Override
+ public OperationResult invokeOperation(String name,
+ Configuration parameters) throws InterruptedException, Exception {
+
+ OperationResult result = new OperationResult();
+
+ Operation operation;
+ if (name.equals("jndi-view")) {
+ Address address = new Address(path);
+ operation = new Operation("jndi-view",address);
+ Result res = getASConnection().execute(operation);
+
+ if (!res.isSuccess()) {
+ result.setErrorMessage(res.getFailureDescription());
+ return result;
+ }
+
+ Configuration config = result.getComplexResults();
+
+ Map<String,Map> contexts = (Map<String, Map>) res.getResult();
+
+ String entryName = "java: contexts";
+ Map<String,Map> javaContexts = contexts.get(entryName);
+ PropertyList javaContextsMap = fillMap(javaContexts, "java-contexts", false);
+ config.put(javaContextsMap);
+ entryName = "applications";
+ Map<String,Map> applications = contexts.get(entryName);
+ PropertyList applicationsMap = fillMap(applications, entryName, true);
+ config.put(applicationsMap);
+
+ return result;
+ }
+
+ return super.invokeOperation(name,parameters);
+ }
+
+ private PropertyList fillMap(Map<String, Map> contexts, String name, boolean isAppCtx) {
+ PropertyList pl = new PropertyList(name);
+ for (String entry : contexts.keySet() ) {
+ Map<String,Object> map = contexts.get(entry);
+ if (map==null)
+ continue;
+
+ for (String innerkey : map.keySet()) {
+ PropertyMap pm = new PropertyMap(name);
+ pm.put(new PropertySimple("context",entry));
+ pm.put(new PropertySimple("name",innerkey));
+ Object val = map.get(innerkey);
+ if (val!=null) {
+ if (isAppCtx) {
+ Map<String,Object> cvmap = (Map<String, Object>) val;
+ if (cvmap.containsKey("AppName")) {
+ Map<String,String> nameMap = (Map<String, String>) cvmap.get("AppName");
+ pm.put(new PropertySimple("value", nameMap.get("value")));
+ }
+ else
+ pm.put(new PropertySimple("value",val.toString() ));
+ }
+ else {
+ Map<String,String> cvmap = (Map<String, String>) val;
+ String clazz = cvmap.get("class-name");
+ String value = cvmap.get("value");
+ pm.put(new PropertySimple("value",clazz + "="+ value));
+ }
+ }
+ pl.add(pm);
+ }
+ }
+
+ return pl;
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index a3552a4..94fe410 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -2003,7 +2003,7 @@ working area for individual server instances</li></ul>"/>
<server name="Naming"
discovery="SubsystemDiscovery"
- class="BaseComponent"
+ class="NamingComponent"
singleton="true"
>
@@ -2016,15 +2016,21 @@ working area for individual server instances</li></ul>"/>
<c:simple-property name="path" readOnly="true" default="subsystem=naming"/>
</plugin-configuration>
- <operation name="naming:jndi-view" displayName="JNDIView" description="Peek at the JNDI tree">
+ <operation name="jndi-view" displayName="JNDIView" description="Peek at the JNDI tree">
<results>
- <c:list-property name="operationResult">
- <c:list-property name="innerContext">
- <c:map-property name="innerContexts">
- <c:simple-property name="class-name"/>
- <c:simple-property name="value"/>
- </c:map-property>
- </c:list-property>
+ <c:list-property name="java-contexts">
+ <c:map-property name="context">
+ <c:simple-property name="context" />
+ <c:simple-property name="name"/>
+ <c:simple-property name="value"/>
+ </c:map-property>
+ </c:list-property>
+ <c:list-property name="applications">
+ <c:map-property name="context">
+ <c:simple-property name="context" />
+ <c:simple-property name="name"/>
+ <c:simple-property name="value"/>
+ </c:map-property>
</c:list-property>
</results>
</operation>
commit c40a23fe09b9f1ae3debafaef01506bf3ea5f708
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 9 12:48:08 2012 +0100
BZ 734488 provide server start time - improvements.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 1886962..34d849c 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -26,6 +26,7 @@ import java.net.ConnectException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
@@ -258,12 +259,16 @@ public class BaseServerComponent extends BaseComponent implements MeasurementFac
public void getValues(MeasurementReport report, Set metrics) throws Exception {
Set<MeasurementScheduleRequest> requests = metrics;
+ Set<MeasurementScheduleRequest> leftovers = new HashSet<MeasurementScheduleRequest>(requests.size());
for (MeasurementScheduleRequest request: requests) {
if (request.getName().equals("startTime")) {
String path = getPath();
if (context.getResourceType().getName().contains("Host Controller")) {
- path = "host=master," + path ; // TODO is the local controller always on host=master?? AS7-3678
+ if (path!=null)
+ path = "host=master," + path ; // TODO is the local controller always on host=master?? AS7-3678
+ else
+ path = "host=master";
}
Address address = new Address(path);
address.add("core-service","platform-mbean");
@@ -276,11 +281,13 @@ public class BaseServerComponent extends BaseComponent implements MeasurementFac
MeasurementDataTrait data = new MeasurementDataTrait(request,new Date(startTime).toString());
report.addData(data);
}
-
+ }
+ else {
+ leftovers.add(request);
}
}
- super.getValues(report, metrics);
+ super.getValues(report, leftovers);
}
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
index 1935126..3873dfc 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
@@ -81,7 +81,7 @@ public class ManagedASComponent extends BaseComponent {
for (MeasurementScheduleRequest request: requests) {
if (request.getName().equals("startTime")) {
String path = getPath();
- path = path.replace("server-config=","server=");
+ path = path.replace("server-config","server");
Address address = new Address(path);
address.add("core-service","platform-mbean");
address.add("type","runtime");
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index bfce241..a3552a4 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -189,7 +189,7 @@
<metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
<metric property="product-name" dataType="trait" displayName="Name of the product"/>
<metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/>
- <metric property="startTime" dataType="trait" displayName="Start time of the server"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
<event name="logEntry" description="an entry in a log file"/>
@@ -363,7 +363,7 @@
<metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
displayType="summary"/>
- <metric property="startTime" dataType="trait" displayName="Start time of the server"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
<event name="logEntry" description="an entry in a log file"/>
@@ -519,7 +519,7 @@
<metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
<metric property="product-name" dataType="trait" displayName="Name of the product"/>
<metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/>
- <metric property="startTime" dataType="trait" displayName="Start time of the server"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
<event name="logEntry" description="an entry in a log file"/>
commit 8d19fa80491d915b986cab452a633374d817e4c9
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 9 12:30:23 2012 +0100
Ignore the RhqThrowable for the moment.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
index 1c68eca..da08eb9 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
@@ -108,10 +108,12 @@ public class Result {
this.throwable = throwable;
}
+ @JsonIgnore
public Throwable getRhqThrowable() {
return rhqThrowable;
}
+ @JsonIgnore
public void setRhqThrowable(Throwable rhqThrowable) {
this.rhqThrowable = rhqThrowable;
}
commit 4bd191abe751f5dc049d2420fce39c2d43c54c94
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 8 21:40:04 2012 +0100
Allow to read and put traits, expose raw metric as html table and csv as well.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index 53255a6..bcc5db2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -66,6 +66,8 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementBaseline;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementDataPK;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
@@ -81,6 +83,7 @@ import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal;
import org.rhq.enterprise.server.rest.domain.MetricSchedule;
import org.rhq.enterprise.server.rest.domain.NumericDataPoint;
+import org.rhq.enterprise.server.rest.domain.StringValue;
/**
* Deal with metrics
@@ -120,7 +123,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
startTime = endTime - EIGHT_HOURS;
}
- MeasurementSchedule schedule = obtainSchedule(scheduleId, false);
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, false, DataType.MEASUREMENT);
MeasurementAggregate aggr = dataManager.getAggregate(caller, scheduleId, startTime, endTime);
MetricAggregate res = new MetricAggregate(scheduleId, aggr.getMin(),aggr.getAvg(),aggr.getMax());
@@ -158,10 +161,11 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
*
* @param scheduleId id to look up
* @param force
+ * @param type
* @return schedule
* @throws StuffNotFoundException if there is no schedule with the passed id
*/
- private MeasurementSchedule obtainSchedule(int scheduleId, boolean force) {
+ private MeasurementSchedule obtainSchedule(int scheduleId, boolean force, DataType type) {
MeasurementSchedule schedule=null;
if(!force)
schedule = getFromCache(scheduleId,MeasurementSchedule.class);
@@ -174,8 +178,8 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
putToCache(scheduleId,MeasurementSchedule.class,schedule);
}
- if (schedule.getDefinition().getDataType()!= DataType.MEASUREMENT)
- throw new IllegalArgumentException("Schedule [" + scheduleId + "] is not a (numerical) metric");
+ if (schedule.getDefinition().getDataType()!= type)
+ throw new IllegalArgumentException("Schedule [" + scheduleId + "] is not a ("+ type + ") metric");
return schedule;
}
private MetricAggregate fill(MetricAggregate res, List<MeasurementDataNumericHighLowComposite> list, int scheduleId,
@@ -428,7 +432,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
throw new IllegalArgumentException("Start time is older than 7 days");
// Check if the schedule exists
- obtainSchedule(scheduleId, false);
+ obtainSchedule(scheduleId, false, DataType.MEASUREMENT);
RawNumericStreamingOutput so = new RawNumericStreamingOutput();
so.scheduleId = scheduleId;
@@ -437,7 +441,6 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
so.mediaType = mediaType;
so.now = now-1; // pass this so that the for the 7days case is still handled from raw tables.
-
return so;
}
@@ -450,7 +453,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
NumericDataPoint point, @Context HttpHeaders headers, UriInfo uriInfo) {
MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
- MeasurementSchedule schedule = obtainSchedule(scheduleId, false);
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, false, DataType.MEASUREMENT);
Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(1);
data.add(new MeasurementDataNumeric(point.getTimeStamp(),scheduleId,point.getValue()));
@@ -466,6 +469,36 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
return Response.created(uri).type(mediaType).build();
}
+ public Response putTraitValue(@PathParam("scheduleId") int scheduleId, StringValue value) {
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, false, DataType.TRAIT);
+
+ Set<MeasurementDataTrait> traits = new HashSet<MeasurementDataTrait>(1);
+ MeasurementDataPK pk = new MeasurementDataPK(System.currentTimeMillis(),scheduleId);
+ traits.add(new MeasurementDataTrait(pk,value.getValue()));
+
+ dataManager.addTraitData(traits);
+
+ return Response.ok().build();
+ }
+
+ @Override
+ public Response getTraitValue(@PathParam("scheduleId") int scheduleId) {
+
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, false, DataType.TRAIT);
+ List<MeasurementDataTrait> traits = dataManager.findTraits(caller,schedule.getResource().getId(),schedule.getDefinition().getId());
+ Response.ResponseBuilder builder;
+ if (traits!=null && traits.size()>0) {
+ builder = Response.ok();
+ StringValue value = new StringValue(traits.get(0).getValue());
+ builder.entity(value);
+
+ } else {
+ builder = Response.status(Response.Status.NOT_FOUND);
+ }
+
+ return builder.build();
+ }
+
@Override
@POST
@@ -490,7 +523,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@Path("data/{scheduleId}/baseline")
public Baseline getBaseline(@PathParam("scheduleId") int scheduleId, @Context HttpHeaders headers,
@Context UriInfo uriInfo) {
- MeasurementSchedule schedule = obtainSchedule(scheduleId, true);
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, true, DataType.MEASUREMENT);
MeasurementBaseline mBase = schedule.getBaseline();
Baseline b;
@@ -507,7 +540,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@Path("data/{scheduleId}/baseline")
public void setBaseline(@PathParam("scheduleId") int scheduleId,
Baseline baseline, HttpHeaders headers, @Context UriInfo uriInfo) {
- MeasurementSchedule schedule = obtainSchedule(scheduleId, false);
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, false, DataType.MEASUREMENT);
// little bit of sanity checking
if (baseline.getMin()>baseline.getMean() || baseline.getMean()>baseline.getMax() || baseline.getMin()>baseline.getMax())
@@ -605,6 +638,31 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
}
pw.println("</collection>");
}
+ else if (mediaType.toString().equals("text/csv")) {
+ pw.println("#schedule,timestamp,value");
+ while (rs.next()) {
+ pw.print(scheduleId);
+ pw.print(',');
+ pw.print(rs.getLong(1));
+ pw.print(',');
+ pw.println(rs.getDouble(2));
+ }
+ }
+ else if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
+ pw.println("<table>");
+ pw.print("<th><td>time</td><td>value</td></th>");
+ while (rs.next()) {
+ pw.print(" <tr>");
+ pw.print("<td>");
+ pw.print(new Date(rs.getLong(1)));
+ pw.print("</td><td>");
+ pw.print(rs.getDouble(2));
+ pw.print("</td>");
+ pw.println("</tr>");
+ }
+ pw.println("</table>");
+
+ }
pw.flush();
pw.close();
} catch (SQLException e) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
index 6d9c174..c6e9450 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
@@ -43,6 +43,7 @@ import org.rhq.enterprise.server.rest.domain.Baseline;
import org.rhq.enterprise.server.rest.domain.MetricAggregate;
import org.rhq.enterprise.server.rest.domain.MetricSchedule;
import org.rhq.enterprise.server.rest.domain.NumericDataPoint;
+import org.rhq.enterprise.server.rest.domain.StringValue;
/**
* Deal with metrics
@@ -120,7 +121,7 @@ public interface MetricHandlerLocal {
*/
@GET
@Path("data/{scheduleId}/raw")
- @Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ @Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML,"text/csv",MediaType.TEXT_HTML})
StreamingOutput getMetricDataRaw(@PathParam("scheduleId") int scheduleId,
@QueryParam("startTime") long startTime,
@QueryParam("endTime") long endTime,
@@ -150,7 +151,7 @@ public interface MetricHandlerLocal {
* Submit a series of (numerical) metric values to the server
* @param points Collection of NumericDataPoint entries
* @param headers Injected HTTP headers
- * @return
+ * @return response object
*/
@POST
@Path("data/raw")
@@ -171,4 +172,14 @@ public interface MetricHandlerLocal {
Baseline baseline,
@Context HttpHeaders headers,
@Context UriInfo uriInfo);
+
+ @PUT
+ @Path("data/{scheduleId}/trait")
+ @Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ Response putTraitValue(@PathParam("scheduleId") int scheduleId, StringValue value);
+
+ @GET
+ @Path("data/{scheduleId}/trait")
+ @Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ Response getTraitValue(@PathParam("scheduleId") int scheduleId);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/StringValue.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/StringValue.java
new file mode 100644
index 0000000..64ceb70
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/StringValue.java
@@ -0,0 +1,28 @@
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Encapsulate a simple string value
+ * @author Heiko W. Rupp
+ */
+@XmlRootElement
+public class StringValue {
+
+ String value;
+
+ public StringValue() {
+ }
+
+ public StringValue(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
commit 96f5b33e5a440b8be1dc0d1ab43b8c1684196457
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 8 21:36:28 2012 +0100
BZ 788554 Prevent NPE when server can not be contacted.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index 7510a8f..14022d0 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -591,6 +591,11 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
if (operation!=null) {
Result result = connection.execute(operation);
+ if (result==null) {
+ operationResult.setErrorMessage("Connection was null - is the server running?");
+ return operationResult;
+ }
+
if (!result.isSuccess()) {
operationResult.setErrorMessage(result.getFailureDescription());
}
commit e0f170a8c55ddaaa64a0126085f03293eb2b122e
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 8 21:35:43 2012 +0100
BZ 734488 provide server start time
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index ed562cd..1886962 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -25,8 +25,10 @@ import java.io.IOException;
import java.net.ConnectException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -35,17 +37,24 @@ import org.jboss.sasl.util.UsernamePasswordHashUtil;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
import org.rhq.core.system.ProcessExecution;
import org.rhq.core.system.ProcessExecutionResults;
+import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
import org.rhq.modules.plugins.jbossas7.json.Result;
/**
* Base component for functionality that is common to Standalone AS and HostControllers
* @author Heiko W. Rupp
*/
-public class BaseServerComponent extends BaseComponent {
+public class BaseServerComponent extends BaseComponent implements MeasurementFacet {
private static final String SEPARATOR = "\n-----------------------\n";
final Log log = LogFactory.getLog(BaseServerComponent.class);
@@ -245,4 +254,33 @@ public class BaseServerComponent extends BaseComponent {
return result;
}
+
+ public void getValues(MeasurementReport report, Set metrics) throws Exception {
+
+ Set<MeasurementScheduleRequest> requests = metrics;
+
+ for (MeasurementScheduleRequest request: requests) {
+ if (request.getName().equals("startTime")) {
+ String path = getPath();
+ if (context.getResourceType().getName().contains("Host Controller")) {
+ path = "host=master," + path ; // TODO is the local controller always on host=master?? AS7-3678
+ }
+ Address address = new Address(path);
+ address.add("core-service","platform-mbean");
+ address.add("type","runtime");
+ Operation op = new ReadAttribute(address,"start-time");
+ Result res = getASConnection().execute(op);
+
+ if (res.isSuccess()) {
+ Long startTime= (Long) res.getResult();
+ MeasurementDataTrait data = new MeasurementDataTrait(request,new Date(startTime).toString());
+ report.addData(data);
+ }
+
+ }
+ }
+
+ super.getValues(report, metrics);
+ }
+
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
index 8fdb02e..1935126 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
@@ -19,7 +19,13 @@
package org.rhq.modules.plugins.jbossas7;
+import java.util.Date;
+import java.util.Set;
+
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.Operation;
import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
@@ -66,4 +72,32 @@ public class ManagedASComponent extends BaseComponent {
return super.getAvailability();
}
+
+
+ public void getValues(MeasurementReport report, Set metrics) throws Exception {
+
+ Set<MeasurementScheduleRequest> requests = metrics;
+
+ for (MeasurementScheduleRequest request: requests) {
+ if (request.getName().equals("startTime")) {
+ String path = getPath();
+ path = path.replace("server-config=","server=");
+ Address address = new Address(path);
+ address.add("core-service","platform-mbean");
+ address.add("type","runtime");
+ Operation op = new ReadAttribute(address,"start-time");
+ Result res = getASConnection().execute(op);
+
+ if (res.isSuccess()) {
+ Long startTime= (Long) res.getResult();
+ MeasurementDataTrait data = new MeasurementDataTrait(request,new Date(startTime).toString());
+ report.addData(data);
+ }
+
+ }
+ }
+
+ super.getValues(report, metrics);
+ }
+
}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index d1a0131..bfce241 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -189,6 +189,7 @@
<metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
<metric property="product-name" dataType="trait" displayName="Name of the product"/>
<metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server"/>
<event name="logEntry" description="an entry in a log file"/>
@@ -362,6 +363,7 @@
<metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
displayType="summary"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server"/>
<event name="logEntry" description="an entry in a log file"/>
@@ -429,6 +431,7 @@
defaults to the home directory of the RHQ agent JRE."/>
&logSources;
+<!--
<c:group name="event" displayName="Events">
<c:list-property name="logEventSources">
<c:map-property name="logEventSource">
@@ -463,6 +466,7 @@
</c:map-property>
</c:list-property>
</c:group>
+-->
</plugin-configuration>
<process-scan name="StandaloneAS" query="process|basename|match=^java.*,arg|org.jboss.as.standalone|match=.*"/>
@@ -515,6 +519,7 @@
<metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
<metric property="product-name" dataType="trait" displayName="Name of the product"/>
<metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server"/>
<event name="logEntry" description="an entry in a log file"/>
commit 64118faf86d212fdb23a40dbf5873a284210aeca
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Feb 8 12:52:13 2012 -0500
initial version of a tool for generating test ejb-jars, wars, and/or ears - currently only supports v2.1 ejb-jars containing only session beans
diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml
new file mode 100644
index 0000000..67fdf05
--- /dev/null
+++ b/modules/helpers/jeeGen/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>rhq-helpers</artifactId>
+ <groupId>org.rhq.helpers</groupId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>jeeGen</artifactId>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.rhq.helpers.jeegen.JeeGen</mainClass>
+ <packageName>org.rhq.helpers.jeegen</packageName>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+ <mainClass>org.rhq.helpers.jeegen.JeeGen</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <!-- this is used for inheritance merges -->
+ <phase>package</phase>
+ <!-- append to the packaging phase. -->
+ <goals>
+ <goal>attached</goal>
+ <!-- goals == mojos -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.18</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ <version>1.0.0-cr-2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <version>1.0.0-cr-2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
+
diff --git a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java
new file mode 100644
index 0000000..7a03e6b
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java
@@ -0,0 +1,41 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.helpers.jeegen;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.rhq.helpers.jeegen.ejb.EjbArchive;
+
+/**
+ * A tool to generate JEE test applications.
+ *
+ * @author Ian Springer
+ */
+public class JeeGen {
+
+ public static void main(String[] args) throws Exception {
+ EjbArchive ejbArchive = new EjbArchive(ShrinkWrap.create(JavaArchive.class), 100, 100);
+ File ejbJarFile = new File("test-ejb.jar");
+ ejbArchive.as(ZipExporter.class).exportTo(ejbJarFile, true);
+ }
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java
new file mode 100644
index 0000000..c6456f7
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java
@@ -0,0 +1,527 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.helpers.jeegen.ejb;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import freemarker.template.Configuration;
+import freemarker.template.DefaultObjectWrapper;
+import freemarker.template.Template;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchiveFormat;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.Assignable;
+import org.jboss.shrinkwrap.api.Filter;
+import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.asset.NamedAsset;
+import org.jboss.shrinkwrap.api.exporter.StreamExporter;
+import org.jboss.shrinkwrap.api.formatter.Formatter;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.path.BasicPath;
+
+/**
+ * An EJB JAR.
+ *
+ * @author Ian Springer
+ */
+public class EjbArchive implements JavaArchive {
+
+ private JavaArchive delegate;
+
+ /**
+ * Create a new JavaArchive with any type storage engine as backing.
+ *
+ * @param delegate The storage backing.
+ */
+ public EjbArchive(JavaArchive delegate, int statelessSessionBeanCount, int statefulSessionBeanCount) {
+ this.delegate = delegate;
+
+ Configuration cfg = new Configuration();
+ cfg.setClassForTemplateLoading(getClass(), "");
+ cfg.setObjectWrapper(new DefaultObjectWrapper());
+
+ ByteArrayOutputStream byteArrayOutputStream;
+ try {
+ Template temp = cfg.getTemplate("v2/ejb-jar.xml.ftl");
+
+ Map dataModel = new HashMap();
+ dataModel.put("name", "Test");
+ dataModel.put("package", "test.ejb.v2");
+ dataModel.put("statelessSessionBeanCount", statelessSessionBeanCount);
+ dataModel.put("statefulSessionBeanCount", statefulSessionBeanCount);
+
+ byteArrayOutputStream = new ByteArrayOutputStream();
+ Writer out = new OutputStreamWriter(byteArrayOutputStream);
+ temp.process(dataModel, out);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to add ejb-jar.xml to EJB-JAR.", e);
+ }
+
+ Asset ejbJarXml = new ByteArrayAsset(byteArrayOutputStream.toByteArray());
+
+ // add deployment descriptor
+ addAsManifestResource(ejbJarXml, new BasicPath("ejb-jar.xml"));
+
+ // add stateless session bean classes
+ addAsResource(new ClassLoaderAsset("test/ejb/v2/StatelessSessionEJBHome.class"), "test/ejb/v2/StatelessSessionEJBHome.class");
+ addAsResource(new ClassLoaderAsset("test/ejb/v2/StatelessSessionEJBObject.class"),"test/ejb/v2/StatelessSessionEJBObject.class");
+ addAsResource(new ClassLoaderAsset("test/ejb/v2/StatelessSessionBean.class"), "test/ejb/v2/StatelessSessionBean.class");
+
+ // add stateful session bean classes
+ addAsResource(new ClassLoaderAsset("test/ejb/v2/StatefulSessionEJBHome.class"), "test/ejb/v2/StatefulSessionEJBHome.class");
+ addAsResource(new ClassLoaderAsset("test/ejb/v2/StatefulSessionEJBObject.class"),"test/ejb/v2/StatefulSessionEJBObject.class");
+ addAsResource(new ClassLoaderAsset("test/ejb/v2/StatefulSessionBean.class"), "test/ejb/v2/StatefulSessionBean.class");
+ }
+
+ @Override
+ public String getName() {
+ return delegate.getName();
+ }
+
+ @Override
+ public JavaArchive add(Asset asset, ArchivePath target) throws IllegalArgumentException {
+ return delegate.add(asset, target);
+ }
+
+ @Override
+ public JavaArchive add(Asset asset, ArchivePath target, String name) throws IllegalArgumentException {
+ return delegate.add(asset, target, name);
+ }
+
+ @Override
+ public JavaArchive add(Asset asset, String target, String name) throws IllegalArgumentException {
+ return delegate.add(asset, target, name);
+ }
+
+ @Override
+ public JavaArchive add(NamedAsset namedAsset) throws IllegalArgumentException {
+ return delegate.add(namedAsset);
+ }
+
+ @Override
+ public JavaArchive add(Asset asset, String target) throws IllegalArgumentException {
+ return delegate.add(asset, target);
+ }
+
+ @Override
+ public JavaArchive addAsDirectory(String path) throws IllegalArgumentException {
+ return delegate.addAsDirectory(path);
+ }
+
+ @Override
+ public JavaArchive addAsDirectories(String... paths) throws IllegalArgumentException {
+ return delegate.addAsDirectories(paths);
+ }
+
+ @Override
+ public JavaArchive addAsDirectory(ArchivePath path) throws IllegalArgumentException {
+ return delegate.addAsDirectory(path);
+ }
+
+ @Override
+ public JavaArchive addAsDirectories(ArchivePath... paths) throws IllegalArgumentException {
+ return delegate.addAsDirectories(paths);
+ }
+
+ @Override
+ public Node get(ArchivePath path) throws IllegalArgumentException {
+ return delegate.get(path);
+ }
+
+ @Override
+ public Node get(String path) throws IllegalArgumentException {
+ return delegate.get(path);
+ }
+
+ @Override
+ public <X extends Archive<X>> X getAsType(Class<X> type, String path) {
+ return delegate.getAsType(type, path);
+ }
+
+ @Override
+ public <X extends Archive<X>> X getAsType(Class<X> type, ArchivePath path) {
+ return delegate.getAsType(type, path);
+ }
+
+ @Override
+ public <X extends Archive<X>> Collection<X> getAsType(Class<X> type, Filter<ArchivePath> filter) {
+ return delegate.getAsType(type, filter);
+ }
+
+ @Override
+ public <X extends Archive<X>> X getAsType(Class<X> type, String path, ArchiveFormat archiveFormat) {
+ return delegate.getAsType(type, path, archiveFormat);
+ }
+
+ @Override
+ public <X extends Archive<X>> X getAsType(Class<X> type, ArchivePath path, ArchiveFormat archiveFormat) {
+ return delegate.getAsType(type, path, archiveFormat);
+ }
+
+ @Override
+ public <X extends Archive<X>> Collection<X> getAsType(Class<X> type, Filter<ArchivePath> filter, ArchiveFormat archiveFormat) {
+ return delegate.getAsType(type, filter, archiveFormat);
+ }
+
+ @Override
+ public boolean contains(ArchivePath path) throws IllegalArgumentException {
+ return delegate.contains(path);
+ }
+
+ @Override
+ public boolean contains(String path) throws IllegalArgumentException {
+ return delegate.contains(path);
+ }
+
+ @Override
+ public Node delete(ArchivePath path) throws IllegalArgumentException {
+ return delegate.delete(path);
+ }
+
+ @Override
+ public Node delete(String archivePath) throws IllegalArgumentException {
+ return delegate.delete(archivePath);
+ }
+
+ @Override
+ public Map<ArchivePath, Node> getContent() {
+ return delegate.getContent();
+ }
+
+ @Override
+ public Map<ArchivePath, Node> getContent(Filter<ArchivePath> filter) {
+ return delegate.getContent(filter);
+ }
+
+ @Override
+ public JavaArchive add(Archive<?> archive, ArchivePath path, Class<? extends StreamExporter> exporter) throws IllegalArgumentException {
+ return delegate.add(archive, path, exporter);
+ }
+
+ @Override
+ public JavaArchive add(Archive<?> archive, String path, Class<? extends StreamExporter> exporter) throws IllegalArgumentException {
+ return delegate.add(archive, path, exporter);
+ }
+
+ @Override
+ public JavaArchive merge(Archive<?> source) throws IllegalArgumentException {
+ return delegate.merge(source);
+ }
+
+ @Override
+ public JavaArchive merge(Archive<?> source, Filter<ArchivePath> filter) throws IllegalArgumentException {
+ return delegate.merge(source, filter);
+ }
+
+ @Override
+ public JavaArchive merge(Archive<?> source, ArchivePath path) throws IllegalArgumentException {
+ return delegate.merge(source, path);
+ }
+
+ @Override
+ public JavaArchive merge(Archive<?> source, String path) throws IllegalArgumentException {
+ return delegate.merge(source, path);
+ }
+
+ @Override
+ public JavaArchive merge(Archive<?> source, ArchivePath path, Filter<ArchivePath> filter) throws IllegalArgumentException {
+ return delegate.merge(source, path, filter);
+ }
+
+ @Override
+ public JavaArchive merge(Archive<?> source, String path, Filter<ArchivePath> filter) throws IllegalArgumentException {
+ return delegate.merge(source, path, filter);
+ }
+
+ @Override
+ public String toString() {
+ return delegate.toString();
+ }
+
+ @Override
+ public String toString(boolean verbose) {
+ return delegate.toString(verbose);
+ }
+
+ @Override
+ public String toString(Formatter formatter) throws IllegalArgumentException {
+ return delegate.toString(formatter);
+ }
+
+ @Override
+ public void writeTo(OutputStream outputStream, Formatter formatter) throws IllegalArgumentException {
+ delegate.writeTo(outputStream, formatter);
+ }
+
+ @Override
+ public <TYPE extends Assignable> TYPE as(Class<TYPE> clazz) {
+ return delegate.as(clazz);
+ }
+
+ @Override
+ public JavaArchive addAsServiceProviderAndClasses(Class<?> serviceInterface, Class<?>... serviceImpls) throws IllegalArgumentException {
+ return delegate.addAsServiceProviderAndClasses(serviceInterface, serviceImpls);
+ }
+
+ @Override
+ public JavaArchive setManifest(String resourceName) throws IllegalArgumentException {
+ return delegate.setManifest(resourceName);
+ }
+
+ @Override
+ public JavaArchive setManifest(File resource) throws IllegalArgumentException {
+ return delegate.setManifest(resource);
+ }
+
+ @Override
+ public JavaArchive setManifest(URL resource) throws IllegalArgumentException {
+ return delegate.setManifest(resource);
+ }
+
+ @Override
+ public JavaArchive setManifest(Asset resource) throws IllegalArgumentException {
+ return delegate.setManifest(resource);
+ }
+
+ @Override
+ public JavaArchive setManifest(Package resourcePackage, String resourceName) throws IllegalArgumentException {
+ return delegate.setManifest(resourcePackage, resourceName);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(String resourceName) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resourceName);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(File resource) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resource);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(String resourceName, String target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resourceName, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(File resource, String target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(URL resource, String target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(Asset resource, String target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(String resourceName, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resourceName, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(File resource, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(URL resource, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(Asset resource, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResources(Package resourcePackage, String... resourceNames) throws IllegalArgumentException {
+ return delegate.addAsManifestResources(resourcePackage, resourceNames);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(Package resourcePackage, String resourceName) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resourcePackage, resourceName);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(Package resourcePackage, String resourceName, String target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resourcePackage, resourceName, target);
+ }
+
+ @Override
+ public JavaArchive addAsManifestResource(Package resourcePackage, String resourceName, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsManifestResource(resourcePackage, resourceName, target);
+ }
+
+ @Override
+ public JavaArchive addAsServiceProvider(Class<?> serviceInterface, Class<?>... serviceImpls) throws IllegalArgumentException {
+ return delegate.addAsServiceProvider(serviceInterface, serviceImpls);
+ }
+
+ @Override
+ public JavaArchive addManifest() throws IllegalArgumentException {
+ return delegate.addManifest();
+ }
+
+ @Override
+ public JavaArchive addClass(Class<?> clazz) throws IllegalArgumentException {
+ return delegate.addClass(clazz);
+ }
+
+ @Override
+ public JavaArchive addClass(String fullyQualifiedClassName) throws IllegalArgumentException {
+ return delegate.addClass(fullyQualifiedClassName);
+ }
+
+ @Override
+ public JavaArchive addClass(String fullyQualifiedClassName, ClassLoader cl) throws IllegalArgumentException {
+ return delegate.addClass(fullyQualifiedClassName, cl);
+ }
+
+ @Override
+ public JavaArchive addClasses(Class<?>... classes) throws IllegalArgumentException {
+ return delegate.addClasses(classes);
+ }
+
+ @Override
+ public JavaArchive addPackage(Package pack) throws IllegalArgumentException {
+ return delegate.addPackage(pack);
+ }
+
+ @Override
+ public JavaArchive addDefaultPackage() {
+ return delegate.addDefaultPackage();
+ }
+
+ @Override
+ public JavaArchive addPackages(boolean recursive, Package... packages) throws IllegalArgumentException {
+ return delegate.addPackages(recursive, packages);
+ }
+
+ @Override
+ public JavaArchive addPackages(boolean recursive, Filter<ArchivePath> filter, Package... packages) throws IllegalArgumentException {
+ return delegate.addPackages(recursive, filter, packages);
+ }
+
+ @Override
+ public JavaArchive addPackage(String pack) throws IllegalArgumentException {
+ return delegate.addPackage(pack);
+ }
+
+ @Override
+ public JavaArchive addPackages(boolean recursive, String... packages) throws IllegalArgumentException {
+ return delegate.addPackages(recursive, packages);
+ }
+
+ @Override
+ public JavaArchive addPackages(boolean recursive, Filter<ArchivePath> filter, String... packages) throws IllegalArgumentException {
+ return delegate.addPackages(recursive, filter, packages);
+ }
+
+ @Override
+ public JavaArchive addAsResource(String resourceName) throws IllegalArgumentException {
+ return delegate.addAsResource(resourceName);
+ }
+
+ @Override
+ public JavaArchive addAsResource(File resource) throws IllegalArgumentException {
+ return delegate.addAsResource(resource);
+ }
+
+ @Override
+ public JavaArchive addAsResource(String resourceName, String target) throws IllegalArgumentException {
+ return delegate.addAsResource(resourceName, target);
+ }
+
+ @Override
+ public JavaArchive addAsResource(File resource, String target) throws IllegalArgumentException {
+ return delegate.addAsResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsResource(URL resource, String target) throws IllegalArgumentException {
+ return delegate.addAsResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsResource(Asset resource, String target) throws IllegalArgumentException {
+ return delegate.addAsResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsResource(String resourceName, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsResource(resourceName, target);
+ }
+
+ @Override
+ public JavaArchive addAsResource(String resourceName, ArchivePath target, ClassLoader classLoader) throws IllegalArgumentException {
+ return delegate.addAsResource(resourceName, target, classLoader);
+ }
+
+ @Override
+ public JavaArchive addAsResource(File resource, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsResource(URL resource, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsResource(Asset resource, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsResource(resource, target);
+ }
+
+ @Override
+ public JavaArchive addAsResources(Package resourcePackage, String... resourceNames) throws IllegalArgumentException {
+ return delegate.addAsResources(resourcePackage, resourceNames);
+ }
+
+ @Override
+ public JavaArchive addAsResource(Package resourcePackage, String resourceName) throws IllegalArgumentException {
+ return delegate.addAsResource(resourcePackage, resourceName);
+ }
+
+ @Override
+ public JavaArchive addAsResource(Package resourcePackage, String resourceName, String target) throws IllegalArgumentException {
+ return delegate.addAsResource(resourcePackage, resourceName, target);
+ }
+
+ @Override
+ public JavaArchive addAsResource(Package resourcePackage, String resourceName, ArchivePath target) throws IllegalArgumentException {
+ return delegate.addAsResource(resourcePackage, resourceName, target);
+ }
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionBean.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionBean.java
new file mode 100644
index 0000000..f037aa7
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionBean.java
@@ -0,0 +1,71 @@
+package test.ejb.v2;
+
+import java.rmi.RemoteException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.ejb.SessionSynchronization;
+
+/**
+ * Stateful session bean - impl.
+ */
+public class StatefulSessionBean implements SessionBean, SessionSynchronization {
+
+ private static final long serialVersionUID = 1L;
+
+ private SessionContext context;
+
+ private AtomicInteger newValue; // value inside Tx, not yet committed
+ private int value; // actual state of the bean
+
+ public int increment() {
+ return newValue.incrementAndGet();
+ }
+
+ public int decrement() {
+ return newValue.decrementAndGet();
+ }
+
+ public void ejbCreate() {
+ this.value = 0;
+ this.newValue = new AtomicInteger(this.value);
+ }
+
+ public void ejbActivate() {
+ return;
+ }
+
+ public void ejbPassivate() {
+ return;
+ }
+
+ public void ejbRemove() {
+ return;
+ }
+
+ public void setSessionContext(SessionContext context) {
+ this.context = context;
+ }
+
+ @Override
+ public void afterBegin() throws EJBException, RemoteException {
+ return;
+ }
+
+ @Override
+ public void beforeCompletion() throws EJBException, RemoteException {
+ return;
+ }
+
+ @Override
+ public void afterCompletion(boolean committed) throws EJBException, RemoteException {
+ if (committed) {
+ this.value = this.newValue.get();
+ } else {
+ this.newValue.set(this.value);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBHome.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBHome.java
new file mode 100644
index 0000000..dbbcf1e
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBHome.java
@@ -0,0 +1,15 @@
+package test.ejb.v2;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * Stateful session bean - home interface.
+ */
+public interface StatefulSessionEJBHome extends EJBHome {
+
+ StatefulSessionEJBObject create() throws RemoteException, CreateException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBObject.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBObject.java
new file mode 100644
index 0000000..69b8c05
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatefulSessionEJBObject.java
@@ -0,0 +1,16 @@
+package test.ejb.v2;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Stateful session bean - remote interface.
+ */
+public interface StatefulSessionEJBObject extends EJBObject {
+
+ int increment() throws RemoteException;
+
+ int decrement() throws RemoteException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionBean.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionBean.java
new file mode 100644
index 0000000..6540236
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionBean.java
@@ -0,0 +1,35 @@
+package test.ejb.v2;
+
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * Stateless session bean - impl.
+ */
+public class StatelessSessionBean implements SessionBean {
+
+ private static final long serialVersionUID = 1L;
+
+ private SessionContext context;
+
+ public String echo(String string) {
+ return string;
+ }
+
+ public void ejbCreate() {
+ }
+
+ public void ejbActivate() {
+ }
+
+ public void ejbPassivate() {
+ }
+
+ public void ejbRemove() {
+ }
+
+ public void setSessionContext(SessionContext context) {
+ this.context = context;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBHome.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBHome.java
new file mode 100644
index 0000000..dedc7b7
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBHome.java
@@ -0,0 +1,14 @@
+package test.ejb.v2;
+
+import java.rmi.RemoteException;
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * Stateless session bean - home interface.
+ */
+public interface StatelessSessionEJBHome extends EJBHome {
+
+ StatelessSessionEJBObject create() throws RemoteException, CreateException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBObject.java b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBObject.java
new file mode 100644
index 0000000..d267268
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/java/test/ejb/v2/StatelessSessionEJBObject.java
@@ -0,0 +1,13 @@
+package test.ejb.v2;
+
+import java.rmi.RemoteException;
+import javax.ejb.EJBObject;
+
+/**
+ * Stateless session bean - remote interface.
+ */
+public interface StatelessSessionEJBObject extends EJBObject {
+
+ String echo(String string) throws RemoteException;
+
+}
diff --git a/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl b/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl
new file mode 100644
index 0000000..5516b9c
--- /dev/null
+++ b/modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ejb-jar id="ejb-jar_ID" version="2.1"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
+
+ <enterprise-beans>
+
+ <!-- Stateless Session Beans -->
+
+<#list 1..statelessSessionBeanCount as index>
+ <session>
+ <ejb-name>${name}StatelessSessionBean${index?c}</ejb-name>
+ <home>${package}.StatelessSessionEJBHome</home>
+ <remote>${package}.StatelessSessionEJBObject</remote>
+ <ejb-class>${package}.StatelessSessionBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+</#list>
+
+ <!-- Stateful Session Beans -->
+
+<#list 1..statefulSessionBeanCount as index>
+ <session>
+ <ejb-name>${name}StatefulSessionBean${index?c}</ejb-name>
+ <home>${package}.StatefulSessionEJBHome</home>
+ <remote>${package}.StatefulSessionEJBObject</remote>
+ <ejb-class>${package}.StatefulSessionBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+</#list>
+
+ </enterprise-beans>
+</ejb-jar>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index c98f407..1e75dca 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -34,6 +34,7 @@
<module>pluginAnnotations</module>
-->
<module>bundleGen</module>
+ <module>jeeGen</module>
<module>perftest-support</module>
<!-- Not built by default because people will need this only rarely when developing tests. -->
commit 34ed3853dda2301ed68049a383dc233497ec886e
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 8 12:06:12 2012 +0100
BZ 788334 - prevent NPE for the first availability report for a new resource.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
index 80c1ff0..5466770 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
@@ -332,7 +332,7 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
// remember we went backwards in time, but we want the returned data to be ascending, so reverse the order
Collections.reverse(availabilityPoints);
- /*
+ /*
* RHQ-1631, make the latest availability dot match the current availability IF desired by the user
* note: this must occur AFTER reversing the collection so the last dot refers to the most recent time slice
*/
@@ -520,11 +520,15 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
// update the last known availability data for this resource
ResourceAvailability currentAvailability = resourceAvailabilityManager.getLatestAvailability(reported
.getResource().getId());
- if (currentAvailability.getAvailabilityType() != reported.getAvailabilityType()) {
+ if (currentAvailability!=null && currentAvailability.getAvailabilityType() != reported.getAvailabilityType()) {
// but only update the record if necessary (if the AvailabilityType changed)
currentAvailability.setAvailabilityType(reported.getAvailabilityType());
entityManager.merge(currentAvailability);
}
+ else if (currentAvailability==null) {
+ currentAvailability = new ResourceAvailability(reported.getResource(),reported.getAvailabilityType());
+ entityManager.persist(currentAvailability);
+ }
}
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
@@ -532,7 +536,7 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
// should we catch exceptions here, or allow them to bubble up and be caught?
/*
- * since we already know we have to update the agent row with the last avail report time, might as well
+ * since we already know we have to update the agent row with the last avail report time, might as well
* set the backfilled to false here (as opposed to called agentManager.setBackfilled(agentId, false)
*/
String updateStatement = "" //
commit 8f06f86c129bf5b15f0231dad25e39b81cd8acc3
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 8 11:17:25 2012 +0100
BZ 788487 - Allow to manually add standalone AS7 servers.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
index 3f049dc..46a65a5 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -41,15 +41,20 @@ import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ManualAddFacet;
import org.rhq.core.pluginapi.inventory.ProcessScanResult;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
+import org.rhq.modules.plugins.jbossas7.json.Result;
/**
* Discovery class
*/
-public class BaseProcessDiscovery extends AbstractBaseDiscovery implements ResourceDiscoveryComponent
+public class BaseProcessDiscovery extends AbstractBaseDiscovery implements ResourceDiscoveryComponent, ManualAddFacet
{
static final String DORG_JBOSS_BOOT_LOG_FILE = "-Dorg.jboss.boot.log.file=";
@@ -209,6 +214,71 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
+ /**
+ * Allow to manually add a (remote) AS7
+ * @param pluginConfiguration the plugin configuration that describes how to discover the Resource being manually
+ * added
+ * @param context
+ * @return
+ * @throws InvalidPluginConfigurationException
+ */
+ @Override
+ public DiscoveredResourceDetails discoverResource(Configuration pluginConfiguration,
+ ResourceDiscoveryContext context) throws InvalidPluginConfigurationException {
+
+ String hostname = pluginConfiguration.getSimpleValue("hostname",null);
+ String portS = pluginConfiguration.getSimpleValue("port",null);
+ String user = pluginConfiguration.getSimpleValue("user",null);
+ String pass = pluginConfiguration.getSimpleValue("password",null);
+
+ if (hostname==null || portS==null) {
+ throw new InvalidPluginConfigurationException("Host and port must not be null");
+ }
+ int port = Integer.valueOf(portS);
+
+ ASConnection connection = new ASConnection(hostname,port, user,pass);
+ String productVersion = getServerAttribute(connection, "product-version");
+ String productName = getServerAttribute(connection,"product-name");
+ String releaseVersion = getServerAttribute(connection,"release-version");
+ if (productVersion == null)
+ productVersion = releaseVersion;
+ if (productName==null)
+ productName = "AS7";
+
+ String resourceKey = hostname + ":" + portS + ":" + productName;
+ String description;
+ if (productName.contains("EAP")) {
+ description = "Standalone JBoss Enterprise Application Platform server";
+ } else if (productName.contains("EDG")) {
+ description = "Standalone JBoss Enterprise DataGrid server";
+ }
+ else
+ description = context.getResourceType().getDescription();
+
+ pluginConfiguration.put(new PropertySimple("manuallyAdded",true));
+
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
+ context.getResourceType(),
+ resourceKey,
+ productName + " @ " + hostname + ":" + port,
+ productVersion,
+ description,
+ pluginConfiguration,
+ null
+ );
+
+ return detail;
+ }
+
+ private String getServerAttribute(ASConnection connection, String attributeName) {
+ Operation op = new ReadAttribute(null,attributeName);
+ Result res = connection.execute(op);
+ if (!res.isSuccess()) {
+ throw new InvalidPluginConfigurationException("Could not connect to remote server [" + res.getFailureDescription() + "]. Did you enable management?");
+ }
+ return (String) res.getResult();
+ }
+
private void fillUserPassFromFile(Configuration config, AS7Mode mode, String baseDir) {
// String configDir = baseDir + File.separator + mode + File.separator + "configuration";
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 8078e15..ed562cd 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory;
import org.jboss.sasl.util.UsernamePasswordHashUtil;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
import org.rhq.core.system.ProcessExecution;
@@ -191,6 +192,13 @@ public class BaseServerComponent extends BaseComponent {
String password = parameters.getSimpleValue("password","");
OperationResult result = new OperationResult();
+
+ PropertySimple remoteProp = pluginConfig.getSimple("manuallyAdded");
+ if (remoteProp!=null && remoteProp.getBooleanValue()!= null && remoteProp.getBooleanValue()) {
+ result.setErrorMessage("This is a manually added server. This operation can not be used to install a management used. Use the server's 'bin/add-user.sh'");
+ return result;
+ }
+
if (user.isEmpty() || password.isEmpty()) {
result.setErrorMessage("User and Password must not be empty");
return result;
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 495c050..d1a0131 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -412,6 +412,7 @@
discovery="BaseProcessDiscovery"
class="StandaloneASComponent"
description="Standalone AS7 server"
+ supportsManualAdd="true"
>
<plugin-configuration>
commit dbfdbbdcf66fab439a653e301b9784557860e641
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Feb 6 13:00:12 2012 +0100
If the media type can not be determined, we use plain text as fallback.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
index fe23ad2..5d5671f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
@@ -25,6 +25,9 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.rhq.enterprise.server.authz.PermissionException;
import org.rhq.enterprise.server.resource.ResourceNotFoundException;
import org.rhq.enterprise.server.rest.domain.RHQErrorWrapper;
@@ -39,6 +42,8 @@ public class CustomExceptionMapper implements ExceptionMapper<Exception> {
@Context
HttpHeaders httpHeaders;
+ Log log = LogFactory.getLog(getClass().getName());
+
@Override
public Response toResponse(Exception e) {
@@ -77,13 +82,21 @@ public class CustomExceptionMapper implements ExceptionMapper<Exception> {
}
/**
- * Wrap the passed message according to the mediaType from the HttpHeader
- * @param builder
- * @param message
+ * Wrap the passed message according to the mediaType from the HttpHeader. If the
+ * type can not be determined, we use plain text
+ * @param builder ResponseBuilder to add the message to
+ * @param message The message to wrap
*/
private void wrapMessage(Response.ResponseBuilder builder, String message) {
- MediaType mediaType = httpHeaders.getAcceptableMediaTypes().get(0);
+ MediaType mediaType;
+ try {
+ mediaType = httpHeaders.getAcceptableMediaTypes().get(0);
+ } catch (Exception e) {
+ log.debug(e.getMessage());
+ mediaType = MediaType.TEXT_PLAIN_TYPE;
+ }
+
if (mediaType.equals(MediaType.TEXT_PLAIN_TYPE)) {
builder.entity(message);
commit 18fffcb886bd9306d5798cafc366525a83306f12
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Feb 6 12:27:01 2012 +0100
Allow to report availabilities
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
index 64cdea3..876f0fc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
@@ -31,8 +31,6 @@ import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.EntityTag;
import javax.ws.rs.core.GenericEntity;
@@ -45,7 +43,9 @@ import javax.ws.rs.core.UriInfo;
import org.rhq.core.domain.alert.Alert;
import org.rhq.core.domain.criteria.AlertCriteria;
+import org.rhq.core.domain.discovery.AvailabilityReport;
import org.rhq.core.domain.measurement.Availability;
+import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
@@ -142,13 +142,7 @@ public class ResourceHandlerBean extends AbstractRestBean implements ResourceHan
@Override
public ResourceWithChildren getHierarchy(int baseResourceId) {
// TODO optimize to do less recursion
- Resource start;
- start = getFromCache(baseResourceId,Resource.class);
- if (start==null) {
- start = resMgr.getResource(caller,baseResourceId);
- if (start!=null)
- putToCache(start.getId(),Resource.class,start);
- }
+ Resource start = obtainResource(baseResourceId);
ResourceWithChildren rwc = getHierarchy(start);
/*new ResourceWithChildren(""+start.getId(),start.getName());
@@ -187,11 +181,33 @@ public class ResourceHandlerBean extends AbstractRestBean implements ResourceHan
public AvailabilityRest getAvailability(int resourceId) {
Availability avail = availMgr.getCurrentAvailabilityForResource(caller, resourceId);
- AvailabilityRest availabilityRest = new AvailabilityRest(avail.getAvailabilityType(),avail.getStartTime().getTime(),
+ AvailabilityRest availabilityRest;
+ if (avail.getAvailabilityType()!=null)
+ availabilityRest = new AvailabilityRest(avail.getAvailabilityType(),avail.getStartTime().getTime(),
avail.getResource().getId());
+ else
+ availabilityRest = new AvailabilityRest(avail.getStartTime().getTime(),resourceId);
return availabilityRest;
}
+ @Override
+ public void reportAvailability(int resourceId, AvailabilityRest avail) {
+ if (avail.getResourceId()!=resourceId)
+ throw new IllegalArgumentException("Resource Ids do not match");
+
+ Resource resource = obtainResource(resourceId);
+
+ AvailabilityType at;
+ at = AvailabilityType.valueOf(avail.getType());
+
+ AvailabilityReport report = new AvailabilityReport(true,resource.getAgent().getName());
+ Availability availability = new Availability(resource, new Date(avail.getSince()),at);
+ report.addAvailability(availability);
+
+ availMgr.mergeAvailabilityReport(report);
+ }
+
+
public Response getSchedules(int resourceId,
String scheduleType,
boolean enabledOnly,
@@ -287,6 +303,16 @@ public class ResourceHandlerBean extends AbstractRestBean implements ResourceHan
}
+ private Resource obtainResource(int resourceId) {
+ Resource resource = getFromCache(resourceId,Resource.class);
+ if (resource==null) {
+ resource = resMgr.getResource(caller,resourceId);
+ if (resource!=null)
+ putToCache(resourceId,Resource.class,resource);
+ }
+ return resource;
+ }
+
@Override
public List<Link> getAlertsForResource(int resourceId) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java
index 77f268f..4abe639 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java
@@ -23,6 +23,7 @@ import java.util.List;
import javax.ejb.Local;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -81,6 +82,10 @@ public interface ResourceHandlerLocal {
@Path("/{id}/availability")
AvailabilityRest getAvailability(@PathParam("id") int resourceId);
+ @PUT
+ @Path("/{id}/availability")
+ public void reportAvailability(@PathParam("id") int resourceId, AvailabilityRest avail);
+
@GET
@Path("/{id}/schedules")
@LinkResource(rel="schedules",value = MetricSchedule.class)
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AvailabilityRest.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AvailabilityRest.java
index 9f64f4b..2534198 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AvailabilityRest.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AvailabilityRest.java
@@ -38,8 +38,6 @@ public class AvailabilityRest {
int resourceId;
- private RESTServiceDiscovery rest;
-
public AvailabilityRest() {
// for RESTEasy/JAXB
}
@@ -50,6 +48,12 @@ public class AvailabilityRest {
this.resourceId = resourceId;
}
+ public AvailabilityRest(long since, int resourceId) {
+ this.since = since;
+ this.type = "- unknown -";
+ this.resourceId = resourceId;
+ }
+
@XmlElement
public long getSince() {
return since;
@@ -65,12 +69,15 @@ public class AvailabilityRest {
return resourceId;
}
- @XmlElementRef
- public RESTServiceDiscovery getRest() {
- return rest;
+ public void setSince(long since) {
+ this.since = since;
+ }
+
+ public void setType(String type) {
+ this.type = type;
}
- public void setRest(RESTServiceDiscovery rest) {
- this.rest = rest;
+ public void setResourceId(int resourceId) {
+ this.resourceId = resourceId;
}
}
commit 97eaa22f659febed301167a8a2b5163f2d813919
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 1 22:11:53 2012 +0100
Example of graphing metrics in HTML+CSS
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 80472f6..faaad33 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -23,7 +23,8 @@ They expect some resources and schedules being present from an initial import wi
an empty database (meaning resource ids and schedule ids starting at 10001).
<ul>
<li><a href="bars_simple.html">Display avg metrics as bars</a></li>
- <li><a href="stacked1.html">Metrics as stacked bars</a></li>
+ <li><a href="stacked1.html">Metrics as stacked bars</a> in SVG</li>
+ <li><a href="stacked3.html">Metrics as stacked bars</a> in pure HTML + (a little) CSS</li>
<li><a href="stacked2.html">Metrics as rects using stacked bars from above</a></li>
<li><a href="whisker.html">Whisker chart 1</a></li>
<li><a href="whisker2.html">Multiple Whisker charts</a></li>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/stacked3.html b/modules/enterprise/gui/rest-war/src/main/webapp/stacked3.html
new file mode 100644
index 0000000..108d859
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/stacked3.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Stacked metrics (free mem, schedule 10003)</title>
+ <script type="text/javascript" src="js/d3.js"></script>
+ <script type="text/javascript" src="js/d3.layout.js"></script>
+ <script type="text/javascript" src="js/d3.time.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <style type="text/css">
+
+
+div.bar {
+ display: inline-block;
+ width: 20px;
+ height: 2px; /* for NaN entries */
+}
+
+ </style>
+ </head>
+ <body>
+
+
+<h1 id="resId">Resource</h1>
+Those bars show the average value during the respective time slot. Scale is from
+min-value to max value. Mouseover the bar to see the actual value.
+<br/>
+<h2 id="header">Schedule</h2>
+<table>
+ <tr>
+ <td>Minimum:</td><td id="minval"></td>
+ </tr>
+ <tr>
+ <td>Maximum:</td><td id="maxval"></td>
+ </tr>
+</table>
+Value: <span id="currval"></span>
+<br/>
+<div id="graph"></div>
+ <script type="text/javascript">
+
+ // Get the platforms and then the first one
+ $.getJSON('/rest/1/resource/platforms.json', function (json) {
+ var res = json[0];
+ var rid = res.resourceId;
+ $("#resId").text("Resource " + rid + " (" + res.resourceName + ")");
+
+ // Now get the metrical schedules of the platform
+ $.getJSON("/rest/1/resource/" + rid + "/schedules.json?type=metric", function (json2) {
+
+ // Take the first
+ var schId = json2[0].scheduleId;
+ $("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + ")");
+
+ // And call d3 graphing on it
+ d3.json('/rest/1/metric/data/' + schId + '.json',
+ function (jsondata) {
+
+ var theDiv = d3.select("div#graph");
+
+ var points = jsondata.dataPoints;
+ var min = jsondata.min;
+ var max = jsondata.max;
+
+ d3.select("td#minval").text(min);
+ d3.select("td#maxval").text(max);
+
+ y = d3.scale.linear().range([0, 400]).domain([min,max]);
+
+ // Add a group for each cause.
+ var bar = theDiv.selectAll("div")
+ .data(points)
+ .enter().append("div")
+ .attr("class", "bar")
+ .style("background-color","lightblue")
+ .style("width","10px")
+ .style("margin-right", "2px")
+ .style("height",
+ function (d) {
+ return (y(d.value) + "px");
+ })
+ .on('mouseover',function(d){
+ d3.select("#currval").append('text')
+ .text(d.value)
+ .attr('class','tip');
+ })
+ .on('mouseout',function(d) {
+ d3.selectAll(".tip").remove();
+ })
+ ;
+ });
+ });
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
commit b4761de3c02ae31c891e783d656ccb1be4bb7b41
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 7 16:39:14 2012 -0600
[BZ 761593] Unit test updates after changes to the SHA256 computation algorithm for exploded deployments.
diff --git a/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java
index f7a395b..79ad510 100644
--- a/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java
+++ b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java
@@ -49,22 +49,22 @@ import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.ZipUtil;
public class TomcatWarComponentTest {
-
+
@Test
public void testDiscoverZippedDeployment() throws Exception {
//create the object under test as a partial mock because only one
//public method will be tested, while the rest will be mocked.
TomcatWarComponent objectUnderTest = mock(TomcatWarComponent.class);
-
+
//tell the method story as it happens: mock dependencies and configure
//those dependencies to get the method under test to completion.
File fileUsedInTest = new File(this.getClass().getResource("/sampleWithManifest.war").getFile());
-
+
@SuppressWarnings("unchecked")
ResourceContext<TomcatVHostComponent> mockResourceContext = mock(ResourceContext.class);
when(objectUnderTest.getResourceContext()).thenReturn(mockResourceContext);
Configuration mockConfiguration = mock(Configuration.class);
- when(mockResourceContext.getPluginConfiguration()).thenReturn(mockConfiguration);
+ when(mockResourceContext.getPluginConfiguration()).thenReturn(mockConfiguration);
when(mockConfiguration.getSimpleValue(eq("filename"), isNull(String.class))).thenReturn(
fileUsedInTest.getAbsolutePath());
@@ -85,10 +85,10 @@ public class TomcatWarComponentTest {
if (actualResourcePackageDetails.getInstallationTimestamp() > System.currentTimeMillis()) {
Assert.fail("Timestamp is not in the past.");
}
-
+
MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
String expectedSha256 = digest.calcDigestString(fileUsedInTest);
-
+
Assert.assertEquals(actualResourcePackageDetails.getSHA256(), expectedSha256);
Assert.assertEquals(actualResourcePackageDetails.getDisplayVersion(), null);
@@ -105,14 +105,14 @@ public class TomcatWarComponentTest {
String[] testArchiveFiles = new String[] { "/sampleWithManifest.war", "/sampleWithoutManifest.war",
"/sampleWithImplementation.war", "/sampleWithSpecification.war",
"/sampleWithSpecificationImplementation.war" };
-
+
Map<String, String> expectedSha256 = new HashMap<String, String>();
- expectedSha256.put(testArchiveFiles[0], "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
- expectedSha256.put(testArchiveFiles[1], "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
- expectedSha256.put(testArchiveFiles[2], "c72750a8952fcd50ee3e9dce8766a75aecdc57f4b654eca5787d3fa12dc78a55");
- expectedSha256.put(testArchiveFiles[3], "968382bcd2f7550c2785a622c24671feaed4cca033bd9fe17665d9d66d8d3646");
- expectedSha256.put(testArchiveFiles[4], "a96d9a054ead08575c11a79ec51ac0174da5ab02d213c008d248b6a59da6dc53");
-
+ expectedSha256.put(testArchiveFiles[0], "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
+ expectedSha256.put(testArchiveFiles[1], "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
+ expectedSha256.put(testArchiveFiles[2], "eebb2c1c171af85fff62ae290206bb792c3d4c5becf58fa677b156f808cf3fe5");
+ expectedSha256.put(testArchiveFiles[3], "3b2bf1cc3981413454ab4c62b9cad58e81609c3271d39aacbbfd8814585f9d65");
+ expectedSha256.put(testArchiveFiles[4], "98c945496e198f75f2653ccf2b9fd9d12c20cd26e2ad13146dcb53f8b8a567fc");
+
Map<String, String> expectedDisplayVersion = new HashMap<String, String>();
expectedDisplayVersion.put(testArchiveFiles[0], null);
expectedDisplayVersion.put(testArchiveFiles[1], null);
@@ -183,7 +183,7 @@ public class TomcatWarComponentTest {
deleteRecursive(deploymentFolderUsedInTest);
}
}
-
+
@Test
public void testDiscoverNoFileOnDisk() throws Exception {
//create the object under test as a partial mock because only one
commit 74baba517d2755b524e112df9fafd5b7d7ac2ddd
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 7 15:51:51 2012 -0600
[BZ 767393] SHA256 computation is now identical irrespective of default operating system implementation for list files & sorting.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java
index 915374a..46c6522 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java
@@ -29,6 +29,8 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.Set;
import java.util.Stack;
import java.util.jar.Attributes;
@@ -264,7 +266,20 @@ public class FileContentDelegate {
Stack<File> unvisitedFolders = new Stack<File>();
unvisitedFolders.add(deploymentDirectory);
while (!unvisitedFolders.empty()) {
- for (File file : unvisitedFolders.pop().listFiles()) {
+ File[] files = unvisitedFolders.pop().listFiles();
+ Arrays.sort(files, new Comparator<File>() {
+ public int compare(File f1, File f2) {
+ try {
+ return f1.getCanonicalPath().compareTo(f2.getCanonicalPath());
+ } catch (IOException e) {
+ //do nothing if the sort fails at this point
+ }
+
+ return 0;
+ }
+ });
+
+ for (File file : files) {
if (file.isDirectory()) {
unvisitedFolders.add(file);
} else {
diff --git a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/FileContentDelegateTest.java b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/FileContentDelegateTest.java
index 0434ec0..69d5760 100644
--- a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/FileContentDelegateTest.java
+++ b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/FileContentDelegateTest.java
@@ -69,8 +69,8 @@ public class FileContentDelegateTest {
String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
manifestStream.close();
- Assert.assertEquals(actualSha256Attribute, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
- Assert.assertEquals(actualShaReturned, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ Assert.assertEquals(actualSha256Attribute, "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
+ Assert.assertEquals(actualShaReturned, "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
//cleanup resources created for this test
deleteRecursive(deploymentDirectory);
@@ -104,8 +104,8 @@ public class FileContentDelegateTest {
String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
manifestStream.close();
- Assert.assertEquals(actualSha256Attribute, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
- Assert.assertEquals(actualShaReturned, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ Assert.assertEquals(actualSha256Attribute, "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
+ Assert.assertEquals(actualShaReturned, "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
deleteRecursive(deploymentDirectory);
}
@@ -142,8 +142,8 @@ public class FileContentDelegateTest {
String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
manifestStream.close();
- Assert.assertEquals(actualSha256Attribute, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
- Assert.assertEquals(actualShaReturned, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ Assert.assertEquals(actualSha256Attribute, "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
+ Assert.assertEquals(actualShaReturned, "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
deleteRecursive(deploymentDirectory);
}
@@ -175,8 +175,8 @@ public class FileContentDelegateTest {
String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
manifestStream.close();
- Assert.assertEquals(actualSha256Attribute, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
- Assert.assertEquals(actualShaReturned, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ Assert.assertEquals(actualSha256Attribute, "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
+ Assert.assertEquals(actualShaReturned, "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
//cleanup resources created for this test
deleteRecursive(deploymentDirectory);
@@ -212,7 +212,6 @@ public class FileContentDelegateTest {
Assert.assertTrue(deploymentDirectory.isDirectory(), "Deployment directory is no longer a directory!!");
Assert.assertFalse(deploymentFile.isDirectory(), "Deployment was exploded when it should not have been.");
-
MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
String actualSHA256OfDeployment = digest.calcDigestString(deploymentFile);
commit 33fa19623d9129416051cbb3be6857e290572f9c
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 7 15:51:22 2012 -0600
[BZ 767247] SHA256 computation is now identical irrespective of default operating system implementation for list files & sorting.
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
index 499d5a5..f82b5ec 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
@@ -29,6 +29,8 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.Set;
import java.util.Stack;
import java.util.jar.Attributes;
@@ -249,7 +251,20 @@ public class FileContentDelegate {
Stack<File> unvisitedFolders = new Stack<File>();
unvisitedFolders.add(deploymentDirectory);
while (!unvisitedFolders.empty()) {
- for (File file : unvisitedFolders.pop().listFiles()) {
+ File[] files = unvisitedFolders.pop().listFiles();
+ Arrays.sort(files, new Comparator<File>() {
+ public int compare(File f1, File f2) {
+ try {
+ return f1.getCanonicalPath().compareTo(f2.getCanonicalPath());
+ } catch (IOException e) {
+ //do nothing if the sort fails at this point
+ }
+
+ return 0;
+ }
+ });
+
+ for (File file : files) {
if (file.isDirectory()) {
unvisitedFolders.add(file);
} else {
diff --git a/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java
index b3e7b93..6e9e355 100644
--- a/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java
+++ b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java
@@ -107,8 +107,8 @@ public class FileContentDelegateTest {
String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
manifestStream.close();
- Assert.assertEquals(actualSha256Attribute, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
- Assert.assertEquals(actualShaReturned, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ Assert.assertEquals(actualSha256Attribute, "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
+ Assert.assertEquals(actualShaReturned, "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
deleteRecursive(deploymentDirectory);
}
@@ -181,8 +181,8 @@ public class FileContentDelegateTest {
String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
manifestStream.close();
- Assert.assertEquals(actualSha256Attribute, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
- Assert.assertEquals(actualShaReturned, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ Assert.assertEquals(actualSha256Attribute, "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
+ Assert.assertEquals(actualShaReturned, "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
//cleanup resources created for this test
deleteRecursive(deploymentDirectory);
@@ -218,7 +218,6 @@ public class FileContentDelegateTest {
Assert.assertTrue(deploymentDirectory.isDirectory(), "Deployment directory is no longer a directory!!");
Assert.assertFalse(deploymentFile.isDirectory(), "Deployment was exploded when it should not have been.");
-
MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
String actualSHA256OfDeployment = digest.calcDigestString(deploymentFile);
commit 9c318d42bbc4f80305afb1fa0e351b38bdbd80ba
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 7 15:49:12 2012 -0600
[BZ 761593] SHA256 computation is now identical irrespective of default operating system implementation for list files & sorting.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
index 6f914db..a4a5560 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
@@ -29,6 +29,8 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.Set;
import java.util.Stack;
import java.util.jar.Attributes;
@@ -213,7 +215,20 @@ public class FileContentDelegate {
Stack<File> unvisitedFolders = new Stack<File>();
unvisitedFolders.add(deploymentDirectory);
while (!unvisitedFolders.empty()) {
- for (File file : unvisitedFolders.pop().listFiles()) {
+ File[] files = unvisitedFolders.pop().listFiles();
+ Arrays.sort(files, new Comparator<File>() {
+ public int compare(File f1, File f2) {
+ try {
+ return f1.getCanonicalPath().compareTo(f2.getCanonicalPath());
+ } catch (IOException e) {
+ //do nothing if the sort fails at this point
+ }
+
+ return 0;
+ }
+ });
+
+ for (File file : files) {
if (file.isDirectory()) {
unvisitedFolders.add(file);
} else {
diff --git a/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java
index 9a2dc49..0536c35 100644
--- a/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java
+++ b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java
@@ -98,8 +98,8 @@ public class FileContentDelegateTest {
String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
manifestStream.close();
- Assert.assertEquals(actualSha256Attribute, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
- Assert.assertEquals(actualShaReturned, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ Assert.assertEquals(actualSha256Attribute, "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
+ Assert.assertEquals(actualShaReturned, "a30a576b5ee15c709469517e9f529989f9ae85bddde131c014a799ca9d7c1c0f");
deleteRecursive(deploymentDirectory);
}
@@ -167,8 +167,8 @@ public class FileContentDelegateTest {
String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
manifestStream.close();
- Assert.assertEquals(actualSha256Attribute, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
- Assert.assertEquals(actualShaReturned, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ Assert.assertEquals(actualSha256Attribute, "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
+ Assert.assertEquals(actualShaReturned, "bff7f7d63ae8e4f1efebb54fa727effe1b1a8246492ad9c36779d79a9771fb2b");
//cleanup resources created for this test
deleteRecursive(deploymentDirectory);
commit 3e1a4c99f56e0a4e3aca393f96a1a4ae4defe881
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Feb 7 12:37:30 2012 -0500
some minor cleanup
diff --git a/modules/jopr/etc/jbas5-jnp-client/client.sh b/modules/jopr/etc/jbas5-jnp-client/client.sh
index d4f0b8d..6087710 100755
--- a/modules/jopr/etc/jbas5-jnp-client/client.sh
+++ b/modules/jopr/etc/jbas5-jnp-client/client.sh
@@ -9,39 +9,33 @@
MAIN_JAR_NAME=jbas5-jnp-client-1.0.jar
MAIN_CLASS=test.RmiClient
-if [ "x$JBOSS_HOME" = "x" ]; then
- echo "JBOSS_HOME environment variable is undefined."
+if [ -z "$JBOSS_HOME" ]; then
+ echo "JBOSS_HOME environment variable is undefined." >&2
exit 1
fi
if [ ! -d "$JBOSS_HOME" ]; then
- echo "Dir specified by JBOSS_HOME variable ($JBOSS_HOME) does not exist."
+ echo "Dir specified by JBOSS_HOME variable ($JBOSS_HOME) does not exist." >&2
exit 1
fi
-JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8788"
+JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8788"
# Find MAIN_JAR, or we can't continue
MAIN_JAR=target/$MAIN_JAR_NAME
-if [ ! -f "$MAIN_JAR" ]
-then
- echo Could not locate $MAIN_JAR%. Please check that you are in the
- echo bin directory when running this script.
+if [ ! -f "$MAIN_JAR" ]; then
+ echo "Could not locate $MAIN_JAR. Please check that you are in the bin directory when running this script." >&2
exit 1
fi
-if [ "`uname`" == "Darwin" ]
-then
+if [ "`uname`" == "Darwin" ]; then
JAVA_HOME=/usr
fi
-if [ "$JAVA_HOME" == "" ]
-then
+if [ "$JAVA_HOME" == "" ]; then
JAVA=java
-
- echo JAVA_HOME is not set. Unexpected results may occur.
- echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+ echo "JAVA_HOME is not set. Unexpected results may occur. Set JAVA_HOME to the directory of your local JDK to avoid this message."
fi
commit abe7b89ee8c154446555000f6c4da37086b7e213
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Feb 7 10:31:56 2012 -0600
[BZ 727959] The script path was not using the bin subdirectory of the server home directory. Updated the code to point to the correct file before attempting to compute the SHA256.
Also, added unit tests to verify the new behavior.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java
index 36682c4..2b1f1c1 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java
@@ -213,7 +213,11 @@ public class ScriptComponent implements ResourceComponent<ApplicationServerCompo
public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) {
Set<ResourcePackageDetails> results = new HashSet<ResourcePackageDetails>();
if (PACKAGE_TYPE.equals(type.getName())) {
- File scriptFile = new File(resourceContext.getResourceKey());
+ String jbossHomeDir = resourceContext.getParentResourceComponent().getResourceContext()
+ .getPluginConfiguration().getSimpleValue(ApplicationServerPluginConfigurationProperties.HOME_DIR, null);
+ File binDirectory = new File(jbossHomeDir, "bin");
+
+ File scriptFile = new File(binDirectory, resourceContext.getResourceKey());
PackageDetailsKey key = new PackageDetailsKey(scriptFile.getName(), PACKAGE_VERSION, PACKAGE_TYPE,
PACKAGE_ARCHITECTURE);
diff --git a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ScriptComponentTest.java b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ScriptComponentTest.java
new file mode 100644
index 0000000..86b4b4e
--- /dev/null
+++ b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ScriptComponentTest.java
@@ -0,0 +1,110 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.plugins.jbossas5.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.util.Set;
+
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.Assert;
+import org.testng.IObjectFactory;
+import org.testng.annotations.ObjectFactory;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.plugins.jbossas5.ApplicationServerComponent;
+import org.rhq.plugins.jbossas5.script.ScriptComponent;
+
+@PrepareForTest({ ScriptComponent.class })
+public class ScriptComponentTest {
+
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
+ @Test
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public void testDiscoverDeployedPackages() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ ResourceContext<ApplicationServerComponent<?>> mockResourceContext = mock(ResourceContext.class);
+
+ ApplicationServerComponent mockApplicationServerComponent = mock(ApplicationServerComponent.class);
+ when(mockResourceContext.getParentResourceComponent()).thenReturn(mockApplicationServerComponent);
+ when(mockApplicationServerComponent.getResourceContext()).thenReturn(mockResourceContext);
+ Configuration mockConfiguration = mock(Configuration.class);
+ when(mockResourceContext.getPluginConfiguration()).thenReturn(mockConfiguration);
+ when(mockConfiguration.getSimpleValue(eq("homeDir"), isNull(String.class))).thenReturn("testHomeDir");
+
+ File mockDirectory = mock(File.class);
+ PowerMockito.whenNew(File.class).withParameterTypes(String.class, String.class)
+ .withArguments(eq("testHomeDir"), eq("bin"))
+ .thenReturn(mockDirectory);
+
+ when(mockResourceContext.getResourceKey()).thenReturn("testResource");
+
+ File mockFile = mock(File.class);
+ PowerMockito.whenNew(File.class).withParameterTypes(File.class, String.class)
+ .withArguments(eq(mockDirectory), eq("testResource")).thenReturn(mockFile);
+
+ when(mockFile.getName()).thenReturn("testResource");
+
+ MessageDigestGenerator mockMessageDigestGenerator = mock(MessageDigestGenerator.class);
+ PowerMockito.whenNew(MessageDigestGenerator.class).withParameterTypes(String.class).withArguments(anyString())
+ .thenReturn(mockMessageDigestGenerator);
+ when(mockMessageDigestGenerator.calcDigestString(any(File.class))).thenReturn("abcd1234");
+
+ PackageType mockPackageType = mock(PackageType.class);
+ when(mockPackageType.getName()).thenReturn("script");
+
+ //create object to test and inject required dependencies
+ ScriptComponent objectUnderTest = new ScriptComponent();
+ objectUnderTest.start(mockResourceContext);
+
+ //run code under test
+ Set<ResourcePackageDetails> result = objectUnderTest.discoverDeployedPackages(mockPackageType);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(result.size(), 1);
+
+ ResourcePackageDetails resultPackageDetails = (ResourcePackageDetails) result.toArray()[0];
+
+ Assert.assertEquals(resultPackageDetails.getSHA256(), "abcd1234");
+
+ PowerMockito.verifyNew(File.class).withArguments(eq("testHomeDir"), eq("bin"));
+ PowerMockito.verifyNew(File.class).withArguments(eq(mockDirectory), eq("testResource"));
+ verify(mockMessageDigestGenerator).calcDigestString(any(File.class));
+ verify(mockResourceContext).getParentResourceComponent();
+ }
+}
\ No newline at end of file
commit 6e5faad9e814cb103504ffd81a61b0c495970d15
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Feb 6 20:54:08 2012 -0600
[BZ 772722] Updated comments in unit tests to better match the story of the test.
diff --git a/modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java b/modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java
index 9981f3a..65972ae 100644
--- a/modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java
+++ b/modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java
@@ -67,8 +67,8 @@ public class DiskSourceTest{
PackageSyncReport mockPackageSyncReport = mock(PackageSyncReport.class);
Collection<ContentProviderPackageDetails> mockCollection = mock(Collection.class);
- //tell the method story as it happens: mock dependencies and make them
- //behave in a way to get the method under test to completion.
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
Configuration mockConfiguration = mock(Configuration.class);
PropertySimple mockProperty = mock(PropertySimple.class);
when(mockConfiguration.get("packageSourceEnabled")).thenReturn(mockProperty);
@@ -99,7 +99,7 @@ public class DiskSourceTest{
//create object to test and inject required dependencies
DiskSource objectUnderTest = new DiskSource();
- //run the code to be tested
+ //run methods under test
objectUnderTest.initialize(mockConfiguration);
objectUnderTest.synchronizePackages(repoName, mockPackageSyncReport, mockCollection);
@@ -119,8 +119,8 @@ public class DiskSourceTest{
PackageSyncReport mockPackageSyncReport = mock(PackageSyncReport.class);
Collection<ContentProviderPackageDetails> mockCollection = mock(Collection.class);
- //tell the method story as it happens: mock dependencies and make them
- //behave in a way to get the method under test to completion.
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
Configuration mockConfiguration = mock(Configuration.class);
PropertySimple mockProperty = mock(PropertySimple.class);
when(mockConfiguration.get("packageSourceEnabled")).thenReturn(mockProperty);
@@ -167,7 +167,7 @@ public class DiskSourceTest{
//create object to test and inject required dependencies
DiskSource objectUnderTest = new DiskSource();
- //run the code to be tested
+ //run methods under test
objectUnderTest.initialize(mockConfiguration);
objectUnderTest.synchronizePackages(repoName, mockPackageSyncReport, mockCollection);
@@ -192,8 +192,8 @@ public class DiskSourceTest{
PackageSyncReport mockPackageSyncReport = mock(PackageSyncReport.class);
Collection<ContentProviderPackageDetails> mockCollection = mock(Collection.class);
- //tell the method story as it happens: mock dependencies and make them
- //behave in a way to get the method under test to completion.
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
Configuration mockConfiguration = mock(Configuration.class);
PropertySimple mockProperty = mock(PropertySimple.class);
when(mockConfiguration.get("packageSourceEnabled")).thenReturn(mockProperty);
@@ -242,7 +242,7 @@ public class DiskSourceTest{
//create object to test and inject required dependencies
DiskSource objectUnderTest = new DiskSource();
- //run the code to be tested
+ //run methods under test
objectUnderTest.initialize(mockConfiguration);
objectUnderTest.synchronizePackages(repoName, mockPackageSyncReport, mockCollection);
commit 8d7f70385d85a34cab6af0fc1cb3ba2e542d7bf6
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Feb 6 20:53:24 2012 -0600
[BZ 767247] Unit tests for content system changed functionality for JBoss AS4.
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index c0292da..d9113f9 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -15,6 +15,10 @@
<name>RHQ JBossAS 3.2.x/4.x Plugin</name>
<description>A plugin for managing JBoss Application Server 3.2.x/4.x</description>
+ <properties>
+ <powermock.version>1.4.11</powermock.version>
+ </properties>
+
<dependencies>
<!-- internal -->
<!-- TODO: Move this up to the parent pom. -->
@@ -73,6 +77,20 @@
<scope>test</scope> <!-- this is OK. plugins do not have access to clientapi, but this is only for tests so this is OK -->
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/ApplicationComponentTest.java b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/ApplicationComponentTest.java
new file mode 100644
index 0000000..f24704b
--- /dev/null
+++ b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/ApplicationComponentTest.java
@@ -0,0 +1,113 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.plugins.jbossas.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.util.Set;
+
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.Assert;
+import org.testng.IObjectFactory;
+import org.testng.annotations.ObjectFactory;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.util.file.JarContentFileInfo;
+import org.rhq.plugins.jbossas.ApplicationComponent;
+import org.rhq.plugins.jbossas.JBossASServerComponent;
+import org.rhq.plugins.jbossas.util.FileContentDelegate;
+
+@PrepareForTest({ ApplicationComponent.class })
+public class ApplicationComponentTest {
+
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
+ @Test
+ public void testDiscoverDeployedPackagesWithDisplayVersionAndSha256Generation() throws Exception {
+ //create the object under test as a partial mock because only one
+ //public method will be tested, while the rest will be mocked.
+ ApplicationComponent objectUnderTest = mock(ApplicationComponent.class);
+
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ PackageType mockPackageType = mock(PackageType.class);
+
+ @SuppressWarnings("unchecked")
+ ResourceContext<JBossASServerComponent<?>> mockResourceContext = mock(ResourceContext.class);
+ when(objectUnderTest.getResourceContext()).thenReturn(mockResourceContext);
+
+ Configuration mockConfiguration = mock(Configuration.class);
+ when(mockResourceContext.getPluginConfiguration()).thenReturn(mockConfiguration);
+
+ when(mockConfiguration.getSimpleValue(eq("filename"), isNull(String.class))).thenReturn("testFileName");
+
+ File mockFile = mock(File.class);
+ PowerMockito.whenNew(File.class).withParameterTypes(String.class).withArguments(any(String.class))
+ .thenReturn(mockFile);
+ when(mockFile.exists()).thenReturn(true);
+
+ when(mockFile.getName()).thenReturn("testFileName");
+
+ FileContentDelegate mockFileContentDelegate = mock(FileContentDelegate.class);
+ PowerMockito.whenNew(FileContentDelegate.class).withArguments(any(File.class), isNull(), isNull())
+ .thenReturn(mockFileContentDelegate);
+ when(mockFileContentDelegate.getSHA(any(File.class))).thenReturn("abcd1234");
+
+ JarContentFileInfo mockJarContentFileInfo = mock(JarContentFileInfo.class);
+ PowerMockito.whenNew(JarContentFileInfo.class).withParameterTypes(File.class).withArguments(any(File.class))
+ .thenReturn(mockJarContentFileInfo);
+ when(mockJarContentFileInfo.getVersion(isNull(String.class))).thenReturn("testDisplayVersion");
+
+ //create object to test and inject required dependencies
+ when(objectUnderTest.discoverDeployedPackages(any(PackageType.class))).thenCallRealMethod();
+
+ //run code under test
+ Set<ResourcePackageDetails> result = objectUnderTest.discoverDeployedPackages(mockPackageType);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(result.size(), 1);
+
+ ResourcePackageDetails resultPackageDetails = (ResourcePackageDetails) result.toArray()[0];
+
+ verifyNoMoreInteractions(mockPackageType);
+
+ Assert.assertEquals(resultPackageDetails.getVersion(), "[sha256=abcd1234]");
+ Assert.assertEquals(resultPackageDetails.getDisplayVersion(), "testDisplayVersion");
+ Assert.assertEquals(resultPackageDetails.getSHA256(), "abcd1234");
+
+ verify(mockFileContentDelegate).getSHA(any(File.class));
+ verify(mockJarContentFileInfo).getVersion(isNull(String.class));
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java
new file mode 100644
index 0000000..b3e7b93
--- /dev/null
+++ b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java
@@ -0,0 +1,270 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.plugins.jbossas.test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.jar.Manifest;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.content.PackageDetails;
+import org.rhq.core.domain.content.PackageDetailsKey;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.core.util.ZipUtil;
+import org.rhq.plugins.jbossas.util.FileContentDelegate;
+
+public class FileContentDelegateTest {
+
+ @Test
+ public void testDeployExplodedWithManifestInArchive() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithManifestWar = new File(this.getClass().getResource("/sampleWithManifest.war").getFile());
+ Assert.assertTrue(sampleWithManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, "", null);
+
+ PackageDetails mockPackageDetails = mock(PackageDetails.class);
+ PackageDetailsKey mockPackageDetailsKey = mock(PackageDetailsKey.class);
+ when(mockPackageDetails.getKey()).thenReturn(mockPackageDetailsKey);
+ when(mockPackageDetailsKey.getName()).thenReturn("deploymentFile");
+
+ //run code under test
+ objectUnderTest.createContent(mockPackageDetails, sampleWithManifestWar, true, false);
+ String actualShaReturned = objectUnderTest.getSHA(new File(deploymentDirectory, "/deploymentFile"));
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/deploymentFile/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithManifestWar);
+
+ Assert.assertEquals(actualSha256Attribute, expectedSHA256);
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testGetShaExplodedWithManifest() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithManifestWar = new File(this.getClass().getResource("/sampleWithManifest.war").getFile());
+ Assert.assertTrue(sampleWithManifestWar.exists());
+
+ ZipUtil.unzipFile(sampleWithManifestWar, deploymentDirectory);
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, null, null);
+
+ //run code under test
+ String actualShaReturned = objectUnderTest.getSHA(deploymentDirectory);
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ Assert.assertEquals(actualShaReturned, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testDeployExplodedWithoutManifestInArchive() throws Exception {
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, "", null);
+
+ PackageDetails mockPackageDetails = mock(PackageDetails.class);
+ PackageDetailsKey mockPackageDetailsKey = mock(PackageDetailsKey.class);
+ when(mockPackageDetails.getKey()).thenReturn(mockPackageDetailsKey);
+ when(mockPackageDetailsKey.getName()).thenReturn("deploymentFile");
+
+ //run code under test
+ objectUnderTest.createContent(mockPackageDetails, sampleWithoutManifestWar, true, false);
+ String actualShaReturned = objectUnderTest.getSHA(new File(deploymentDirectory, "/deploymentFile"));
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/deploymentFile/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
+
+ Assert.assertEquals(actualSha256Attribute, expectedSHA256);
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testGetShaExplodedWithoutManifest() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ ZipUtil.unzipFile(sampleWithoutManifestWar, deploymentDirectory);
+
+ //run code under test
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, null, null);
+ String actualShaReturned = objectUnderTest.getSHA(deploymentDirectory);
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ Assert.assertEquals(actualShaReturned, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testDeployZipped() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+ deploymentDirectory.mkdirs();
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ File deploymentFile = new File(deploymentDirectory, sampleWithoutManifestWar.getName());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, "", null);
+
+ PackageDetails mockPackageDetails = mock(PackageDetails.class);
+ PackageDetailsKey mockPackageDetailsKey = mock(PackageDetailsKey.class);
+ when(mockPackageDetails.getKey()).thenReturn(mockPackageDetailsKey);
+ when(mockPackageDetailsKey.getName()).thenReturn(sampleWithoutManifestWar.getName());
+
+ //run code under test
+ objectUnderTest.createContent(mockPackageDetails, sampleWithoutManifestWar, false, false);
+ String actualShaReturned = objectUnderTest.getSHA(sampleWithoutManifestWar);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertTrue(deploymentDirectory.exists(), "Deployment did not happen.");
+ Assert.assertTrue(deploymentDirectory.isDirectory(), "Deployment directory is no longer a directory!!");
+ Assert.assertFalse(deploymentFile.isDirectory(), "Deployment was exploded when it should not have been.");
+
+
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
+ String actualSHA256OfDeployment = digest.calcDigestString(deploymentFile);
+
+ Assert.assertEquals(actualSHA256OfDeployment, expectedSHA256);
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentFile);
+ }
+
+ @Test
+ public void testGetShaZipped() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(sampleWithoutManifestWar, null, null);
+
+ //run code under test
+ String actualShaReturned = objectUnderTest.getSHA(sampleWithoutManifestWar);
+
+ //verify the results (Assert and mock verification)
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
+
+ //cleanup resources created for this test
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+ }
+
+ private void deleteRecursive(File fileToDelete) throws Exception {
+ if (fileToDelete.exists()) {
+ if (fileToDelete.isDirectory()) {
+ for (File file : fileToDelete.listFiles()) {
+ if (file.isDirectory()) {
+ deleteRecursive(file);
+ } else {
+ file.delete();
+ }
+ }
+ }
+
+ fileToDelete.delete();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JarContentDelegateTest.java b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JarContentDelegateTest.java
new file mode 100644
index 0000000..152fdbe
--- /dev/null
+++ b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JarContentDelegateTest.java
@@ -0,0 +1,86 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.plugins.jbossas.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.Set;
+import java.util.jar.JarFile;
+
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.Assert;
+import org.testng.IObjectFactory;
+import org.testng.annotations.ObjectFactory;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.plugins.jbossas.util.JarContentDelegate;
+
+@PrepareForTest({ JarContentDelegate.class })
+public class JarContentDelegateTest {
+
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
+ @Test
+ public void testDiscoverDeployedPackages() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File mockDirectory = mock(File.class);
+ when(mockDirectory.exists()).thenReturn(true);
+ when(mockDirectory.isDirectory()).thenReturn(true);
+
+ File mockFile = mock(File.class);
+ when(mockDirectory.listFiles(any(FileFilter.class))).thenReturn(new File[] { mockFile });
+ when(mockFile.getName()).thenReturn("testFile");
+
+ JarFile mockJarFile = mock(JarFile.class);
+ PowerMockito.whenNew(JarFile.class).withParameterTypes(File.class).withArguments(any(File.class))
+ .thenReturn(mockJarFile);
+
+ MessageDigestGenerator mockMessageDigestGenerator = mock(MessageDigestGenerator.class);
+ PowerMockito.whenNew(MessageDigestGenerator.class).withParameterTypes(String.class).withArguments(anyString())
+ .thenReturn(mockMessageDigestGenerator);
+ when(mockMessageDigestGenerator.calcDigestString(any(File.class))).thenReturn("abcd1234");
+
+ //create object to test and inject required dependencies
+ JarContentDelegate objectUnderTest = new JarContentDelegate(mockDirectory, "jar");
+
+ //run code under test
+ Set<ResourcePackageDetails> resultSet = objectUnderTest.discoverDeployedPackages();
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(resultSet.size(), 1);
+
+ ResourcePackageDetails resultPackageDetails = (ResourcePackageDetails) resultSet.toArray()[0];
+
+ Assert.assertEquals(resultPackageDetails.getVersion(), "[sha256=abcd1234]");
+ Assert.assertEquals(resultPackageDetails.getSHA256(), "abcd1234");
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as/src/test/resources/sampleWithImplementation.war b/modules/plugins/jboss-as/src/test/resources/sampleWithImplementation.war
new file mode 100644
index 0000000..9a5b7f4
Binary files /dev/null and b/modules/plugins/jboss-as/src/test/resources/sampleWithImplementation.war differ
diff --git a/modules/plugins/jboss-as/src/test/resources/sampleWithManifest.war b/modules/plugins/jboss-as/src/test/resources/sampleWithManifest.war
new file mode 100644
index 0000000..0a127e6
Binary files /dev/null and b/modules/plugins/jboss-as/src/test/resources/sampleWithManifest.war differ
diff --git a/modules/plugins/jboss-as/src/test/resources/sampleWithSpecification.war b/modules/plugins/jboss-as/src/test/resources/sampleWithSpecification.war
new file mode 100644
index 0000000..5f021e7
Binary files /dev/null and b/modules/plugins/jboss-as/src/test/resources/sampleWithSpecification.war differ
diff --git a/modules/plugins/jboss-as/src/test/resources/sampleWithSpecificationImplementation.war b/modules/plugins/jboss-as/src/test/resources/sampleWithSpecificationImplementation.war
new file mode 100644
index 0000000..43fa852
Binary files /dev/null and b/modules/plugins/jboss-as/src/test/resources/sampleWithSpecificationImplementation.war differ
diff --git a/modules/plugins/jboss-as/src/test/resources/sampleWithoutManifest.war b/modules/plugins/jboss-as/src/test/resources/sampleWithoutManifest.war
new file mode 100644
index 0000000..0f938f5
Binary files /dev/null and b/modules/plugins/jboss-as/src/test/resources/sampleWithoutManifest.war differ
commit 804d79900d034cec72e6d422364013b0ad805673
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Feb 6 20:50:35 2012 -0600
[BZ 767393] Add unit tests for content system changed functionality in JBoss AS5 plugin.
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 3de6752..6e5fb9b 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -21,6 +21,7 @@
<properties>
<jbossas.version>6.0.0.M1</jbossas.version>
+ <powermock.version>1.4.11</powermock.version>
</properties>
<dependencyManagement>
@@ -360,6 +361,21 @@
<scope>provided</scope>
</dependency>
-->
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/FileContentDelegateTest.java b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/FileContentDelegateTest.java
new file mode 100644
index 0000000..0434ec0
--- /dev/null
+++ b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/FileContentDelegateTest.java
@@ -0,0 +1,264 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.plugins.jbossas5.test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.jar.Manifest;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.content.PackageDetails;
+import org.rhq.core.domain.content.PackageDetailsKey;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.core.util.ZipUtil;
+import org.rhq.plugins.jbossas5.util.FileContentDelegate;
+
+public class FileContentDelegateTest {
+
+ @Test
+ public void testDeployExplodedWithManifestInArchive() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithManifestWar = new File(this.getClass().getResource("/sampleWithManifest.war").getFile());
+ Assert.assertTrue(sampleWithManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, "", null);
+
+ PackageDetails mockPackageDetails = mock(PackageDetails.class);
+ PackageDetailsKey mockPackageDetailsKey = mock(PackageDetailsKey.class);
+ when(mockPackageDetails.getKey()).thenReturn(mockPackageDetailsKey);
+ when(mockPackageDetailsKey.getName()).thenReturn("deploymentFile");
+
+ //run code under test
+ objectUnderTest.createContent(mockPackageDetails, new FileInputStream(sampleWithManifestWar), true, false);
+ String actualShaReturned = objectUnderTest.getSHA(new File(deploymentDirectory, "/deploymentFile"));
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/deploymentFile/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ Assert.assertEquals(actualShaReturned, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testGetShaExplodedWithManifest() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithManifestWar = new File(this.getClass().getResource("/sampleWithManifest.war").getFile());
+ Assert.assertTrue(sampleWithManifestWar.exists());
+
+ ZipUtil.unzipFile(sampleWithManifestWar, deploymentDirectory);
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, null, null);
+
+ //run code under test
+ String actualShaReturned = objectUnderTest.getSHA(deploymentDirectory);
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ Assert.assertEquals(actualShaReturned, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testDeployExplodedWithoutManifestInArchive() throws Exception {
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, "", null);
+
+ PackageDetails mockPackageDetails = mock(PackageDetails.class);
+ PackageDetailsKey mockPackageDetailsKey = mock(PackageDetailsKey.class);
+ when(mockPackageDetails.getKey()).thenReturn(mockPackageDetailsKey);
+ when(mockPackageDetailsKey.getName()).thenReturn("deploymentFile");
+
+ //run code under test
+ objectUnderTest.createContent(mockPackageDetails, new FileInputStream(sampleWithoutManifestWar), true, false);
+ String actualShaReturned = objectUnderTest.getSHA(new File(deploymentDirectory, "/deploymentFile"));
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/deploymentFile/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ Assert.assertEquals(actualShaReturned, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testGetShaExplodedWithoutManifest() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ ZipUtil.unzipFile(sampleWithoutManifestWar, deploymentDirectory);
+
+ //run code under test
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, null, null);
+ String actualShaReturned = objectUnderTest.getSHA(deploymentDirectory);
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ Assert.assertEquals(actualShaReturned, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testDeployZipped() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+ deploymentDirectory.mkdirs();
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ File deploymentFile = new File(deploymentDirectory, sampleWithoutManifestWar.getName());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory, "", null);
+
+ PackageDetails mockPackageDetails = mock(PackageDetails.class);
+ PackageDetailsKey mockPackageDetailsKey = mock(PackageDetailsKey.class);
+ when(mockPackageDetails.getKey()).thenReturn(mockPackageDetailsKey);
+ when(mockPackageDetailsKey.getName()).thenReturn(sampleWithoutManifestWar.getName());
+
+ //run code under test
+ objectUnderTest.createContent(mockPackageDetails, new FileInputStream(sampleWithoutManifestWar), false, false);
+ String actualShaReturned = objectUnderTest.getSHA(sampleWithoutManifestWar);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertTrue(deploymentDirectory.exists(), "Deployment did not happen.");
+ Assert.assertTrue(deploymentDirectory.isDirectory(), "Deployment directory is no longer a directory!!");
+ Assert.assertFalse(deploymentFile.isDirectory(), "Deployment was exploded when it should not have been.");
+
+
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
+ String actualSHA256OfDeployment = digest.calcDigestString(deploymentFile);
+
+ Assert.assertEquals(actualSHA256OfDeployment, expectedSHA256);
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentFile);
+ }
+
+ @Test
+ public void testGetShaZipped() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(sampleWithoutManifestWar, null, null);
+
+ //run code under test
+ String actualShaReturned = objectUnderTest.getSHA(sampleWithoutManifestWar);
+
+ //verify the results (Assert and mock verification)
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
+
+ //cleanup resources created for this test
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+ }
+
+ private void deleteRecursive(File fileToDelete) throws Exception {
+ if (fileToDelete.exists()) {
+ if (fileToDelete.isDirectory()) {
+ for (File file : fileToDelete.listFiles()) {
+ if (file.isDirectory()) {
+ deleteRecursive(file);
+ } else {
+ file.delete();
+ }
+ }
+ }
+
+ fileToDelete.delete();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/JarContentDelegateTest.java b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/JarContentDelegateTest.java
new file mode 100644
index 0000000..ca8ee25
--- /dev/null
+++ b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/JarContentDelegateTest.java
@@ -0,0 +1,86 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.plugins.jbossas5.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.Set;
+import java.util.jar.JarFile;
+
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.Assert;
+import org.testng.IObjectFactory;
+import org.testng.annotations.ObjectFactory;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.plugins.jbossas5.util.JarContentDelegate;
+
+@PrepareForTest({ JarContentDelegate.class })
+public class JarContentDelegateTest {
+
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
+ @Test
+ public void testDiscoverDeployedPackages() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File mockDirectory = mock(File.class);
+ when(mockDirectory.exists()).thenReturn(true);
+ when(mockDirectory.isDirectory()).thenReturn(true);
+
+ File mockFile = mock(File.class);
+ when(mockDirectory.listFiles(any(FileFilter.class))).thenReturn(new File[] { mockFile });
+ when(mockFile.getName()).thenReturn("testFile");
+
+ JarFile mockJarFile = mock(JarFile.class);
+ PowerMockito.whenNew(JarFile.class).withParameterTypes(File.class).withArguments(any(File.class))
+ .thenReturn(mockJarFile);
+
+ MessageDigestGenerator mockMessageDigestGenerator = mock(MessageDigestGenerator.class);
+ PowerMockito.whenNew(MessageDigestGenerator.class).withParameterTypes(String.class).withArguments(anyString())
+ .thenReturn(mockMessageDigestGenerator);
+ when(mockMessageDigestGenerator.calcDigestString(any(File.class))).thenReturn("abcd1234");
+
+ //create object to test and inject required dependencies
+ JarContentDelegate objectUnderTest = new JarContentDelegate(mockDirectory, "jar");
+
+ //run code under test
+ Set<ResourcePackageDetails> resultSet = objectUnderTest.discoverDeployedPackages();
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(resultSet.size(), 1);
+
+ ResourcePackageDetails resultPackageDetails = (ResourcePackageDetails) resultSet.toArray()[0];
+
+ Assert.assertEquals(resultPackageDetails.getVersion(), "[sha256=abcd1234]");
+ Assert.assertEquals(resultPackageDetails.getSHA256(), "abcd1234");
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/StandaloneManagedDeploymentComponentTest.java b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/StandaloneManagedDeploymentComponentTest.java
new file mode 100644
index 0000000..4eb3004
--- /dev/null
+++ b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/StandaloneManagedDeploymentComponentTest.java
@@ -0,0 +1,92 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.plugins.jbossas5.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.Set;
+
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.Assert;
+import org.testng.IObjectFactory;
+import org.testng.annotations.ObjectFactory;
+
+import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.plugins.jbossas5.AbstractManagedDeploymentComponent;
+import org.rhq.plugins.jbossas5.StandaloneManagedDeploymentComponent;
+import org.rhq.plugins.jbossas5.util.FileContentDelegate;
+
+@PrepareForTest({ StandaloneManagedDeploymentComponent.class })
+public class StandaloneManagedDeploymentComponentTest {
+
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
+ //@Test
+ public void testDiscoverDeployedPackages() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File mockFile = mock(File.class);
+ when(mockFile.exists()).thenReturn(true);
+ when(mockFile.getName()).thenReturn("testFileName");
+
+ PackageType mockPackageType = mock(PackageType.class);
+
+ FileContentDelegate mockFileContentDelegate = mock(FileContentDelegate.class);
+ PowerMockito.whenNew(FileContentDelegate.class).withArguments(any(File.class), isNull(), isNull())
+ .thenReturn(mockFileContentDelegate);
+ when(mockFileContentDelegate.getSHA(any(File.class))).thenReturn("abcd1234");
+
+ //create object to test and inject required dependencies
+ StandaloneManagedDeploymentComponent objectUnderTest = new StandaloneManagedDeploymentComponent();
+
+ Field[] fields = AbstractManagedDeploymentComponent.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("deploymentFile")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockFile);
+ }
+ }
+
+ //run code under test
+ Set<ResourcePackageDetails> result = objectUnderTest.discoverDeployedPackages(mockPackageType);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(result.size(), 1);
+
+ ResourcePackageDetails resultPackageDetails = (ResourcePackageDetails) result.toArray()[0];
+
+ Assert.assertEquals(resultPackageDetails.getSHA256(), "abcd1234");
+ Assert.assertEquals(resultPackageDetails.getVersion(), "[sha256=abcd1234]");
+
+ verify(mockFileContentDelegate).getSHA(any(File.class));
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as-5/src/test/resources/sampleWithImplementation.war b/modules/plugins/jboss-as-5/src/test/resources/sampleWithImplementation.war
new file mode 100644
index 0000000..9a5b7f4
Binary files /dev/null and b/modules/plugins/jboss-as-5/src/test/resources/sampleWithImplementation.war differ
diff --git a/modules/plugins/jboss-as-5/src/test/resources/sampleWithManifest.war b/modules/plugins/jboss-as-5/src/test/resources/sampleWithManifest.war
new file mode 100644
index 0000000..0a127e6
Binary files /dev/null and b/modules/plugins/jboss-as-5/src/test/resources/sampleWithManifest.war differ
diff --git a/modules/plugins/jboss-as-5/src/test/resources/sampleWithSpecification.war b/modules/plugins/jboss-as-5/src/test/resources/sampleWithSpecification.war
new file mode 100644
index 0000000..5f021e7
Binary files /dev/null and b/modules/plugins/jboss-as-5/src/test/resources/sampleWithSpecification.war differ
diff --git a/modules/plugins/jboss-as-5/src/test/resources/sampleWithSpecificationImplementation.war b/modules/plugins/jboss-as-5/src/test/resources/sampleWithSpecificationImplementation.war
new file mode 100644
index 0000000..43fa852
Binary files /dev/null and b/modules/plugins/jboss-as-5/src/test/resources/sampleWithSpecificationImplementation.war differ
diff --git a/modules/plugins/jboss-as-5/src/test/resources/sampleWithoutManifest.war b/modules/plugins/jboss-as-5/src/test/resources/sampleWithoutManifest.war
new file mode 100644
index 0000000..0f938f5
Binary files /dev/null and b/modules/plugins/jboss-as-5/src/test/resources/sampleWithoutManifest.war differ
commit b6fb8cd62aac2c10a727208c2cea08352f8a89d1
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Feb 3 17:32:32 2012 -0600
[BZ 761593] Add unit tests for changed content system code.
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 4837c5b..ce258a9 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -14,6 +14,10 @@
<name>RHQ Tomcat Plugin</name>
<description>A plugin for managing standalone JBoss EWS and Apache Tomcat Servers</description>
+
+ <properties>
+ <powermock.version>1.4.11</powermock.version>
+ </properties>
<dependencies>
@@ -24,6 +28,20 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
diff --git a/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java
new file mode 100644
index 0000000..9a2dc49
--- /dev/null
+++ b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java
@@ -0,0 +1,246 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.jboss.on.plugins.tomcat.test;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.jar.Manifest;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.jboss.on.plugins.tomcat.helper.FileContentDelegate;
+
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.core.util.ZipUtil;
+
+public class FileContentDelegateTest {
+
+ @Test
+ public void testDeployExplodedWithManifestInArchive() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithManifestWar = new File(this.getClass().getResource("/sampleWithManifest.war").getFile());
+ Assert.assertTrue(sampleWithManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory);
+
+ //run code under test
+ objectUnderTest.createContent(deploymentDirectory, sampleWithManifestWar, true);
+ String actualShaReturned = objectUnderTest.getSHA(deploymentDirectory);
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithManifestWar);
+
+ Assert.assertEquals(actualSha256Attribute, expectedSHA256);
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testGetShaExplodedWithManifest() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithManifestWar = new File(this.getClass().getResource("/sampleWithManifest.war").getFile());
+ Assert.assertTrue(sampleWithManifestWar.exists());
+
+ ZipUtil.unzipFile(sampleWithManifestWar, deploymentDirectory);
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory);
+
+ //run code under test
+ String actualShaReturned = objectUnderTest.getSHA(deploymentDirectory);
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ Assert.assertEquals(actualShaReturned, "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testDeployExplodedWithoutManifestInArchive() throws Exception {
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory);
+
+ //run code under test
+ objectUnderTest.createContent(deploymentDirectory, sampleWithoutManifestWar, true);
+ String actualShaReturned = objectUnderTest.getSHA(deploymentDirectory);
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
+
+ Assert.assertEquals(actualSha256Attribute, expectedSHA256);
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testGetShaExplodedWithoutManifest() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ ZipUtil.unzipFile(sampleWithoutManifestWar, deploymentDirectory);
+
+ //run code under test
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentDirectory);
+ String actualShaReturned = objectUnderTest.getSHA(deploymentDirectory);
+
+ //verify the results (Assert and mock verification)
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ Assert.assertEquals(actualShaReturned, "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentDirectory);
+ }
+
+ @Test
+ public void testDeployZipped() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File deploymentFile = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory.war");
+ deleteRecursive(deploymentFile);
+
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(deploymentFile);
+
+ //run code under test
+ objectUnderTest.createContent(deploymentFile, sampleWithoutManifestWar, false);
+ String actualShaReturned = objectUnderTest.getSHA(sampleWithoutManifestWar);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertTrue(deploymentFile.exists(), "Deployment did not happen.");
+ Assert.assertFalse(deploymentFile.isDirectory(), "Deployment was exploded when it should not have been.");
+
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
+ String actualSHA256OfDeployment = digest.calcDigestString(deploymentFile);
+
+ Assert.assertEquals(actualSHA256OfDeployment, expectedSHA256);
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentFile);
+ }
+
+ @Test
+ public void testGetShaZipped() throws Exception {
+ //tell the method story as it happens: mock or create dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File sampleWithoutManifestWar = new File(this.getClass().getResource("/sampleWithoutManifest.war").getFile());
+ Assert.assertTrue(sampleWithoutManifestWar.exists());
+
+ //create object to test and inject required dependencies
+ FileContentDelegate objectUnderTest = new FileContentDelegate(sampleWithoutManifestWar);
+
+ //run code under test
+ String actualShaReturned = objectUnderTest.getSHA(sampleWithoutManifestWar);
+
+ //verify the results (Assert and mock verification)
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSHA256 = digest.calcDigestString(sampleWithoutManifestWar);
+
+ //cleanup resources created for this test
+ Assert.assertEquals(actualShaReturned, expectedSHA256);
+ }
+
+ private void deleteRecursive(File fileToDelete) throws Exception {
+ if (fileToDelete.exists()) {
+ if (fileToDelete.isDirectory()) {
+ for (File file : fileToDelete.listFiles()) {
+ if (file.isDirectory()) {
+ deleteRecursive(file);
+ } else {
+ file.delete();
+ }
+ }
+ }
+
+ fileToDelete.delete();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatVHostComponentTest.java b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatVHostComponentTest.java
new file mode 100644
index 0000000..73a30ae
--- /dev/null
+++ b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatVHostComponentTest.java
@@ -0,0 +1,155 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.jboss.on.plugins.tomcat.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.jar.Manifest;
+
+import org.mc4j.ems.connection.bean.EmsBean;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.jboss.on.plugins.tomcat.TomcatServerComponent;
+import org.jboss.on.plugins.tomcat.TomcatVHostComponent;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.content.PackageDetailsKey;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.domain.resource.CreateResourceStatus;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.content.ContentContext;
+import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+
+public class TomcatVHostComponentTest{
+
+ @Test
+ public void testCreateSource() throws Exception {
+ //create the object under test as a partial mock because only one
+ //public method will be tested, while the rest will be mocked.
+ TomcatVHostComponent objectUnderTest = mock(TomcatVHostComponent.class);
+
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
+ CreateResourceReport mockCreateResourceReport = mock(CreateResourceReport.class);
+ ResourceType mockResourceType = mock(ResourceType.class);
+ when(mockCreateResourceReport.getResourceType()).thenReturn(mockResourceType);
+ when(mockResourceType.getName()).thenReturn("Tomcat Web Application (WAR)");
+
+ ResourcePackageDetails mockResourcePackageDetails = mock(ResourcePackageDetails.class);
+ when(mockCreateResourceReport.getPackageDetails()).thenReturn(mockResourcePackageDetails);
+ PackageDetailsKey mockPackageDetailsKey = mock(PackageDetailsKey.class);
+ when(mockResourcePackageDetails.getKey()).thenReturn(mockPackageDetailsKey);
+ when(mockPackageDetailsKey.getName()).thenReturn("testApplication.war");
+
+ Configuration mockConfiguration = mock(Configuration.class);
+ when(mockResourcePackageDetails.getDeploymentTimeConfiguration()).thenReturn(mockConfiguration);
+ PropertySimple mockPropertySimple = mock(PropertySimple.class);
+ when(mockConfiguration.getSimple(any(String.class))).thenReturn(mockPropertySimple);
+ when(mockPropertySimple.getBooleanValue()).thenReturn(Boolean.TRUE);
+
+ EmsBean mockEmsBean = mock(EmsBean.class);
+ when(objectUnderTest.getEmsBean()).thenReturn(mockEmsBean);
+ EmsAttribute mockEmsAttribute = mock(EmsAttribute.class);
+ when(mockEmsBean.getAttribute(anyString())).thenReturn(mockEmsAttribute);
+ when(mockEmsAttribute.getValue()).thenReturn(Boolean.TRUE);
+
+ File deploymentDirectory = new File(this.getClass().getResource("/").getFile() + "deploymentDirectory");
+ deleteRecursive(deploymentDirectory);
+ when(objectUnderTest.getConfigurationPath()).thenReturn(deploymentDirectory);
+
+ File tempDirectory = new File(this.getClass().getResource("/").getFile() + "tempDirectory");
+ deleteRecursive(tempDirectory);
+ tempDirectory.mkdirs();
+
+ @SuppressWarnings("unchecked")
+ ResourceContext<TomcatServerComponent<?>> mockResourceContext = mock(ResourceContext.class);
+ when(objectUnderTest.getResourceContext()).thenReturn(mockResourceContext);
+ when(mockResourceContext.getTemporaryDirectory()).thenReturn(tempDirectory);
+
+ ContentContext mockContentContext = mock(ContentContext.class);
+ when(mockResourceContext.getContentContext()).thenReturn(mockContentContext);
+ ContentServices mockContentServices = mock(ContentServices.class);
+ when(mockContentContext.getContentServices()).thenReturn(mockContentServices);
+
+ when(objectUnderTest.isWebApplication(any(File.class))).thenReturn(Boolean.TRUE);
+
+ //run code under test
+ when(objectUnderTest.createResource(any(CreateResourceReport.class))).thenCallRealMethod();
+ objectUnderTest.createResource(mockCreateResourceReport);
+
+ //verify the results (Assert and mock verification)
+ verify(objectUnderTest).getEmsBean();
+ verify(objectUnderTest, times(2)).getResourceContext();
+ verify(objectUnderTest).getConfigurationPath();
+ verify(objectUnderTest).isWebApplication(any(File.class));
+
+ verify(mockContentServices).downloadPackageBitsForChildResource(any(ContentContext.class), anyString(),
+ any(PackageDetailsKey.class), any(OutputStream.class));
+
+ verify(mockCreateResourceReport).setStatus(eq(CreateResourceStatus.SUCCESS));
+ verify(mockCreateResourceReport).setResourceName(eq("testApplication"));
+
+ File manifestFile = new File(deploymentDirectory.getAbsolutePath() + "/testApplication/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertNotNull(actualSha256Attribute);
+ Assert.assertEquals(actualSha256Attribute.length(), 64);
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentDirectory);
+ deleteRecursive(tempDirectory);
+ }
+
+ private void deleteRecursive(File fileToDelete) throws Exception {
+ if (fileToDelete.exists()) {
+ if (fileToDelete.isDirectory()) {
+ for (File file : fileToDelete.listFiles()) {
+ if (file.isDirectory()) {
+ deleteRecursive(file);
+ } else {
+ file.delete();
+ }
+ }
+ }
+
+ fileToDelete.delete();
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java
new file mode 100644
index 0000000..f7a395b
--- /dev/null
+++ b/modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java
@@ -0,0 +1,270 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.jboss.on.plugins.tomcat.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.Manifest;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.jboss.on.plugins.tomcat.TomcatVHostComponent;
+import org.jboss.on.plugins.tomcat.TomcatWarComponent;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.core.util.ZipUtil;
+
+public class TomcatWarComponentTest {
+
+ @Test
+ public void testDiscoverZippedDeployment() throws Exception {
+ //create the object under test as a partial mock because only one
+ //public method will be tested, while the rest will be mocked.
+ TomcatWarComponent objectUnderTest = mock(TomcatWarComponent.class);
+
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File fileUsedInTest = new File(this.getClass().getResource("/sampleWithManifest.war").getFile());
+
+ @SuppressWarnings("unchecked")
+ ResourceContext<TomcatVHostComponent> mockResourceContext = mock(ResourceContext.class);
+ when(objectUnderTest.getResourceContext()).thenReturn(mockResourceContext);
+ Configuration mockConfiguration = mock(Configuration.class);
+ when(mockResourceContext.getPluginConfiguration()).thenReturn(mockConfiguration);
+ when(mockConfiguration.getSimpleValue(eq("filename"), isNull(String.class))).thenReturn(
+ fileUsedInTest.getAbsolutePath());
+
+ PackageType mockPackageType = mock(PackageType.class);
+
+ when(objectUnderTest.discoverDeployedPackages(any(PackageType.class))).thenCallRealMethod();
+
+ //run code under test
+ Set<ResourcePackageDetails> actualResult = objectUnderTest.discoverDeployedPackages(mockPackageType);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(actualResult.size(), 1);
+
+ ResourcePackageDetails actualResourcePackageDetails = (ResourcePackageDetails) actualResult.toArray()[0];
+ Assert.assertEquals(actualResourcePackageDetails.getFileName(), fileUsedInTest.getName());
+ Assert.assertEquals(actualResourcePackageDetails.getLocation(), fileUsedInTest.getPath());
+ Assert.assertEquals((long) actualResourcePackageDetails.getFileSize(), fileUsedInTest.length());
+ if (actualResourcePackageDetails.getInstallationTimestamp() > System.currentTimeMillis()) {
+ Assert.fail("Timestamp is not in the past.");
+ }
+
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String expectedSha256 = digest.calcDigestString(fileUsedInTest);
+
+ Assert.assertEquals(actualResourcePackageDetails.getSHA256(), expectedSha256);
+ Assert.assertEquals(actualResourcePackageDetails.getDisplayVersion(), null);
+
+ verify(mockResourceContext, times(1)).getPluginConfiguration();
+ verify(objectUnderTest, times(1)).getResourceContext();
+ verify(mockConfiguration, times(1)).getSimpleValue(eq("filename"), isNull(String.class));
+ verifyNoMoreInteractions(mockPackageType);
+ }
+
+ @Test
+ public void testDiscoverExplodedDeployments() throws Exception {
+
+ //Presetup resources for the test
+ String[] testArchiveFiles = new String[] { "/sampleWithManifest.war", "/sampleWithoutManifest.war",
+ "/sampleWithImplementation.war", "/sampleWithSpecification.war",
+ "/sampleWithSpecificationImplementation.war" };
+
+ Map<String, String> expectedSha256 = new HashMap<String, String>();
+ expectedSha256.put(testArchiveFiles[0], "342b0c96b83cc1b36184cb7e67a7df986ef305a5891041ea1c36afd9c04afd4d");
+ expectedSha256.put(testArchiveFiles[1], "f2fa6712d19d25b47639f2ad7bd9dd1cb5af8d5551120f9f4a775edee7c5bb20");
+ expectedSha256.put(testArchiveFiles[2], "c72750a8952fcd50ee3e9dce8766a75aecdc57f4b654eca5787d3fa12dc78a55");
+ expectedSha256.put(testArchiveFiles[3], "968382bcd2f7550c2785a622c24671feaed4cca033bd9fe17665d9d66d8d3646");
+ expectedSha256.put(testArchiveFiles[4], "a96d9a054ead08575c11a79ec51ac0174da5ab02d213c008d248b6a59da6dc53");
+
+ Map<String, String> expectedDisplayVersion = new HashMap<String, String>();
+ expectedDisplayVersion.put(testArchiveFiles[0], null);
+ expectedDisplayVersion.put(testArchiveFiles[1], null);
+ expectedDisplayVersion.put(testArchiveFiles[2], "9.99");
+ expectedDisplayVersion.put(testArchiveFiles[3], "1.234");
+ expectedDisplayVersion.put(testArchiveFiles[4], "1.234 (9.990)");
+
+ for (String availableArchiveFile : testArchiveFiles) {
+ //create the object under test as a partial mock because only one
+ //public method will be tested, while the rest will be mocked.
+ TomcatWarComponent objectUnderTest = mock(TomcatWarComponent.class);
+
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File archiveUsedInTest = new File(this.getClass().getResource(availableArchiveFile).getFile());
+ File deploymentFolderUsedInTest = new File(this.getClass().getResource("/").getFile() + "deploymentFolder");
+ ZipUtil.unzipFile(archiveUsedInTest, deploymentFolderUsedInTest);
+
+ @SuppressWarnings("unchecked")
+ ResourceContext<TomcatVHostComponent> mockResourceContext = mock(ResourceContext.class);
+ when(objectUnderTest.getResourceContext()).thenReturn(mockResourceContext);
+ Configuration mockConfiguration = mock(Configuration.class);
+ when(mockResourceContext.getPluginConfiguration()).thenReturn(mockConfiguration);
+ when(mockConfiguration.getSimpleValue(eq("filename"), isNull(String.class))).thenReturn(
+ deploymentFolderUsedInTest.getAbsolutePath());
+
+ PackageType mockPackageType = mock(PackageType.class);
+
+ when(objectUnderTest.discoverDeployedPackages(any(PackageType.class))).thenCallRealMethod();
+
+ //run code under test
+ Set<ResourcePackageDetails> actualResult = objectUnderTest.discoverDeployedPackages(mockPackageType);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(actualResult.size(), 1);
+
+ ResourcePackageDetails actualResourcePackageDetails = (ResourcePackageDetails) actualResult.toArray()[0];
+ Assert.assertEquals(actualResourcePackageDetails.getFileName(), deploymentFolderUsedInTest.getName());
+ Assert.assertEquals(actualResourcePackageDetails.getLocation(), deploymentFolderUsedInTest.getPath());
+ Assert.assertEquals(actualResourcePackageDetails.getFileSize(), null);
+ if (actualResourcePackageDetails.getInstallationTimestamp() > System.currentTimeMillis()) {
+ Assert.fail("Timestamp is not in the past.");
+ }
+
+ String expectedSha256ForDeployment = expectedSha256.get(availableArchiveFile);
+
+ Assert.assertEquals(actualResourcePackageDetails.getSHA256(), expectedSha256.get(availableArchiveFile));
+ Assert.assertEquals(actualResourcePackageDetails.getDisplayVersion(),
+ expectedDisplayVersion.get(availableArchiveFile));
+
+ File manifestFile = new File(deploymentFolderUsedInTest.getAbsolutePath() + "/META-INF/MANIFEST.MF");
+ Assert.assertTrue(manifestFile.exists(), "Manifest file not created properly!");
+ Assert.assertNotEquals(manifestFile.length(), 0, "Empty manifest!!");
+
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = new Manifest(manifestStream);
+ String actualSha256Attribute = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ manifestStream.close();
+
+ Assert.assertEquals(actualSha256Attribute, expectedSha256ForDeployment);
+
+ verify(mockResourceContext, times(1)).getPluginConfiguration();
+ verify(objectUnderTest, times(1)).getResourceContext();
+ verify(mockConfiguration, times(1)).getSimpleValue(eq("filename"), isNull(String.class));
+ verifyNoMoreInteractions(mockPackageType);
+
+ //cleanup resources created for this test
+ deleteRecursive(deploymentFolderUsedInTest);
+ }
+ }
+
+ @Test
+ public void testDiscoverNoFileOnDisk() throws Exception {
+ //create the object under test as a partial mock because only one
+ //public method will be tested, while the rest will be mocked.
+ TomcatWarComponent objectUnderTest = mock(TomcatWarComponent.class);
+
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
+ File fileUsedInTest = new File(this.getClass().getResource("/").getFile() + "randomNonExistingFile");
+
+ @SuppressWarnings("unchecked")
+ ResourceContext<TomcatVHostComponent> mockResourceContext = mock(ResourceContext.class);
+ when(objectUnderTest.getResourceContext()).thenReturn(mockResourceContext);
+ Configuration mockConfiguration = mock(Configuration.class);
+ when(mockResourceContext.getPluginConfiguration()).thenReturn(mockConfiguration);
+ when(mockConfiguration.getSimpleValue(eq("filename"), isNull(String.class))).thenReturn(
+ fileUsedInTest.getAbsolutePath());
+
+ PackageType mockPackageType = mock(PackageType.class);
+
+ when(objectUnderTest.discoverDeployedPackages(any(PackageType.class))).thenCallRealMethod();
+
+ //run code under test
+ Set<ResourcePackageDetails> actualResult = objectUnderTest.discoverDeployedPackages(mockPackageType);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(actualResult.size(), 0);
+
+ verify(mockResourceContext, times(1)).getPluginConfiguration();
+ verify(objectUnderTest, times(1)).getResourceContext();
+ verify(mockConfiguration, times(1)).getSimpleValue(eq("filename"), isNull(String.class));
+
+ verifyNoMoreInteractions(mockPackageType);
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testDiscoverIncorrectConfiguration() throws Exception {
+ //create the object under test as a partial mock because only one
+ //public method will be tested, while the rest will be mocked.
+ TomcatWarComponent objectUnderTest = mock(TomcatWarComponent.class);
+
+ //tell the method story as it happens: mock dependencies and configure
+ //those dependencies to get the method under test to completion.
+ @SuppressWarnings("unchecked")
+ ResourceContext<TomcatVHostComponent> mockResourceContext = mock(ResourceContext.class);
+ when(objectUnderTest.getResourceContext()).thenReturn(mockResourceContext);
+ Configuration mockConfiguration = mock(Configuration.class);
+ when(mockResourceContext.getPluginConfiguration()).thenReturn(mockConfiguration);
+ when(mockConfiguration.getSimpleValue(eq("filename"), isNull(String.class))).thenReturn(null);
+
+ PackageType mockPackageType = mock(PackageType.class);
+
+ when(objectUnderTest.discoverDeployedPackages(any(PackageType.class))).thenCallRealMethod();
+
+ //run code under test
+ Set<ResourcePackageDetails> actualResult = objectUnderTest.discoverDeployedPackages(mockPackageType);
+
+ //verify the results (Assert and mock verification)
+ Assert.assertEquals(actualResult.size(), 0);
+
+ verify(mockResourceContext, times(1)).getPluginConfiguration();
+ verify(objectUnderTest, times(1)).getResourceContext();
+ verify(mockConfiguration, times(1)).getSimpleValue(eq("filename"), isNull(String.class));
+
+ verifyNoMoreInteractions(mockPackageType);
+ }
+
+ private void deleteRecursive(File fileToDelete) throws Exception {
+ if (fileToDelete.exists()) {
+ if (fileToDelete.isDirectory()) {
+ for (File file : fileToDelete.listFiles()) {
+ if (file.isDirectory()) {
+ deleteRecursive(file);
+ } else {
+ file.delete();
+ }
+ }
+ }
+
+ fileToDelete.delete();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modules/plugins/tomcat/src/test/resources/sampleWithImplementation.war b/modules/plugins/tomcat/src/test/resources/sampleWithImplementation.war
new file mode 100644
index 0000000..9a5b7f4
Binary files /dev/null and b/modules/plugins/tomcat/src/test/resources/sampleWithImplementation.war differ
diff --git a/modules/plugins/tomcat/src/test/resources/sampleWithManifest.war b/modules/plugins/tomcat/src/test/resources/sampleWithManifest.war
new file mode 100644
index 0000000..0a127e6
Binary files /dev/null and b/modules/plugins/tomcat/src/test/resources/sampleWithManifest.war differ
diff --git a/modules/plugins/tomcat/src/test/resources/sampleWithSpecification.war b/modules/plugins/tomcat/src/test/resources/sampleWithSpecification.war
new file mode 100644
index 0000000..5f021e7
Binary files /dev/null and b/modules/plugins/tomcat/src/test/resources/sampleWithSpecification.war differ
diff --git a/modules/plugins/tomcat/src/test/resources/sampleWithSpecificationImplementation.war b/modules/plugins/tomcat/src/test/resources/sampleWithSpecificationImplementation.war
new file mode 100644
index 0000000..43fa852
Binary files /dev/null and b/modules/plugins/tomcat/src/test/resources/sampleWithSpecificationImplementation.war differ
diff --git a/modules/plugins/tomcat/src/test/resources/sampleWithoutManifest.war b/modules/plugins/tomcat/src/test/resources/sampleWithoutManifest.war
new file mode 100644
index 0000000..0f938f5
Binary files /dev/null and b/modules/plugins/tomcat/src/test/resources/sampleWithoutManifest.war differ
commit 9ce3f7f9ee5dae9e68e5413d146082fb1aeeb92d
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Feb 2 08:29:54 2012 -0600
[BZ 771418] Corrected incorrect import of junit dependencies. Testng is the framework of choice.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java
index 7ee018f..70eef9d 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java
@@ -44,13 +44,12 @@ import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.sql.DataSource;
-import junit.framework.Assert;
-
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.Assert;
import org.testng.IObjectFactory;
import org.testng.annotations.ObjectFactory;
import org.testng.annotations.Test;
commit 6263ca50dfe5e168018ed248efb5700b8be55867
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Feb 2 08:26:19 2012 -0600
[BZ 772722] Adding unit tests for the JBoss CSP server plugin to ensure sha256 and version are correctly populated during sync.
diff --git a/modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/test/RssFeedParserTest.java b/modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/test/RssFeedParserTest.java
index 15fc3cc..30d0efa 100644
--- a/modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/test/RssFeedParserTest.java
+++ b/modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/test/RssFeedParserTest.java
@@ -25,6 +25,10 @@ import java.net.URL;
import java.util.Iterator;
import java.util.Set;
+import churchillobjects.rss4j.RssDocument;
+import churchillobjects.rss4j.parser.RssParser;
+
+import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -32,9 +36,6 @@ import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails
import org.rhq.enterprise.server.plugin.pc.content.PackageSyncReport;
import org.rhq.enterprise.server.plugins.jboss.software.RssFeedParser;
-import churchillobjects.rss4j.RssDocument;
-import churchillobjects.rss4j.parser.RssParser;
-
/**
* @author Jason Dobies
*/
@@ -98,6 +99,8 @@ public class RssFeedParserTest {
int totalNumVersions = 0;
for (ContentProviderPackageDetails pkg : newPackages) {
totalNumVersions += pkg.getResourceVersions().size();
+
+ Assert.assertEquals("[sha256=" + pkg.getSHA256() + "]", pkg.getKey().getVersion());
}
assert totalNumVersions == 282 : "Incorrect number of total versions represented. Expected: 282, Found: "
@@ -126,6 +129,10 @@ public class RssFeedParserTest {
+ report.getDeletedPackages().size();
assert report.getUpdatedPackages().size() == 0 : "Incorrect number of updated packages. Expected: 0, Found: "
+ report.getUpdatedPackages().size();
+
+ for (ContentProviderPackageDetails pkg : report.getNewPackages()) {
+ Assert.assertEquals("[sha256=" + pkg.getSHA256() + "]", pkg.getKey().getVersion());
+ }
}
@Test
commit 8bd92ab64b02162101aa4efae1155c14836cb44f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Feb 2 01:52:33 2012 -0600
[BZ 772722] Added unit tests for updated functionality of the disk source repository.
diff --git a/.classpath b/.classpath
index 88f670d..46efded 100644
--- a/.classpath
+++ b/.classpath
@@ -292,5 +292,6 @@
<classpathentry kind="src" path="modules/plugins/jboss-as-7/src/test/java"/>
<classpathentry kind="src" path="modules/integration-tests/jboss-as-7-plugin-test/src/test/java"/>
<classpathentry kind="src" path="modules/integration-tests/mod_cluster-plugin-test/src/test/java"/>
+ <classpathentry kind="src" path="modules/enterprise/server/plugins/disk/src/test/java"/>
<classpathentry kind="output" path="eclipse-classes"/>
</classpath>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 9fcc685..c6f3ced 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -12,6 +12,10 @@
<artifactId>rhq-serverplugin-disk</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <powermock.version>1.4.11</powermock.version>
+ </properties>
+
<name>RHQ Enterprise Server Disk Content Source Plugin</name>
<description>JBoss Operations Network Enterprise Server Disk Content Source Plugin</description>
@@ -24,6 +28,20 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java b/modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java
new file mode 100644
index 0000000..9981f3a
--- /dev/null
+++ b/modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java
@@ -0,0 +1,263 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.server.plugins.disk.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.verifyNew;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+
+import java.io.File;
+import java.util.Collection;
+
+import org.mockito.ArgumentCaptor;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.Assert;
+import org.testng.IObjectFactory;
+import org.testng.annotations.ObjectFactory;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.core.util.file.ContentFileInfo;
+import org.rhq.core.util.file.ContentFileInfoFactory;
+import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails;
+import org.rhq.enterprise.server.plugin.pc.content.PackageSyncReport;
+import org.rhq.enterprise.server.plugins.disk.DiskSource;
+
+@PrepareForTest({ DiskSource.class, ContentFileInfoFactory.class })
+public class DiskSourceTest{
+
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void noPackageDiscoveredOnDisk() throws Exception {
+
+ //set all the method call arguments
+ String repoName = "testRepo";
+ PackageSyncReport mockPackageSyncReport = mock(PackageSyncReport.class);
+ Collection<ContentProviderPackageDetails> mockCollection = mock(Collection.class);
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ Configuration mockConfiguration = mock(Configuration.class);
+ PropertySimple mockProperty = mock(PropertySimple.class);
+ when(mockConfiguration.get("packageSourceEnabled")).thenReturn(mockProperty);
+ when(mockConfiguration.get("repoSourceEnabled")).thenReturn(mockProperty);
+ when(mockProperty.getBooleanValue()).thenReturn(Boolean.TRUE, Boolean.FALSE);
+
+ final String directoryPath = "mock path";
+
+ when(mockConfiguration.getSimpleValue(eq("rootDirectory"), anyString())).thenReturn(directoryPath);
+ when(mockConfiguration.getSimpleValue(eq("packageTypeName"), anyString())).thenReturn("packageTypeName");
+ when(mockConfiguration.getSimpleValue(eq("architectureName"), anyString())).thenReturn("architectureName");
+ when(mockConfiguration.getSimpleValue(eq("resourceType"), anyString())).thenReturn("resource-type");
+
+ File mockRootFolder = mock(File.class);
+ whenNew(File.class).withArguments(directoryPath).thenReturn(mockRootFolder);
+ when(mockRootFolder.exists()).thenReturn(true);
+ when(mockRootFolder.canRead()).thenReturn(true);
+ when(mockRootFolder.isDirectory()).thenReturn(true);
+
+ when(mockCollection.toArray()).thenReturn(new Object[0]);
+
+ File mockRepoFolder = mock(File.class);
+ when(mockRootFolder.listFiles()).thenReturn(new File[] { mockRepoFolder });
+ when(mockRepoFolder.isDirectory()).thenReturn(true);
+ when(mockRepoFolder.getName()).thenReturn(repoName);
+ when(mockRepoFolder.listFiles()).thenReturn(new File[0]);
+
+ //create object to test and inject required dependencies
+ DiskSource objectUnderTest = new DiskSource();
+
+ //run the code to be tested
+ objectUnderTest.initialize(mockConfiguration);
+ objectUnderTest.synchronizePackages(repoName, mockPackageSyncReport, mockCollection);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockPackageSyncReport, never()).addUpdatedPackage(any(ContentProviderPackageDetails.class));
+ verify(mockPackageSyncReport, never()).addNewPackage(any(ContentProviderPackageDetails.class));
+ verify(mockConfiguration, times(2)).get(anyString());
+ verifyNew(File.class).withArguments(directoryPath);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void onePackageDiscoveredOnDisk() throws Exception {
+
+ //set all the method call arguments
+ String repoName = "testRepo";
+ PackageSyncReport mockPackageSyncReport = mock(PackageSyncReport.class);
+ Collection<ContentProviderPackageDetails> mockCollection = mock(Collection.class);
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ Configuration mockConfiguration = mock(Configuration.class);
+ PropertySimple mockProperty = mock(PropertySimple.class);
+ when(mockConfiguration.get("packageSourceEnabled")).thenReturn(mockProperty);
+ when(mockConfiguration.get("repoSourceEnabled")).thenReturn(mockProperty);
+ when(mockProperty.getBooleanValue()).thenReturn(Boolean.TRUE, Boolean.FALSE);
+
+ final String directoryPath = "mock path";
+
+ when(mockConfiguration.getSimpleValue(eq("rootDirectory"), anyString())).thenReturn(directoryPath);
+ when(mockConfiguration.getSimpleValue(eq("packageTypeName"), anyString())).thenReturn("packageTypeName");
+ when(mockConfiguration.getSimpleValue(eq("architectureName"), anyString())).thenReturn("architectureName");
+ when(mockConfiguration.getSimpleValue(eq("resourceType"), anyString())).thenReturn("resource-type");
+ when(mockConfiguration.getSimpleValue(eq("filenameFilter"), anyString())).thenReturn(".*");
+
+ File mockRootFolder = mock(File.class);
+ whenNew(File.class).withArguments(directoryPath).thenReturn(mockRootFolder);
+ when(mockRootFolder.getAbsolutePath()).thenReturn(directoryPath);
+ when(mockRootFolder.exists()).thenReturn(true);
+ when(mockRootFolder.canRead()).thenReturn(true);
+ when(mockRootFolder.isDirectory()).thenReturn(true);
+
+ when(mockCollection.toArray()).thenReturn(new Object[0]);
+
+ File mockRepoFolder = mock(File.class);
+ when(mockRootFolder.listFiles()).thenReturn(new File[] { mockRepoFolder });
+ when(mockRepoFolder.isDirectory()).thenReturn(true);
+ when(mockRepoFolder.getName()).thenReturn(repoName);
+
+ File mockFile = mock(File.class);
+ when(mockRepoFolder.listFiles()).thenReturn(new File[] { mockFile });
+ when(mockFile.getAbsolutePath()).thenReturn("test");
+
+ ContentFileInfo contentFileInfo = mock(ContentFileInfo.class);
+ PowerMockito.mockStatic(ContentFileInfoFactory.class);
+ when(ContentFileInfoFactory.createContentFileInfo(any(File.class))).thenReturn(contentFileInfo);
+
+ MessageDigestGenerator mockDigest = mock(MessageDigestGenerator.class);
+ whenNew(MessageDigestGenerator.class).withArguments(anyString()).thenReturn(mockDigest);
+ when(mockDigest.calcDigestString(any(File.class))).thenReturn("sha256");
+
+ when(mockFile.getName()).thenReturn("fileName");
+ when(mockFile.getAbsolutePath()).thenReturn("mock path");
+
+ //create object to test and inject required dependencies
+ DiskSource objectUnderTest = new DiskSource();
+
+ //run the code to be tested
+ objectUnderTest.initialize(mockConfiguration);
+ objectUnderTest.synchronizePackages(repoName, mockPackageSyncReport, mockCollection);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockPackageSyncReport, never()).addUpdatedPackage(any(ContentProviderPackageDetails.class));
+ verify(mockConfiguration, times(2)).get(anyString());
+ verifyNew(File.class).withArguments(directoryPath);
+
+ ArgumentCaptor<ContentProviderPackageDetails> argument = ArgumentCaptor
+ .forClass(ContentProviderPackageDetails.class);
+ verify(mockPackageSyncReport, times(1)).addNewPackage(argument.capture());
+ Assert.assertEquals("sha256", argument.getValue().getSHA256());
+ Assert.assertEquals("[sha256=sha256]", argument.getValue().getKey().getVersion());
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void onePackageDiscoveredOnDiskWithRedundantSubfolder() throws Exception {
+
+ //set all the method call arguments
+ String repoName = "testRepo";
+ PackageSyncReport mockPackageSyncReport = mock(PackageSyncReport.class);
+ Collection<ContentProviderPackageDetails> mockCollection = mock(Collection.class);
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ Configuration mockConfiguration = mock(Configuration.class);
+ PropertySimple mockProperty = mock(PropertySimple.class);
+ when(mockConfiguration.get("packageSourceEnabled")).thenReturn(mockProperty);
+ when(mockConfiguration.get("repoSourceEnabled")).thenReturn(mockProperty);
+ when(mockProperty.getBooleanValue()).thenReturn(Boolean.TRUE, Boolean.FALSE);
+
+ final String directoryPath = "mock path";
+
+ when(mockConfiguration.getSimpleValue(eq("rootDirectory"), anyString())).thenReturn(directoryPath);
+ when(mockConfiguration.getSimpleValue(eq("packageTypeName"), anyString())).thenReturn("packageTypeName");
+ when(mockConfiguration.getSimpleValue(eq("architectureName"), anyString())).thenReturn("architectureName");
+ when(mockConfiguration.getSimpleValue(eq("resourceType"), anyString())).thenReturn("resource-type");
+ when(mockConfiguration.getSimpleValue(eq("filenameFilter"), anyString())).thenReturn(".*");
+
+ File mockRootFolder = mock(File.class);
+ whenNew(File.class).withArguments(directoryPath).thenReturn(mockRootFolder);
+ when(mockRootFolder.getAbsolutePath()).thenReturn(directoryPath);
+ when(mockRootFolder.exists()).thenReturn(true);
+ when(mockRootFolder.canRead()).thenReturn(true);
+ when(mockRootFolder.isDirectory()).thenReturn(true);
+
+ when(mockCollection.toArray()).thenReturn(new Object[0]);
+
+ File mockRepoFolder = mock(File.class);
+ when(mockRootFolder.listFiles()).thenReturn(new File[] { mockRepoFolder });
+ when(mockRepoFolder.isDirectory()).thenReturn(true);
+ when(mockRepoFolder.getName()).thenReturn(repoName);
+
+ File mockExtraFolder = mock(File.class);
+ File mockFile = mock(File.class);
+ when(mockRepoFolder.listFiles()).thenReturn(new File[] { mockFile, mockExtraFolder });
+ when(mockFile.getAbsolutePath()).thenReturn("test");
+ when(mockExtraFolder.isDirectory()).thenReturn(true);
+
+ ContentFileInfo contentFileInfo = mock(ContentFileInfo.class);
+ PowerMockito.mockStatic(ContentFileInfoFactory.class);
+ when(ContentFileInfoFactory.createContentFileInfo(any(File.class))).thenReturn(contentFileInfo);
+
+ MessageDigestGenerator mockDigest = mock(MessageDigestGenerator.class);
+ whenNew(MessageDigestGenerator.class).withArguments(anyString()).thenReturn(mockDigest);
+ when(mockDigest.calcDigestString(any(File.class))).thenReturn("sha256");
+
+ when(mockFile.getName()).thenReturn("fileName");
+ when(mockFile.getAbsolutePath()).thenReturn("mock path");
+
+ //create object to test and inject required dependencies
+ DiskSource objectUnderTest = new DiskSource();
+
+ //run the code to be tested
+ objectUnderTest.initialize(mockConfiguration);
+ objectUnderTest.synchronizePackages(repoName, mockPackageSyncReport, mockCollection);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockPackageSyncReport, never()).addUpdatedPackage(any(ContentProviderPackageDetails.class));
+ verify(mockConfiguration, times(2)).get(anyString());
+ verifyNew(File.class).withArguments(directoryPath);
+
+ ArgumentCaptor<ContentProviderPackageDetails> argument = ArgumentCaptor
+ .forClass(ContentProviderPackageDetails.class);
+ verify(mockPackageSyncReport, times(1)).addNewPackage(argument.capture());
+ Assert.assertEquals("sha256", argument.getValue().getSHA256());
+ Assert.assertEquals("[sha256=sha256]", argument.getValue().getKey().getVersion());
+
+ verify(mockExtraFolder, times(1)).isDirectory();
+ }
+
+}
\ No newline at end of file
commit 6d15c4f3ee59ee0922410cd488b5eda32fd1b5cc
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Feb 1 16:29:01 2012 -0600
[BZ 771418] Adding unit tests for changed functionality around display version and existing package version selection.
diff --git a/.classpath b/.classpath
index a66ca82..88f670d 100644
--- a/.classpath
+++ b/.classpath
@@ -126,6 +126,12 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/2.2.1.GA/jaxrs-api-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar"/>
<classpathentry exported="true" kind="var" path="JDK_HOME/lib/tools.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-api-mockito/1.4.11/powermock-api-mockito-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-core/1.4.11/powermock-core-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-api-support/1.4.11/powermock-api-support-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-module-testng-common/1.4.11/powermock-module-testng-common-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-module-testng/1.4.11/powermock-module-testng-1.4.11.jar"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/itests/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/drift-mongodb/src/main/java"/>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 68ecc5c..b47f0e2 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -23,6 +23,7 @@
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
<clean.db>true</clean.db>
+ <powermock.version>1.4.11</powermock.version>
</properties>
<dependencies>
@@ -529,6 +530,20 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java
new file mode 100644
index 0000000..7ee018f
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java
@@ -0,0 +1,457 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.server.content.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.sql.DataSource;
+
+import junit.framework.Assert;
+
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.IObjectFactory;
+import org.testng.annotations.ObjectFactory;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.content.Architecture;
+import org.rhq.core.domain.content.Package;
+import org.rhq.core.domain.content.PackageBits;
+import org.rhq.core.domain.content.PackageBitsBlob;
+import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.PackageVersion;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.enterprise.server.content.ContentManagerBean;
+import org.rhq.enterprise.server.content.ContentManagerHelper;
+import org.rhq.enterprise.server.content.ContentManagerLocal;
+import org.rhq.enterprise.server.plugin.pc.content.PackageTypeBehavior;
+
+(a)PrepareForTest(ContentManagerHelper.class)
+public class ContentManagerBeanMockTest {
+
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There are no existing package version objects in the database
+ * 2) A new package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersion() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = "PackageDisplayVersion";
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+
+ Architecture mockArchitecture = mock(Architecture.class);
+ when(mockArchitecture.getName()).thenReturn("ArchitectureName");
+ when(mockEntityManager.find(eq(Architecture.class), anyInt())).thenReturn(mockArchitecture);
+
+ PackageType mockPackageType = mock(PackageType.class);
+ when(mockEntityManager.find(eq(PackageType.class), eq(1))).thenReturn(mockPackageType);
+
+ PackageTypeBehavior mockPackageTypeBehavior = mock(PackageTypeBehavior.class);
+ PowerMockito.mockStatic(ContentManagerHelper.class);
+ when(ContentManagerHelper.getPackageTypeBehavior(1)).thenReturn(mockPackageTypeBehavior);
+
+ when(mockEntityManager.createNamedQuery(eq(Architecture.QUERY_FIND_BY_NAME))).thenReturn(mockQuery);
+ when(mockEntityManager.createNamedQuery(eq(Package.QUERY_FIND_BY_NAME_PKG_TYPE_ID))).thenReturn(mockQuery);
+
+ ContentManagerLocal mockContentManager = mock(ContentManagerLocal.class);
+ Package mockPackage = mock(Package.class);
+ when(mockContentManager.persistPackage(isNotNull(Package.class))).thenReturn(mockPackage);
+
+ when(mockEntityManager.find(eq(Package.class), any())).thenReturn(mockPackage);
+ when(mockPackage.getPackageType()).thenReturn(mockPackageType);
+
+ PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockContentManager.persistPackageVersion(isNotNull(PackageVersion.class)))
+ .thenReturn(mockPackageVersion);
+
+ when(mockEntityManager.find(eq(PackageVersion.class), anyInt())).thenReturn(mockPackageVersion);
+ when(mockPackageVersion.getGeneralPackage()).thenReturn(mockPackage);
+ when(mockPackageVersion.getArchitecture()).thenReturn(mockArchitecture);
+
+ PackageBitsBlob mockPackageBitsBlob = mock(PackageBitsBlob.class);
+ when(mockEntityManager.find(eq(PackageBitsBlob.class), anyInt())).thenReturn(mockPackageBitsBlob);
+
+ PackageBits mockBits = mock(PackageBits.class);
+ when(mockEntityManager.find(eq(PackageBits.class), anyInt())).thenReturn(mockBits);
+
+ DataSource mockDataSource = mock(DataSource.class);
+ Connection mockConnection = mock(Connection.class);
+ when(mockDataSource.getConnection()).thenReturn(mockConnection);
+ PreparedStatement mockPreparedStatement1 = mock(PreparedStatement.class);
+ when(mockConnection.prepareStatement(anyString())).thenReturn(mockPreparedStatement1);
+ ResultSet mockResultSet = mock(ResultSet.class);
+ when(mockPreparedStatement1.executeQuery()).thenReturn(mockResultSet);
+ when(mockResultSet.next()).thenReturn(true, false);
+ Blob mockBlob = mock(Blob.class);
+ when(mockResultSet.getBlob(anyInt())).thenReturn(mockBlob);
+ OutputStream mockOutputStream = mock(OutputStream.class);
+ when(mockBlob.setBinaryStream(anyLong())).thenReturn(mockOutputStream);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ else if (field.getName().equals("contentManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockContentManager);
+ field.setAccessible(false);
+ }
+ else if (field.getName().equals("dataSource")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockDataSource);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(2)).size();
+ verify(mockList, never()).get(anyInt());
+
+ verify(result, times(2)).setPackageBits(any(PackageBits.class));
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ verify(result).setSHA256(digest.calcDigestString(sampleContent));
+ verify(result).setFileSize((long) sampleContent.getBytes().length);
+ verify(result).setDisplayVersion(displayVersion);
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There is an existing package
+ * 2) No package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ * 4) No updates required to the packageVersion retrieved because input display version is null.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersionExistingPackage() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = null;
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+ when(mockList.size()).thenReturn(1);
+ PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockList.get(eq(0))).thenReturn(mockPackageVersion);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(1)).size();
+ verify(mockList, times(1)).get(eq(0));
+ verify(mockEntityManager, times(1)).createNamedQuery(anyString());
+
+ Assert.assertEquals(mockPackageVersion, result);
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There is an existing package
+ * 2) No package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ * 4) No updates required to the packageVersion retrieved because input display version is empty after trimming.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersionExistingPackageEmptyDisplayVersion() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = " ";
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+ when(mockList.size()).thenReturn(1);
+ PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockList.get(eq(0))).thenReturn(mockPackageVersion);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(1)).size();
+ verify(mockList, times(1)).get(eq(0));
+ verify(mockEntityManager, times(1)).createNamedQuery(anyString());
+
+ Assert.assertEquals(mockPackageVersion, result);
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There are two existing package version objects stored in the database
+ * 2) Only the first package version is ever touched by this method
+ * 2) No package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ * 4) No updates required to the packageVersion retrieved because input display version is empty after trimming.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersionExistingPackagePickOnlyFirst() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = " ";
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+ when(mockList.size()).thenReturn(2);
+ PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockList.get(eq(0))).thenReturn(mockPackageVersion);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(1)).size();
+ verify(mockList, times(1)).get(eq(0));
+ verify(mockList, never()).get(eq(1));
+
+ verify(mockEntityManager, times(1)).createNamedQuery(anyString());
+
+ Assert.assertEquals(mockPackageVersion, result);
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There is an existing package
+ * 2) No package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ * 4) Updates required to the packageVersion because display version needs to be updated.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersionExistingPackageUpdateDisplayVersion() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = "PackageDisplayVersion";
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+ when(mockList.size()).thenReturn(1);
+ final PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockList.get(eq(0))).thenReturn(mockPackageVersion);
+
+ when(mockPackageVersion.getId()).thenReturn(0);
+ ContentManagerLocal mockContentManager = mock(ContentManagerLocal.class);
+ when(mockContentManager.persistPackageVersion(any(PackageVersion.class))).thenAnswer(
+ new Answer<PackageVersion>() {
+ public PackageVersion answer(InvocationOnMock invocation) throws Throwable {
+ Object[] args = invocation.getArguments();
+ return (PackageVersion) args[0];
+ }
+ });
+
+ when(mockEntityManager.find(eq(PackageVersion.class), eq(0))).thenAnswer(new Answer<PackageVersion>() {
+ public PackageVersion answer(InvocationOnMock invocation) throws Throwable {
+ return mockPackageVersion;
+ }
+ });
+
+ Package mockPackage = mock(Package.class);
+ when(mockPackageVersion.getGeneralPackage()).thenReturn(mockPackage);
+ Architecture mockArchitecture = mock(Architecture.class);
+ when(mockPackageVersion.getArchitecture()).thenReturn(mockArchitecture);
+ when(mockPackageVersion.getExtraProperties()).thenReturn(null);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ else if (field.getName().equals("contentManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockContentManager);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(1)).size();
+ verify(mockList, times(1)).get(eq(0));
+ verify(mockEntityManager, times(1)).createNamedQuery(anyString());
+
+ verify(mockPackageVersion, times(1)).setDisplayVersion(displayVersion);
+
+ Assert.assertEquals(mockPackageVersion, result);
+ }
+}
commit 76079fa65b0c11ebde9cde6eb19d3884717695aa
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Jan 24 16:56:57 2012 -0600
[BZ 781763] Added extra code to check if the directory for the JBoss server even exists before attempting to perform content discovery. If the folder is not there then the list will be empty since nothing is discovered.
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
index 33a2f02..af4243a 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
@@ -79,61 +79,63 @@ public class JarContentDelegate extends FileContentDelegate {
public Set<ResourcePackageDetails> discoverDeployedPackages() {
Set<ResourcePackageDetails> packages = new HashSet<ResourcePackageDetails>();
- File[] files = this.directory.listFiles(new FileFilter() {
- public boolean accept(File pathname) {
- return pathname.getName().endsWith(getFileEnding()) && pathname.isFile();
- }
- });
-
- for (File file : files) {
- String manifestVersion = null;
- JarFile jf = null;
- try {
- Configuration config = new Configuration();
- jf = new JarFile(file);
- Manifest manifest = jf.getManifest();
-
- if (manifest != null) {
- Attributes attributes = manifest.getMainAttributes();
-
- manifestVersion = attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
-
- config.put(new PropertySimple("version", manifestVersion));
- config.put(new PropertySimple("title", attributes.getValue(Attributes.Name.IMPLEMENTATION_TITLE)));
- config.put(new PropertySimple("url", attributes.getValue(Attributes.Name.IMPLEMENTATION_URL)));
- config
- .put(new PropertySimple("vendor", attributes.getValue(Attributes.Name.IMPLEMENTATION_VENDOR)));
-
- config.put(new PropertySimple("classpath", attributes.getValue(Attributes.Name.CLASS_PATH)));
- config.put(new PropertySimple("sealed", attributes.getValue(Attributes.Name.SEALED)));
+ if (this.directory != null && this.directory.exists() && this.directory.isDirectory()) {
+ File[] files = this.directory.listFiles(new FileFilter() {
+ public boolean accept(File pathname) {
+ return pathname.getName().endsWith(getFileEnding()) && pathname.isFile();
}
- String sha256 = null;
- try {
- sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(file);
- } catch (Exception e) {
- // leave as null
- }
-
- ResourcePackageDetails details = new ResourcePackageDetails(new PackageDetailsKey(file.getName(),
- getVersion(sha256), getPackageTypeName(), "noarch"));
-
- packages.add(details);
- details.setFileCreatedDate(file.lastModified()); // Why don't we have a last modified time?
- details.setFileName(file.getName());
- details.setFileSize(file.length());
- details.setClassification(MIME_TYPE_JAR);
- details.setSHA256(sha256);
- details.setDisplayVersion(getDisplayVersion(file));
-
- details.setExtraProperties(config);
- } catch (IOException e) {
- // If we can't open it, don't worry about it, we just won't know the version
- } finally {
+ });
+
+ for (File file : files) {
+ String manifestVersion = null;
+ JarFile jf = null;
try {
- if (jf != null)
- jf.close();
- } catch (Exception e) {
- // Nothing we can do here ...
+ Configuration config = new Configuration();
+ jf = new JarFile(file);
+ Manifest manifest = jf.getManifest();
+
+ if (manifest != null) {
+ Attributes attributes = manifest.getMainAttributes();
+
+ manifestVersion = attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+
+ config.put(new PropertySimple("version", manifestVersion));
+ config.put(new PropertySimple("title", attributes.getValue(Attributes.Name.IMPLEMENTATION_TITLE)));
+ config.put(new PropertySimple("url", attributes.getValue(Attributes.Name.IMPLEMENTATION_URL)));
+ config
+ .put(new PropertySimple("vendor", attributes.getValue(Attributes.Name.IMPLEMENTATION_VENDOR)));
+
+ config.put(new PropertySimple("classpath", attributes.getValue(Attributes.Name.CLASS_PATH)));
+ config.put(new PropertySimple("sealed", attributes.getValue(Attributes.Name.SEALED)));
+ }
+ String sha256 = null;
+ try {
+ sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(file);
+ } catch (Exception e) {
+ // leave as null
+ }
+
+ ResourcePackageDetails details = new ResourcePackageDetails(new PackageDetailsKey(file.getName(),
+ getVersion(sha256), getPackageTypeName(), "noarch"));
+
+ packages.add(details);
+ details.setFileCreatedDate(file.lastModified()); // Why don't we have a last modified time?
+ details.setFileName(file.getName());
+ details.setFileSize(file.length());
+ details.setClassification(MIME_TYPE_JAR);
+ details.setSHA256(sha256);
+ details.setDisplayVersion(getDisplayVersion(file));
+
+ details.setExtraProperties(config);
+ } catch (IOException e) {
+ // If we can't open it, don't worry about it, we just won't know the version
+ } finally {
+ try {
+ if (jf != null)
+ jf.close();
+ } catch (Exception e) {
+ // Nothing we can do here ...
+ }
}
}
}
commit 04a56516c22a106620aad8fa9ca3349b50bd6810
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Jan 24 16:55:26 2012 -0600
[BZ 771418] Adding java docs for deprecated CLI method.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index 498e0be..ff39171 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -505,6 +505,11 @@ public class ResourceClientProxy {
return remoteClient.getContentManager().getBackingPackageForResource(remoteClient.getSubject(), resourceClientProxy.resourceId);
}
+ /**
+ * @deprecated Superseded by ({@link #updateBackingContent(String, String)}
+ *
+ * @param fileName file name
+ */
@Deprecated
public void updateBackingContent(String filename) {
this.updateBackingContent(filename, null);
@@ -649,6 +654,11 @@ public class ResourceClientProxy {
public InstalledPackage getBackingContent();
+ /**
+ * @deprecated Superseded by ({@link #updateBackingContent(String, String)}
+ *
+ * @param fileName file name
+ */
@Deprecated
public void updateBackingContent(String fileName);
commit b1f4739b249968d01c1ade6ca0f6bc7ee930f61c
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Jan 17 08:56:35 2012 -0600
[BZ 771418] Mark old updateBackingContent method (with no display version) as deprecated.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index 63ca2d7..498e0be 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -505,6 +505,7 @@ public class ResourceClientProxy {
return remoteClient.getContentManager().getBackingPackageForResource(remoteClient.getSubject(), resourceClientProxy.resourceId);
}
+ @Deprecated
public void updateBackingContent(String filename) {
this.updateBackingContent(filename, null);
}
@@ -648,10 +649,11 @@ public class ResourceClientProxy {
public InstalledPackage getBackingContent();
- public void updateBackingContent(String fileName, String displayVersion);
-
+ @Deprecated
public void updateBackingContent(String fileName);
+ public void updateBackingContent(String fileName, String displayVersion);
+
public void retrieveBackingContent(String fileName) throws IOException;
}
commit bc95b6a58ae9c676216cb66625853b52cf2980fd
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 16 15:21:06 2012 -0600
[BZ 782207] Removed the rhnhosted server plugin directory and all the pom and classpath references.
diff --git a/.classpath b/.classpath
index e20fe75..a66ca82 100644
--- a/.classpath
+++ b/.classpath
@@ -204,9 +204,6 @@
<classpathentry kind="src" path="modules/enterprise/server/plugins/yum/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/packagetype-cli/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/cobbler/src/main/java"/>
- <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/src/main/java"/>
- <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/src/test/java"/>
- <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/target/classes/generated-source"/>
<classpathentry kind="src" path="modules/plugins/platform/src/main/java"/>
<classpathentry kind="src" path="modules/plugins/platform/src/test/java"/>
<classpathentry kind="src" path="modules/plugins/jmx/src/main/java"/>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index ddb8e3a..a51ac52 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -56,7 +56,6 @@
<module>disk</module>
<module>yum</module>
<module>url</module>
- <module>rhnhosted</module>
<module>jboss-software</module>
<module>perspectives/core</module>
<module>alert-email</module>
diff --git a/modules/enterprise/server/plugins/rhnhosted/.gitignore b/modules/enterprise/server/plugins/rhnhosted/.gitignore
deleted file mode 100644
index 32db266..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/main/generated-source
diff --git a/modules/enterprise/server/plugins/rhnhosted/README.testing b/modules/enterprise/server/plugins/rhnhosted/README.testing
deleted file mode 100644
index 9257b66..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/README.testing
+++ /dev/null
@@ -1,24 +0,0 @@
-Overview:
- Run a test against RHN Hosted to see if basic rhnhosted functionality is working.
-
-What will be tested:
- Package Syncs & Distribution Syncs
-
-Setup:
- 1) systemid file is required at: "/etc/sysconfig/rhn/systemid"
- Register a RHEL5 system to RHN Hosted.
- Copy the /etc/sysconfig/rhn/systemid file from the RHEL5 box to your local machine where you will be running RHQ and this test.
-
- 2) /usr/share/rhn/RHNS-CA-CERT
- This is required if you want to run against a https connection
- Copy this from a RHEL5 box
-
- 3) Edit pom.xml
- Change the property: "RunRHNProviderTest" to "true".
-
- If you want to run a more exhaustive test change:
- "RunRHNMD5SumTests" to "true". This will download each package and kickstart file and compare the md5sum against the expected value.
-
-Run:
- Execute: mvn test -Dtest="RHNProviderTest"
-
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
deleted file mode 100644
index e4c2529..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>rhq-serverplugin-rhnhosted</artifactId>
- <packaging>jar</packaging>
-
- <name>RHQ Enterprise Server RHN Hosted Plugin</name>
- <description>Provides ability to communicate with RHN Hosted</description>
-
- <dependencies>
- <!-- Internal Deps -->
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
-
- <!-- Bouncy Castle -->
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>140</version>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcpg-jdk15</artifactId>
- <version>140</version>
- </dependency>
-
- <!-- Apache WS XMLRPC -->
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
- <version>3.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-common</artifactId>
- <version>3.1.2</version>
- </dependency>
-
- <!-- JAXB -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl.version}</version>
- </dependency>
-
- </dependencies>
-
-
- <build>
-
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <includes>
- <include>test-log4j.xml</include>
- </includes>
- </testResource>
- </testResources>
-
- <plugins>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
- -->
- <systemProperties>
- <property>
- <!--
- set this to true if you want to run a test with RHNProvider against RHN Hosted. It will sync packages & kickstart
- trees This should be set to false by default
- -->
- <name>RunRHNProviderTest</name>
- <value>false</value>
- </property>
- <property>
- <!--
- set this to true if you want to run a more exhaustive test. This prop will trigger the InputStreams to be read fully
- while comparing the resulting md5sum with the expected value. This will take longer to run, so by default it is left
- to false
- -->
- <name>RunRHNMD5SumTests</name>
- <value>false</value>
- </property>
- <property>
- <!--
- set this to true if you want the temp xmlrpc data read to be saved. by default the files are stored in /tmp and will
- be deleted after use.
- -->
- <name>RhnXmlrpcSaveTempFiles</name>
- <value>false</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>test-log4j.xml</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeScope>runtime</includeScope>
- <excludeTransitive>false</excludeTransitive>
- <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>xjc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <packageName>org.rhq.enterprise.server.plugins.rhnhosted.xml</packageName>
- <outputDirectory>${project.build.outputDirectory}/generated-source</outputDirectory>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <profiles>
-
- <profile>
- <id>dev</id>
-
- <properties>
- <rhq.rootDir>../../../../..</rhq.rootDir>
- <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
- <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/rhq-serverplugins</rhq.deploymentDir>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
-
- <execution>
- <id>deploy</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="${rhq.deploymentDir}" />
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating ${deployment.file}...</echo>
- <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <configuration>
- <tasks>
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Deleting ${deployment.file}...</echo>
- <delete file="${deployment.file}" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>deploy-jar-meta-inf</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating META-INF dir in ${deployment.file}...</echo>
- <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}">
- <patternset>
- <include name="META-INF/**" />
- </patternset>
- </unjar>
- <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- <profile>
- <id>cobertura-plugins</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>${cobertura.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>cobertura-instrument</id>
- <phase>process-test-classes</phase>
- <configuration>
- <tasks>
- <!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/cobertura/backup" />
- <!-- backup all classes so that we can instrument the original classes-->
- <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
- <fileset dir="target/classes">
- <include name="**/*.class" />
- </fileset>
- </copy>
- <!-- create a properties file and save there location of cobertura data file-->
- <touch file="target/classes/cobertura.properties" />
- <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
- <!-- instrument all classes in target/classes directory -->
- <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/classes">
- <include name="**/*.class" />
- </fileset>
- </cobertura-instrument>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>cobertura-report</id>
- <phase>prepare-package</phase>
- <configuration>
- <tasks>
- <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
- <!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/site/cobertura" />
- <!-- restore classes from backup folder to classes folder -->
- <copy toDir="target/classes" verbose="true" overwrite="true">
- <fileset dir="target/cobertura/backup">
- <include name="**/*.class" />
- </fileset>
- </copy>
- <!-- delete backup folder-->
- <delete dir="target/cobertura/backup" />
- <!-- create a code coverage report -->
- <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
- <fileset dir="${basedir}/src/main/java">
- <include name="**/*.java" />
- </fileset>
- </cobertura-report>
- <!-- delete cobertura.properties file -->
- <delete file="target/classes/cobertura.properties" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXML.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXML.java
deleted file mode 100644
index 6ecbf3a..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXML.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.output.XMLOutputter;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageObsoletesEntryType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageObsoletesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageProvidesEntryType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageProvidesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageRequiresEntryType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageRequiresType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageType;
-
-/**
- * @author John Matthews
- */
-public class PrimaryXML {
- /** Example package element from primary.xml used by yum
- *
-
- <package type="rpm">
- <name>gnome-user-docs</name>
- <arch>noarch</arch>
- <version ver="2.16.0" rel="2.fc6" epoch="0"/>
- <checksum type="md5" pkgid="YES">4e7d379301407b4c79f211596b802a13</checksum>
- <summary>GNOME User Documentation</summary>
- <description>This package contains end user documentation for the GNOME desktop environment.</description>
- <packager/>
- <url/>
- <time file="1157750823" build="1157750823"/>
- <size package="6549456" archive="11858600" installed=""/>
- <location href="getPackage/gnome-user-docs-2.16.0-2.fc6.noarch.rpm"/>
- <format>
- <rpm:license>FDL</rpm:license>
- <rpm:vendor>Red Hat, Inc.</rpm:vendor>
- <rpm:group>Documentation</rpm:group>
- <rpm:buildhost>altix2.build.redhat.com</rpm:buildhost>
- <rpm:sourcerpm>gnome-user-docs-2.16.0-2.fc6.src.rpm</rpm:sourcerpm>
- <rpm:header-range start="440" end="97656"/>
- <rpm:provides>
- <rpm:entry name="gnome-user-docs" flags="EQ" epoch="0" ver="2.16.0" rel="2.fc6"/>
- </rpm:provides>
- <rpm:requires>
- <rpm:entry name="/bin/sh"/>
- <rpm:entry name="/bin/sh"/>
- <rpm:entry name="rpmlib(CompressedFileNames)" flags="LE" epoch="0" ver="3.0.4" rel="1"/>
- <rpm:entry name="rpmlib(PayloadFilesHavePrefix)" flags="LE" epoch="0" ver="4.0" rel="1"/>
- <rpm:entry name="rpmlib(VersionedDependencies)" flags="LE" epoch="0" ver="3.0.3" rel="1"/>
- <rpm:entry name="scrollkeeper" flags="GE" epoch="0" ver="0.3.11"/>
- </rpm:requires>
- <rpm:conflicts/>
- <rpm:obsoletes>
- <rpm:entry name="gnome-users-guide"/>
- </rpm:obsoletes>
- </format>
- </package>
-
- **/
-
- /** RPM uses bit flags to determine if a package relationships is "Greater, LessThan, Equals";
- * These values can be found from running the python console and executing
- * "import rpm" "print rpm.RPMSENSE_LESS", "print rpm.RPMSENSE_GREATER", "print rpm.RPMSENSE_EQUAL"
- */
- final static int RPM_SENSE_LESS = 2;
- final static int RPM_SENSE_GREATER = 4;
- final static int RPM_SENSE_EQUAL = 8;
-
- final static String RHNHOSTED_URI = "http://rhq-project.org/rhnhosted";
-
- static private final Log log = LogFactory.getLog(PrimaryXML.class);
-
- static public String getFlags(String sense) {
- int tmp = Integer.parseInt(sense);
- int flags = tmp & (RPM_SENSE_LESS | RPM_SENSE_GREATER | RPM_SENSE_EQUAL);
- if (flags == (RPM_SENSE_LESS | RPM_SENSE_EQUAL)) {
- return "LE";
- } else if (flags == RPM_SENSE_LESS) {
- return "LT";
- } else if (flags == (RPM_SENSE_GREATER | RPM_SENSE_EQUAL)) {
- return "GE";
- } else if (flags == (RPM_SENSE_GREATER)) {
- return "GT";
- } else if (flags == (RPM_SENSE_EQUAL)) {
- return "EQ";
- }
- return "";
- }
-
- /**
- * Will return the 'epoch'. If the epoch is empty, then a "0" is returned
- * to comply with yum's expectations for package metadata
- * @param version string containing epoch:version-release
- * @return
- */
- static public String getEpoch(String version) {
- int end = version.indexOf("-");
- if (end < 0) {
- return "0";
- }
- String tmp = version.substring(0, end);
- int index = tmp.indexOf(":");
- if (index < 0) {
- return "0";
- }
- String epoch = tmp.substring(0, index);
- if (StringUtils.isBlank(epoch)) {
- return "0";
- }
- return epoch;
- }
-
- static public String getVersion(String version) {
- int end = version.indexOf("-");
- if (end < 0) {
- return version; //unsure how to parse, return passed in string
- }
- String tmp = version.substring(0, end);
- int start = tmp.indexOf(":");
- if (start < 0) {
- start = 0;
- } else {
- start = start + 1;
- }
- return tmp.substring(start, end);
- }
-
- static public String getRelease(String version) {
- int start = version.indexOf("-");
- if (start < 0) {
- return "";
- }
- start = start + 1; // go past the "-" character
- return version.substring(start);
- }
-
- /**
- * Will create a xml string snippet conforming to the <package> entry in a primary.xml file used by yum
- *
- * @param pkg JAXB Object to transform
- * @return string snippet of xml data
- */
- static public String createPackageXML(RhnPackageType pkg) {
- Namespace packageNS = Namespace.getNamespace(RHNHOSTED_URI);
-
- Element top = new Element("package", packageNS);
- top.setAttribute("type", "rpm");
-
- Element name = new Element("name", packageNS);
- name.setText(pkg.getName());
- top.addContent(name);
-
- Element arch = new Element("arch", packageNS);
- arch.setText(pkg.getPackageArch());
- top.addContent(arch);
-
- Element version = new Element("version", packageNS);
- version.setText(pkg.getVersion());
- version.setAttribute("ver", pkg.getVersion());
- version.setAttribute("rel", pkg.getRelease());
- String epoch = pkg.getEpoch();
- // Note, if epoch is empty we need to change it to a zero as that is what yum expects.
- if (StringUtils.isBlank(epoch)) {
- epoch = "0";
- }
- version.setAttribute("epoch", epoch);
- top.addContent(version);
-
- Element checksum = new Element("checksum", packageNS);
- checksum.setAttribute("type", "md5");
- checksum.setAttribute("pkgid", "YES");
- checksum.setText(pkg.getMd5Sum());
- top.addContent(checksum);
-
- Element summary = new Element("summary", packageNS);
- summary.setText(pkg.getRhnPackageSummary());
- top.addContent(summary);
-
- Element description = new Element("description", packageNS);
- description.setText(pkg.getRhnPackageDescription());
- top.addContent(description);
-
- Element packager = new Element("packager", packageNS);
- //TODO: Not sure if we get 'packager' info from RHN.
- packager.setText("");
- top.addContent(packager);
-
- Element url = new Element("url", packageNS);
- //TODO: Not sure what to put for url value, don't think it applies to RHN
- url.setText("");
- top.addContent(url);
-
- Element time = new Element("time", packageNS);
- //TODO: Verify below, guessing for file/build times.
- time.setAttribute("file", pkg.getLastModified());
- time.setAttribute("build", pkg.getBuildTime());
- top.addContent(time);
-
- Element size = new Element("size", packageNS);
- size.setAttribute("package", pkg.getPackageSize());
- size.setAttribute("archive", pkg.getPayloadSize());
- //TODO: Unsure about installed, does this need to change on server side when package is installed on a client?
- size.setAttribute("installed", "");
- top.addContent(size);
-
- Element location = new Element("location", packageNS);
- //This value can not be empty and can not contain a "?".
- //It's value is ignored by the RHQ processing for yum.
- //RHQ will append a series of request parameters to download the file.
- String rpmName = RHNHelper.constructRpmDownloadName(pkg.getName(), pkg.getVersion(), pkg.getRelease(), pkg.getEpoch(),
- pkg.getPackageArch());
- location.setAttribute("href", rpmName);
- top.addContent(location);
-
- Element format = new Element("format", packageNS);
-
- Namespace rpmNS = Namespace.getNamespace("rpm", "http://rhq-project.org/rhnhosted");
- Element rpmLicense = new Element("license", rpmNS);
- rpmLicense.setText(pkg.getRhnPackageCopyright());
- format.addContent(rpmLicense);
-
- Element rpmVendor = new Element("vendor", rpmNS);
- rpmVendor.setText(pkg.getRhnPackageVendor());
- format.addContent(rpmVendor);
-
- Element rpmGroup = new Element("group", rpmNS);
- rpmGroup.setText(pkg.getPackageGroup());
- format.addContent(rpmGroup);
-
- Element rpmBuildHost = new Element("buildhost", rpmNS);
- rpmBuildHost.setText(pkg.getBuildHost());
- format.addContent(rpmBuildHost);
-
- Element rpmSourceRPM = new Element("sourcerpm", rpmNS);
- rpmSourceRPM.setText(pkg.getSourceRpm());
- format.addContent(rpmSourceRPM);
-
- Element rpmHeaderRange = new Element("header-range", rpmNS);
- rpmHeaderRange.setAttribute("start", pkg.getRhnPackageHeaderStart());
- rpmHeaderRange.setAttribute("end", pkg.getRhnPackageHeaderEnd());
- format.addContent(rpmHeaderRange);
-
- Element rpmProvides = new Element("provides", rpmNS);
- RhnPackageProvidesType provides_type = pkg.getRhnPackageProvides();
- if (provides_type != null) {
- List<RhnPackageProvidesEntryType> provides = provides_type.getRhnPackageProvidesEntry();
- for (RhnPackageProvidesEntryType provEntry : provides) {
- Element entry = new Element("entry", rpmNS);
- entry.setAttribute("name", provEntry.getName());
- String flags = getFlags(provEntry.getSense());
- if (!StringUtils.isBlank(flags)) {
- entry.setAttribute("flags", flags);
- String provEpoch = getEpoch(provEntry.getVersion());
- entry.setAttribute("epoch", provEpoch);
- String provVer = getVersion(provEntry.getVersion());
- entry.setAttribute("ver", provVer);
- String provRel = getRelease(provEntry.getVersion());
- entry.setAttribute("rel", getRelease(provEntry.getVersion()));
- }
- rpmProvides.addContent(entry);
- }
- }
- format.addContent(rpmProvides);
-
- Element rpmRequires = new Element("requires", rpmNS);
- RhnPackageRequiresType requires_type = pkg.getRhnPackageRequires();
- if (requires_type != null) {
- List<RhnPackageRequiresEntryType> requires = requires_type.getRhnPackageRequiresEntry();
- for (RhnPackageRequiresEntryType reqEntry : requires) {
- Element entry = new Element("entry", rpmNS);
- entry.setAttribute("name", reqEntry.getName());
- String flags = getFlags(reqEntry.getSense());
- if (!StringUtils.isBlank(flags)) {
- entry.setAttribute("flags", flags);
- String reqEpoch = getEpoch(reqEntry.getVersion());
- entry.setAttribute("epoch", reqEpoch);
- String reqVer = getVersion(reqEntry.getVersion());
- entry.setAttribute("ver", reqVer);
- String reqRel = getRelease(reqEntry.getVersion());
- entry.setAttribute("rel", getRelease(reqEntry.getVersion()));
- }
- rpmRequires.addContent(entry);
- }
- }
- format.addContent(rpmRequires);
-
- Element rpmConflicts = new Element("conflicts", rpmNS);
- rpmConflicts.setText(pkg.getRhnPackageConflicts());
- format.addContent(rpmConflicts);
-
- Element rpmObsoletes = new Element("obsoletes", rpmNS);
- RhnPackageObsoletesType obs_type = pkg.getRhnPackageObsoletes();
- if (obs_type != null) {
- List<Serializable> obsoletes = obs_type.getContent();
- for (Serializable s : obsoletes) {
- RhnPackageObsoletesEntryType obsEntry = null;
- if (s instanceof String) {
- String obsString = (String) s;
- if (StringUtils.isBlank(obsString)) {
- continue;
- }
- //log.debug("Adding Obsoletes info <String Class> value = " + obsString);
- Element entry = new Element("entry", rpmNS);
- entry.setAttribute("name", obsString);
- rpmObsoletes.addContent(entry);
- // skip rest of obs processing for this entry
- continue;
- }
- //
- // Below obs entry processing is for JAXBElement types only
- //
- if (s instanceof JAXBElement) {
- JAXBElement je = (JAXBElement) s;
- //log.debug("Processing obsolete info for JAXBElement of type : " + je.getDeclaredType());
- obsEntry = (RhnPackageObsoletesEntryType) je.getValue();
- } else if (s instanceof RhnPackageObsoletesEntryType) {
- obsEntry = (RhnPackageObsoletesEntryType) s;
- } else {
- log.info("Processing obsoletes info: unable to determine what class obsoletes entry is: "
- + "getClass() = " + s.getClass() + ", toString() = " + s.toString() + ", hashCode = "
- + s.hashCode());
- continue;
- }
- Element entry = new Element("entry", rpmNS);
- entry.setAttribute("name", obsEntry.getName());
- String obsVer = obsEntry.getVersion();
- if (!StringUtils.isBlank(obsVer)) {
- entry.setAttribute("version", obsVer);
- }
- String obsFlags = getFlags(obsEntry.getSense());
- if (!StringUtils.isBlank(obsFlags)) {
- entry.setAttribute("flags", obsFlags);
- }
- rpmObsoletes.addContent(entry);
- }
- }
- format.addContent(rpmObsoletes);
-
- top.addContent(format);
- XMLOutputter xmlOut = new XMLOutputter();
- return xmlOut.outputString(top);
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivator.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivator.java
deleted file mode 100644
index 53b74a8..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivator.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.KeyException;
-import java.util.ArrayList;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.certificate.PublicKeyRing;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.XmlRpcExecutor;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.XmlRpcExecutorFactory;
-
-/**
- * @author pkilambi
- *
- */
-public class RHNActivator {
-
- private String certificateText;
- private String systemid;
- private XmlRpcExecutor client;
- private final Log log = LogFactory.getLog(RHNActivator.class);
-
- /**
- * Constructor
- * @param systemIdString xml systemid
- * @param certificateTextIn certificate file path
- * @param serverUrlIn hosted server url as a string
- * @throws Exception
- */
- public RHNActivator(String systemIdString, String certificateTextIn, String serverUrlIn) throws Exception {
-
- this.certificateText = certificateTextIn;
- this.systemid = systemIdString;
- URL serverUrl = new URL(serverUrlIn);
- client = newClient(serverUrl);
-
- }
-
- /**
- * RHN Connector Constructor
- * @param certificateTextIn certificate text as a string
- * @param serverUrlIn hosted serverUrl
- *
- */
- public RHNActivator(String certificateTextIn, String serverUrlIn) throws Exception {
- this.certificateText = certificateTextIn;
-
- URL serverUrl = new URL(serverUrlIn);
- client = newClient(serverUrl);
- File systemid_file = new File(RHNConstants.DEFAULT_SYSTEM_ID);
- this.systemid = FileUtils.readFileToString(systemid_file);
- }
-
- protected XmlRpcExecutor newClient(URL serverUrl) {
- return XmlRpcExecutorFactory.getClient(serverUrl.toString());
- }
-
- /**
- * Call that invokes the server object and passing in the xmlrpc
- * exposed call to activate the rhq server.
- *
- */
- public void processActivation() throws Exception {
-
- ArrayList<String> params = new ArrayList<String>();
- params.add(this.systemid);
- params.add(this.certificateText);
-
- this.client.execute("satellite.activateSatellite", params);
- log.info("Activation successful");
- }
-
- /**
- * Call that invokes the server object and passing in the xmlrpc
- * exposed call to deactivate the rhq server.
- *
- */
- public void processDeActivation() throws Exception {
- ArrayList<String> params = new ArrayList<String>();
- params.add(this.systemid);
-
- this.client.execute("satellite.deactivateSatellite", params);
- log.info("Activation successful");
-
- // this.deleteCertTempFile(this.certificateFileName);
- }
-
- public PublicKeyRing readDefaultKeyRing() throws ClassNotFoundException, KeyException, IOException {
- InputStream keyringStream = new FileInputStream(RHNConstants.DEFAULT_WEBAPP_GPG_KEY_RING);
- return new PublicKeyRing(keyringStream);
- }
-
- /**
- * Delete the certificate file from the filesystem.
- * @param fileName certificate filename
- * @return boolean returns delete operation status
- *
- */
- protected boolean deleteCertTempFile(String fileName) {
- File f = new File(fileName);
- return f.delete();
- }
-
- public String getSystemid() {
- return systemid;
- }
-
- public static void main(String[] args) throws Exception {
- // commandline test
- if (args.length > 0) {
-
- String systemId = FileUtils.readFileToString(new File(args[0]));
- String cert = FileUtils.readFileToString(new File(args[1]));
-
- String serverUrl = "http://satellite.rhn.redhat.com/rpc/api";
- try {
- RHNActivator rhqServer = new RHNActivator(systemId, cert, serverUrl);
- rhqServer.processActivation();
- System.out.println("Activation Complete");
- rhqServer.processDeActivation();
- System.out.println("De-Activation Complete");
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNConstants.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNConstants.java
deleted file mode 100644
index 74a49d8..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-/**
- * @author pkilambi
- *
- */
-public final class RHNConstants {
-
- public static final String DEFAULT_WEBAPP_GPG_KEY_RING = "/etc/webapp-keyring.gpg";
- public static final String DEFAULT_SYSTEM_ID = "/etc/sysconfig/rhn/systemid";
- public static final String DEFAULT_HANDLER = "/rpc/api";
- public static final String DEFAULT_SSL_CERT_PATH = "/usr/share/rhn/RHNS-CA-CERT";
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelper.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelper.java
deleted file mode 100644
index 62e3afd..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelper.java
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xmlrpc.XmlRpcException;
-
-import org.rhq.enterprise.server.plugin.pc.content.AdvisoryBugDetails;
-import org.rhq.enterprise.server.plugin.pc.content.AdvisoryCVEDetails;
-import org.rhq.enterprise.server.plugin.pc.content.AdvisoryDetails;
-import org.rhq.enterprise.server.plugin.pc.content.AdvisoryPackageDetails;
-import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails;
-import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetailsKey;
-import org.rhq.enterprise.server.plugin.pc.content.DistributionDetails;
-import org.rhq.enterprise.server.plugin.pc.content.DistributionFileDetails;
-import org.rhq.enterprise.server.plugin.pc.content.ThreadUtil;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelFamilyType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnErratumBugType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnErratumType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartFileType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartableTreeType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.RhnComm;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.RhnDownloader;
-
-/**
- * @author pkilambi
- *
- */
-public class RHNHelper {
-
- private final String baseurl;
- private final RhnComm rhndata;
- private final RhnDownloader rhndownload;
- private final String systemid;
- private final String distributionType;
-
- private final Log log = LogFactory.getLog(RHNHelper.class);
-
- /**
- * Constructor.
- *
- * @param baseurl The base url to connect to hosted
- * @param systemIdIn systemId to use for auth
- */
- public RHNHelper(String baseurl, String systemIdIn) {
-
- this.baseurl = baseurl;
- this.rhndata = new RhnComm(baseurl);
- this.rhndownload = new RhnDownloader(baseurl);
- this.systemid = systemIdIn;
- this.distributionType = "kickstart";
-
- }
-
- public boolean checkSystemId(String systemId) throws IOException, XmlRpcException {
- return this.rhndata.checkSystemId(systemId);
- }
-
- public List<DistributionDetails> getDistributionMetaData(List<String> labels) throws IOException, XmlRpcException {
- log.debug("getDistributionMetaData(" + labels + " invoked");
-
- List<DistributionDetails> distros = new ArrayList<DistributionDetails>();
- List<RhnKickstartableTreeType> ksTreeTypes = rhndata.getKickstartTreeMetadata(this.systemid, labels);
- for (RhnKickstartableTreeType ksTree : ksTreeTypes) {
- log.debug("Forming DistributionDetails(" + ksTree.getLabel() + ", " + ksTree.getBasePath() + " , "
- + distributionType);
- DistributionDetails details = new DistributionDetails(ksTree.getLabel(), ksTree.getBasePath(),
- distributionType);
- distros.add(details);
-
- List<RhnKickstartFileType> ksFiles = ksTree.getRhnKickstartFiles().getRhnKickstartFile();
- for (RhnKickstartFileType ksFile : ksFiles) {
- if (log.isDebugEnabled()) {
- log.debug("RHNHelper::getDistributionMetaData<ksLabel=" + ksTree.getLabel() + "> current file = "
- + ksFile.getRelativePath() + ", md5sum = " + ksFile.getMd5Sum() + ", lastModified = "
- + ksFile.getLastModified() + ", fileSize = " + ksFile.getFileSize());
- }
- Long lastMod = Long.parseLong(ksFile.getLastModified());
- DistributionFileDetails dFile = new DistributionFileDetails(ksFile.getRelativePath(), lastMod, ksFile
- .getMd5Sum());
- Long fileSize = Long.parseLong(ksFile.getFileSize());
- dFile.setFileSize(fileSize);
- details.addFile(dFile);
- }
- }
- return distros;
- }
-
- public List<AdvisoryDetails> getAdvisoryMetadata(List<String> advisoryList, String repoName)
- throws XmlRpcException, IOException, InterruptedException {
- List<AdvisoryDetails> erratadetails = new ArrayList<AdvisoryDetails>();
- List<RhnErratumType> errata = rhndata.getErrataMetadata(this.systemid, advisoryList);
- for (RhnErratumType erratum : errata) {
- ThreadUtil.checkInterrupted();
- log.debug("Forming AdvisoryDetails(" + erratum.getAdvisory());
- AdvisoryDetails details = new AdvisoryDetails(erratum.getAdvisory(), erratum.getRhnErratumAdvisoryType(),
- erratum.getRhnErratumSynopsis());
- details.setDescription(erratum.getRhnErratumDescription());
- details.setSolution(erratum.getRhnErratumSolution());
- details.setTopic(erratum.getRhnErratumTopic());
- details.setIssue_date(getLongForDate(erratum.getRhnErratumIssueDate()));
- details.setUpdate_date(getLongForDate(erratum.getRhnErratumUpdateDate()));
- details.setAdvisory_name(erratum.getRhnErratumAdvisoryName());
- details.setAdvisory_rel(erratum.getRhnErratumAdvisoryRel());
- String cvestr = erratum.getCveNames();
- String[] cves = cvestr.split(" ");
- log.debug("list of cves " + cvestr + cves.toString());
-
- for (String cve : cves) {
- if (log.isDebugEnabled()) {
- log.debug("RHNHelper::getAdvisoryMetaData<Advisory=" + erratum.getAdvisory() + "> CVEs<" + cve
- + ">");
- }
- AdvisoryCVEDetails acve = new AdvisoryCVEDetails(cve);
- details.addCVE(acve);
- }
-
- List<RhnErratumBugType> ebugs = erratum.getRhnErratumBugs().getRhnErratumBug();
-
- if (ebugs != null) {
- for (RhnErratumBugType ebug : ebugs) {
- if (log.isDebugEnabled()) {
- log.debug("RHNHelper::getAdvisoryMetaData<Advisory=" + erratum.getAdvisory() + "> Bugs<" + ebug
- + ">");
- }
- AdvisoryBugDetails dbug = new AdvisoryBugDetails(ebug.getRhnErratumBugId());
- details.addBug(dbug);
- }
- }
-
- String pkgs = erratum.getPackages();
- String[] pkgIds = pkgs.split(" ");
-
- //try {
- List<AdvisoryPackageDetails> apkgdetails = new ArrayList<AdvisoryPackageDetails>();
- List<RhnPackageType> pkgdetails = rhndata.getPackageMetadata(this.systemid, Arrays.asList(pkgIds));
- for (RhnPackageType pkgd : pkgdetails) {
- if (log.isDebugEnabled()) {
- log.debug("RHNHelper::getAdvisoryMetaData<Advisory=" + erratum.getAdvisory() + "> Package<" + pkgd
- + ">");
- }
- String name = pkgd.getName();
- String version = pkgd.getVersion();
- String arch = pkgd.getPackageArch();
- String release = pkgd.getRelease();
- String rpmname = constructRpmDisplayName(name, version, release, arch);
- AdvisoryPackageDetails apkgd = new AdvisoryPackageDetails(name, version, arch, rpmname);
- apkgdetails.add(apkgd);
- }
- details.addPkgs(apkgdetails);
-
- //} catch (Exception e) {
- // e.printStackTrace();
- // }
-
- erratadetails.add(details);
- }
- return erratadetails;
- }
-
- /**
- * Extract the package metadata for all available packages to sync
- * @param packageIds Valid package ids for getPackageMatadata call to fetch from hosted
- * @param channelName channel name of passed in package ids
- * @return A list of package detail objects
- * @throws Exception On all errors
- */
- public List<ContentProviderPackageDetails> getPackageDetails(List packageIds, String channelName) throws Exception {
- log.debug("getPackageDetails() for " + packageIds.size() + " packageIds on channel " + channelName);
- int skippedPackages = 0;
- int pkgNoName = 0;
- List<ContentProviderPackageDetails> pdlist = new ArrayList<ContentProviderPackageDetails>();
- List<RhnPackageType> pkgs = rhndata.getPackageMetadata(this.systemid, packageIds);
- log.debug(pkgs.size() + " packages were returned from getPackageMetadata().");
- for (RhnPackageType pkg : pkgs) {
- try {
- ContentProviderPackageDetails details = getDetails(pkg, channelName);
- pdlist.add(details);
- } catch (Exception e) {
- if (pkg != null) {
- if (StringUtils.isBlank(pkg.getName())) {
- log.debug("getPackageDetails skipping package with no name.");
- pkgNoName++;
- continue;
- }
- }
- log.warn("Caught exception with getDetails() of package: " + pkg.getName() + " : " + e);
- log.warn("Package: id = " + pkg.getId() + " getSourceRpm() = " + pkg.getSourceRpm()
- + ", getDescription() = " + pkg.getRhnPackageDescription());
- // something went wrong while constructing the pkg object.
- // Proceed to next and get as many packages as we can.
- skippedPackages++;
- continue;
- }
- }
- log.info("We skipped: " + skippedPackages + " packages. " + "We also skipped " + pkgNoName
- + " packages because they had no name");
- log.info("getPackageDetails was called with a list of package ids size = " + packageIds.size()
- + " we have fetched metadata for " + pdlist.size() + " packages");
- return pdlist;
- }
-
- /**
- * Extract the package details for each rpm metadata fetched
- *
- * @param p an rpm package metadata object
- * @param channelName channel name
- *
- * @return ContentProviderPackageDetails pkg object
- */
- private ContentProviderPackageDetails getDetails(RhnPackageType p, String channelName) throws IOException {
-
- String name = p.getName();
- String version = p.getVersion();
- String arch = p.getPackageArch();
- String downloadName = constructRpmDownloadName(name, version, p.getRelease(), p.getEpoch(), arch);
- String displayName = constructRpmDisplayName(name, version, p.getRelease(), arch);
- ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(name, version, "rpm", arch,
- "Linux", "Platforms");
- ContentProviderPackageDetails pkg = new ContentProviderPackageDetails(key);
-
- pkg.setDisplayName(name);
- pkg.setShortDescription(p.getRhnPackageSummary());
- pkg.setLongDescription(p.getRhnPackageDescription());
- pkg.setFileName(displayName);
- pkg.setFileSize(new Long(p.getPackageSize()));
- pkg.setFileCreatedDate(new Long(p.getLastModified()));
- pkg.setLicenseName("license");
- pkg.setMD5(p.getMd5Sum());
- pkg.setLocation(constructPackageUrl(channelName, downloadName));
-
- String metadata = PrimaryXML.createPackageXML(p);
- byte[] gzippedMetadata = gzip(metadata.getBytes());
- pkg.setMetadata(gzippedMetadata);
-
- return pkg;
-
- }
-
- /**
- * Get List of packagesIds for Given Channels
- * @param channelName channel name
- * @return List of all package ids associated to the channel
- * @throws IOException on io errors on systemid reads
- * @throws XmlRpcException on xmlrpc faults
- */
- public List<String> getChannelPackages(String channelName) throws IOException, XmlRpcException {
- log.debug("getChannelPackages(" + channelName + ")");
- ArrayList<String> allPackages = new ArrayList();
- List<RhnChannelType> channels = rhndata.getChannels(this.systemid, Arrays.asList(channelName));
-
- for (RhnChannelType channel : channels) {
- String packages = channel.getPackages();
- String[] pkgIds = packages.split(" ");
- if (pkgIds.length > 1) {
- allPackages.addAll(Arrays.asList(pkgIds));
- }
- }
-
- return allPackages;
- }
-
- /**
- * Get List of errataIds for Given Channels
- * @param channelName channel name
- * @return List of all errata ids associated to the channel
- * @throws IOException on io errors on systemid reads
- * @throws XmlRpcException on xmlrpc faults
- */
- public List<String> getChannelAdvisory(String channelName) throws IOException, XmlRpcException {
- log.debug("getChannelAdvisory(" + channelName + ")");
- ArrayList<String> allAdvisory = new ArrayList();
- List<RhnChannelType> channels = rhndata.getChannels(this.systemid, Arrays.asList(channelName));
-
- for (RhnChannelType channel : channels) {
- String errata = channel.getChannelErrata();
- String[] errataIds = errata.split(" ");
- if (errataIds.length > 1) {
- allAdvisory.addAll(Arrays.asList(errataIds));
- }
- }
-
- return allAdvisory;
- }
-
- /**
- * Get a list of all Syncable Channels based on entitled channel families
- * @return A list of channel labels
- * @throws IOException on systemid reads
- * @throws XmlRpcException on xmlrpc faults
- */
- public List<String> getSyncableChannels() throws IOException, XmlRpcException {
- log.debug("getSyncableChannels()");
- ArrayList<String> allchannels = new ArrayList<String>();
- String[] ignoredChannelFamiliesArray = { "education", "k12ltsp", "rh-public", "rhel-devsuite", "rhel-gfs" };
- List<String> ignoredChannelFamilies = Arrays.asList(ignoredChannelFamiliesArray);
- log.debug("Ignoring expired channel families :");
- log.debug(ignoredChannelFamilies.toString());
-
- List<RhnChannelFamilyType> cfts = rhndata.getChannelFamilies(this.systemid);
- for (RhnChannelFamilyType cf : cfts) {
- if (ignoredChannelFamilies.contains(cf.getLabel())) {
- continue;
- }
- String channeldata = cf.getChannelLabels();
- String[] clabels = channeldata.split(" ");
- if (clabels.length > 1) {
- allchannels.addAll(Arrays.asList(clabels));
- }
- }
-
- return allchannels;
- }
-
- /**
- *
- * @return returns list of all possible kickstart labels from all possible channels
- * @throws IOException
- * @throws XmlRpcException
- */
- public List<String> getSyncableKickstartLabels() throws IOException, XmlRpcException {
- log.debug("getSyncableKickstartLabels() - no channels passed, will use all available channels");
- List<String> allChannels = getSyncableChannels();
- return getSyncableKickstartLabels(allChannels);
- }
-
- /**
- *
- * @param channelName channel name
- * @return kickstart labels part of the passed in channel name
- * @throws IOException
- * @throws XmlRpcException
- */
- public List<String> getSyncableKickstartLabels(String channelName) throws IOException, XmlRpcException {
- log.debug("getSyncableKickstartLabels(" + channelName + ")");
- List<String> names = new ArrayList<String>();
- names.add(channelName);
- return getSyncableKickstartLabels(names);
- }
-
- /**
- *
- * @param channelLabels list of channel names to restrict return data to
- * @return kickstart labels from the passed in list of channel names
- * @throws IOException
- * @throws XmlRpcException
- */
- public List<String> getSyncableKickstartLabels(List<String> channelLabels) throws IOException, XmlRpcException {
- log.debug("getSyncableKickstartLabels(" + channelLabels + ")");
- List<String> ksLabels = new ArrayList<String>();
- List<RhnChannelType> rct = rhndata.getChannels(this.systemid, channelLabels);
- for (RhnChannelType ct : rct) {
- String ksTrees = ct.getKickstartableTrees();
- String[] trees = ksTrees.split(" ");
- ksLabels.addAll(Arrays.asList(trees));
- }
- return ksLabels;
- }
-
- /**
- * Open an input stream to specifed relative url. Prepends the baseurl to the <i>url</i> and opens and opens and
- * input stream. Files with a .gz suffix will be unziped (inline).
- *
- * @param location A url that is relative to the <i>baseurl</i> and references a file within the repo.
- *
- * @return An open input stream that <b>must</b> be closed by the caller.
- *
- * @throws IOException On io errors.
- *
- * @throws XmlRpcException On all errors.
- */
- public InputStream openStream(String location) throws IOException, XmlRpcException {
- log.info("File being fetched from: " + location);
- return rhndownload.getFileStream(this.systemid, location);
- }
-
- /**
- * Constructs a downloadable url for package downloads.
- * @param channelName channel label to be synced.
- * @param rpmName rpm file name
- * @return a valid url location to fetch the rpm from.
- */
- public String constructPackageUrl(String channelName, String rpmName) {
-
- return constructPackageUrl(baseurl, channelName, rpmName);
- }
-
- static public String constructPackageUrl(String baseurl, String channelName, String rpmName) {
-
- String appendurl = "/SAT/$RHN/" + channelName + "/getPackage/" + rpmName;
- return baseurl + appendurl;
- }
-
- /**
- * Constructs a downloadable url for package downloads.
- * @param channelName channel label to be synced.
- * @param ksTreeLabel kickstart tree label name
- * @param ksFilePath path to kickstart file
- * @return a valid url location to fetch the rpm from.
- */
- public String constructKickstartFileUrl(String channelName, String ksTreeLabel, String ksFilePath) {
-
- return constructKickstartFileUrl(baseurl, channelName, ksTreeLabel, ksFilePath);
- }
-
- static public String constructKickstartFileUrl(String baseurl, String channelName, String ksTreeLabel,
- String ksFilePath) {
- String appendurl = "/SAT/$RHN/" + channelName + "/getKickstartFile/" + ksTreeLabel + "/" + ksFilePath;
- return baseurl + appendurl;
- }
-
- /**
- * Method to construct an rpm format filename for download url
- * @param name rpm package name
- * @param version rpm package version
- * @param release rpm package release
- * @param epoch rpm package epoch
- * @param arch rpm package arch
- * @return an rpm package name string
- */
- static public String constructRpmDownloadName(String name, String version, String release, String epoch, String arch) {
-
- String releaseepoch = release + ":" + epoch;
- return name + "-" + version + "-" + releaseepoch + "." + arch + ".rpm";
- }
-
- /**
- * construct a legitimate rpm name to display
- * @param name
- * @param version
- * @param release
- * @param arch
- * @return rpm name String
- */
- static public String constructRpmDisplayName(String name, String version, String release, String arch) {
-
- return name + "-" + version + "-" + release + "." + arch + ".rpm";
- }
-
- private byte[] gzip(byte[] input) throws IOException {
-
- ByteArrayOutputStream zipped = new ByteArrayOutputStream();
- GZIPOutputStream gzip = new GZIPOutputStream(zipped);
- try {
- gzip.write(input);
- } finally {
- gzip.close();
- }
- return zipped.toByteArray();
- }
-
- private long getLongForDate(String dateIn) {
- return Long.parseLong(dateIn);
- }
-
- /*
- * (non-Javadoc) @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return baseurl;
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java
deleted file mode 100644
index 03e7ba6..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.KeyException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xmlrpc.XmlRpcException;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.enterprise.server.plugin.pc.content.AdvisoryDetails;
-import org.rhq.enterprise.server.plugin.pc.content.AdvisorySource;
-import org.rhq.enterprise.server.plugin.pc.content.AdvisorySyncReport;
-import org.rhq.enterprise.server.plugin.pc.content.ContentProvider;
-import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails;
-import org.rhq.enterprise.server.plugin.pc.content.DistributionDetails;
-import org.rhq.enterprise.server.plugin.pc.content.DistributionSource;
-import org.rhq.enterprise.server.plugin.pc.content.DistributionSyncReport;
-import org.rhq.enterprise.server.plugin.pc.content.InitializationException;
-import org.rhq.enterprise.server.plugin.pc.content.PackageSource;
-import org.rhq.enterprise.server.plugin.pc.content.PackageSyncReport;
-import org.rhq.enterprise.server.plugin.pc.content.RepoDetails;
-import org.rhq.enterprise.server.plugin.pc.content.RepoImportReport;
-import org.rhq.enterprise.server.plugin.pc.content.RepoSource;
-import org.rhq.enterprise.server.plugin.pc.content.SyncException;
-import org.rhq.enterprise.server.plugin.pc.content.SyncProgressWeight;
-import org.rhq.enterprise.server.plugin.pc.content.ThreadUtil;
-import org.rhq.enterprise.server.plugins.rhnhosted.certificate.Certificate;
-import org.rhq.enterprise.server.plugins.rhnhosted.certificate.CertificateFactory;
-import org.rhq.enterprise.server.plugins.rhnhosted.certificate.PublicKeyRing;
-
-/**
- * @author pkilambi
- *
- */
-public class RHNProvider implements ContentProvider, PackageSource, RepoSource, DistributionSource, AdvisorySource {
-
- private final Log log = LogFactory.getLog(RHNProvider.class);
- private RHNActivator rhnObject;
- private RHNHelper helper;
-
- /**
- * Initializes the adapter with the specified configuration.
- *
- * <p/>Expects <u>one</u> of the following properties:
- *
- * <p/>
- * <table border="1">
- * <tr>
- * <td><b>location</b></td>
- * <td>RHN Hosted server URL</td>
- * </tr>
- * <tr>
- * <td><b>certificate</b></td>
- * <td>A certificate for authentication and subscription validation.</td>
- * </tr>
- * </table>
- *
- * <p/>
- *
- * @param configuration The adapter's configuration propeties.
- *
- * @throws Exception On errors.
- */
- public void initialize(Configuration configuration) throws Exception {
- String locationIn = configuration.getSimpleValue("location", null);
- String certificate = configuration.getSimpleValue("certificate", null);
-
- String location = locationIn + RHNConstants.DEFAULT_HANDLER;
-
- location = trim(location);
- log.info("Initialized with location: " + location);
- certificate = certificate.trim();
-
- // check location field validity
- try {
- new URL(location);
- } catch (MalformedURLException mue) {
- throw new IllegalArgumentException("Invalid 'location' property");
- }
-
- // check certificate field validity
- try {
- Certificate cert = CertificateFactory.read(certificate);
- PublicKeyRing keyRing = this.readDefaultKeyRing();
- cert.verifySignature(keyRing);
-
- } catch (Exception e) {
- log.debug("Invalid Cert");
- throw new InitializationException("Invalid 'Certificate' property", e);
- }
-
- String systemId = FileUtils.readFileToString(new File(RHNConstants.DEFAULT_SYSTEM_ID));
- helper = new RHNHelper(locationIn, systemId);
- log.info("RHNProvider initialized RHNHelper with location = " + locationIn + "\n " + "systemid = " + systemId);
- // Check basic authentication capabilities with passed in systemid and RHN server
- // If there is a problem a XmlRpcException will be thrown, we'll allow it to be thrown and not try to catch it
- helper.checkSystemId(systemId);
-
- // Now we have valid data. Spawn the activation.
- try {
- rhnObject = new RHNActivator(systemId, certificate, location);
- rhnObject.processActivation();
- log.debug("Activation successful");
- } catch (Exception e) {
- log.debug("Activation Failed. Please check your configuration");
- throw new InitializationException("Server Activation Failed.", e);
- }
- }
-
- /**
- * @inheritDoc
- */
- public void shutdown() {
- log.debug("shutdown");
- }
-
- /**
- * @inheritDoc
- */
- public InputStream getInputStream(String location) throws Exception {
- log.debug("opening: " + location);
- return helper.openStream(location);
- }
-
- /**
- * @inheritDoc
- */
- public void synchronizePackages(String repoName, PackageSyncReport report,
- Collection<ContentProviderPackageDetails> existingPackages) throws SyncException, InterruptedException {
- log.info("synchronizePackages(repoName = " + repoName + ", report = " + report + ", existingPackages.size() = "
- + existingPackages.size());
- RHNSummary summary = new RHNSummary(helper);
- List<ContentProviderPackageDetails> deletedPackages = new ArrayList<ContentProviderPackageDetails>();
- deletedPackages.addAll(existingPackages);
- log.info("Report" + report);
- // sync now
- try {
- summary.markStarted();
- List<String> pkgIds = helper.getChannelPackages(repoName);
- log.info("RHNProvider:: helper.getChannelPackages returned " + pkgIds.size() + " packages");
- List<ContentProviderPackageDetails> pkgDetails = new ArrayList<ContentProviderPackageDetails>();
-
- //
- // We ran into problems when syncing large package lists, example 6000 packages.
- // We are going to chunk the list to processing a smaller amount at a time.
- //
- long startTime = System.currentTimeMillis();
- int sliceSize = 100;
- for (int index = 0; index < pkgIds.size(); index += sliceSize) {
- int end = index + sliceSize;
- if (end >= pkgIds.size()) {
- end = pkgIds.size() - 1;
- }
- long startTimeSlice = System.currentTimeMillis();
- log.debug("Getting package details for slice [" + index + " -> " + end + "]");
- List<String> pkgSliceList = pkgIds.subList(index, end);
- List<ContentProviderPackageDetails> tempList = helper.getPackageDetails(pkgSliceList, repoName);
- log.debug("We called getPackageDetails() on a list of " + pkgSliceList.size()
- + " pkg ids and got a return list of " + tempList.size() + " packages");
- pkgDetails.addAll(tempList);
- long endTimeSlice = System.currentTimeMillis();
- log.debug("Slice processed in " + (endTimeSlice - startTimeSlice) + "ms current size of pkgDetails is "
- + pkgDetails.size());
- ThreadUtil.checkInterrupted();
- }
- long endTime = System.currentTimeMillis();
- log.info("It took " + (endTime - startTime) + "ms too get PackageDetails for " + pkgIds.size()
- + " packages");
- log.info("We fetched metadata for " + pkgDetails.size() + " packages, passed in list of pkgIds was: "
- + pkgIds.size());
-
- for (ContentProviderPackageDetails p : pkgDetails) {
- log.debug("Processing package at (" + p.getLocation());
- deletedPackages.remove(p);
- if (!existingPackages.contains(p)) {
- log.debug("New package at (" + p.getLocation() + ") detected");
- report.addNewPackage(p);
- summary.added++;
- }
- ThreadUtil.checkInterrupted();
- }
- for (ContentProviderPackageDetails p : deletedPackages) {
- log.debug("Package at (" + p.getDisplayName() + ") marked as deleted");
- report.addDeletePackage(p);
- summary.deleted++;
- }
- } catch (Exception e) {
- summary.errors.add(e.toString());
- throw new SyncException("error synching packages.", e);
- } finally {
- //helper.disconnect();
- summary.markEnded();
- report.setSummary(summary.toString());
- log.info("synchronizing with repository: " + helper + " finished\n" + summary);
- }
- }
-
- /**
- * @inheritDoc
- */
- public void synchronizeAdvisory(String repoName, AdvisorySyncReport report,
- Collection<AdvisoryDetails> existingAdvisory) throws SyncException, InterruptedException {
-
- List<String> existingLabels = new ArrayList<String>();
- for (AdvisoryDetails ad : existingAdvisory) {
- existingLabels.add(ad.getAdvisory());
- }
- List<String> toSyncAdvs = new ArrayList<String>();
- List<String> deletedAdvs = new ArrayList<String>(); //Existing advisories we want to remove.
- deletedAdvs.addAll(existingLabels);
-
- try {
- List<String> errataIds = helper.getChannelAdvisory(repoName);
- List<AdvisoryDetails> advList = helper.getAdvisoryMetadata(errataIds, repoName);
- log.debug("Found " + advList.size() + " available errata");
- for (AdvisoryDetails adv : advList) {
- log.debug("Processing Advisory ::" + adv.getAdvisory());
- deletedAdvs.remove(adv.getAdvisory());
- if (!existingLabels.contains(adv.getAdvisory())) {
- log.debug("New Advisory " + adv.getAdvisory() + ") detected" + " with bugs" + adv.getBugs()
- + "with cves" + adv.getCVEs() + "wiuth packages" + adv.getPkgs());
- report.addAdvisory(adv);
- }
- ThreadUtil.checkInterrupted();
- }
- } catch (IOException ioe) {
- throw new SyncException("IOException syncing advisory meta", ioe);
- } catch (XmlRpcException x) {
- throw new SyncException("XmlRpcException syncing advisory meta", x);
- }
-
- for (String adv : deletedAdvs) {
- for (AdvisoryDetails advd : existingAdvisory) {
- if (advd.getAdvisory().compareToIgnoreCase(adv) == 0) {
- report.addDeletedAdvisory(advd);
- }
- }
- }
- }
-
- /**
- * @inheritDoc
- */
- public void synchronizeDistribution(String repoName, DistributionSyncReport report,
- Collection<DistributionDetails> existingDistros) throws SyncException {
-
- // Goal:
- // This method will create the metadata representing what kickstart tree files need to be downloaded.
- // the metadata will be returned through the DistributionSyncReport object.
- // NOTE: This method DOES not do the actual downloading of data.
-
- List<String> existingLabels = new ArrayList<String>();
- for (DistributionDetails d : existingDistros) {
- existingLabels.add(d.getLabel());
- }
- List<String> toSyncDistros = new ArrayList<String>();
- List<String> deletedDistros = new ArrayList<String>(); //Existing distros we want to remove.
- deletedDistros.addAll(existingLabels);
-
- List<String> availableLabels;
- try {
- availableLabels = helper.getSyncableKickstartLabels(repoName);
- } catch (Exception e) {
- throw new SyncException("Error synching kickstart labels", e);
- }
- log.debug("Found " + availableLabels.size() + " available kickstart trees");
- for (String label : availableLabels) {
- log.debug("Processing kickstart: " + label);
- deletedDistros.remove(label);
- if (!existingLabels.contains(label)) {
- log.debug("New kickstart to sync: " + label);
- toSyncDistros.add(label);
- }
- }
-
- // Determine what distros are to be removed, i.e. they are synced by RHQ but no longer exist from RHN
- for (String label : deletedDistros) {
- for (DistributionDetails dd : existingDistros) {
- if (dd.getLabel().compareToIgnoreCase(label) == 0) {
- report.addDeletedDistro(dd);
- }
- }
- }
-
- List<DistributionDetails> ddList;
- try {
- ddList = helper.getDistributionMetaData(toSyncDistros);
- } catch (Exception e) {
- throw new SyncException("Error synching distro metadata", e);
- }
- report.addDistros(ddList);
- }
-
- /**
- * @inheritDoc
- */
- public void testConnection() throws Exception {
- rhnObject.processDeActivation();
- rhnObject.processActivation();
- }
-
- /**
- * @inheritDoc
- */
- public RepoImportReport importRepos() throws Exception {
- RepoImportReport report = new RepoImportReport();
-
- List<String> channels = helper.getSyncableChannels();
- for (String clabel : channels) {
- log.info("Importing repo: " + clabel);
- RepoDetails repo = new RepoDetails(clabel);
- report.addRepo(repo);
- }
-
- return report;
- }
-
- /**
- * Reads the public keyring on filesystem into memory
- *
- * @return A PublicKeyRing object.
- * @throws IOException On failing to read webapp keyring
- * @throws KeyException thrown on failing to validate the key
- */
- private PublicKeyRing readDefaultKeyRing() throws KeyException, IOException {
- InputStream keyringStream = new FileInputStream(RHNConstants.DEFAULT_WEBAPP_GPG_KEY_RING);
- return new PublicKeyRing(keyringStream);
- }
-
- /**
- * Trim white space and trailing (/) characters.
- *
- * @param path A url/directory path string.
- *
- * @return A trimmed string.
- */
- private String trim(String path) {
- path = path.trim();
- while ((path.length() > 1) && path.endsWith("/")) {
- path = path.substring(0, path.length() - 1);
- }
-
- return path;
- }
-
- /**
- * @inheritDoc
- */
- public String getDistFileRemoteLocation(String repoName, String label, String relativeFilename) {
- return helper.constructKickstartFileUrl(repoName, label, relativeFilename);
- }
-
- public SyncProgressWeight getSyncProgressWeight() {
- return new SyncProgressWeight(10, 1, 0, 0, 1);
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReader.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReader.java
deleted file mode 100644
index 9ec3e37..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReader.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.io.File;
-import java.io.IOException;
-import java.io.ByteArrayInputStream;
-import java.io.PrintStream;
-import java.io.DataInputStream;
-import java.security.cert.X509Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateException;
-import java.security.cert.Certificate;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.KeyManagementException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.InetAddress;
-import java.net.URL;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.HttpsURLConnection;
-
-import org.apache.commons.io.FileUtils;
-
-public class RHNSSLCertReader
-{
- static final public String BEGIN_CERT = "-----BEGIN CERTIFICATE-----\n";
- static final public String END_CERT = "-----END CERTIFICATE-----\n";
-
-
- static protected int getStartPosition(String rawText, int offset) {
- return rawText.indexOf(BEGIN_CERT, offset);
- }
-
- static protected int getEndPosition(String rawText, int offset) {
- int index = rawText.indexOf(END_CERT, offset);
- if (index > 0) {
- index = index + END_CERT.length();
- }
- return index;
- }
-
- static public List<String> getCertText(String rawText) {
- ArrayList<String> certs = new ArrayList<String>();
- int start = 0, end = 0;
- while(true) {
- start = getStartPosition(rawText, end);
- end = getEndPosition(rawText, start);
- if ((end < 0) || (start < 0)) {
- break;
- }
- certs.add(rawText.substring(start, end));
- }
- return certs;
- }
-
- static public List<X509Certificate> getSSLCertificates(String rawText) throws CertificateException {
- List<X509Certificate> certs = new ArrayList<X509Certificate>();
- List<String> rawCerts = getCertText(rawText);
- return getSSLCertificates(rawCerts);
- }
-
- static public List<X509Certificate> getSSLCertificates(List<String> rawCerts) throws CertificateException {
- List<X509Certificate> certs = new ArrayList<X509Certificate>();
- for (String raw: rawCerts) {
- certs.add(getCert(raw));
- }
- return certs;
- }
-
- static public X509Certificate getCert(String rawText) throws CertificateException {
- CertificateFactory cf = CertificateFactory.getInstance("X.509");
- ByteArrayInputStream stream = new ByteArrayInputStream(rawText.getBytes());
- return (X509Certificate)cf.generateCertificate(stream);
- }
-
- static public void main(String[] args) {
- if (args.length < 1) {
- System.out.println("Please re-run and specify an argument for the location of a RHN SSL Cert.");
- System.exit(0);
- }
- String path = args[0];
- System.out.println("path is " + path);
- String rawCert = null;
- try {
- rawCert = FileUtils.readFileToString(new File(path));
- }
- catch (IOException e) {
- e.printStackTrace();
- System.exit(0);
- }
- List<String> certs = RHNSSLCertReader.getCertText(rawCert);
- for (String cert: certs) {
- System.out.println("Parsed SSL Certificate: \n" + cert);
- }
-
- List<X509Certificate> sslCerts = new ArrayList<X509Certificate>();
- try {
- sslCerts = getSSLCertificates(rawCert);
- }
- catch (CertificateException e) {
- e.printStackTrace();
- System.exit(0);
- }
- for (X509Certificate c: sslCerts) {
- System.out.println("Cert SigAlgName = " + c.getSigAlgName());
- System.out.println("Cert IssuerDN = " + c.getIssuerDN());
- System.out.println("Cert NotAfter = " + c.getNotAfter());
- System.out.println("Cert NotBefore = " + c.getNotBefore());
- System.out.println("Cert PublicKey = " + c.getPublicKey());
- System.out.println("Cert SubjectDN = " + c.getSubjectDN());
- }
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactory.java
deleted file mode 100644
index 6ebb5d0..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.io.File;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
-import java.util.List;
-
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-
-import org.apache.commons.io.FileUtils;
-
-
-public class RHNSSLSocketFactory
-{
- /**
- * This method will read in 'certPath' and uses these certs to restrict validation.
- *
- * @param certPath path to SSL Cert file
- * @return a SSLSocketFactory instance which will restrict validation to SSL certs in 'certPath'
- * @throws IOException
- * @throws GeneralSecurityException
- */
- static public SSLSocketFactory getSSLSocketFactory(String certPath)
- throws IOException, GeneralSecurityException
- {
- RHNSSLCertReader certReader = new RHNSSLCertReader();
- String rawCert = FileUtils.readFileToString(new File(certPath));
- List<X509Certificate> sslCerts = certReader.getSSLCertificates(rawCert);
- return getSSLSocketFactory(sslCerts);
- }
-
- /**
- *
- * @param sslCerts these certs will be used to validate the ssl connection
- * @return
- * @throws IOException
- * @throws GeneralSecurityException
- */
- static public SSLSocketFactory getSSLSocketFactory(List<X509Certificate> sslCerts)
- throws IOException, GeneralSecurityException
- {
- SSLContext sc = null;
- KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
- ks.load(null); //Important, this intializes the keystore
- int counter = 0;
- for (X509Certificate cert: sslCerts) {
- ks.setCertificateEntry("rhn-key-"+counter, cert);
- counter++;
- }
- sc = SSLContext.getInstance("SSL");
- TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- tmf.init(ks);
- sc.init(null, tmf.getTrustManagers(), new java.security.SecureRandom());
- return sc.getSocketFactory();
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSummary.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSummary.java
deleted file mode 100644
index 10f65d9..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSummary.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class RHNSummary {
- int added = 0;
- int updated = 0;
- int deleted = 0;
- long started = 0;
- long ended = 0;
- Object context;
- List<String> errors = new ArrayList<String>();
-
- RHNSummary(Object context) {
- this.context = context;
- }
-
- void markStarted() {
- started = System.currentTimeMillis();
- }
-
- void markEnded() {
- ended = System.currentTimeMillis();
- }
-
- @Override
- public String toString() {
- boolean failed = errors.size() > 0;
- StringBuilder sb = new StringBuilder();
- sb.append("Synchronization with RHNHosted - ");
- sb.append((failed ? "FAILED" : "SUCCEEDED"));
- sb.append("\nLocation: " + context);
- sb.append("\nDuration: " + (ended - started) + " (ms)");
- sb.append("\nPackages:");
- sb.append("\n\tAdded: " + added);
- sb.append("\n\tUpdated: " + updated);
- sb.append("\n\tDeleted: " + deleted);
- sb.append("\n\tErrors: " + errors.size());
- for (String s : errors) {
- sb.append("\n\t\t");
- sb.append(s);
- }
-
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/Certificate.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/Certificate.java
deleted file mode 100644
index 64c9940..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/Certificate.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.certificate.XmlTag;
-
-import java.security.SignatureException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-/**
- * @author pkilambi
- *
- */
-/**
- * A rhq server certificate.
- *
- */
-public class Certificate {
-
- public static final String CURRENT_GENERATION = "2";
- // Some of these properties should probably be int's or Date's
- // But until that is really needed, we'll stick with Strings
-
- private String product;
- private String owner;
- private String issued;
- private String expires;
- private String slots;
- private String provisioningSlots;
- private String monitoringSlots;
- private String virtualizationSlots;
- private String virtualizationPlatformSlots;
- private String nonlinuxSlots;
- private String satelliteVersion;
- private String generation;
- private String signature;
- private List channelFamilies;
- private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-
- /**
- * Construct an empty certificate.
- */
- Certificate() {
- channelFamilies = new ArrayList();
- }
-
- /**
- * States whether or not this certificate is expired.
- * @return true iff <code>expires</code> is after current system time
- * @throws ParseException this shouldn't happen, means the date format in
- * the cert is not what we expect
- */
- public boolean isExpired() throws ParseException {
- Date now = Calendar.getInstance().getTime();
- return now.after(this.getExpiresDate());
- }
-
- /**
- * Convert this certificate into the canonical form used for signing.
- *
- * @return the certificate in the canonical form used for signing
- */
- public String asChecksumString() {
- StringBuffer result = new StringBuffer();
- // Fields must appear in the output in alphabetical order
- // The channelFamilies are sorted in their very own way
- // (see ChannelFamily.compareTo)
- Collections.sort(channelFamilies);
- for (int i = 0; i < channelFamilies.size(); i++) {
- ChannelFamilyDescriptor cf = (ChannelFamilyDescriptor) channelFamilies.get(i);
- result.append(cf.asChecksumString()).append("\n");
- }
- appendField(result, "expires", getExpires());
- appendField(result, "generation", getGeneration());
- appendField(result, "issued", getIssued());
- appendField(result, "monitoring-slots", getMonitoringSlots());
- appendField(result, "nonlinux-slots", getNonlinuxSlots());
- appendField(result, "owner", getOwner());
- appendField(result, "product", getProduct());
- appendField(result, "provisioning-slots", getProvisioningSlots());
- appendField(result, "satellite-version", getSatelliteVersion());
- appendField(result, "slots", getSlots());
- appendField(result, "virtualization_host", this.getVirtualizationSlots());
- appendField(result, "virtualization_host_platform", this
- .getVirtualizationPlatformSlots());
- return result.toString();
- }
-
- /**
- * Returns the XML representation of the cert.
- * @return the XML representation of the cert.
- */
- public String asXmlString() {
- StringBuffer buf = new StringBuffer();
-
- buf.append(XML_HEADER).append("\n");
-
- XmlTag t = new XmlTag("rhn-cert");
- t.setAttribute("version", "0.1");
- buf.append(t.renderOpenTag()).append("\n");
-
- appendXmlField(buf, "product", getProduct());
- appendXmlField(buf, "owner", getOwner());
- appendXmlField(buf, "issued", getIssued());
- appendXmlField(buf, "expires", getExpires());
- appendXmlField(buf, "slots", getSlots());
- appendXmlField(buf, "monitoring-slots", getMonitoringSlots());
- appendXmlField(buf, "provisioning-slots", getProvisioningSlots());
- appendXmlField(buf, "nonlinux-slots", getNonlinuxSlots());
- appendXmlField(buf, "virtualization_host", this.getVirtualizationSlots());
- appendXmlField(buf, "virtualization_host_platform", this
- .getVirtualizationPlatformSlots());
-
- for (int i = 0; i < channelFamilies.size(); i++) {
- ChannelFamilyDescriptor cf = (ChannelFamilyDescriptor) channelFamilies.get(i);
- buf.append(" ").append(cf.asXmlString()).append("\n");
- }
-
- appendXmlField(buf, "satellite-version", getSatelliteVersion());
- appendXmlField(buf, "generation", getGeneration());
-
- XmlTag sig = new XmlTag("rhn-cert-signature");
- sig.addBody(getSignature());
- buf.append(" ").append(sig.render()).append("\n");
-
- buf.append(t.renderCloseTag()).append("\n");
- return buf.toString();
- }
-
- private void appendXmlField(StringBuffer result, String fieldName, String value) {
- if (value != null) {
- XmlTag t = new XmlTag("rhn-cert-field", false);
- t.setAttribute("name", fieldName);
- t.addBody(value);
- result.append(" ").append(t.render()).append('\n');
- }
- }
-
- /**
- * Check that this certificate was signed with a private key whose public
- * counterpart is on <code>keyRing</code>
- * @param keyRing the public keys with which to check the signatures
- * @return <code>true</code> if this certificate was signed with a private
- * key whose public counterpart is on <code>keyRing</code>,
- * <code>false</code> otherwise
- * @throws SignatureException if processing the sigature fails
- */
- public boolean verifySignature(PublicKeyRing keyRing) throws SignatureException {
- return keyRing.verifySignature(asChecksumString(), getSignature());
- }
-
- // Setters. They shouldn't be public, but have to be
- // since we use reflection to populate the certificate
- // when reading from XML.
-
- /**
- * Add a channel family
- * @param family the channel family to add
- */
- public void addChannelFamily(ChannelFamilyDescriptor family) {
- channelFamilies.add(family);
- }
-
- /**
- * Set the expiration date for the certificate
- * @param expires0 the expiration date
- */
- public void setExpires(String expires0) {
- expires = expires0;
- }
-
- /**
- * Set the generation
- * @param generation0 the generation
- */
- public void setGeneration(String generation0) {
- generation = generation0;
- }
-
- /**
- * Set the date of issue
- * @param issued0 date of issue
- */
- public void setIssued(String issued0) {
- issued = issued0;
- }
-
- /**
- * Set the number of non-linux slots
- * @param nonlinuxSlots0 the number of non-linux slots
- */
- public void setNonlinuxSlots(String nonlinuxSlots0) {
- nonlinuxSlots = nonlinuxSlots0;
- }
-
- /**
- * Set the number of monitoring slots
- * @param monitoringSlots0 the number of monitoring slots
- */
- public void setMonitoringSlots(String monitoringSlots0) {
- monitoringSlots = monitoringSlots0;
- }
-
- /**
- * Set the owner
- * @param owner0 the owner
- */
- public void setOwner(String owner0) {
- owner = owner0;
- }
-
- /**
- * Set the product
- * @param product0 the product
- */
- public void setProduct(String product0) {
- product = product0;
- }
-
- /**
- * Set the number of provisioning slots
- * @param provisioningSlots0 the number of provisioning slots
- */
- public void setProvisioningSlots(String provisioningSlots0) {
- provisioningSlots = provisioningSlots0;
- }
-
- /**
- * Set the satellite version
- * @param satelliteVersion0 the satellite version
- */
- public void setSatelliteVersion(String satelliteVersion0) {
- satelliteVersion = satelliteVersion0;
- }
-
- /**
- * Set the signature as an ASCII armored string
- * @param signature0 the ASCII armored signature
- */
- public void setSignature(String signature0) {
- signature = signature0;
- }
-
- /**
- * Set the number of slots
- * @param slots0 the number of slots
- */
- public void setSlots(String slots0) {
- slots = slots0;
- }
-
- /**
- * Set the number of virtualization slots
- * @param virtualizationSlots0 the number of virtualization slots
- */
- public void setVirtualizationSlots(String virtualizationSlots0) {
- virtualizationSlots = virtualizationSlots0;
- }
-
- /**
- * Set the number of virtualization platform slots
- * @param virtualizationSlots0 the number of virtualization platform slots
- */
- public void setVirtualizationPlatformSlots(String virtualizationSlots0) {
- virtualizationPlatformSlots = virtualizationSlots0;
- }
-
- // Getters
-
- /**
- * Return an unmodifiable list of the channel families
- * @return an unmodifiable list of the channel families
- */
- public List getChannelFamilies() {
- return Collections.unmodifiableList(channelFamilies);
- }
-
- /**
- * Return the channel family with name <code>family</code>, or
- * <code>null</code> if no such family exists.
- * @param family the name of the family
- * @return the channel family with name <code>family</code>, or
- * <code>null</code> if no such family exists.
- */
- public ChannelFamilyDescriptor getChannelFamily(String family) {
- for (int i = 0; i < channelFamilies.size(); i++) {
- ChannelFamilyDescriptor f = (ChannelFamilyDescriptor) channelFamilies.get(i);
- if (f.getFamily().equals(family)) {
- return f;
- }
- }
- return null;
- }
-
- /**
- * Get the expiration date
- * @return the expiration date
- */
- public String getExpires() {
- return expires;
- }
-
- /**
- * Convenience function, returns java.util.Date equivalent of
- * <code>expires</code>
- * @return Date obj equivalent of <code>expires</code>
- * @throws ParseException format of <code>expires</code> not what we
- * expected
- */
- public Date getExpiresDate() throws ParseException {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- return sdf.parse(expires);
- }
-
- /**
- * Get the generation
- * @return the generation
- */
- public String getGeneration() {
- return generation;
- }
-
- /**
- * Get the issue date
- * @return the issue date
- */
- public String getIssued() {
- return issued;
- }
-
- /**
- * Get the nonlinux slots
- * @return the nonlinux slots
- */
- public String getNonlinuxSlots() {
- return nonlinuxSlots;
- }
-
- /**
- * Get the monitoring slots
- * @return the monitoring slots
- */
- public String getMonitoringSlots() {
- return monitoringSlots;
- }
-
- /**
- * Get the owner
- * @return the owner
- */
- public String getOwner() {
- return owner;
- }
-
- /**
- * Get the product
- * @return the product
- */
- public String getProduct() {
- return product;
- }
-
- /**
- * Get the number of provisioning slots
- * @return the number of provisioning slots
- */
- public String getProvisioningSlots() {
- return provisioningSlots;
- }
-
- /**
- * Get the satellite version
- * @return the satellite version
- */
- public String getSatelliteVersion() {
- return satelliteVersion;
- }
-
- /**
- * Get the ASCII armoured signature
- * @return the ASCII armoured signature
- */
- public String getSignature() {
- return signature;
- }
-
- /**
- * Get the number of slots
- * @return the number of slots
- */
- public String getSlots() {
- return slots;
- }
-
- /**
- * Get the number of virtualization slots
- * @return the number of virtualization slots
- */
- public String getVirtualizationSlots() {
- return virtualizationSlots;
- }
-
- /**
- * Get the number of virtualization platform slots
- * @return the number of virtualizationPlatform slots
- */
- public String getVirtualizationPlatformSlots() {
- return virtualizationPlatformSlots;
- }
-
- private void appendField(StringBuffer result, String fieldName, String value) {
- if (value != null) {
- result.append(fieldName).append("-").append(value).append('\n');
- }
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/CertificateFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/CertificateFactory.java
deleted file mode 100644
index 49d4850..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/CertificateFactory.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-
-/**
- * @author pkilambi
- *
- */
-/**
- * A class for parsing rhq certificates from their XML form. The XML
- * format is identical to the one used by the perl code.
- *
- */
-public class CertificateFactory {
-
- private static final String ELEM_SIGNATURE = "rhn-cert-signature";
- private static final String ELEM_FIELD = "rhn-cert-field";
- private static final String ELEM_CERT = "rhn-cert";
-
- private static final FieldExtractor[] FIELD_EXTRACTORS = {
- new SimpleExtractor("product", true),
- new SimpleExtractor("owner", true),
- new SimpleExtractor("issued", true),
- new SimpleExtractor("expires", true),
- new SimpleExtractor("slots", true),
- new SimpleExtractor("monitoring-slots", "monitoringSlots"),
- new SimpleExtractor("provisioning-slots", "provisioningSlots"),
- new SimpleExtractor("virtualization_host", "virtualizationSlots"),
- new SimpleExtractor("virtualization_host_platform",
- "virtualizationPlatformSlots"),
- new SimpleExtractor("nonlinux-slots", "nonlinuxSlots"),
- new SimpleExtractor("satellite-version", "satelliteVersion"),
- new SimpleExtractor("generation"),
- new ChannelFamilyExtractor("channel-families") };
-
- private static final HashMap FIELD_MAP = new HashMap();
-
- static {
- for (int i = 0; i < FIELD_EXTRACTORS.length; i++) {
- FIELD_MAP.put(FIELD_EXTRACTORS[i].getFieldName(), FIELD_EXTRACTORS[i]);
- }
- }
-
- private CertificateFactory() {
- }
-
- /**
- * Parse the certificate from <code>certString</code>.
- * @param certString valid Satellite Certificate in string form
- * @return the certificate from <code>certString</code>
- * @throws JDOMException XML parsing fails
- * @throws IOException unknown
- */
- public static Certificate read(String certString) throws JDOMException, IOException {
- return readDocument(new SAXBuilder().build(new StringReader(certString)),
- certString);
- }
-
- /**
- * Parse a certificate from <code>file</code>. The file must contain the
- * certificate in XML form.
- *
- * @param file the file with the XML certificate
- * @return the certificate from <code>fle</code>
- * @throws JDOMException if parsing the XML fails
- * @throws IOException if reading the file fails
- */
- public static Certificate read(File file) throws JDOMException, IOException {
- return readDocument(new SAXBuilder().build(file), file.getAbsolutePath());
- }
-
- /**
- * Parse a certificate from the contents of <code>url</code>. The file must
- * contain the certificate in XML form.
- *
- * @param url the URL at which the XML certificate is located
- * @return the certificate from <code>fle</code>
- * @throws JDOMException if parsing the XML fails
- * @throws IOException if reading the contents of <code>url</code> fails
- */
- public static Certificate read(URL url) throws JDOMException, IOException {
- return readDocument(new SAXBuilder().build(url), url.toExternalForm());
- }
-
- private static Certificate readDocument(Document doc, String source)
- throws JDOMException {
- Certificate result = new Certificate();
- Element root = doc.getRootElement();
- if (!ELEM_CERT.equals(root.getName())) {
- throw new JDOMException("Expected root element in " + source + " to be " +
- ELEM_CERT + " but found " + root.getName());
- }
- Element signature = root.getChild(ELEM_SIGNATURE);
- if (signature == null) {
- throw new JDOMException("Could not find signature element ");
- }
- result.setSignature(signature.getText());
- List children = root.getChildren(ELEM_FIELD);
- for (int i = 0; i < children.size(); i++) {
- Element child = (Element) children.get(i);
- extractField(result, child);
- }
- return result;
- }
-
- private static void extractField(Certificate result, Element child)
- throws JDOMException {
- String name = child.getAttributeValue("name");
- FieldExtractor e = (FieldExtractor) FIELD_MAP.get(name);
- if (name == null) {
- throw new JDOMException("The field " + name +
- " is not one of the possible fields for " + ELEM_FIELD);
- }
- e.extract(result, child);
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyDescriptor.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyDescriptor.java
deleted file mode 100644
index 3d3d0c6..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyDescriptor.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.certificate.XmlTag;
-/**
- * @author pkilambi
- *
- */
-/**
- * The entitlements for a channel family, consisting of the family name and a
- * quantity.
- *
- */
-public class ChannelFamilyDescriptor implements Comparable {
-
- private String family;
- private String quantity;
-
- ChannelFamilyDescriptor(String family0, String quantity0) {
- family = family0;
- quantity = quantity0;
- }
-
- /**
- * Return the name of this channel family
- * @return the name of this channel family
- */
- public String getFamily() {
- return family;
- }
-
- /**
- * Return the quantity for this family
- * @return the quantity for this family
- */
- public String getQuantity() {
- return quantity;
- }
-
- String asChecksumString() {
- return "channel-families-family-" + getFamily() + "-quantity-" + getQuantity();
- }
-
- /**
- * {@inheritDoc}
- */
- public int compareTo(Object obj) {
- ChannelFamilyDescriptor other = (ChannelFamilyDescriptor) obj;
- // The sort order for families is kinda odd; this replicates
- // exactly the way the Perl code sorts the fields so that
- // signature checking on the result is possible across Perl and Java
- return asSortKey().compareTo(other.asSortKey());
- }
-
- private String asSortKey() {
- return getQuantity() + "familyquantity" + getFamily();
- }
-
- String asXmlString() {
- XmlTag tag = new XmlTag("rhn-cert-field", false);
- tag.setAttribute("name", "channel-families");
- tag.setAttribute("quantity", getQuantity());
- tag.setAttribute("family", getFamily());
- return tag.render();
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyExtractor.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyExtractor.java
deleted file mode 100644
index 90f4a6f..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyExtractor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import org.jdom.Element;
-/**
- * @author pkilambi
- *
- */
-/**
- * ChannelFamilyExtractor
- */
-public class ChannelFamilyExtractor implements FieldExtractor {
-
- private String fieldName;
-
- /**
- *
- */
- public ChannelFamilyExtractor(String fieldName0) {
- fieldName = fieldName0;
- }
-
- /**
- * {@inheritDoc}
- */
- public void extract(Certificate target, Element field) {
- String quantity = field.getAttributeValue("quantity");
- String family = field.getAttributeValue("family");
- ChannelFamilyDescriptor cf = new ChannelFamilyDescriptor(family, quantity);
- target.addChannelFamily(cf);
- }
-
- public boolean isRequired() {
- return false;
- }
-
- public String getFieldName() {
- return fieldName;
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/FieldExtractor.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/FieldExtractor.java
deleted file mode 100644
index 9ece636..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/FieldExtractor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import org.jdom.Element;
-import org.jdom.JDOMException;
-
-/**
- * @author pkilambi
- *
- */
-/**
- * An interface to describe how a field is to be extracted from the DOM
- * representation of the XML rhq certificate
- */
-interface FieldExtractor {
-
- void extract(Certificate target, Element field) throws JDOMException;
-
- boolean isRequired();
-
- String getFieldName();
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/PublicKeyRing.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/PublicKeyRing.java
deleted file mode 100644
index ba45aee..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/PublicKeyRing.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyException;
-import java.security.NoSuchProviderException;
-import java.security.Security;
-import java.security.SignatureException;
-
-import org.bouncycastle.bcpg.ArmoredInputStream;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openpgp.PGPException;
-import org.bouncycastle.openpgp.PGPObjectFactory;
-import org.bouncycastle.openpgp.PGPPublicKey;
-import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
-import org.bouncycastle.openpgp.PGPSignature;
-import org.bouncycastle.openpgp.PGPSignatureList;
-import org.bouncycastle.openpgp.PGPUtil;
-
-/**
- * @author pkilambi
- * This module is taken from Satellite
- */
-/**
- * A GPG public keyring.
- *
- */
-public class PublicKeyRing {
-
- static {
- Security.addProvider(new BouncyCastleProvider());
- Security.addProvider(new RhnSecurityProvider());
- }
-
- private PGPPublicKeyRingCollection keyRing;
-
- /**
- * Read the key ring from <code>keyRingStream</code>.
- * @param keyRingStream the stream from which the key ring will be read
- * @throws IOException if reading the stream fails
- * @throws KeyException if the keyring can not be created from the stream
- */
- public PublicKeyRing(InputStream keyRingStream) throws IOException, KeyException {
- super();
- try {
- keyRing = new PGPPublicKeyRingCollection(PGPUtil
- .getDecoderStream(keyRingStream));
- }
- catch (PGPException e) {
- // We recast this as a KeyException so that we don't leak
- // any dependency on bouncycastle here
- throw (KeyException) new KeyException("Reading the keyring failed - " +
- e.getMessage()).initCause(e);
- }
- }
-
- /**
- * Verify that <code>asciiSig</code> is a valid signature for
- * <code>message</code> using this key ring.
- *
- * @param message the cleartext message
- * @param asciiSig the ASCII armored sigature
- * @return <code>true</code> if the signature was generated from
- * <code>message</code> using one of the private keys corresponding to the
- * public keys on this key ring
- * @throws SignatureException if processing hte signature fails
- */
- public boolean verifySignature(String message, String asciiSig)
- throws SignatureException {
- PGPSignature sig = decodeSignature(asciiSig);
- PGPPublicKey key;
- boolean result;
- try {
- key = keyRing.getPublicKey(sig.getKeyID());
- sig.initVerify(key, RhnSecurityProvider.NAME);
- sig.update(message.getBytes());
-
- result = sig.verify();
- }
- catch (PGPException e) {
- // We recast this as a SignatureException so that we don't leak
- // any dependency on bouncycastle here
- throw (SignatureException) new SignatureException("Verification failed - " +
- e.getMessage()).initCause(e);
- }
- catch (NoSuchProviderException e) {
- // We define the provider in the static block. Something weird is
- // afoot
- throw (IllegalStateException) new IllegalStateException("The provider " +
- RhnSecurityProvider.NAME + " should be defined").initCause(e);
- }
- return result;
- }
-
- /**
- * Turn the ASCII armored signature <code>asciiSig</code> into a
- * <code>PGPSignature</code>
- * @param asciiSig an ASCII armored signature
- * @return the signature
- */
- private static PGPSignature decodeSignature(String asciiSig) {
- PGPSignature result;
- ByteArrayInputStream bais = new ByteArrayInputStream(asciiSig.getBytes());
- try {
- ArmoredInputStream ais = new ArmoredInputStream(bais);
- try {
- InputStream in = PGPUtil.getDecoderStream(ais);
- try {
- result = ((PGPSignatureList) new PGPObjectFactory(in).nextObject()).get(0);
- } finally {
- in.close();
- }
- } finally {
- ais.close();
- }
- }
- catch (IOException e) {
- // This is so unlikely that we convert it to a runtime exception
- throw (IllegalArgumentException) new IllegalArgumentException(
- "The string asciiSig is not a valid signature").initCause(e);
- }
- return result;
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/RhnSecurityProvider.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/RhnSecurityProvider.java
deleted file mode 100644
index 207110a..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/RhnSecurityProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import java.security.Provider;
-
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.jce.provider.JDKDSASigner;
-import org.bouncycastle.jce.provider.JDKKeyFactory;
-/**
- * @author pkilambi
- * This module is taken from Satellite
- */
-/**
- * This JCE provider exists solely to hack around the fact that the bouncycastle
- * provider does not offer <code>RIPEMD160 + DSA</code> signature processing. It
- * cobbles the existing bits from bouncycastle together to add processing of
- * these signatures.
- *
- */
-final class RhnSecurityProvider extends Provider {
-
- /**
- * The name under which this provider registers
- */
- public static final String NAME = "RHNSP";
- private static final String INFO = "RHN Security Provider (provides RIPEMD160WithDSA signatures)";
-
- /**
- * Create the provider
- */
- public RhnSecurityProvider() {
- super(NAME, 1.0, INFO);
- put("KeyFactory.DSA", JDKKeyFactory.DSA.class.getName());
- put("Signature.RIPEMD160WithDSA", RIPEMD160WithDSA.class.getName());
- }
-
- /**
- * The signer that combines <code>RIPEMD160</code> hashing with DSA signing.
- */
- public static class RIPEMD160WithDSA extends JDKDSASigner {
-
- public RIPEMD160WithDSA() {
- super(new RIPEMD160Digest(), new DSASigner());
- }
-
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/SimpleExtractor.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/SimpleExtractor.java
deleted file mode 100644
index 49f83e7..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/SimpleExtractor.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-
-/**
- * @author pkilambi
- *
- */
-/**
- * SimpleExtractor
- */
-class SimpleExtractor implements FieldExtractor {
-
- private String fieldName;
- private String propertyName;
- private boolean required;
-
- public SimpleExtractor(String name) {
- this(name, name, false);
- }
-
- public SimpleExtractor(String fieldName0, String propertyName0) {
- this(fieldName0, propertyName0, false);
- }
-
- public SimpleExtractor(String name, boolean required0) {
- this(name, name, required0);
- }
-
- /**
- *
- */
- public SimpleExtractor(String fieldName0, String propertyName0, boolean required0) {
- fieldName = fieldName0;
- propertyName = propertyName0;
- required = required0;
- }
-
- /**
- * {@inheritDoc}
- * @throws JDOMException
- */
- public void extract(Certificate target, Element field) throws JDOMException {
- if (!PropertyUtils.isWriteable(target, propertyName)) {
- throw new JDOMException("Property " + propertyName +
- " is not writable in target " + target);
- }
-
- try {
- BeanUtils.setProperty(target, propertyName, field.getTextTrim());
- }
- catch (IllegalAccessException e) {
- throw new JDOMException("Could not set value of property " + propertyName, e);
- }
- catch (InvocationTargetException e) {
- throw new JDOMException("Could not set value of property " + propertyName, e);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isRequired() {
- return required;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getFieldName() {
- return fieldName;
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/XmlTag.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/XmlTag.java
deleted file mode 100644
index 73704d9..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/XmlTag.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.certificate;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-/**
- * @author pkilambi
- *
- */
-/**
- * XmlTag a simple class to render an XML tag
- */
-public class XmlTag {
-
- private String tag;
- private Map attribs;
- private List body;
- private boolean spaceBeforeEndTag;
- private List keys;
-
- /**
- * Standard xml header with utf-8 encoding. Example usage:<br />
- * <code>
- * StringBuffer buf = new StringBuffer();
- * buf.append(XmlTag.XML_HDR_UTF8);
- * buf.append(new XmlTag("foo").render());
- * </code>
- */
- public static final String XML_HDR_UTF8 = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
-
- /**
- * Standard xml header with no encoding. Example usage:<br />
- * <code>
- * StringBuffer buf = new StringBuffer();
- * buf.append(XmlTag.XML_HDR);
- * buf.append(new XmlTag("foo").render());
- * </code>
- */
- public static final String XML_HDR = "<?xml version=\"1.0\"?>";
-
- /**
- * Public constructor
- * @param tagIn the name of the tag
- */
- protected XmlTag(String tagIn) {
- this(tagIn, true);
- }
-
- /**
- * Constructs an XmlTag. The <code>spaceBefore</code> attribute controls
- * whether a space is inserted before the closing tag of a single line
- * element.<br />
- * For example, a true value for spaceBefore and a tagIn of "foo" will
- * render <foo />. A spaceBefore value of false would've rendered
- * <foo/>.
- * @param tagIn the name of the tag
- * @param spaceBefore true if you want a space before the closing tag.
- */
-
- protected XmlTag(String tagIn, boolean spaceBefore) {
- attribs = new HashMap();
- tag = tagIn;
- body = new ArrayList();
- keys = new ArrayList();
- spaceBeforeEndTag = spaceBefore;
- }
-
- /**
- * set an attribute of the html tag
- * @param name the attribute name
- * @param value the attribute value
- */
- public void setAttribute(String name, String value) {
- attribs.put(name, value);
- keys.add(name);
- }
-
- /**
- * Removes an attribute of the html tag.
- * @param name the attribute name to be removed.
- */
- public void removeAttribute(String name) {
- attribs.remove(name);
- keys.remove(name);
- }
-
- /**
- * set the body of the tag
- * @param bodyIn the new body
- */
- public void addBody(String bodyIn) {
- body.add(bodyIn);
- }
-
- /**
- * Adds the given tag to the body of this tag.
- * @param bodyTag Tag to be added to the body of this tag.
- */
- public void addBody(XmlTag bodyTag) {
- body.add(bodyTag);
- }
-
- /**
- * render the tag into a string
- * @return the string version
- */
- public String render() {
- StringBuffer ret = new StringBuffer();
- ret.append(renderOpenTag());
- if (!hasBody()) {
- ret.deleteCharAt(ret.length() - 1);
- if (spaceBeforeEndTag) {
- ret.append(" />");
- }
- else {
- ret.append("/>");
- }
- }
- else {
- ret.append(renderBody());
- ret.append(renderCloseTag());
- }
- return ret.toString();
- }
-
- /**
- * render the open tag and attributes
- * @return the open tag as a string
- */
- public String renderOpenTag() {
- StringBuffer ret = new StringBuffer("<");
- ret.append(tag);
-
- Iterator i = keys.iterator();
- while (i.hasNext()) {
- String attrib = (String) i.next();
- ret.append(" ");
- ret.append(attrib);
- ret.append("=\"");
- ret.append((String) attribs.get(attrib));
- ret.append("\"");
- }
- ret.append(">");
-
- return ret.toString();
- }
-
- /**
- * render the tag body
- * @return the tag body as a string
- */
- public String renderBody() {
- StringBuffer buf = new StringBuffer();
-
- for (Iterator itr = body.iterator(); itr.hasNext();) {
- buf.append(convertToString(itr.next()));
- }
-
- return buf.toString();
- }
-
- private String convertToString(Object o) {
- if (o instanceof XmlTag) {
- return ((XmlTag) o).render();
- }
- else if (o instanceof String) {
- return (String) o;
- }
- else {
- return o.toString();
- }
- }
-
- /**
- * render the close tag
- * @return the close tag as a string
- */
- public String renderCloseTag() {
- return "</" + tag + ">";
- }
-
- /**
- * Returns true if this tag has a body defined.
- * @return true if this tag has a body defined.
- */
- public boolean hasBody() {
- return (body.size() > 0);
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/ApacheXmlRpcExecutor.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/ApacheXmlRpcExecutor.java
deleted file mode 100644
index 004608a..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/ApacheXmlRpcExecutor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.util.List;
-
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.client.XmlRpcClient;
-
-public class ApacheXmlRpcExecutor implements XmlRpcExecutor {
-
- private XmlRpcClient client;
-
- public ApacheXmlRpcExecutor(XmlRpcClient clientIn) {
- this.client = clientIn;
- }
-
- public Object execute(String methodName, Object[] params) throws XmlRpcException {
- return client.execute(methodName, params);
- }
-
- public Object execute(String pMethodName, List pParams) throws XmlRpcException {
- return client.execute(pMethodName, pParams);
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransport.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransport.java
deleted file mode 100644
index 475cebc..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransport.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
-
-public class CustomReqPropTransport extends RhnSSLTransport {
-
- private final Log log = LogFactory.getLog(CustomReqPropTransport.class);
- protected Map<String, String> reqProps;
- protected boolean dumpMessageToFile; // used during debug to save a copy of the data received
- protected String dumpFilePath;
- protected String PROP_NAME_TO_SAVE_TEMP_FILES = "RhnXMLRPCSaveTempFiles";
-
- public CustomReqPropTransport(XmlRpcClient pClient) {
- super(pClient);
- }
-
- public void setDumpMessageToFile(boolean dump) {
- dumpMessageToFile = dump;
- }
-
- public boolean getDumpMessageToFile() {
- return dumpMessageToFile;
- }
-
- public void setDumpFilePath(String dumpPath) {
- dumpFilePath = dumpPath;
- }
-
- public String getDumpFilePath() {
- return dumpFilePath;
- }
-
- public void setRequestProperties(Map props) {
- reqProps = props;
- }
-
- public Map<String, String> getRequestProperties() {
- return reqProps;
- }
-
- public void setRequestProperty(String name, String value) {
- if (reqProps == null) {
- reqProps = new HashMap<String, String>();
- }
- reqProps.put(name, value);
- }
-
- public String getRequestProperty(String name, String value) {
- return (String) reqProps.get(name);
- }
-
- protected URLConnection newURLConnection(URL pURL) throws IOException {
- URLConnection conn = super.newURLConnection(pURL);
- if (reqProps != null) {
- for (String key : reqProps.keySet()) {
- conn.addRequestProperty(key, reqProps.get(key));
- }
- }
- return conn;
- }
-
- protected File cacheResponseToFile(InputStream inStream) throws XmlRpcException {
- //
- // We will read the response and write it to a file. Prior approach read all data in memory and parsed it.
- // This created a problem when retrieving package details for large package lists of 6000+ packages.
- // We were seeing out of memory exceptions,
- // estimate on "rhel-i386-server-5" are 6200+ packages, metadata size written to disk in xml is 1.1GB
- //
- File tempFile = null;
- BufferedOutputStream outStream = null;
- try {
- if (!StringUtils.isBlank(dumpFilePath)) {
- // dumpFilePath was specified so use that, even though we may be over-writing it
- tempFile = new File(dumpFilePath);
- } else {
- tempFile = File.createTempFile("RHQ-rhn-xmlrpc-output", ".tmp");
- }
- outStream = new BufferedOutputStream(new FileOutputStream(tempFile, false));
- final byte[] buffer = new byte[0x100000];
-
- BufferedInputStream buffInStream = new BufferedInputStream(inStream);
-
- int read;
- do {
- //long startRead = System.currentTimeMillis();
- read = buffInStream.read(buffer, 0, buffer.length);
- //read = inStream.read(buffer, 0, buffer.length);
- if (read > 0) {
- //long endRead = System.currentTimeMillis();
- //log.debug("Read " + read + " bytes took " + (endRead - startRead) + "ms");
- //long startWrite = System.currentTimeMillis();
- outStream.write(buffer, 0, read);
- //long endWrite = System.currentTimeMillis();
- //log.debug("Wrote " + read + " bytes in " + (endWrite - startWrite) + "ms");
- }
- } while (read >= 0);
- } catch (Exception e) {
- log.warn("RhnJaxbTransport readResponse exception", e);
- throw new XmlRpcException(e.getMessage());
- } finally {
- try {
- if (outStream != null) {
- outStream.close();
- outStream = null;
- }
- } catch (Exception e) {
- ; //ignore exceptions from close
- }
- }
- return tempFile;
- }
-
- protected Object readResponse(XmlRpcStreamRequestConfig pConfig, InputStream pStream) throws XmlRpcException {
-
- // During debug modes we may want to cache all the input to a file
- if (dumpMessageToFile) {
- InputStream dataStream = null;
- try {
- File tempFile = cacheResponseToFile(pStream);
- dataStream = new FileInputStream(tempFile);
- return super.readResponse(pConfig, dataStream);
- } catch (FileNotFoundException e) {
-
- } finally {
- if (dataStream != null) {
- try {
- dataStream.close();
- } catch (Exception e) {
- ;//ignore
- }
- }
- }
- }
- // we aren't writing the data to a file
- return super.readResponse(pConfig, pStream);
- }
-
- protected boolean doWeDeleteTempFile(File f) {
- // Check basic file access to ensure we could delete the file
- if (!f.exists() || f.isDirectory() || !f.canWrite()) {
- return false;
- }
- // If we set dumpMessageToFile, then we obviously don't want to delete it
- if (dumpMessageToFile) {
- return false;
- }
- // Check our System Prop to see if maybe we are debugging and want to keep temp files.
- String value = System.getProperty(PROP_NAME_TO_SAVE_TEMP_FILES);
- if (!StringUtils.isBlank(value)) {
- if (Boolean.parseBoolean(value)) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransportFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransportFactory.java
deleted file mode 100644
index f30ae78..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransportFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcTransport;
-
-public class CustomReqPropTransportFactory extends RhnSSLTransportFactory {
-
- protected Map reqProps;
- protected boolean dumpMessageToFile;
- protected String dumpMessagePath;
- protected String PROP_NAME_SAVE_XML_TO_FILE = "RhnXmlrpcSaveTempFiles";
-
- /**
- * Creates a new factory, which creates transports for the given client.
- * @param pClient The client, which is operating the factory.
- */
- public CustomReqPropTransportFactory(XmlRpcClient pClient) {
- super(pClient);
- String value = System.getProperty(PROP_NAME_SAVE_XML_TO_FILE);
- if (!StringUtils.isBlank(value)) {
- dumpMessageToFile = Boolean.parseBoolean(value);
- }
- }
-
- public void setRequestProperties(Map props) {
- reqProps = props;
- }
-
- public Map<String, String> getRequestProperties() {
- return reqProps;
- }
-
- public void setRequestProperty(String name, String value) {
- if (reqProps == null) {
- reqProps = new HashMap<String, String>();
- }
- reqProps.put(name, value);
- }
-
- public String getRequestProperty(String name, String value) {
- return (String) reqProps.get(name);
- }
-
- public void setDumpMessageToFile(boolean dump) {
- dumpMessageToFile = dump;
- }
-
- public boolean getDumpMessageToFile() {
- return dumpMessageToFile;
- }
-
- public void setDumpFilePath(String dumpPath) {
- dumpMessagePath = dumpPath;
- }
-
- public String getDumpFilePath() {
- return dumpMessagePath;
- }
-
- /**
- * Override to specify a different Transport
- * */
- protected CustomReqPropTransport newTransportInstance() {
- return new CustomReqPropTransport(getClient());
- }
-
- public XmlRpcTransport getTransport() {
- CustomReqPropTransport transport = newTransportInstance();
- if (reqProps != null) {
- transport.setRequestProperties(reqProps);
- }
- transport.setSSLSocketFactory(getSSLSocketFactory());
- transport.setProxy(getProxy());
- transport.setDumpMessageToFile(dumpMessageToFile);
- transport.setDumpFilePath(dumpMessagePath);
- return transport;
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnComm.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnComm.java
deleted file mode 100644
index 0ddf65f..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnComm.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xmlrpc.XmlRpcException;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelFamilyType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnErratumType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartableTreeType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageShortType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnProductNameType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnSatelliteType;
-
-public class RhnComm {
- private final Log log = LogFactory.getLog(RhnComm.class);
- protected XmlRpcExecutor satHandler;
- protected XmlRpcExecutor dumpHandler;
- protected String serverUrl;
- protected String SAT_HANDLER = "/SAT";
- protected String SATDUMP_HANDLER = "/SAT-DUMP";
-
- public RhnComm(String serverUrlIn) {
- serverUrl = serverUrlIn;
- satHandler = XmlRpcExecutorFactory.getJaxbClient(serverUrl + SAT_HANDLER);
- dumpHandler = XmlRpcExecutorFactory.getJaxbClient(serverUrl + SATDUMP_HANDLER);
- }
-
- public boolean checkSystemId(String systemId) throws IOException, XmlRpcException {
- Object[] params = new Object[] { systemId };
-
- log.debug("checkSystemId() systemId used is " + systemId);
- Integer result = (Integer) satHandler.execute("authentication.check", params);
- if (result == 1) {
- return true;
- } else {
- return false;
- }
- }
-
- public List<RhnProductNameType> getProductNames(String systemId) throws IOException, XmlRpcException {
- Object[] params = new Object[] { systemId };
-
- log.debug("getProductNames()");
- JAXBElement<RhnSatelliteType> result = (JAXBElement) dumpHandler.execute("dump.product_names", params);
- RhnSatelliteType sat = result.getValue();
- List<RhnProductNameType> names = sat.getRhnProductNames().getRhnProductName();
- return names;
- }
-
- public List<RhnChannelFamilyType> getChannelFamilies(String systemId) throws IOException, XmlRpcException {
- Object[] params = new Object[] { systemId };
-
- log.debug("getChannelFamilies()");
- JAXBElement<RhnSatelliteType> result = (JAXBElement) dumpHandler.execute("dump.channel_families", params);
- RhnSatelliteType sat = result.getValue();
- List<RhnChannelFamilyType> families = sat.getRhnChannelFamilies().getRhnChannelFamily();
- return families;
- }
-
- public List<RhnChannelType> getChannels(String systemId, List<String> channelLabels) throws IOException,
- XmlRpcException {
-
- log.debug("getChannels(" + channelLabels + ")");
- Object[] params = new Object[] { systemId, channelLabels };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) dumpHandler.execute("dump.channels", params);
- RhnSatelliteType sat = result.getValue();
- List<RhnChannelType> channels = sat.getRhnChannels().getRhnChannel();
- return channels;
- }
-
- public List<RhnPackageShortType> getPackageShortInfo(String systemId, List<String> pkgIds) throws IOException,
- XmlRpcException {
-
- log.debug("getPackageShortInfo() passed in package id list has " + pkgIds.size() + " entries");
- Object[] params = new Object[] { systemId, pkgIds };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) dumpHandler.execute("dump.packages_short", params);
- RhnSatelliteType sat = result.getValue();
- List<RhnPackageShortType> pkgs = sat.getRhnPackagesShort().getRhnPackageShort();
- return pkgs;
- }
-
- public List<RhnPackageType> getPackageMetadata(String systemId, List<String> pkgIds) throws IOException,
- XmlRpcException {
-
- log.debug("getPackageMetadata() passed in package id list has " + pkgIds.size() + " entries");
- Object[] params = new Object[] { systemId, pkgIds };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) dumpHandler.execute("dump.packages", params);
- RhnSatelliteType sat = result.getValue();
- List<RhnPackageType> pkgs = sat.getRhnPackages().getRhnPackage();
- return pkgs;
- }
-
- public List<RhnKickstartableTreeType> getKickstartTreeMetadata(String systemId, List<String> ksLabels)
- throws IOException, XmlRpcException {
-
- log.debug("getKickstartTreeMetadata(" + ksLabels + ")");
- Object[] params = new Object[] { systemId, ksLabels };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) dumpHandler.execute("dump.kickstartable_trees", params);
- RhnSatelliteType sat = result.getValue();
- return sat.getRhnKickstartableTrees().getRhnKickstartableTree();
- }
-
- public List<RhnErratumType> getErrataMetadata(String systemId, List<String> erratumIds) throws IOException,
- XmlRpcException {
-
- log.debug("getErratum(" + erratumIds + ")");
- Object[] params = new Object[] { systemId, erratumIds };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) dumpHandler.execute("dump.errata", params);
- RhnSatelliteType sat = result.getValue();
- return sat.getRhnErrata().getRhnErratum();
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnDownloader.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnDownloader.java
deleted file mode 100644
index c0b0497..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnDownloader.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xmlrpc.XmlRpcException;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.RHNConstants;
-
-public class RhnDownloader {
- private final Log log = LogFactory.getLog(RhnDownloader.class);
- protected XmlRpcExecutor satHandler;
- protected String serverUrl;
- protected String SAT_HANDLER = "/SAT";
- protected String sslCertPath;
- protected Map<String, Map> cachedAuthMap;
- protected final String RHN_AUTH_EXPIRE_OFFSET = "X-RHN-Auth-Expire-Offset";
- protected final String RHN_AUTH_SERVER_TIME = "X-RHN-Auth-Server-Time";
- protected final String RHN_AUTH = "X-RHN-Auth";
- protected final String RHQ_CACHED_TIME = "RHQ-Time-Auth-Cached";
-
- public RhnDownloader(String serverUrlIn, String sslCertPathIn) {
- serverUrl = serverUrlIn;
- satHandler = XmlRpcExecutorFactory.getClient(serverUrl + SAT_HANDLER);
- sslCertPath = sslCertPathIn;
- cachedAuthMap = new HashMap<String, Map>();
- }
-
- public RhnDownloader(String serverUrlIn) {
- this(serverUrlIn, RHNConstants.DEFAULT_SSL_CERT_PATH);
- }
-
- public String getServerUrl() {
- return this.serverUrl;
- }
-
- public void setSSLCertPath(String sslCertPathIn) {
- sslCertPath = sslCertPathIn;
- }
-
- public String getSSLCertPath() {
- return sslCertPath;
- }
-
- protected HttpURLConnection getNewConnection(String urlIn) throws IOException {
- return (HttpURLConnection) RhnHttpURLConnectionFactory.openConnection(new URL(urlIn), sslCertPath);
- }
-
- protected boolean verifyAuthMap(Map authProps) {
- if (authProps.containsKey(RHN_AUTH_EXPIRE_OFFSET) == false) {
- log.info("Invalid cached auth, No key for " + RHN_AUTH_EXPIRE_OFFSET + " present.");
- return false;
- }
- if (authProps.containsKey(RHN_AUTH_SERVER_TIME) == false) {
- log.info("Invalid cached auth, No key for " + RHN_AUTH_SERVER_TIME + " present.");
- return false;
- }
- if (authProps.containsKey(RHN_AUTH) == false) {
- log.info("Invalid cached auth, No key for " + RHN_AUTH + " present.");
- return false;
- }
- if (authProps.containsKey(RHQ_CACHED_TIME) == false) {
- log.info("Invalid cached auth, No key for " + RHQ_CACHED_TIME + " present.");
- return false;
- }
- long cachedTime = (Long) authProps.get(RHQ_CACHED_TIME);
- long expireOffset = Float.valueOf((String) authProps.get(RHN_AUTH_EXPIRE_OFFSET)).longValue();
- long expireTime = cachedTime + (expireOffset * 1000); //remember to convert offset from seconds to milliseconds
- long currentTime = System.currentTimeMillis();
- log.debug("Current time = " + currentTime + ", This Authentication map was cached at: " + cachedTime
- + " and will expire at " + expireTime);
- if (currentTime >= expireTime) {
- log.debug("Cached authentication is invalid, time has expired: Current time is: " + currentTime
- + ", expireTime = " + expireTime);
- return false;
- }
- return true;
- }
-
- public Map login(String systemId) throws IOException, XmlRpcException {
- return login(systemId, false);
- }
-
- /**
- * @param systemId systemid string contents
- * @param refresh true will cause a refresh of cached login info if any exists
- * @return Map with values for the keys:
- * X-RHN-Server-Id
- * X-RHN-Auth
- * X-RHN-Auth-User-Id
- * X-RHN-Auth-Expire-Offset
- * X-RHN-Auth-Server-Time
- */
- public Map login(String systemId, boolean refresh) throws IOException, XmlRpcException {
- Map result;
-
- if (refresh && cachedAuthMap.containsKey(systemId)) {
- log.info("login was invoked with refresh = true, therefore removing cached auth data.");
- cachedAuthMap.remove(systemId);
- }
-
- if (!refresh && cachedAuthMap.containsKey(systemId)) {
- result = (Map) cachedAuthMap.get(systemId);
- if (verifyAuthMap(result)) {
- log.debug("Using cached credentials");
- return result;
- }
- log.info("Removing cached authentication data because it is invalid");
- cachedAuthMap.remove(systemId);
- }
- log.info("Calling out to remote server for authentication.login info");
- Object[] params = new Object[] { systemId };
- result = (Map) satHandler.execute("authentication.login", params);
- // Record when we are caching this auth token
- result.put(RHQ_CACHED_TIME, Long.valueOf(System.currentTimeMillis()));
- log.info("Saving authentication data to map.");
- cachedAuthMap.put(systemId, result);
- return result;
- }
-
- public boolean checkAuth(String systemId) throws IOException, XmlRpcException {
- Object[] params = new Object[] { systemId };
- Integer result = (Integer) satHandler.execute("authentication.check", params);
- if (result.intValue() == 1) {
- return true;
- }
- return false;
- }
-
- /**
- * @param systemId string containing system id data
- * @param locationUrl url to fetch for package/file/etc
- * @return InputStream
- */
- public InputStream getFileStream(String systemId, String locationUrl) throws IOException, XmlRpcException {
- try {
- //
- // We are wrapping _getFileStream so we can catch an IOException and refresh our authentication credentials
- // After we have refreshed the login credentials, we'll re-try the _getFileStream call one more time
- //
- return _getFileStream(systemId, locationUrl);
- } catch (IOException e) {
- log.info("Caught exception: " + e.getMessage());
- log.info(e);
- log.info("Cached authentication might be invalid, will refresh login authentication and retry.");
- login(systemId, true);
- return _getFileStream(systemId, locationUrl);
- }
- }
-
- /**
- *
- * @param systemId
- * @param locationUrl
- * @return
- * @throws IOException
- * @throws XmlRpcException
- */
- protected InputStream _getFileStream(String systemId, String locationUrl) throws IOException, XmlRpcException {
-
- HttpURLConnection conn = getNewConnection(locationUrl);
- Map props = login(systemId);
- for (Object key : props.keySet()) {
- conn.setRequestProperty((String) key, props.get(key).toString());
- }
- conn.setRequestMethod("GET");
- conn.connect();
- InputStream in = conn.getInputStream();
-
- return in;
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java
deleted file mode 100644
index a7f51a8..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import org.rhq.enterprise.server.util.MethodUtil;
-import org.rhq.enterprise.server.plugins.rhnhosted.RHNSSLSocketFactory;
-import org.rhq.enterprise.server.plugins.rhnhosted.RHNConstants;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
-
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.net.URLConnection;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-
-import javax.net.ssl.HttpsURLConnection;
-
-
-public class RhnHttpURLConnectionFactory {
-
- final public static String RHN_MOCK_HTTP_URL_CONNECTION = "RhnMockHttpUrlConnection";
- final private static Log log = LogFactory.getLog(RhnHttpURLConnectionFactory.class);
-
- protected static HttpURLConnection _openConnection(URL urlIn, String sslCertPathIn) throws IOException {
- URLConnection conn = urlIn.openConnection();
- if (conn instanceof HttpsURLConnection) {
- try
- {
- ((HttpsURLConnection)conn).setSSLSocketFactory(RHNSSLSocketFactory.getSSLSocketFactory(sslCertPathIn));
- }
- catch (GeneralSecurityException e)
- {
- e.printStackTrace();
- log.error(e);
- throw new IOException(e.getMessage());
- }
- log.debug("SSLSocketFactory has been set with a custom version using certPath: " + sslCertPathIn);
- }
- return (HttpURLConnection)conn;
- }
-
- public static HttpURLConnection openConnection(URL urlIn, String sslCertPathIn) throws IOException {
-
- String propMockHttpURLConn = System.getProperty(RHN_MOCK_HTTP_URL_CONNECTION);
- if (StringUtils.isBlank(propMockHttpURLConn)) {
- return _openConnection(urlIn, sslCertPathIn);
- }
- log.info("Using a Mock HttpURLConnection object, Property for RHN_MOCK_HTTP_URL_CONNECTION is " +
- propMockHttpURLConn);
- Object[] args = { urlIn };
- HttpURLConnection retval =
- (HttpURLConnection) MethodUtil.getClassFromSystemProperty(RHN_MOCK_HTTP_URL_CONNECTION, args);
- return retval;
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransport.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransport.java
deleted file mode 100644
index 52214bc..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransport.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
-import org.jdom.Document;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-
-public class RhnJaxbTransport extends CustomReqPropTransport {
-
- protected String jaxbDomain;
-
- private final Log log = LogFactory.getLog(RhnJaxbTransport.class);
-
- public RhnJaxbTransport(XmlRpcClient pClient) {
- super(pClient);
- }
-
- public void setJaxbDomain(String domain) {
- jaxbDomain = domain;
- }
-
- public String getJaxbDomain() {
- return jaxbDomain;
- }
-
- protected boolean isJaxbMessage(File message) {
- try {
- FileInputStream in = new FileInputStream(message);
- Document doc = new SAXBuilder().build(in);
- String name = doc.getRootElement().getName();
- log.info("Root element name is " + name);
- if (name.equalsIgnoreCase("rhn-satellite")) {
- return true;
- }
- } catch (JDOMException e) {
- log.error("isJaxbMessage()", e);
- } catch (IOException e) {
- log.error("isJaxbMessage()", e);
- }
-
- return false;
- }
-
- protected Object readResponse(XmlRpcStreamRequestConfig pConfig, InputStream pStream) throws XmlRpcException {
-
- log.debug("readResponse invoked");
-
- long start = System.currentTimeMillis();
- File tempFile = cacheResponseToFile(pStream);
- long end = System.currentTimeMillis();
- float bandwidth = (float) tempFile.length() / (1024);
- bandwidth = (bandwidth / (end - start)) * 1000;
- log.info("response cached " + ((float) tempFile.length() / 1024) + " KB in " + (end - start)
- + "ms. Estimated Bandwidth: " + bandwidth + " KB/sec");
-
- /**
- * Point of this method is to not require the traditional "methodResponse" xml wrapping
- * around the response. RHN just returns the pure XML data.
- *
- * For error conditions, RHN defaults back to using "methodResponse".
- * We need to check what the top element is. If it's "rhn-satellite" do JAXB parsing,
- * if it's "methodResponse" do traditional XMLRPC parsing.
- *
- * */
- FileInputStream dataStream = null;
- try {
- dataStream = new FileInputStream(tempFile);
- if (isJaxbMessage(tempFile) == false) {
- log.info("Message is not a JAXB element");
- return super.readResponse(pConfig, dataStream);
- }
-
- JAXBContext jc = JAXBContext.newInstance(jaxbDomain);
- Unmarshaller u = jc.createUnmarshaller();
- return u.unmarshal(dataStream);
- } catch (JAXBException e) {
- log.error(e);
- e.printStackTrace();
- throw new XmlRpcException(e.getMessage());
- } catch (IOException e) {
- log.error(e);
- e.printStackTrace();
- throw new XmlRpcException(e.getMessage());
- } finally {
- if (doWeDeleteTempFile(tempFile)) {
- log.info("Deleting temp file: " + tempFile.getAbsolutePath());
- tempFile.delete();
- } else {
- log.info("Temporary file of xmlrpc data is available at: " + tempFile.getAbsolutePath());
- }
- try {
- if (dataStream != null) {
- dataStream.close();
- }
- } catch (Exception e) {
- ; //ignore exception from close
- }
- }
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransportFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransportFactory.java
deleted file mode 100644
index eb588fa..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransportFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import org.apache.xmlrpc.client.XmlRpcClient;
-
-public class RhnJaxbTransportFactory extends CustomReqPropTransportFactory {
- protected String jaxbDomain;
-
- /**
- * Creates a new factory, which creates transports for the given client.
- * @param pClient The client, which is operating the factory.
- */
- public RhnJaxbTransportFactory(XmlRpcClient pClient) {
- super(pClient);
- }
-
- public void setJaxbDomain(String domain) {
- jaxbDomain = domain;
- }
-
- public String getJaxbDomain() {
- return jaxbDomain;
- }
-
- protected CustomReqPropTransport newTransportInstance() {
- RhnJaxbTransport transport = new RhnJaxbTransport(getClient());
- transport.setJaxbDomain(jaxbDomain);
- return transport;
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java
deleted file mode 100644
index 5fa8a63..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.security.GeneralSecurityException;
-import java.net.URLConnection;
-import java.net.URL;
-import java.io.IOException;
-
-import javax.net.ssl.HttpsURLConnection;
-
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcSun15HttpTransport;
-import org.rhq.enterprise.server.plugins.rhnhosted.RHNSSLSocketFactory;
-import org.rhq.enterprise.server.plugins.rhnhosted.RHNConstants;
-
-public class RhnSSLTransport extends XmlRpcSun15HttpTransport
-{
- private final Log log = LogFactory.getLog(RhnSSLTransport.class);
- private String sslCertPath = RHNConstants.DEFAULT_SSL_CERT_PATH;
-
- /**
- * Creates a new instance.
- * @param pClient The client controlling this instance.
- */
- public RhnSSLTransport(XmlRpcClient pClient) {
- super(pClient);
- }
-
- public void setSSLCertPath(String path) {
- sslCertPath = path;
- }
-
- public String getSSLCertPath() {
- return sslCertPath;
- }
-
- @Override
- protected URLConnection newURLConnection(URL url) throws IOException
- {
- URLConnection c = super.newURLConnection(url);
- if (c instanceof HttpsURLConnection) {
- try
- {
- ((HttpsURLConnection)c).setSSLSocketFactory(RHNSSLSocketFactory.getSSLSocketFactory(sslCertPath));
- }
- catch (GeneralSecurityException e)
- {
- e.printStackTrace();
- log.error(e);
- throw new IOException(e.getMessage());
- }
- log.debug("SSLSocketFactory has been set with a custom version using cert path: " + sslCertPath);
- }
- return c;
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransportFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransportFactory.java
deleted file mode 100644
index 144a15d..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransportFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.net.Proxy;
-
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcSun15HttpTransportFactory;
-import org.apache.xmlrpc.client.XmlRpcTransport;
-import org.apache.xmlrpc.client.XmlRpcSun15HttpTransport;
-import org.rhq.enterprise.server.plugins.rhnhosted.RHNConstants;
-
-
-public class RhnSSLTransportFactory extends XmlRpcSun15HttpTransportFactory
-{
- protected String sslCertPath = RHNConstants.DEFAULT_SSL_CERT_PATH;
- /**
- * Creates a new factory, which creates transports for the given client.
- * @param pClient The client, which is operating the factory.
- */
- public RhnSSLTransportFactory(XmlRpcClient pClient) {
- super(pClient);
- }
-
- /**
- * Override to specify a different Transport
- * */
- protected RhnSSLTransport newTransportInstance() {
- return new RhnSSLTransport(getClient());
- }
-
- public void setSSLCert(String certPath) {
- sslCertPath = certPath;
- }
-
- public String getSSLCert(String certPath) {
- return sslCertPath;
- }
-
- /**
- * We can't access the proxy member directly from our super class
- * so we are grabbing it from the transport instance.
- * Would prefer if XmlRpcSun15HttpTransportFactory had a getProxy method
- * */
- protected Proxy getProxy() {
- XmlRpcSun15HttpTransport hackGetProxy = (XmlRpcSun15HttpTransport)super.getTransport();
- return hackGetProxy.getProxy();
- }
-
- @Override
- public XmlRpcTransport getTransport()
- {
- RhnSSLTransport transport = new RhnSSLTransport(getClient());
- transport.setSSLSocketFactory(getSSLSocketFactory());
- transport.setProxy(getProxy());
- transport.setSSLCertPath(sslCertPath);
- return transport;
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutor.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutor.java
deleted file mode 100644
index 721b350..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.util.List;
-
-import org.apache.xmlrpc.XmlRpcException;
-
-public interface XmlRpcExecutor {
-
- /**
- * Execute an XMLRPC method
- * @param methodName
- * @param params
- * @return
- */
- public Object execute(String methodName, Object[] params) throws XmlRpcException;
-
- /** Performs a request with the clients default configuration.
- * @param pMethodName The method being performed.
- * @param pParams The parameters.
- * @return The result object.
- * @throws XmlRpcException Performing the request failed.
- */
- public Object execute(String pMethodName, List pParams) throws XmlRpcException;
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutorFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutorFactory.java
deleted file mode 100644
index 01b03fd..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutorFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.RHNConstants;
-import org.rhq.enterprise.server.util.MethodUtil;
-
-/**
- * Class responsible for handing out XmlRpcClient classes, either real or mocked.
- */
-public class XmlRpcExecutorFactory {
-
- protected static String XML_DUMP_VERSION = "3.3";
- protected static String sslCertPath = RHNConstants.DEFAULT_SSL_CERT_PATH;
-
- private static XmlRpcExecutor getExecutor(XmlRpcClient wrappedClient) {
- Object[] args = { wrappedClient };
- XmlRpcExecutor retval = (XmlRpcExecutor) MethodUtil.getClassFromSystemProperty(ApacheXmlRpcExecutor.class
- .getName(), args);
- return retval;
- }
-
- public static XmlRpcExecutor getJaxbClient(String url) {
- return getJaxbClient(url, sslCertPath);
- }
-
- public static XmlRpcExecutor getJaxbClient(String url, String sslCertPathIn) {
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
-
- try {
- config.setServerURL(new URL(url));
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
-
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setSSLCert(sslCertPathIn);
- client.setTransportFactory(transportFactory);
- return getExecutor(client);
- }
-
- public static XmlRpcExecutor getClient(String url) {
- return getClient(url, sslCertPath);
- }
-
- public static XmlRpcExecutor getClient(String url, String sslCertPathIn) {
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
-
- try {
- config.setServerURL(new URL(url));
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
-
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- CustomReqPropTransportFactory transportFactory = new CustomReqPropTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setSSLCert(sslCertPathIn);
- client.setTransportFactory(transportFactory);
-
- return getExecutor(client);
- }
-
- public static Map getRequestProperties() {
- Map reqProps = new HashMap();
- reqProps.put("X-RHN-Satellite-XML-Dump-Version", XML_DUMP_VERSION);
- return reqProps;
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml
deleted file mode 100644
index bf87c37..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<content-plugin name="RHNHostedPlugin"
- displayName="Red Hat Network Content"
- description="Provides the ability to obtain content from Red Hat Network"
- xmlns="urn:xmlns:rhq-serverplugin.content"
- xmlns:serverplugin="urn:xmlns:rhq-serverplugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <serverplugin:help><![CDATA[
- Provides a content source that retrieves content from the Red Hat Network (RHN).
- ]]></serverplugin:help>
-
- <contentSourceType name="RHNSource"
- displayName="RHN Hosted Content Source"
- description="This plugin facilitates communication with Red Hat Network."
- lazyLoad="false"
- downloadMode="filesystem"
- apiClass="org.rhq.enterprise.server.plugins.rhnhosted.RHNProvider">
-
- <configuration>
- <c:simple-property
- name="location"
- type="string"
- required="true"
- default="http://satellite.rhn.redhat.com/"
- description="RHN Hosted server url for connection."/>
-
- <c:simple-property
- name="certificate"
- type="longString"
- required="true"
- description="RHQ subscription Certificate for activation ."/>
-
- <!--<c:group name="repos" displayName="repo list">
- <c:simple-property name="repos" type="string" default="rhn-tools-rhel-i386-server-5"/>
- </c:group>-->
- </configuration>
-
- </contentSourceType>
-
-</content-plugin>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/genSchema.sh b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/genSchema.sh
deleted file mode 100755
index 56140e2..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/genSchema.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#Script relies on: apache project xmlbeans
-#http://xmlbeans.apache.org/sourceAndBinaries/index.html
-
-/opt/xmlbeans-2.4.0/bin/inst2xsd -design vb -simple-content-types string -enumerations never ./sample/*.xml
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channel_families.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channel_families.xml
deleted file mode 100644
index 498e5c7..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channel_families.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><rhn-satellite generation="2" version="3.4"><rhn-channel-families><rhn-channel-family channel-labels="redhat-linux-i386-6.2 redhat-linux-alpha-6.2 redhat-linux-sparc-6.2 redhat-powertools-i386-6.2 redhat-powertools-alpha-6.2 redhat-powertools-sparc-6.2 redhat-linux-i386-7.0 redhat-linux-alpha-7.0 redhat-powertools-i386-7.0 redhat-powertools-alpha-7.0 redhat-linux-i386-7.1 redhat-linux-alpha-7.1 redhat-powertools-i386-7.1 redhat-powertools-alpha-7.1 redhat-linux-ee-i386-6.2 redhat-linux-s390x-7.1 redhat-linux-i386-7.2 redhat-linux-ia64-7.2 redhat-linux-s390-7.2 redhat-linux-i386-7.3 redhat-linux-i386-8.0 redhat-linux-i386-9 redhat-linux-ia64-7.1 redhat-gcc3.1-i386-7.3 redhat-linux-iSeries-7.1 redhat-linux-pSeries-7.1 redhat-linux-severn-i386-9.0.93 redhat-linux-severn-i386-9.0.93-updates severn-beta2-i386 severn-beta2-i386-updates" id="rhn-channel-family-1000" label="rh-public"><rhn-channel-family-name>Red Hat Public Channels</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/products/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="k12ltsp-i386-7.2" id="rhn-channel-family-1024" label="k12ltsp"><rhn-channel-family-name>K12 Linux Terminal Server Project</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/products/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="redhat-rhn-proxy-4.0-as-i386-3 redhat-rhn-proxy-4.0-as-i386-4 redhat-rhn-proxy-4.1-as-i386-3 redhat-rhn-proxy-4.1-as-i386-4 redhat-rhn-proxy-4.2-as-i386-3 redhat-rhn-proxy-4.2-as-i386-4 redhat-rhn-proxy-5.0-as-i386-4 redhat-rhn-proxy-5.1-as-i386-4 redhat-rhn-proxy-5.1-as-x86_64-4 redhat-rhn-proxy-5.1-as-s390-4 redhat-rhn-proxy-5.1-as-s390x-4 redhat-rhn-proxy-5.2-as-i386-4 redhat-rhn-proxy-5.2-as-s390-4 redhat-rhn-proxy-5.2-as-s390x-4 redhat-rhn-proxy-5.2-as-x86_64-4 redhat-rhn-proxy-5.2-server-i386-5 redhat-rhn-proxy-5.2-server-s390x-5 redhat-rhn-proxy-5.2-server-x86_64-5 redhat-rhn-proxy-5.3-as-i386-4 redhat-rhn-proxy-5.3-as-s390-4 redhat-rhn-proxy-5.3-as-s390x-4 redhat-rhn-proxy-5.3-as-x86_64-4 redhat-rhn-proxy-5.3-server-i386-5 redhat-rhn-proxy-5.3-server-s390x-5 redhat-rhn-proxy-5.3-server-x86_64-5" max-members="100" id="rhn-channel-family-1047" label="rhn-proxy"><rhn-channel-family-name>Red Hat Network Proxy</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/products/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="education-k12ltsp-i386-7.3 education-general-i386-7.3 education-k12ltsp-i386-8.0 education-k12ltsp-i386-9" id="rhn-channel-family-1109" label="education"><rhn-channel-family-name>Education channels</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/products/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-as-3-cluster rhel-i386-es-3-cluster rhel-ia64-as-3-cluster rhel-ia64-es-3-cluster rhel-x86_64-as-3-cluster rhel-x86_64-es-3-cluster rhel-i386-ws-3-cluster rhel-ia64-ws-3-cluster rhel-x86_64-ws-3-cluster rhel-i386-as-4-cluster rhel-i386-es-4-cluster rhel-i386-ws-4-cluster rhel-ia64-as-4-cluster rhel-ia64-es-4-cluster rhel-ia64-ws-4-cluster rhel-x86_64-as-4-cluster rhel-x86_64-es-4-cluster rhel-x86_64-ws-4-cluster rhel-ppc-as-4-cluster" max-members="4000" id="rhn-channel-family-1555" label="rhel-cluster"><rhn-channel-family-name>Red Hat Cluster Suite</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-as-3-devsuite rhel-i386-es-3-devsuite rhel-i386-ws-3-devsuite rhel-ia64-as-3-devsuite rhel-ia64-es-3-devsuite rhel-ia64-ws-3-devsuite rhel-x86_64-as-3-devsuite rhel-x86_64-es-3-devsuite rhel-x86_64-ws-3-devsuite rhel-i386-desktop-3-devsuite rhel-x86_64-desktop-3-devsuite rhel-3-as-i386-rhds-2 rhel-3-es-i386-rhds-2 rhel-3-ws-i386-rhds-2 rhel-3-as-ia64-rhds-2 rhel-3-es-ia64-rhds-2 rhel-3-ws-ia64-rhds-2 rhel-3-as-ppc-rhds-2 rhel-4-as-i386-rhds-2.1 rhel-4-es-i386-rhds-2.1 rhel-4-ws-i386-rhds-2.1 rhel-4-as-ia64-rhds-2.1 rhel-4-es-ia64-rhds-2.1 rhel-4-ws-ia64-rhds-2.1 rhel-4-as-x86_64-rhds-2.1 rhel-4-es-x86_64-rhds-2.1 rhel-4-ws-x86_64-rhds-2.1 rhel-4-as-ppc-rhds-2.1 rhel-4-as-i386-rhds-3 rhel-4-es-i386-rhds-3 rhel-4-ws-i386-rhds-3 rhel-4-as-ia64-rhds-3 rhel-4-es-ia64-rhds-3 rhel-4-ws-ia64-rhds-3 rhel-4-as-x86_64-rhds-3 rhel-4-es-x86_64-rhds-3 rhel-4-ws-x86_64-rhds-3 rhel-4-as-ppc-rhds-3" max-members="4000" id="rhn-channel-family-1556" label="rhel-devsuite"><rhn-channel-family-name>Red Hat Developer Suite</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhn-tools" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhn-tools-rhel-3-as-i386 rhn-tools-rhel-3-es-i386 rhn-tools-rhel-3-ws-i386 rhn-tools-redhat-linux-i386-9 rhn-tools-rhel-3-desktop-i386 rhn-tools-rhel-3-as-x86_64 rhn-tools-rhel-3-es-x86_64 rhn-tools-rhel-3-ws-x86_64 rhn-tools-rhel-3-desktop-x86_64 rhn-tools-rhel-4-as-i386 rhn-tools-rhel-4-es-i386 rhn-tools-rhel-4-ws-i386 rhn-tools-rhel-4-desktop-i386 rhn-tools-rhel-4-as-x86_64 rhn-tools-rhel-4-es-x86_64 rhn-tools-rhel-4-ws-x86_64 rhn-tools-rhel-4-desktop-x86_64 rhn-tools-rhel-3-as-ia64 rhn-tools-rhel-3-es-ia64 rhn-tools-rhel-3-ws-ia64 rhn-tools-rhel-4-as-ia64 rhn-tools-rhel-4-es-ia64 rhn-tools-rhel-4-ws-ia64 rhn-tools-rhel-i386-server-5 rhn-tools-rhel-x86_64-server-5 rhn-tools-rhel-ia64-server-5 rhn-tools-rhel-i386-client-5 rhn-tools-rhel-x86_64-client-5 rhn-tools-rhel-4-as-ppc rhn-tools-rhel-4-as-s390 rhn-tools-rhel-4-as-s390x rhn-tools-rhel-ppc-server-5 rhn-tools-rhel-s390x-server-5 rhn-tools-rhel-3-as-ppc rhn-tools-rhel-3-as-s390 rhn-tools-rhel-3-as-s390x" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-1729" max-members="6000"><rhn-channel-family-name>Red Hat Network Tools for Red Hat Enterprise Linux</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-as-3-gfs-6 rhel-i386-es-3-gfs-6 rhel-ia64-as-3-gfs-6 rhel-ia64-es-3-gfs-6 rhel-x86_64-as-3-gfs-6 rhel-x86_64-es-3-gfs-6 rhel-i386-ws-3-gfs-6 rhel-ia64-ws-3-gfs-6 rhel-x86_64-ws-3-gfs-6 rhel-i386-as-4-gfs-6.1 rhel-i386-es-4-gfs-6.1 rhel-i386-ws-4-gfs-6.1 rhel-ia64-as-4-gfs-6.1 rhel-ia64-es-4-gfs-6.1 rhel-ia64-ws-4-gfs-6.1 rhel-x86_64-as-4-gfs-6.1 rhel-x86_64-es-4-gfs-6.1 rhel-x86_64-ws-4-gfs-6.1 rhel-ppc-as-4-gfs-6.1" max-members="4000" id="rhn-channel-family-2004" label="rhel-gfs"><rhn-channel-family-name>Red Hat Global File System 6.0 (for AS v3 x86)</rhn-channel-family-name><rhn-channel-family-product-url>/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-3-as-i386-rhaps-1 rhel-3-es-i386-rhaps-1 rhel-3-ws-i386-rhaps-1 rhel-3-as-ia64-rhaps-1 rhel-3-es-ia64-rhaps-1 rhel-3-ws-ia64-rhaps-1 rhel-3-as-ppc-rhaps-1 rhel-4-as-i386-rhaps-2 rhel-4-es-i386-rhaps-2 rhel-4-ws-i386-rhaps-2 rhel-4-as-ia64-rhaps-2 rhel-4-es-ia64-rhaps-2 rhel-4-ws-ia64-rhaps-2 rhel-4-as-x86_64-rhaps-2 rhel-4-es-x86_64-rhaps-2 rhel-4-ws-x86_64-rhaps-2 rhel-4-as-ppc-rhaps-2" max-members="4000" id="rhn-channel-family-2359" label="rhel-rhaps"><rhn-channel-family-name>Red Hat Application Server 1.0 (AS for i386)</rhn-channel-family-name><rhn-channel-family-product-url>/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-as-4-appstk-1 rhel-i386-es-4-appstk-1 rhel-x86_64-as-4-appstk-1 rhel-x86_64-es-4-appstk-1 rhel-i386-server-5-appstk-2 rhel-x86_64-server-5-appstk-2" max-members="1000" id="rhn-channel-family-5090" label="rhel-appstk"><rhn-channel-family-name>Red Hat Application Stack 1.0 (for AS v. 4 x86)</rhn-channel-family-name><rhn-channel-family-product-url>/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-client" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-ws-3 rhel-ia64-ws-3 rhel-x86_64-ws-3 rhel-i386-desktop-3 rhel-x86_64-desktop-3 rhel-i386-ws-4 rh-i386-desktop-4 rhel-x86_64-ws-4 rh-x86_64-desktop-4 rhel-ia64-ws-4 rhel-i386-client-5 rhel-x86_64-client-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5482" max-members="2000"><rhn-channel-family-name>Red Hat Enterprise Linux Desktop (core client)</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-client-fastrack" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rh-i386-desktop-4-fastrack rh-x86_64-desktop-4-fastrack rhel-i386-desktop-3-fastrack rhel-x86_64-desktop-3-fastrack rhel-i386-client-fastrack-5 rhel-x86_64-client-fastrack-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5483" max-members="2000"><rhn-channel-family-name>RHEL Desktop FasTrack</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-client-supplementary" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-ws-3-extras rhel-ia64-ws-3-extras rhel-x86_64-ws-3-extras rhel-i386-desktop-3-extras rhel-x86_64-desktop-3-extras rhel-i386-ws-4-extras rh-i386-desktop-4-extras rhel-x86_64-ws-4-extras rh-x86_64-desktop-4-extras rhel-ia64-ws-4-extras rhel-i386-client-supplementary-5 rhel-x86_64-client-supplementary-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5484" max-members="2000"><rhn-channel-family-name>RHEL Desktop Supplementary</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-client-vt-5 rhel-x86_64-client-vt-5" max-members="1000" id="rhn-channel-family-5485" label="rhel-client-vt"><rhn-channel-family-name>RHEL Desktop Multi OS</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-client-workstation" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-client-workstation-5 rhel-x86_64-client-workstation-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5486" max-members="1000"><rhn-channel-family-name>RHEL Desktop Workstation</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-client-workstation-fastrack" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-ws-4-fastrack rhel-x86_64-ws-4-fastrack rhel-ia64-ws-4-fastrack rhel-i386-ws-3-fastrack rhel-ia64-ws-3-fastrack rhel-x86_64-ws-3-fastrack rhel-i386-client-workstation-fastrack-5 rhel-x86_64-client-workstation-fastrack-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5487" max-members="1000"><rhn-channel-family-name>RHEL Desktop Workstation FasTrack</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-server" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-as-3 rhel-i386-es-3 rhel-ia64-as-3 rhel-ia64-es-3 rhel-x86_64-as-3 rhel-x86_64-es-3 rhel-ppc-as-3 rhel-i386-as-4 rhel-i386-es-4 rhel-x86_64-as-4 rhel-x86_64-es-4 rhel-ia64-as-4 rhel-ia64-es-4 rhel-ppc-as-4 rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5488" max-members="2000"><rhn-channel-family-name>Red Hat Enterprise Linux (core server)</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-server-cluster" virt-sub-level-label="virtualization_platform_free" channel-labels="rhel-i386-server-cluster-5 rhel-x86_64-server-cluster-5 rhel-ia64-server-cluster-5 rhel-ppc-server-cluster-5" virt-sub-level-name="Virtualization Platform free content group" id="rhn-channel-family-5489" max-members="1000"><rhn-channel-family-name>RHEL Clustering</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-server-cluster-storage" virt-sub-level-label="virtualization_platform_free" channel-labels="rhel-i386-server-cluster-storage-5 rhel-x86_64-server-cluster-storage-5 rhel-ia64-server-cluster-storage-5 rhel-ppc-server-cluster-storage-5" virt-sub-level-name="Virtualization Platform free content group" id="rhn-channel-family-5490" max-members="1000"><rhn-channel-family-name>RHEL Cluster-Storage</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-server-supplementary" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-as-3-extras rhel-i386-es-3-extras rhel-ia64-as-3-extras rhel-ia64-es-3-extras rhel-x86_64-as-3-extras rhel-x86_64-es-3-extras rhel-ppc-as-3-extras rhel-i386-as-4-extras rhel-i386-es-4-extras rhel-x86_64-as-4-extras rhel-x86_64-es-4-extras rhel-ia64-as-4-extras rhel-ia64-es-4-extras rhel-ppc-as-4-extras rhel-i386-server-supplementary-5 rhel-x86_64-server-supplementary-5 rhel-ia64-server-supplementary-5 rhel-ppc-server-supplementary-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5491" max-members="2000"><rhn-channel-family-name>RHEL Supplementary</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-server-hts" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-as-4-hwcert rhel-x86_64-as-4-hwcert rhel-ia64-as-4-hwcert rhel-ppc-as-4-hwcert rhel-s390-as-4-hwcert rhel-s390x-as-4-hwcert rhel-i386-as-3-hwcert rhel-ia64-as-3-hwcert rhel-x86_64-as-3-hwcert rhel-ppc-as-3-hwcert rhel-s390-as-3-hwcert rhel-s390x-as-3-hwcert rhel-i386-server-hts-5 rhel-x86_64-server-hts-5 rhel-ia64-server-hts-5 rhel-ppc-server-hts-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5492" max-members="8000"><rhn-channel-family-name>RHEL Hardware Certification</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-server-productivity" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-server-productivity-5 rhel-x86_64-server-productivity-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5493" max-members="1000"><rhn-channel-family-name>RHEL Optional Productivity Apps</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-server-vt-5 rhel-x86_64-server-vt-5 rhel-ia64-server-vt-5" max-members="2000" id="rhn-channel-family-5494" label="rhel-server-vt"><rhn-channel-family-name>RHEL Virtualization</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family label="rhel-server-fastrack" virt-sub-level-label="virtualization_free virtualization_platform_free" channel-labels="rhel-i386-as-4-fastrack rhel-i386-es-4-fastrack rhel-x86_64-as-4-fastrack rhel-x86_64-es-4-fastrack rhel-ia64-as-4-fastrack rhel-ia64-es-4-fastrack rhel-ppc-as-4-fastrack rhel-i386-as-3-fastrack rhel-i386-es-3-fastrack rhel-ia64-as-3-fastrack rhel-ia64-es-3-fastrack rhel-x86_64-as-3-fastrack rhel-x86_64-es-3-fastrack rhel-ppc-as-3-fastrack rhel-i386-server-fastrack-5 rhel-x86_64-server-fastrack-5 rhel-ia64-server-fastrack-5 rhel-ppc-server-fastrack-5" virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" id="rhn-channel-family-5495" max-members="2000"><rhn-channel-family-name>RHEL FasTrack</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-s390-as-3 rhel-s390x-as-3 rhel-s390-as-4 rhel-s390x-as-4 rhel-s390x-server-5" max-members="1000" id="rhn-channel-family-5496" label="rhel-s390x-server"><rhn-channel-family-name>Red Hat Enterprise Linux (v. 5 64-bit IBM System z)</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-s390-as-3-extras rhel-s390x-as-3-extras rhel-s390-as-4-extras rhel-s390x-as-4-extras rhel-s390x-server-supplementary-5" max-members="1000" id="rhn-channel-family-5497" label="rhel-s390x-server-supplementary"><rhn-channel-family-name>RHEL Supplementary (v. 5 for 64-bit IBM System z)</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-s390-as-4-fastrack rhel-s390x-as-4-fastrack rhel-s390-as-3-fastrack rhel-s390x-as-3-fastrack rhel-s390x-server-fastrack-5" max-members="1000" id="rhn-channel-family-5499" label="rhel-s390x-fastrack"><rhn-channel-family-name>RHEL FasTrack (v. 5 for 64-bit IBM System z)</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="jb-middleware" max-members="1000" id="rhn-channel-family-5873" label="jb-middleware"><rhn-channel-family-name>JBoss Enterprise Middleware</rhn-channel-family-name><rhn-channel-family-product-url>/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="jbappplatform-4-zip jbappplatform-4-i386-as-4-rpm jbappplatform-4-i386-es-4-rpm jbappplatform-4-x86_64-as-4-rpm jbappplatform-4-x86_64-es-4-rpm jbappplatform-4-i386-server-5-rpm jbappplatform-4-x86_64-server-5-rpm jbappplatform-4.3.0-i386-as-4-rpm jbappplatform-4.3.0-i386-es-4-rpm jbappplatform-4.3.0-x86_64-as-4-rpm jbappplatform-4.3.0-x86_64-es-4-rpm jbappplatform-4.3.0-i386-server-5-rpm jbappplatform-4.3.0-x86_64-server-5-rpm jbappplatform-4.3.0-zip" max-members="1000" id="rhn-channel-family-5874" label="jb-appplatform"><rhn-channel-family-name>JBoss Enterprise Application Platform (v 4, zip format)</rhn-channel-family-name><rhn-channel-family-product-url>/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-server-5.0.z rhel-x86_64-server-5.0.z rhel-i386-as-4.5.z rhel-i386-es-4.5.z rhel-ia64-as-4.5.z rhel-ia64-es-4.5.z rhel-ppc-as-4.5.z rhel-x86_64-as-4.5.z rhel-x86_64-es-4.5.z rhel-i386-server-5.1.z rhel-x86_64-server-5.1.z rhel-i386-as-4.6.z rhel-i386-es-4.6.z rhel-ia64-as-4.6.z rhel-ia64-es-4.6.z rhel-ppc-as-4.6.z rhel-x86_64-as-4.6.z rhel-x86_64-es-4.6.z rhel-i386-server-5.2.z rhel-x86_64-server-5.2.z rhel-i386-as-4.7.z rhel-i386-es-4.7.z rhel-x86_64-as-4.7.z rhel-x86_64-es-4.7.z rhel-i386-server-5.3.z rhel-x86_64-server-5.3.z rhel-i386-as-4.8.z rhel-i386-es-4.8.z rhel-x86_64-as-4.8.z rhel-x86_64-es-4.8.z rhel-i386-server-5.4.z rhel-x86_64-server-5.4.z" max-members="1000" id="rhn-channel-family-5956" label="rhel-server-z"><rhn-channel-family-name>RHEL Extended Update Support</rhn-channel-family-name><rhn-channel-family-product-url>/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-server-vt-5.0.z rhel-x86_64-server-vt-5.0.z rhel-ppc-server-vt-5.0.z rhel-s390x-server-vt-5.0.z rhel-i386-server-vt-5.1.z rhel-x86_64-server-vt-5.1.z rhel-ppc-server-vt-5.1.z rhel-s390x-server-vt-5.1.z rhel-i386-server-vt-5.2.z rhel-x86_64-server-vt-5.2.z rhel-i386-server-vt-5.3.z rhel-x86_64-server-vt-5.3.z rhel-x86_64-server-vt-5.4.z" max-members="1000" id="rhn-channel-family-5957" label="rhel-server-vt-z"><rhn-channel-family-name>RHEL Virtualization EUS</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-server-cluster-5.0.z rhel-x86_64-server-cluster-5.0.z rhel-s390x-server-cluster-5.0.z rhel-i386-as-4.5.z-cluster rhel-i386-es-4.5.z-cluster rhel-ia64-as-4.5.z-cluster rhel-ia64-es-4.5.z-cluster rhel-x86_64-as-4.5.z-cluster rhel-x86_64-es-4.5.z-cluster rhel-i386-server-cluster-5.1.z rhel-x86_64-server-cluster-5.1.z rhel-s390x-server-cluster-5.1.z rhel-i386-as-4.6.z-cluster rhel-i386-es-4.6.z-cluster rhel-ia64-as-4.6.z-cluster rhel-ia64-es-4.6.z-cluster rhel-x86_64-as-4.6.z-cluster rhel-x86_64-es-4.6.z-cluster rhel-i386-server-cluster-5.2.z rhel-x86_64-server-cluster-5.2.z rhel-i386-as-4.7.z-cluster rhel-i386-es-4.7.z-cluster rhel-x86_64-as-4.7.z-cluster rhel-x86_64-es-4.7.z-cluster rhel-i386-server-cluster-5.3.z rhel-x86_64-server-cluster-5.3.z rhel-i386-as-4.8.z-cluster rhel-i386-es-4.8.z-cluster rhel-x86_64-as-4.8.z-cluster rhel-x86_64-es-4.8.z-cluster rhel-i386-server-cluster-5.4.z rhel-x86_64-server-cluster-5.4.z" max-members="1000" id="rhn-channel-family-5958" label="rhel-server-cluster-z"><rhn-channel-family-name>RHEL Clustering EUS</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-server-cluster-storage-5.0.z rhel-x86_64-server-cluster-storage-5.0.z rhel-s390x-server-cluster-storage-5.0.z rhel-i386-server-cluster-storage-5.1.z rhel-x86_64-server-cluster-storage-5.1.z rhel-s390x-server-cluster-storage-5.1.z rhel-i386-as-4.5.z-gfs rhel-i386-es-4.5.z-gfs rhel-ia64-as-4.5.z-gfs rhel-ia64-es-4.5.z-gfs rhel-x86_64-as-4.5.z-gfs rhel-x86_64-es-4.5.z-gfs rhel-i386-as-4.6.z-gfs rhel-i386-es-4.6.z-gfs rhel-ia64-as-4.6.z-gfs rhel-ia64-es-4.6.z-gfs rhel-x86_64-as-4.6.z-gfs rhel-x86_64-es-4.6.z-gfs rhel-i386-server-cluster-storage-5.2.z rhel-x86_64-server-cluster-storage-5.2.z rhel-i386-as-4.7.z-gfs rhel-i386-es-4.7.z-gfs rhel-x86_64-as-4.7.z-gfs rhel-x86_64-es-4.7.z-gfs rhel-i386-server-cluster-storage-5.3.z rhel-x86_64-server-cluster-storage-5.3.z rhel-i386-as-4.8.z-gfs rhel-i386-es-4.8.z-gfs rhel-x86_64-as-4.8.z-gfs rhel-x86_64-es-4.8.z-gfs rhel-i386-server-cluster-storage-5.4.z rhel-x86_64-server-cluster-storage-5.4.z" max-members="1000" id="rhn-channel-family-5959" label="rhel-server-cluster-storage-z"><rhn-channel-family-name>RHEL Cluster-Storage EUS</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-server-productivity-5.0.z rhel-x86_64-server-productivity-5.0.z rhel-i386-server-productivity-5.1.z rhel-x86_64-server-productivity-5.1.z rhel-i386-server-productivity-5.2.z rhel-x86_64-server-productivity-5.2.z rhel-i386-server-productivity-5.3.z rhel-x86_64-server-productivity-5.3.z rhel-i386-server-productivity-5.4.z rhel-x86_64-server-productivity-5.4.z" max-members="1000" id="rhn-channel-family-5960" label="rhel-server-productivity-z"><rhn-channel-family-name>RHEL Optional Productivity Apps EUS</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family><rhn-channel-family channel-labels="rhel-i386-server-supplementary-5.0.z rhel-x86_64-server-supplementary-5.0.z rhel-i386-as-4.5.z-extras rhel-i386-es-4.5.z-extras rhel-ia64-as-4.5.z-extras rhel-ia64-es-4.5.z-extras rhel-ppc-as-4.5.z-extras rhel-x86_64-as-4.5.z-extras rhel-x86_64-es-4.5.z-extras rhel-i386-server-supplementary-5.1.z rhel-x86_64-server-supplementary-5.1.z rhel-i386-as-4.6.z-extras rhel-i386-es-4.6.z-extras rhel-ia64-as-4.6.z-extras rhel-ia64-es-4.6.z-extras rhel-ppc-as-4.6.z-extras rhel-x86_64-as-4.6.z-extras rhel-x86_64-es-4.6.z-extras rhel-i386-server-supplementary-5.2.z rhel-x86_64-server-supplementary-5.2.z rhel-i386-as-4.7.z-extras rhel-i386-es-4.7.z-extras rhel-x86_64-as-4.7.z-extras rhel-x86_64-es-4.7.z-extras rhel-i386-server-supplementary-5.3.z rhel-x86_64-server-supplementary-5.3.z rhel-i386-as-4.8.z-extras rhel-i386-es-4.8.z-extras rhel-x86_64-as-4.8.z-extras rhel-x86_64-es-4.8.z-extras rhel-i386-server-supplementary-5.4.z rhel-x86_64-server-supplementary-5.4.z" max-members="1000" id="rhn-channel-family-5961" label="rhel-server-supplementary-z"><rhn-channel-family-name>RHEL Supplementary EUS</rhn-channel-family-name><rhn-channel-family-product-url>http://www.redhat.com/software/</rhn-channel-family-product-url></rhn-channel-family></rhn-channel-families></rhn-satellite>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channels.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channels.xml
deleted file mode 100644
index decf0a0..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channels.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><rhn-satellite generation="2" version="3.4"><rhn-channels><rhn-channel channel-arch="channel-ia32" has-comps="True" channel-errata="rhn-erratum-5388 rhn-erratum-5390 rhn-erratum-5392 rhn-erratum-5393 rhn-erratum-5394 rhn-erratum-5396 rhn-erratum-5397 rhn-erratum-5398 rhn-erratum-5399 rhn-erratum-5400 rhn-erratum-5401 rhn-erratum-5402 rhn-erratum-5403 rhn-erratum-5404 rhn-erratum-5405 rhn-erratum-5406 rhn-erratum-5407 rhn-erratum-5411 rhn-erratum-5412 rhn-erratum-5427 rhn-erratum-5428 rhn-erratum-5431 rhn-erratum-5443 rhn-erratum-5444 rhn-erratum-5445 rhn-erratum-5447 rhn-erratum-5465 rhn-erratum-5466 rhn-erratum-5470 rhn-erratum-5475 rhn-erratum-5619 rhn-erratum-5645 rhn-erratum-5646 rhn-erratum-5647 rhn-erratum-5655 rhn-erratum-5656 rhn-erratum-5676 rhn-erratum-5677 rhn-erratum-5689 rhn-erratum-5690 rhn-erratum-5694 rhn-erratum-5695 rhn-erratum-5697 rhn-erratum-5698 rhn-erratum-5707 rhn-erratum-5710 rhn-erratum-5718 rhn-erratum-5720 rhn-erratum-5721 rhn-erratum-5724 rhn-erratum-5728 rhn-erratum-5730 rhn-erratum-5800 rhn-erratum-5806 rhn-erratum-5807 rhn-erratum-5809 rhn-erratum-5812 rhn-erratum-5816 rhn-erratum-5817 rhn-erratum-5820 rhn-erratum-5825 rhn-erratum-5833 rhn-erratum-5835 rhn-erratum-5836 rhn-erratum-5837 rhn-erratum-5838 rhn-erratum-5839 rhn-erratum-5840 rhn-erratum-5842 rhn-erratum-5843 rhn-erratum-5844 rhn-erratum-5845 rhn-erratum-5854 rhn-erratum-5859 rhn-erratum-5860 rhn-erratum-5861 rhn-erratum-5862 rhn-erratum-5863 rhn-erratum-5865 rhn-erratum-5870 rhn-erratum-5871 rhn-erratum-5877 rhn-erratum-5879 rhn-erratum-5880 rhn-erratum-5881 rhn-erratum-5887 rhn-erratum-5890 rhn-erratum-5891 rhn-erratum-5892 rhn-erratum-5915 rhn-erratum-5916 rhn-erratum-5919 rhn-erratum-5920 rhn-erratum-5928 rhn-erratum-5960 rhn-erratum-5969 rhn-erratum-5970 rhn-erratum-5973 rhn-erratum-5975 rhn-erratum-5982 rhn-erratum-5984 rhn-erratum-5985 rhn-erratum-5992 rhn-erratum-5993 rhn-erratum-5998 rhn-erratum-5999 rhn-erratum-6027 rhn-erratum-6038 rhn-erratum-6039 rhn-erratum-6040 rhn-erratum-6043 rhn-erratum-6045 rhn-erratum-6048 rhn-erratum-6052 rhn-erratum-6054 rhn-erratum-6056 rhn-erratum-6060 rhn-erratum-6061 rhn-erratum-6065 rhn-erratum-6071 rhn-erratum-6072 rhn-erratum-6073 rhn-erratum-6074 rhn-erratum-6075 rhn-erratum-6076 rhn-erratum-6078 rhn-erratum-6079 rhn-erratum-6080 rhn-erratum-6081 rhn-erratum-6082 rhn-erratum-6083 rhn-erratum-6084 rhn-erratum-6085 rhn-erratum-6086 rhn-erratum-6087 rhn-erratum-6088 rhn-erratum-6090 rhn-erratum-6091 rhn-erratum-6092 rhn-erratum-6094 rhn-erratum-6095 rhn-erratum-6096 rhn-erratum-6097 rhn-erratum-6099 rhn-erratum-6101 rhn-erratum-6102 rhn-erratum-6103 rhn-erratum-6104 rhn-erratum-6105 rhn-erratum-6106 rhn-erratum-6107 rhn-erratum-6108 rhn-erratum-6109 rhn-erratum-6110 rhn-erratum-6111 rhn-erratum-6112 rhn-erratum-6113 rhn-erratum-6114 rhn-erratum-6115 rhn-erratum-6116 rhn-erratum-6117 rhn-erratum-6119 rhn-erratum-6120 rhn-erratum-6124 rhn-erratum-6126 rhn-erratum-6129 rhn-erratum-6130 rhn-erratum-6132 rhn-erratum-6136 rhn-erratum-6137 rhn-erratum-6138 rhn-erratum-6139 rhn-erratum-6140 rhn-erratum-6142 rhn-erratum-6144 rhn-erratum-6146 rhn-erratum-6148 rhn-erratum-6149 rhn-erratum-6150 rhn-erratum-6151 rhn-erratum-6152 rhn-erratum-6153 rhn-erratum-6154 rhn-erratum-6156 rhn-erratum-6157 rhn-erratum-6158 rhn-erratum-6159 rhn-erratum-6160 rhn-erratum-6161 rhn-erratum-6162 rhn-erratum-6163 rhn-erratum-6164 rhn-erratum-6166 rhn-erratum-6168 rhn-erratum-6169 rhn-erratum-6170 rhn-erratum-6171 rhn-erratum-6172 rhn-erratum-6173 rhn-erratum-6174 rhn-erratum-6175 rhn-erratum-6176 rhn-erratum-6177 rhn-erratum-6178 rhn-erratum-6179 rhn-erratum-6181 rhn-erratum-6182 rhn-erratum-6183 rhn-erratum-6184 rhn-erratum-6185 rhn-erratum-6186 rhn-erratum-6187 rhn-erratum-6189 rhn-erratum-6191 rhn-erratum-6192 rhn-erratum-6193 rhn-erratum-6195 rhn-erratum-6196 rhn-erratum-6197 rhn-erratum-6198 rhn-erratum-6199 rhn-erratum-6201 rhn-erratum-6202 rhn-erratum-6206 rhn-erratum-6208 rhn-erratum-6209 rhn-erratum-6210 rhn-erratum-6211 rhn-erratum-6212 rhn-erratum-6213 rhn-erratum-6214 rhn-erratum-6215 rhn-erratum-6216 rhn-erratum-6217 rhn-erratum-6218 rhn-erratum-6219 rhn-erratum-6220 rhn-erratum-6221 rhn-erratum-6222 rhn-erratum-6223 rhn-erratum-6224 rhn-erratum-6225 rhn-erratum-6226 rhn-erratum-6227 rhn-erratum-6228 rhn-erratum-6236 rhn-erratum-6238 rhn-erratum-6240 rhn-erratum-6241 rhn-erratum-6242 rhn-erratum-6243 rhn-erratum-6244 rhn-erratum-6245 rhn-erratum-6249 rhn-erratum-6254 rhn-erratum-6255 rhn-erratum-6256 rhn-erratum-6263 rhn-erratum-6383 rhn-erratum-6389 rhn-erratum-6390 rhn-erratum-6392 rhn-erratum-6393 rhn-erratum-6396 rhn-erratum-6398 rhn-erratum-6400 rhn-erratum-6404 rhn-erratum-6405 rhn-erratum-6406 rhn-erratum-6407 rhn-erratum-6408 rhn-erratum-6412 rhn-erratum-6413 rhn-erratum-6435 rhn-erratum-6436 rhn-erratum-6437 rhn-erratum-6439 rhn-erratum-6440 rhn-erratum-6444 rhn-erratum-6448 rhn-erratum-6452 rhn-erratum-6453 rhn-erratum-6454 rhn-erratum-6455 rhn-erratum-6464 rhn-erratum-6466 rhn-erratum-6473 rhn-erratum-6476 rhn-erratum-6477 rhn-erratum-6478 rhn-erratum-6479 rhn-erratum-6480 rhn-erratum-6481 rhn-erratum-6482 rhn-erratum-6483 rhn-erratum-6485 rhn-erratum-6486 rhn-erratum-6488 rhn-erratum-6494 rhn-erratum-6495 rhn-erratum-6497 rhn-erratum-6498 rhn-erratum-6499 rhn-erratum-6500 rhn-erratum-6516 rhn-erratum-6517 rhn-erratum-6518 rhn-erratum-6519 rhn-erratum-6520 rhn-erratum-6522 rhn-erratum-6524 rhn-erratum-6525 rhn-erratum-6527 rhn-erratum-6528 rhn-erratum-6537 rhn-erratum-6538 rhn-erratum-6544 rhn-erratum-6550 rhn-erratum-6551 rhn-erratum-6552 rhn-erratum-6553 rhn-erratum-6554 rhn-erratum-6555 rhn-erratum-6556 rhn-erratum-6557 rhn-erratum-6558 rhn-erratum-6560 rhn-erratum-6561 rhn-erratum-6564 rhn-erratum-6568 rhn-erratum-6569 rhn-erratum-6570 rhn-erratum-6571 rhn-erratum-6572 rhn-erratum-6573 rhn-erratum-6574 rhn-erratum-6575 rhn-erratum-6576 rhn-erratum-6577 rhn-erratum-6578 rhn-erratum-6579 rhn-erratum-6580 rhn-erratum-6596 rhn-erratum-6597 rhn-erratum-6598 rhn-erratum-6601 rhn-erratum-6603 rhn-erratum-6618 rhn-erratum-6619 rhn-erratum-6620 rhn-erratum-6622 rhn-erratum-6625 rhn-erratum-6628 rhn-erratum-6631 rhn-erratum-6638 rhn-erratum-6642 rhn-erratum-6659 rhn-erratum-6662 rhn-erratum-6664 rhn-erratum-6665 rhn-erratum-6680 rhn-erratum-6681 rhn-erratum-6682 rhn-erratum-6683 rhn-erratum-6697 rhn-erratum-6717 rhn-erratum-6718 rhn-erratum-6719 rhn-erratum-6739 rhn-erratum-6747 rhn-erratum-6748 rhn-erratum-6752 rhn-erratum-6756 rhn-erratum-6764 rhn-erratum-6777 rhn-erratum-6779 rhn-erratum-6795 rhn-erratum-6797 rhn-erratum-6798 rhn-erratum-6803 rhn-erratum-6860 rhn-erratum-6868 rhn-erratum-6898 rhn-erratum-6902 rhn-erratum-6903 rhn-erratum-6919 rhn-erratum-6920 rhn-erratum-6921 rhn-erratum-6922 rhn-erratum-6923 rhn-erratum-6924 rhn-erratum-6925 rhn-erratum-6926 rhn-erratum-6928 rhn-erratum-6929 rhn-erratum-6930 rhn-erratum-6931 rhn-erratum-6932 rhn-erratum-6934 rhn-erratum-6935 rhn-erratum-6936 rhn-erratum-6937 rhn-erratum-6939 rhn-erratum-6940 rhn-erratum-6941 rhn-erratum-6942 rhn-erratum-6943 rhn-erratum-6944 rhn-erratum-6945 rhn-erratum-6946 rhn-erratum-6947 rhn-erratum-6949 rhn-erratum-6950 rhn-erratum-6951 rhn-erratum-6952 rhn-erratum-6954 rhn-erratum-6956 rhn-erratum-6957 rhn-erratum-6958 rhn-erratum-6959 rhn-erratum-6960 rhn-erratum-6961 rhn-erratum-6962 rhn-erratum-6963 rhn-erratum-6964 rhn-erratum-6965 rhn-erratum-6967 rhn-erratum-6968 rhn-erratum-6969 rhn-erratum-6970 rhn-erratum-6971 rhn-erratum-6972 rhn-erratum-6973 rhn-erratum-6974 rhn-erratum-6975 rhn-erratum-6976 rhn-erratum-6977 rhn-erratum-6978 rhn-erratum-6979 rhn-erratum-6980 rhn-erratum-6981 rhn-erratum-6983 rhn-erratum-6984 rhn-erratum-6985 rhn-erratum-6986 rhn-erratum-6987 rhn-erratum-6989 rhn-erratum-6990 rhn-erratum-6993 rhn-erratum-6995 rhn-erratum-6996 rhn-erratum-6998 rhn-erratum-7000 rhn-erratum-7001 rhn-erratum-7002 rhn-erratum-7003 rhn-erratum-7004 rhn-erratum-7005 rhn-erratum-7006 rhn-erratum-7007 rhn-erratum-7008 rhn-erratum-7009 rhn-erratum-7010 rhn-erratum-7011 rhn-erratum-7012 rhn-erratum-7014 rhn-erratum-7015 rhn-erratum-7016 rhn-erratum-7017 rhn-erratum-7018 rhn-erratum-7019 rhn-erratum-7020 rhn-erratum-7021 rhn-erratum-7022 rhn-erratum-7023 rhn-erratum-7026 rhn-erratum-7027 rhn-erratum-7028 rhn-erratum-7034 rhn-erratum-7035 rhn-erratum-7036 rhn-erratum-7037 rhn-erratum-7039 rhn-erratum-7040 rhn-erratum-7041 rhn-erratum-7042 rhn-erratum-7044 rhn-erratum-7045 rhn-erratum-7046 rhn-erratum-7047 rhn-erratum-7048 rhn-erratum-7049 rhn-erratum-7050 rhn-erratum-7051 rhn-erratum-7052 rhn-erratum-7053 rhn-erratum-7054 rhn-erratum-7055 rhn-erratum-7056 rhn-erratum-7058 rhn-erratum-7059 rhn-erratum-7061 rhn-erratum-7062 rhn-erratum-7063 rhn-erratum-7064 rhn-erratum-7065 rhn-erratum-7066 rhn-erratum-7067 rhn-erratum-7068 rhn-erratum-7069 rhn-erratum-7070 rhn-erratum-7071 rhn-erratum-7073 rhn-erratum-7074 rhn-erratum-7075 rhn-erratum-7076 rhn-erratum-7077 rhn-erratum-7078 rhn-erratum-7079 rhn-erratum-7080 rhn-erratum-7081 rhn-erratum-7082 rhn-erratum-7083 rhn-erratum-7084 rhn-erratum-7085 rhn-erratum-7087 rhn-erratum-7088 rhn-erratum-7089 rhn-erratum-7091 rhn-erratum-7092 rhn-erratum-7093 rhn-erratum-7095 rhn-erratum-7096 rhn-erratum-7098 rhn-erratum-7099 rhn-erratum-7100 rhn-erratum-7101 rhn-erratum-7102 rhn-erratum-7103 rhn-erratum-7104 rhn-erratum-7106 rhn-erratum-7107 rhn-erratum-7108 rhn-erratum-7109 rhn-erratum-7110 rhn-erratum-7112 rhn-erratum-7114 rhn-erratum-7115 rhn-erratum-7116 rhn-erratum-7117 rhn-erratum-7118 rhn-erratum-7119 rhn-erratum-7120 rhn-erratum-7121 rhn-erratum-7122 rhn-erratum-7123 rhn-erratum-7124 rhn-erratum-7126 rhn-erratum-7127 rhn-erratum-7128 rhn-erratum-7130 rhn-erratum-7131 rhn-erratum-7133 rhn-erratum-7134 rhn-erratum-7135 rhn-erratum-7136 rhn-erratum-7144 rhn-erratum-7147 rhn-erratum-7178 rhn-erratum-7179 rhn-erratum-7180 rhn-erratum-7185 rhn-erratum-7186 rhn-erratum-7188 rhn-erratum-7189 rhn-erratum-7191 rhn-erratum-7192 rhn-erratum-7194 rhn-erratum-7196 rhn-erratum-7198 rhn-erratum-7199 rhn-erratum-7200 rhn-erratum-7201 rhn-erratum-7219 rhn-erratum-7223 rhn-erratum-7225 rhn-erratum-7226 rhn-erratum-7228 rhn-erratum-7237 rhn-erratum-7259 rhn-erratum-7265 rhn-erratum-7269 rhn-erratum-7271 rhn-erratum-7272 rhn-erratum-7273 rhn-erratum-7275 rhn-erratum-7277 rhn-erratum-7280 rhn-erratum-7284 rhn-erratum-7287 rhn-erratum-7292 rhn-erratum-7293 rhn-erratum-7294 rhn-erratum-7295 rhn-erratum-7296 rhn-erratum-7435 rhn-erratum-7459 rhn-erratum-7479 rhn-erratum-7480 rhn-erratum-7481 rhn-erratum-7482 rhn-erratum-7483 rhn-erratum-7487 rhn-erratum-7488 rhn-erratum-7498 rhn-erratum-7511 rhn-erratum-7512 rhn-erratum-7513 rhn-erratum-7515 rhn-erratum-7516 rhn-erratum-7517 rhn-erratum-7518 rhn-erratum-7521 rhn-erratum-7527 rhn-erratum-7530 rhn-erratum-7531 rhn-erratum-7532 rhn-erratum-7533 rhn-erratum-7538 rhn-erratum-7539 rhn-erratum-7560 rhn-erratum-7562 rhn-erratum-7563 rhn-erratum-7564 rhn-erratum-7565 rhn-erratum-7568 rhn-erratum-7574 rhn-erratum-7578 rhn-erratum-7590 rhn-erratum-7591 rhn-erratum-7592 rhn-erratum-7593 rhn-erratum-7594 rhn-erratum-7595 rhn-erratum-7596 rhn-erratum-7607 rhn-erratum-7618 rhn-erratum-7619 rhn-erratum-7620 rhn-erratum-7621 rhn-erratum-7638 rhn-erratum-7640 rhn-erratum-7641 rhn-erratum-7642 rhn-erratum-7643 rhn-erratum-7646 rhn-erratum-7658 rhn-erratum-7659 rhn-erratum-7660 rhn-erratum-7662 rhn-erratum-7663 rhn-erratum-7664 rhn-erratum-7665 rhn-erratum-7704 rhn-erratum-7705 rhn-erratum-7707 rhn-erratum-7708 rhn-erratum-7710 rhn-erratum-7717 rhn-erratum-7719 rhn-erratum-7721 rhn-erratum-7725 rhn-erratum-7726 rhn-erratum-7727 rhn-erratum-7728 rhn-erratum-7738 rhn-erratum-7739 rhn-erratum-7742 rhn-erratum-7778 rhn-erratum-7799 rhn-erratum-7800 rhn-erratum-7801 rhn-erratum-7803 rhn-erratum-7805 rhn-erratum-7806 rhn-erratum-7820 rhn-erratum-7821 rhn-erratum-7828 rhn-erratum-7830 rhn-erratum-7863 rhn-erratum-7866 rhn-erratum-7867 rhn-erratum-7870 rhn-erratum-7879 rhn-erratum-7880 rhn-erratum-7901 rhn-erratum-7906 rhn-erratum-7918 rhn-erratum-7919 rhn-erratum-7922 rhn-erratum-7924 rhn-erratum-7926 rhn-erratum-7959 rhn-erratum-7961 rhn-erratum-7962 rhn-erratum-7963 rhn-erratum-7964 rhn-erratum-7979 rhn-erratum-7980 rhn-erratum-7981 rhn-erratum-7982 rhn-erratum-8007 rhn-erratum-8008 rhn-erratum-8009 rhn-erratum-8011 rhn-erratum-8012 rhn-erratum-8013 rhn-erratum-8016 rhn-erratum-8017 rhn-erratum-8018 rhn-erratum-8019 rhn-erratum-8020 rhn-erratum-8021 rhn-erratum-8022 rhn-erratum-8023 rhn-erratum-8024 rhn-erratum-8025 rhn-erratum-8026 rhn-erratum-8027 rhn-erratum-8028 rhn-erratum-8029 rhn-erratum-8030 rhn-erratum-8031 rhn-erratum-8032 rhn-erratum-8033 rhn-erratum-8034 rhn-erratum-8036 rhn-erratum-8037 rhn-erratum-8038 rhn-erratum-8039 rhn-erratum-8040 rhn-erratum-8041 rhn-erratum-8042 rhn-erratum-8043 rhn-erratum-8045 rhn-erratum-8046 rhn-erratum-8047 rhn-erratum-8052 rhn-erratum-8054 rhn-erratum-8055 rhn-erratum-8056 rhn-erratum-8057 rhn-erratum-8058 rhn-erratum-8059 rhn-erratum-8060 rhn-erratum-8061 rhn-erratum-8062 rhn-erratum-8063 rhn-erratum-8064 rhn-erratum-8065 rhn-erratum-8066 rhn-erratum-8067 rhn-erratum-8068 rhn-erratum-8069 rhn-erratum-8070 rhn-erratum-8072 rhn-erratum-8073 rhn-erratum-8074 rhn-erratum-8075 rhn-erratum-8076 rhn-erratum-8077 rhn-erratum-8078 rhn-erratum-8080 rhn-erratum-8081 rhn-erratum-8082 rhn-erratum-8083 rhn-erratum-8085 rhn-erratum-8086 rhn-erratum-8090 rhn-erratum-8091 rhn-erratum-8092 rhn-erratum-8093 rhn-erratum-8094 rhn-erratum-8095 rhn-erratum-8096 rhn-erratum-8098 rhn-erratum-8099 rhn-erratum-8100 rhn-erratum-8101 rhn-erratum-8103 rhn-erratum-8104 rhn-erratum-8107 rhn-erratum-8108 rhn-erratum-8109 rhn-erratum-8110 rhn-erratum-8111 rhn-erratum-8112 rhn-erratum-8113 rhn-erratum-8114 rhn-erratum-8115 rhn-erratum-8116 rhn-erratum-8117 rhn-erratum-8118 rhn-erratum-8119 rhn-erratum-8120 rhn-erratum-8121 rhn-erratum-8122 rhn-erratum-8124 rhn-erratum-8125 rhn-erratum-8126 rhn-erratum-8127 rhn-erratum-8128 rhn-erratum-8129 rhn-erratum-8130 rhn-erratum-8131 rhn-erratum-8132 rhn-erratum-8134 rhn-erratum-8135 rhn-erratum-8136 rhn-erratum-8137 rhn-erratum-8138 rhn-erratum-8139 rhn-erratum-8140 rhn-erratum-8142 rhn-erratum-8143 rhn-erratum-8144 rhn-erratum-8145 rhn-erratum-8146 rhn-erratum-8147 rhn-erratum-8148 rhn-erratum-8149 rhn-erratum-8150 rhn-erratum-8151 rhn-erratum-8152 rhn-erratum-8153 rhn-erratum-8154 rhn-erratum-8155 rhn-erratum-8156 rhn-erratum-8157 rhn-erratum-8158 rhn-erratum-8159 rhn-erratum-8162 rhn-erratum-8163 rhn-erratum-8164 rhn-erratum-8165 rhn-erratum-8166 rhn-erratum-8167 rhn-erratum-8168 rhn-erratum-8169 rhn-erratum-8170 rhn-erratum-8171 rhn-erratum-8172 rhn-erratum-8173 rhn-erratum-8174 rhn-erratum-8175 rhn-erratum-8176 rhn-erratum-8177 rhn-erratum-8178 rhn-erratum-8179 rhn-erratum-8180 rhn-erratum-8182 rhn-erratum-8183 rhn-erratum-8184 rhn-erratum-8185 rhn-erratum-8187 rhn-erratum-8188 rhn-erratum-8189 rhn-erratum-8190 rhn-erratum-8191 rhn-erratum-8192 rhn-erratum-8193 rhn-erratum-8194 rhn-erratum-8195 rhn-erratum-8203 rhn-erratum-8204 rhn-erratum-8205 rhn-erratum-8243 rhn-erratum-8266 rhn-erratum-8276 rhn-erratum-8279 rhn-erratum-8283 rhn-erratum-8284 rhn-erratum-8285 rhn-erratum-8286 rhn-erratum-8288 rhn-erratum-8289 rhn-erratum-8291 rhn-erratum-8301 rhn-erratum-8304 rhn-erratum-8319 rhn-erratum-8325 rhn-erratum-8327 rhn-erratum-8328 rhn-erratum-8330 rhn-erratum-8338 rhn-erratum-8339 rhn-erratum-8358 rhn-erratum-8362 rhn-erratum-8363 rhn-erratum-8378 rhn-erratum-8379 rhn-erratum-8380 rhn-erratum-8382 rhn-erratum-8383 rhn-erratum-8384 rhn-erratum-8399 rhn-erratum-8400 rhn-erratum-8401 rhn-erratum-8403 rhn-erratum-8409 rhn-erratum-8423 rhn-erratum-8424 rhn-erratum-8425 rhn-erratum-8426 rhn-erratum-8427 rhn-erratum-8428 rhn-erratum-8429 rhn-erratum-8431 rhn-erratum-8437 rhn-erratum-8438 rhn-erratum-8440 rhn-erratum-8441 rhn-erratum-8444 rhn-erratum-8445 rhn-erratum-8446 rhn-erratum-8447 rhn-erratum-8449 rhn-erratum-8450 rhn-erratum-8451 rhn-erratum-8461 rhn-erratum-8462 rhn-erratum-8463 rhn-erratum-8464 rhn-erratum-8465 rhn-erratum-8466 rhn-erratum-8467 rhn-erratum-8469 rhn-erratum-8472 rhn-erratum-8476 rhn-erratum-8477 rhn-erratum-8478 rhn-erratum-8479 rhn-erratum-8480 rhn-erratum-8481 rhn-erratum-8482 rhn-erratum-8483 rhn-erratum-8521 rhn-erratum-8524 rhn-erratum-8525 rhn-erratum-8528 rhn-erratum-8529 rhn-erratum-8538 rhn-erratum-8539 rhn-erratum-8540 rhn-erratum-8542 rhn-erratum-8543 rhn-erratum-8549 rhn-erratum-8551 rhn-erratum-8552 rhn-erratum-8558 rhn-erratum-8559 rhn-erratum-8561 rhn-erratum-8562 rhn-erratum-8563 rhn-erratum-8564 rhn-erratum-8565 rhn-erratum-8566 rhn-erratum-8671 rhn-erratum-8673 rhn-erratum-8690 rhn-erratum-8703 rhn-erratum-8724 rhn-erratum-8725 rhn-erratum-8726 rhn-erratum-8727 rhn-erratum-8728 rhn-erratum-8729 rhn-erratum-8730 rhn-erratum-8731 rhn-erratum-8732 rhn-erratum-8742 rhn-erratum-8743 rhn-erratum-8744 rhn-erratum-8745 rhn-erratum-8765 rhn-erratum-8766 rhn-erratum-8769 rhn-erratum-8772 rhn-erratum-8776 rhn-erratum-8777 rhn-erratum-8778 rhn-erratum-8780 rhn-erratum-8781 rhn-erratum-8782 rhn-erratum-8783 rhn-erratum-8784 rhn-erratum-8785 rhn-erratum-8788 rhn-erratum-8789 rhn-erratum-8790 rhn-erratum-8791 rhn-erratum-8794 rhn-erratum-8796 rhn-erratum-8797 rhn-erratum-8798 rhn-erratum-8799 rhn-erratum-8800 rhn-erratum-8816 rhn-erratum-8817 rhn-erratum-8821 rhn-erratum-8836 rhn-erratum-8838 rhn-erratum-8856 rhn-erratum-8857 rhn-erratum-8859 rhn-erratum-8861 rhn-erratum-8883 rhn-erratum-8885 rhn-erratum-8886 rhn-erratum-8895 rhn-erratum-8897 rhn-erratum-8898 rhn-erratum-8899 rhn-erratum-8901 rhn-erratum-8912 rhn-erratum-8915 rhn-erratum-8923 rhn-erratum-8927 rhn-erratum-8928 rhn-erratum-8929 rhn-erratum-8936 rhn-erratum-8938 rhn-erratum-8939 rhn-erratum-8940 rhn-erratum-8942 rhn-erratum-8946 rhn-erratum-8960 rhn-erratum-8961 rhn-erratum-8965 rhn-erratum-8968 rhn-erratum-8978 rhn-erratum-8985 rhn-erratum-8988 rhn-erratum-8989 rhn-erratum-8990 rhn-erratum-8991 rhn-erratum-8992 rhn-erratum-8993 rhn-erratum-8996 rhn-erratum-8997 rhn-erratum-8998 rhn-erratum-8999 rhn-erratum-9000 rhn-erratum-9001 rhn-erratum-9002 rhn-erratum-9004 rhn-erratum-9006 rhn-erratum-9007 rhn-erratum-9008 rhn-erratum-9009 rhn-erratum-9010 rhn-erratum-9013 rhn-erratum-9014 rhn-erratum-9017 rhn-erratum-9018 rhn-erratum-9019 rhn-erratum-9020 rhn-erratum-9021 rhn-erratum-9022 rhn-erratum-9023 rhn-erratum-9024 rhn-erratum-9026 rhn-erratum-9027 rhn-erratum-9028 rhn-erratum-9029 rhn-erratum-9030 rhn-erratum-9031 rhn-erratum-9032 rhn-erratum-9033 rhn-erratum-9034 rhn-erratum-9035 rhn-erratum-9036 rhn-erratum-9037 rhn-erratum-9039 rhn-erratum-9040 rhn-erratum-9042 rhn-erratum-9043 rhn-erratum-9045 rhn-erratum-9046 rhn-erratum-9047 rhn-erratum-9049 rhn-erratum-9051 rhn-erratum-9052 rhn-erratum-9053 rhn-erratum-9054 rhn-erratum-9055 rhn-erratum-9056 rhn-erratum-9057 rhn-erratum-9058 rhn-erratum-9059 rhn-erratum-9060 rhn-erratum-9061 rhn-erratum-9063 rhn-erratum-9066 rhn-erratum-9067 rhn-erratum-9068 rhn-erratum-9069 rhn-erratum-9070 rhn-erratum-9071 rhn-erratum-9072 rhn-erratum-9074 rhn-erratum-9076 rhn-erratum-9080 rhn-erratum-9081 rhn-erratum-9082 rhn-erratum-9083 rhn-erratum-9084 rhn-erratum-9085 rhn-erratum-9086 rhn-erratum-9087 rhn-erratum-9088 rhn-erratum-9089 rhn-erratum-9090 rhn-erratum-9091 rhn-erratum-9092 rhn-erratum-9093 rhn-erratum-9094 rhn-erratum-9095 rhn-erratum-9096 rhn-erratum-9097 rhn-erratum-9098 rhn-erratum-9099 rhn-erratum-9100 rhn-erratum-9101 rhn-erratum-9102 rhn-erratum-9103 rhn-erratum-9104 rhn-erratum-9105 rhn-erratum-9107 rhn-erratum-9108 rhn-erratum-9109 rhn-erratum-9110 rhn-erratum-9111 rhn-erratum-9112 rhn-erratum-9114 rhn-erratum-9115 rhn-erratum-9116 rhn-erratum-9117 rhn-erratum-9118 rhn-erratum-9120 rhn-erratum-9121 rhn-erratum-9122 rhn-erratum-9124 rhn-erratum-9125 rhn-erratum-9126 rhn-erratum-9127 rhn-erratum-9128 rhn-erratum-9129 rhn-erratum-9130 rhn-erratum-9132 rhn-erratum-9134 rhn-erratum-9136 rhn-erratum-9138 rhn-erratum-9139 rhn-erratum-9140 rhn-erratum-9141 rhn-erratum-9142 rhn-erratum-9143 rhn-erratum-9144 rhn-erratum-9145 rhn-erratum-9146 rhn-erratum-9147 rhn-erratum-9150 rhn-erratum-9157 rhn-erratum-9158 rhn-erratum-9159 rhn-erratum-9162 rhn-erratum-9163 rhn-erratum-9164 rhn-erratum-9166 rhn-erratum-9167 rhn-erratum-9168 rhn-erratum-9170 rhn-erratum-9175 rhn-erratum-9176 rhn-erratum-9179 rhn-erratum-9184 rhn-erratum-9185 rhn-erratum-9199 rhn-erratum-9200 rhn-erratum-9203 rhn-erratum-9206 rhn-erratum-9211 rhn-erratum-9215 rhn-erratum-9216 rhn-erratum-9219 rhn-erratum-9220 rhn-erratum-9221 rhn-erratum-9223 rhn-erratum-9224 rhn-erratum-9225 rhn-erratum-9227 rhn-erratum-9229 rhn-erratum-9237 rhn-erratum-9240 rhn-erratum-9241 rhn-erratum-9244 rhn-erratum-9248 rhn-erratum-9249 rhn-erratum-9260 rhn-erratum-9265 rhn-erratum-9266 rhn-erratum-9268" kickstartable-trees="ks-rhel-i386-server-5 ks-rhel-i386-server-5-u1 ks-rhel-i386-server-5-u2 ks-rhel-i386-server-5-u3 ks-rhel-i386-server-5-u4" label="rhel-i386-server-5" packages="rhn-package-386981 rhn-package-386982 rhn-package-386983 rhn-package-386984 rhn-package-386985 rhn-package-386986 rhn-package-386987 rhn-package-386988 rhn-package-386989 rhn-package-386990 rhn-package-386992 rhn-package-386993 rhn-package-386994 rhn-package-386995 rhn-package-386996 rhn-package-386997 rhn-package-386999 rhn-package-387000 rhn-package-387001 rhn-package-387002 rhn-package-387003 rhn-package-387004 rhn-package-387005 rhn-package-387006 rhn-package-387007 rhn-package-387008 rhn-package-387009 rhn-package-387010 rhn-package-387011 rhn-package-387012 rhn-package-387013 rhn-package-387014 rhn-package-387015 rhn-package-387017 rhn-package-387018 rhn-package-387019 rhn-package-387020 rhn-package-387021 rhn-package-387022 rhn-package-387023 rhn-package-387024 rhn-package-387025 rhn-package-387026 rhn-package-387027 rhn-package-387028 rhn-package-387029 rhn-package-387030 rhn-package-387031 rhn-package-387032 rhn-package-387034 rhn-package-387035 rhn-package-387036 rhn-package-387037 rhn-package-387038 rhn-package-387039 rhn-package-387040 rhn-package-387041 rhn-package-387042 rhn-package-387043 rhn-package-387045 rhn-package-387046 rhn-package-387047 rhn-package-387048 rhn-package-387049 rhn-package-387050 rhn-package-387051 rhn-package-387052 rhn-package-387053 rhn-package-387054 rhn-package-387055 rhn-package-387056 rhn-package-387057 rhn-package-387058 rhn-package-387059 rhn-package-387060 rhn-package-387063 rhn-package-387064 rhn-package-387065 rhn-package-387066 rhn-package-387067 rhn-package-387069 rhn-package-387070 rhn-package-387071 rhn-package-387072 rhn-package-387074 rhn-package-387075 rhn-package-387076 rhn-package-387077 rhn-package-387078 rhn-package-387080 rhn-package-387082 rhn-package-387083 rhn-package-387084 rhn-package-387085 rhn-package-387087 rhn-package-387088 rhn-package-387091 rhn-package-387092 rhn-package-387093 rhn-package-387094 rhn-package-387095 rhn-package-387096 rhn-package-387098 rhn-package-387099 rhn-package-387100 rhn-package-387101 rhn-package-387103 rhn-package-387104 rhn-package-387105 rhn-package-387106 rhn-package-387107 rhn-package-387108 rhn-package-387109 rhn-package-387110 rhn-package-387111 rhn-package-387112 rhn-package-387113 rhn-package-387114 rhn-package-387115 rhn-package-387116 rhn-package-387117 rhn-package-387118 rhn-package-387119 rhn-package-387120 rhn-package-387122 rhn-package-387123 rhn-package-387124 rhn-package-387125 rhn-package-387127 rhn-package-387128 rhn-package-387129 rhn-package-387130 rhn-package-387132 rhn-package-387133 rhn-package-387134 rhn-package-387135 rhn-package-387136 rhn-package-387137 rhn-package-387138 rhn-package-387139 rhn-package-387140 rhn-package-387141 rhn-package-387143 rhn-package-387144 rhn-package-387145 rhn-package-387146 rhn-package-387147 rhn-package-387148 rhn-package-387149 rhn-package-387150 rhn-package-387151 rhn-package-387152 rhn-package-387153 rhn-package-387154 rhn-package-387155 rhn-package-387156 rhn-package-387157 rhn-package-387158 rhn-package-387159 rhn-package-387160 rhn-package-387161 rhn-package-387162 rhn-package-387163 rhn-package-387164 rhn-package-387165 rhn-package-387167 rhn-package-387168 rhn-package-387170 rhn-package-387171 rhn-package-387172 rhn-package-387174 rhn-package-387175 rhn-package-387176 rhn-package-387177 rhn-package-387178 rhn-package-387179 rhn-package-387180 rhn-package-387181 rhn-package-387183 rhn-package-387184 rhn-package-387185 rhn-package-387186 rhn-package-387187 rhn-package-387188 rhn-package-387189 rhn-package-387191 rhn-package-387192 rhn-package-387194 rhn-package-387195 rhn-package-387196 rhn-package-387197 rhn-package-387198 rhn-package-387199 rhn-package-387200 rhn-package-387201 rhn-package-387202 rhn-package-387203 rhn-package-387204 rhn-package-387207 rhn-package-387208 rhn-package-387209 rhn-package-387210 rhn-package-387211 rhn-package-387214 rhn-package-387215 rhn-package-387216 rhn-package-387217 rhn-package-387219 rhn-package-387220 rhn-package-387221 rhn-package-387222 rhn-package-387223 rhn-package-387224 rhn-package-387225 rhn-package-387226 rhn-package-387227 rhn-package-387229 rhn-package-387230 rhn-package-387231 rhn-package-387232 rhn-package-387233 rhn-package-387234 rhn-package-387235 rhn-package-387236 rhn-package-387237 rhn-package-387238 rhn-package-387239 rhn-package-387240 rhn-package-387241 rhn-package-387243 rhn-package-387244 rhn-package-387245 rhn-package-387246 rhn-package-387247 rhn-package-387248 rhn-package-387249 rhn-package-387251 rhn-package-387252 rhn-package-387254 rhn-package-387256 rhn-package-387257 rhn-package-387258 rhn-package-387259 rhn-package-387260 rhn-package-387261 rhn-package-387262 rhn-package-387263 rhn-package-387264 rhn-package-387265 rhn-package-387266 rhn-package-387267 rhn-package-387268 rhn-package-387269 rhn-package-387270 rhn-package-387271 rhn-package-387272 rhn-package-387273 rhn-package-387274 rhn-package-387275 rhn-package-387276 rhn-package-387277 rhn-package-387278 rhn-package-387279 rhn-package-387280 rhn-package-387282 rhn-package-387284 rhn-package-387285 rhn-package-387286 rhn-package-387287 rhn-package-387288 rhn-package-387289 rhn-package-387290 rhn-package-387292 rhn-package-387293 rhn-package-387294 rhn-package-387295 rhn-package-387296 rhn-package-387298 rhn-package-387299 rhn-package-387300 rhn-package-387301 rhn-package-387302 rhn-package-387303 rhn-package-387304 rhn-package-387305 rhn-package-387306 rhn-package-387307 rhn-package-387308 rhn-package-387309 rhn-package-387310 rhn-package-387311 rhn-package-387312 rhn-package-387313 rhn-package-387314 rhn-package-387316 rhn-package-387317 rhn-package-387318 rhn-package-387319 rhn-package-387320 rhn-package-387321 rhn-package-387322 rhn-package-387323 rhn-package-387324 rhn-package-387325 rhn-package-387326 rhn-package-387327 rhn-package-387328 rhn-package-387330 rhn-package-387331 rhn-package-387332 rhn-package-387333 rhn-package-387334 rhn-package-387335 rhn-package-387336 rhn-package-387337 rhn-package-387338 rhn-package-387339 rhn-package-387340 rhn-package-387341 rhn-package-387342 rhn-package-387343 rhn-package-387344 rhn-package-387346 rhn-package-387347 rhn-package-387349 rhn-package-387350 rhn-package-387351 rhn-package-387352 rhn-package-387353 rhn-package-387354 rhn-package-387355 rhn-package-387356 rhn-package-387357 rhn-package-387358 rhn-package-387359 rhn-package-387360 rhn-package-387361 rhn-package-387362 rhn-package-387363 rhn-package-387364 rhn-package-387365 rhn-package-387366 rhn-package-387367 rhn-package-387368 rhn-package-387369 rhn-package-387370 rhn-package-387372 rhn-package-387374 rhn-package-387375 rhn-package-387376 rhn-package-387377 rhn-package-387378 rhn-package-387379 rhn-package-387380 rhn-package-387381 rhn-package-387382 rhn-package-387383 rhn-package-387384 rhn-package-387386 rhn-package-387387 rhn-package-387388 rhn-package-387389 rhn-package-387390 rhn-package-387392 rhn-package-387393 rhn-package-387394 rhn-package-387395 rhn-package-387397 rhn-package-387398 rhn-package-387399 rhn-package-387400 rhn-package-387401 rhn-package-387402 rhn-package-387403 rhn-package-387405 rhn-package-387406 rhn-package-387407 rhn-package-387408 rhn-package-387409 rhn-package-387410 rhn-package-387412 rhn-package-387413 rhn-package-387414 rhn-package-387415 rhn-package-387416 rhn-package-387417 rhn-package-387418 rhn-package-387419 rhn-package-387420 rhn-package-387421 rhn-package-387422 rhn-package-387423 rhn-package-387424 rhn-package-387425 rhn-package-387426 rhn-package-387427 rhn-package-387428 rhn-package-387429 rhn-package-387430 rhn-package-387431 rhn-package-387432 rhn-package-387433 rhn-package-387434 rhn-package-387435 rhn-package-387436 rhn-package-387437 rhn-package-387438 rhn-package-387439 rhn-package-387440 rhn-package-387441 rhn-package-387442 rhn-package-387443 rhn-package-387444 rhn-package-387445 rhn-package-387446 rhn-package-387447 rhn-package-387448 rhn-package-387449 rhn-package-387450 rhn-package-387451 rhn-package-387452 rhn-package-387453 rhn-package-387454 rhn-package-387455 rhn-package-387456 rhn-package-387457 rhn-package-387458 rhn-package-387459 rhn-package-387460 rhn-package-387461 rhn-package-387462 rhn-package-387463 rhn-package-387465 rhn-package-387467 rhn-package-387468 rhn-package-387469 rhn-package-387470 rhn-package-387471 rhn-package-387472 rhn-package-387473 rhn-package-387475 rhn-package-387476 rhn-package-387477 rhn-package-387478 rhn-package-387479 rhn-package-387480 rhn-package-387481 rhn-package-387482 rhn-package-387484 rhn-package-387485 rhn-package-387487 rhn-package-387488 rhn-package-387490 rhn-package-387491 rhn-package-387492 rhn-package-387493 rhn-package-387494 rhn-package-387496 rhn-package-387497 rhn-package-387498 rhn-package-387499 rhn-package-387500 rhn-package-387501 rhn-package-387502 rhn-package-387503 rhn-package-387504 rhn-package-387505 rhn-package-387507 rhn-package-387508 rhn-package-387509 rhn-package-387510 rhn-package-387511 rhn-package-387512 rhn-package-387513 rhn-package-387514 rhn-package-387515 rhn-package-387516 rhn-package-387517 rhn-package-387518 rhn-package-387520 rhn-package-387521 rhn-package-387523 rhn-package-387524 rhn-package-387525 rhn-package-387526 rhn-package-387527 rhn-package-387528 rhn-package-387529 rhn-package-387530 rhn-package-387531 rhn-package-387532 rhn-package-387533 rhn-package-387534 rhn-package-387535 rhn-package-387536 rhn-package-387537 rhn-package-387539 rhn-package-387540 rhn-package-387541 rhn-package-387542 rhn-package-387543 rhn-package-387544 rhn-package-387545 rhn-package-387547 rhn-package-387549 rhn-package-387550 rhn-package-387551 rhn-package-387553 rhn-package-387554 rhn-package-387555 rhn-package-387556 rhn-package-387557 rhn-package-387558 rhn-package-387559 rhn-package-387560 rhn-package-387561 rhn-package-387562 rhn-package-387563 rhn-package-387564 rhn-package-387566 rhn-package-387567 rhn-package-387568 rhn-package-387569 rhn-package-387570 rhn-package-387571 rhn-package-387572 rhn-package-387573 rhn-package-387574 rhn-package-387576 rhn-package-387577 rhn-package-387578 rhn-package-387579 rhn-package-387580 rhn-package-387581 rhn-package-387583 rhn-package-387584 rhn-package-387585 rhn-package-387586 rhn-package-387587 rhn-package-387588 rhn-package-387589 rhn-package-387590 rhn-package-387591 rhn-package-387592 rhn-package-387593 rhn-package-387594 rhn-package-387595 rhn-package-387596 rhn-package-387597 rhn-package-387598 rhn-package-387599 rhn-package-387600 rhn-package-387601 rhn-package-387602 rhn-package-387603 rhn-package-387604 rhn-package-387605 rhn-package-387606 rhn-package-387607 rhn-package-387608 rhn-package-387609 rhn-package-387610 rhn-package-387611 rhn-package-387612 rhn-package-387614 rhn-package-387615 rhn-package-387617 rhn-package-387618 rhn-package-387619 rhn-package-387620 rhn-package-387621 rhn-package-387622 rhn-package-387623 rhn-package-387624 rhn-package-387625 rhn-package-387626 rhn-package-387628 rhn-package-387630 rhn-package-387632 rhn-package-387634 rhn-package-387635 rhn-package-387636 rhn-package-387637 rhn-package-387640 rhn-package-387641 rhn-package-387642 rhn-package-387644 rhn-package-387645 rhn-package-387646 rhn-package-387648 rhn-package-387650 rhn-package-387651 rhn-package-387652 rhn-package-387653 rhn-package-387654 rhn-package-387655 rhn-package-387656 rhn-package-387657 rhn-package-387658 rhn-package-387659 rhn-package-387660 rhn-package-387661 rhn-package-387662 rhn-package-387663 rhn-package-387664 rhn-package-387665 rhn-package-387667 rhn-package-387668 rhn-package-387669 rhn-package-387670 rhn-package-387671 rhn-package-387672 rhn-package-387673 rhn-package-387674 rhn-package-387675 rhn-package-387676 rhn-package-387677 rhn-package-387678 rhn-package-387679 rhn-package-387680 rhn-package-387681 rhn-package-387682 rhn-package-387683 rhn-package-387684 rhn-package-387685 rhn-package-387686 rhn-package-387687 rhn-package-387688 rhn-package-387689 rhn-package-387690 rhn-package-387691 rhn-package-387692 rhn-package-387693 rhn-package-387694 rhn-package-387695 rhn-package-387696 rhn-package-387698 rhn-package-387699 rhn-package-387700 rhn-package-387702 rhn-package-387703 rhn-package-387704 rhn-package-387707 rhn-package-387708 rhn-package-387709 rhn-package-387710 rhn-package-387711 rhn-package-387713 rhn-package-387714 rhn-package-387715 rhn-package-387716 rhn-package-387717 rhn-package-387718 rhn-package-387720 rhn-package-387721 rhn-package-387722 rhn-package-387723 rhn-package-387724 rhn-package-387725 rhn-package-387726 rhn-package-387727 rhn-package-387728 rhn-package-387729 rhn-package-387730 rhn-package-387731 rhn-package-387732 rhn-package-387733 rhn-package-387734 rhn-package-387735 rhn-package-387736 rhn-package-387737 rhn-package-387738 rhn-package-387739 rhn-package-387740 rhn-package-387741 rhn-package-387742 rhn-package-387743 rhn-package-387744 rhn-package-387745 rhn-package-387747 rhn-package-387748 rhn-package-387749 rhn-package-387750 rhn-package-387751 rhn-package-387752 rhn-package-387753 rhn-package-387754 rhn-package-387755 rhn-package-387756 rhn-package-387757 rhn-package-387758 rhn-package-387759 rhn-package-387760 rhn-package-387761 rhn-package-387762 rhn-package-387763 rhn-package-387764 rhn-package-387765 rhn-package-387766 rhn-package-387767 rhn-package-387768 rhn-package-387769 rhn-package-387770 rhn-package-387771 rhn-package-387772 rhn-package-387773 rhn-package-387774 rhn-package-387775 rhn-package-387776 rhn-package-387777 rhn-package-387778 rhn-package-387779 rhn-package-387780 rhn-package-387781 rhn-package-387782 rhn-package-387783 rhn-package-387784 rhn-package-387785 rhn-package-387786 rhn-package-387787 rhn-package-387788 rhn-package-387789 rhn-package-387790 rhn-package-387791 rhn-package-387792 rhn-package-387793 rhn-package-387794 rhn-package-387795 rhn-package-387796 rhn-package-387797 rhn-package-387798 rhn-package-387799 rhn-package-387800 rhn-package-387801 rhn-package-387802 rhn-package-387803 rhn-package-387804 rhn-package-387805 rhn-package-387807 rhn-package-387808 rhn-package-387809 rhn-package-387810 rhn-package-387811 rhn-package-387812 rhn-package-387813 rhn-package-387814 rhn-package-387815 rhn-package-387816 rhn-package-387817 rhn-package-387818 rhn-package-387819 rhn-package-387820 rhn-package-387821 rhn-package-387822 rhn-package-387823 rhn-package-387824 rhn-package-387825 rhn-package-387826 rhn-package-387827 rhn-package-387828 rhn-package-387829 rhn-package-387830 rhn-package-387831 rhn-package-387832 rhn-package-387833 rhn-package-387834 rhn-package-387835 rhn-package-387836 rhn-package-387837 rhn-package-387838 rhn-package-387839 rhn-package-387840 rhn-package-387841 rhn-package-387842 rhn-package-387843 rhn-package-387844 rhn-package-387845 rhn-package-387846 rhn-package-387847 rhn-package-387848 rhn-package-387849 rhn-package-387850 rhn-package-387851 rhn-package-387852 rhn-package-387853 rhn-package-387854 rhn-package-387855 rhn-package-387856 rhn-package-387857 rhn-package-387858 rhn-package-387859 rhn-package-387860 rhn-package-387861 rhn-package-387862 rhn-package-387863 rhn-package-387864 rhn-package-387865 rhn-package-387866 rhn-package-387867 rhn-package-387868 rhn-package-387869 rhn-package-387870 rhn-package-387871 rhn-package-387873 rhn-package-387874 rhn-package-387875 rhn-package-387876 rhn-package-387877 rhn-package-387878 rhn-package-387879 rhn-package-387880 rhn-package-387881 rhn-package-387882 rhn-package-387883 rhn-package-387884 rhn-package-387885 rhn-package-387886 rhn-package-387887 rhn-package-387888 rhn-package-387889 rhn-package-387890 rhn-package-387891 rhn-package-387892 rhn-package-387893 rhn-package-387894 rhn-package-387895 rhn-package-387896 rhn-package-387897 rhn-package-387898 rhn-package-387899 rhn-package-387900 rhn-package-387901 rhn-package-387902 rhn-package-387903 rhn-package-387904 rhn-package-387905 rhn-package-387906 rhn-package-387907 rhn-package-387908 rhn-package-387909 rhn-package-387910 rhn-package-387911 rhn-package-387912 rhn-package-387913 rhn-package-387914 rhn-package-387915 rhn-package-387916 rhn-package-387917 rhn-package-387918 rhn-package-387919 rhn-package-387920 rhn-package-387921 rhn-package-387922 rhn-package-387923 rhn-package-387924 rhn-package-387925 rhn-package-387926 rhn-package-387927 rhn-package-387928 rhn-package-387929 rhn-package-387930 rhn-package-387931 rhn-package-387932 rhn-package-387933 rhn-package-387934 rhn-package-387935 rhn-package-387936 rhn-package-387937 rhn-package-387938 rhn-package-387939 rhn-package-387940 rhn-package-387941 rhn-package-387942 rhn-package-387943 rhn-package-387944 rhn-package-387945 rhn-package-387946 rhn-package-387947 rhn-package-387948 rhn-package-387949 rhn-package-387950 rhn-package-387951 rhn-package-387952 rhn-package-387953 rhn-package-387954 rhn-package-387955 rhn-package-387956 rhn-package-387957 rhn-package-387958 rhn-package-387959 rhn-package-387960 rhn-package-387961 rhn-package-387962 rhn-package-387964 rhn-package-387965 rhn-package-387966 rhn-package-387967 rhn-package-387968 rhn-package-387969 rhn-package-387970 rhn-package-387971 rhn-package-387972 rhn-package-387973 rhn-package-387974 rhn-package-387975 rhn-package-387976 rhn-package-387977 rhn-package-387979 rhn-package-387980 rhn-package-387981 rhn-package-387982 rhn-package-387983 rhn-package-387984 rhn-package-387985 rhn-package-387986 rhn-package-387987 rhn-package-387988 rhn-package-387989 rhn-package-387990 rhn-package-387991 rhn-package-387992 rhn-package-387993 rhn-package-387994 rhn-package-387995 rhn-package-387996 rhn-package-387997 rhn-package-387998 rhn-package-388000 rhn-package-388001 rhn-package-388002 rhn-package-388003 rhn-package-388004 rhn-package-388005 rhn-package-388006 rhn-package-388007 rhn-package-388008 rhn-package-388009 rhn-package-388010 rhn-package-388011 rhn-package-388012 rhn-package-388013 rhn-package-388014 rhn-package-388015 rhn-package-388017 rhn-package-388018 rhn-package-388019 rhn-package-388020 rhn-package-388021 rhn-package-388022 rhn-package-388023 rhn-package-388024 rhn-package-388025 rhn-package-388026 rhn-package-388027 rhn-package-388028 rhn-package-388029 rhn-package-388030 rhn-package-388031 rhn-package-388032 rhn-package-388033 rhn-package-388034 rhn-package-388035 rhn-package-388036 rhn-package-388037 rhn-package-388038 rhn-package-388039 rhn-package-388040 rhn-package-388041 rhn-package-388042 rhn-package-388043 rhn-package-388044 rhn-package-388045 rhn-package-388046 rhn-package-388047 rhn-package-388048 rhn-package-388049 rhn-package-388050 rhn-package-388051 rhn-package-388052 rhn-package-388053 rhn-package-388054 rhn-package-388056 rhn-package-388057 rhn-package-388058 rhn-package-388059 rhn-package-388060 rhn-package-388061 rhn-package-388062 rhn-package-388064 rhn-package-388065 rhn-package-388066 rhn-package-388067 rhn-package-388068 rhn-package-388069 rhn-package-388070 rhn-package-388071 rhn-package-388072 rhn-package-388073 rhn-package-388074 rhn-package-388076 rhn-package-388077 rhn-package-388078 rhn-package-388080 rhn-package-388081 rhn-package-388082 rhn-package-388083 rhn-package-388084 rhn-package-388085 rhn-package-388086 rhn-package-388087 rhn-package-388088 rhn-package-388089 rhn-package-388091 rhn-package-388092 rhn-package-388094 rhn-package-388095 rhn-package-388096 rhn-package-388097 rhn-package-388098 rhn-package-388099 rhn-package-388100 rhn-package-388101 rhn-package-388102 rhn-package-388103 rhn-package-388104 rhn-package-388105 rhn-package-388106 rhn-package-388107 rhn-package-388108 rhn-package-388109 rhn-package-388110 rhn-package-388111 rhn-package-388112 rhn-package-388113 rhn-package-388114 rhn-package-388115 rhn-package-388116 rhn-package-388117 rhn-package-388118 rhn-package-388119 rhn-package-388120 rhn-package-388121 rhn-package-388122 rhn-package-388123 rhn-package-388124 rhn-package-388125 rhn-package-388126 rhn-package-388127 rhn-package-388129 rhn-package-388130 rhn-package-388131 rhn-package-388132 rhn-package-388133 rhn-package-388134 rhn-package-388135 rhn-package-388136 rhn-package-388137 rhn-package-388138 rhn-package-388140 rhn-package-388142 rhn-package-388143 rhn-package-388144 rhn-package-388145 rhn-package-388146 rhn-package-388147 rhn-package-388148 rhn-package-388149 rhn-package-388150 rhn-package-388151 rhn-package-388152 rhn-package-388153 rhn-package-388154 rhn-package-388155 rhn-package-388156 rhn-package-388157 rhn-package-388158 rhn-package-388159 rhn-package-388160 rhn-package-388161 rhn-package-388162 rhn-package-388163 rhn-package-388164 rhn-package-388165 rhn-package-388166 rhn-package-388167 rhn-package-388168 rhn-package-388169 rhn-package-388170 rhn-package-388171 rhn-package-388172 rhn-package-388173 rhn-package-388174 rhn-package-388175 rhn-package-388176 rhn-package-388177 rhn-package-388179 rhn-package-388180 rhn-package-388181 rhn-package-388182 rhn-package-388183 rhn-package-388184 rhn-package-388185 rhn-package-388186 rhn-package-388187 rhn-package-388188 rhn-package-388189 rhn-package-388190 rhn-package-388191 rhn-package-388192 rhn-package-388193 rhn-package-388195 rhn-package-388196 rhn-package-388197 rhn-package-388198 rhn-package-388199 rhn-package-388200 rhn-package-388201 rhn-package-388202 rhn-package-388203 rhn-package-388205 rhn-package-388206 rhn-package-388207 rhn-package-388208 rhn-package-388209 rhn-package-388210 rhn-package-388211 rhn-package-388212 rhn-package-388213 rhn-package-388214 rhn-package-388215 rhn-package-388216 rhn-package-388217 rhn-package-388218 rhn-package-388219 rhn-package-388220 rhn-package-388221 rhn-package-388222 rhn-package-388223 rhn-package-388224 rhn-package-388225 rhn-package-388226 rhn-package-388227 rhn-package-388228 rhn-package-388229 rhn-package-388230 rhn-package-388231 rhn-package-388232 rhn-package-388233 rhn-package-388234 rhn-package-388235 rhn-package-388236 rhn-package-388237 rhn-package-388238 rhn-package-388239 rhn-package-388240 rhn-package-388241 rhn-package-388242 rhn-package-388243 rhn-package-388244 rhn-package-388245 rhn-package-388246 rhn-package-388247 rhn-package-388248 rhn-package-388249 rhn-package-388250 rhn-package-388251 rhn-package-388252 rhn-package-388253 rhn-package-388254 rhn-package-388255 rhn-package-388256 rhn-package-388257 rhn-package-388259 rhn-package-388260 rhn-package-388261 rhn-package-388262 rhn-package-388263 rhn-package-388264 rhn-package-388265 rhn-package-388266 rhn-package-388267 rhn-package-388268 rhn-package-388269 rhn-package-388270 rhn-package-388271 rhn-package-388272 rhn-package-388273 rhn-package-388274 rhn-package-388276 rhn-package-388277 rhn-package-388278 rhn-package-388279 rhn-package-388280 rhn-package-388281 rhn-package-388282 rhn-package-388283 rhn-package-388284 rhn-package-388285 rhn-package-388286 rhn-package-388287 rhn-package-388288 rhn-package-388289 rhn-package-388290 rhn-package-388291 rhn-package-388292 rhn-package-388293 rhn-package-388295 rhn-package-388296 rhn-package-388298 rhn-package-388299 rhn-package-388300 rhn-package-388301 rhn-package-388302 rhn-package-388303 rhn-package-388305 rhn-package-388306 rhn-package-388307 rhn-package-388308 rhn-package-388309 rhn-package-388310 rhn-package-388311 rhn-package-388312 rhn-package-388313 rhn-package-388314 rhn-package-388315 rhn-package-388316 rhn-package-388317 rhn-package-388318 rhn-package-388319 rhn-package-388320 rhn-package-388321 rhn-package-388322 rhn-package-388323 rhn-package-388324 rhn-package-388325 rhn-package-388326 rhn-package-388327 rhn-package-388328 rhn-package-388329 rhn-package-388330 rhn-package-388331 rhn-package-388332 rhn-package-388333 rhn-package-388334 rhn-package-388335 rhn-package-388336 rhn-package-388337 rhn-package-388338 rhn-package-388339 rhn-package-388340 rhn-package-388341 rhn-package-388342 rhn-package-388343 rhn-package-388344 rhn-package-388345 rhn-package-388346 rhn-package-388347 rhn-package-388348 rhn-package-388349 rhn-package-388350 rhn-package-388351 rhn-package-388352 rhn-package-388353 rhn-package-388355 rhn-package-388356 rhn-package-388357 rhn-package-388358 rhn-package-388359 rhn-package-388360 rhn-package-388361 rhn-package-388362 rhn-package-388363 rhn-package-388364 rhn-package-388365 rhn-package-388366 rhn-package-388367 rhn-package-388368 rhn-package-388369 rhn-package-388370 rhn-package-388371 rhn-package-388372 rhn-package-388373 rhn-package-388374 rhn-package-388375 rhn-package-388376 rhn-package-388377 rhn-package-388378 rhn-package-388379 rhn-package-388380 rhn-package-388381 rhn-package-388382 rhn-package-388383 rhn-package-388384 rhn-package-388385 rhn-package-388386 rhn-package-388387 rhn-package-388388 rhn-package-388389 rhn-package-388390 rhn-package-388391 rhn-package-388392 rhn-package-388393 rhn-package-388394 rhn-package-388395 rhn-package-388396 rhn-package-388397 rhn-package-388398 rhn-package-388399 rhn-package-388400 rhn-package-388401 rhn-package-388402 rhn-package-388403 rhn-package-388404 rhn-package-388405 rhn-package-388406 rhn-package-388407 rhn-package-388408 rhn-package-388409 rhn-package-388410 rhn-package-388411 rhn-package-388412 rhn-package-388413 rhn-package-388414 rhn-package-388415 rhn-package-388416 rhn-package-388417 rhn-package-388418 rhn-package-388419 rhn-package-388420 rhn-package-388421 rhn-package-388422 rhn-package-388423 rhn-package-388424 rhn-package-388425 rhn-package-388426 rhn-package-388427 rhn-package-388428 rhn-package-388429 rhn-package-388430 rhn-package-388431 rhn-package-388432 rhn-package-388433 rhn-package-388434 rhn-package-388435 rhn-package-388436 rhn-package-388437 rhn-package-388438 rhn-package-388439 rhn-package-388440 rhn-package-388441 rhn-package-388442 rhn-package-388443 rhn-package-388444 rhn-package-388445 rhn-package-388446 rhn-package-388447 rhn-package-388448 rhn-package-388449 rhn-package-388450 rhn-package-388451 rhn-package-388452 rhn-package-388453 rhn-package-388454 rhn-package-388455 rhn-package-388456 rhn-package-388457 rhn-package-388458 rhn-package-388459 rhn-package-388460 rhn-package-388461 rhn-package-388462 rhn-package-388463 rhn-package-388464 rhn-package-388465 rhn-package-388466 rhn-package-388467 rhn-package-388468 rhn-package-388469 rhn-package-388470 rhn-package-388471 rhn-package-388473 rhn-package-388474 rhn-package-388475 rhn-package-388476 rhn-package-388477 rhn-package-388478 rhn-package-388480 rhn-package-388481 rhn-package-388482 rhn-package-388483 rhn-package-388485 rhn-package-388486 rhn-package-388518 rhn-package-388519 rhn-package-388520 rhn-package-388521 rhn-package-388522 rhn-package-388523 rhn-package-388524 rhn-package-388525 rhn-package-388526 rhn-package-388527 rhn-package-388528 rhn-package-388529 rhn-package-388530 rhn-package-388531 rhn-package-388532 rhn-package-388534 rhn-package-388535 rhn-package-388536 rhn-package-388537 rhn-package-388538 rhn-package-388539 rhn-package-388540 rhn-package-388541 rhn-package-388542 rhn-package-388543 rhn-package-388544 rhn-package-388545 rhn-package-388546 rhn-package-388547 rhn-package-388548 rhn-package-388549 rhn-package-388551 rhn-package-388552 rhn-package-388554 rhn-package-388555 rhn-package-388556 rhn-package-388557 rhn-package-388558 rhn-package-388560 rhn-package-388561 rhn-package-388562 rhn-package-388563 rhn-package-388564 rhn-package-388565 rhn-package-388566 rhn-package-388567 rhn-package-388568 rhn-package-388569 rhn-package-388570 rhn-package-388571 rhn-package-388572 rhn-package-388574 rhn-package-388575 rhn-package-388576 rhn-package-388577 rhn-package-388578 rhn-package-388579 rhn-package-388580 rhn-package-388581 rhn-package-388582 rhn-package-388583 rhn-package-388584 rhn-package-388585 rhn-package-388586 rhn-package-388587 rhn-package-388588 rhn-package-388589 rhn-package-388590 rhn-package-388591 rhn-package-388592 rhn-package-388593 rhn-package-388594 rhn-package-388595 rhn-package-388596 rhn-package-388597 rhn-package-388598 rhn-package-388599 rhn-package-388600 rhn-package-388601 rhn-package-388602 rhn-package-388603 rhn-package-388604 rhn-package-388605 rhn-package-388606 rhn-package-388607 rhn-package-388608 rhn-package-388609 rhn-package-388610 rhn-package-388611 rhn-package-388612 rhn-package-388613 rhn-package-388614 rhn-package-388615 rhn-package-388616 rhn-package-388617 rhn-package-388618 rhn-package-388619 rhn-package-388620 rhn-package-388621 rhn-package-388622 rhn-package-388623 rhn-package-388624 rhn-package-388625 rhn-package-388626 rhn-package-388627 rhn-package-388628 rhn-package-388629 rhn-package-388630 rhn-package-388631 rhn-package-388632 rhn-package-388633 rhn-package-388634 rhn-package-388635 rhn-package-388636 rhn-package-388637 rhn-package-388638 rhn-package-388639 rhn-package-388640 rhn-package-388641 rhn-package-388642 rhn-package-388643 rhn-package-388644 rhn-package-388645 rhn-package-388646 rhn-package-388647 rhn-package-388648 rhn-package-388649 rhn-package-388650 rhn-package-388651 rhn-package-388652 rhn-package-388653 rhn-package-388654 rhn-package-388655 rhn-package-388656 rhn-package-388657 rhn-package-388658 rhn-package-388659 rhn-package-388660 rhn-package-388661 rhn-package-388662 rhn-package-388663 rhn-package-388664 rhn-package-388665 rhn-package-388666 rhn-package-388667 rhn-package-388668 rhn-package-388669 rhn-package-388670 rhn-package-388671 rhn-package-388672 rhn-package-388673 rhn-package-388674 rhn-package-388676 rhn-package-388677 rhn-package-388678 rhn-package-388679 rhn-package-388680 rhn-package-388681 rhn-package-388682 rhn-package-388683 rhn-package-388684 rhn-package-388685 rhn-package-388686 rhn-package-388687 rhn-package-388688 rhn-package-388689 rhn-package-388690 rhn-package-388691 rhn-package-388692 rhn-package-388693 rhn-package-388694 rhn-package-388695 rhn-package-388696 rhn-package-388697 rhn-package-388698 rhn-package-388699 rhn-package-388700 rhn-package-388701 rhn-package-388702 rhn-package-388703 rhn-package-388704 rhn-package-388705 rhn-package-388706 rhn-package-388707 rhn-package-388708 rhn-package-388709 rhn-package-388710 rhn-package-388711 rhn-package-388712 rhn-package-388713 rhn-package-388714 rhn-package-388715 rhn-package-388716 rhn-package-388717 rhn-package-388718 rhn-package-388719 rhn-package-388720 rhn-package-388721 rhn-package-388722 rhn-package-388723 rhn-package-388724 rhn-package-388725 rhn-package-388726 rhn-package-388727 rhn-package-388728 rhn-package-388729 rhn-package-388730 rhn-package-388732 rhn-package-388733 rhn-package-388734 rhn-package-388735 rhn-package-388736 rhn-package-388737 rhn-package-388738 rhn-package-388739 rhn-package-388740 rhn-package-388741 rhn-package-388742 rhn-package-388743 rhn-package-388744 rhn-package-388745 rhn-package-388746 rhn-package-388747 rhn-package-388748 rhn-package-388750 rhn-package-388751 rhn-package-388752 rhn-package-388753 rhn-package-388754 rhn-package-388755 rhn-package-388756 rhn-package-388757 rhn-package-388758 rhn-package-388759 rhn-package-388760 rhn-package-388761 rhn-package-388762 rhn-package-388763 rhn-package-388764 rhn-package-388765 rhn-package-388766 rhn-package-388767 rhn-package-388768 rhn-package-388769 rhn-package-388770 rhn-package-388771 rhn-package-388772 rhn-package-388773 rhn-package-388774 rhn-package-388775 rhn-package-388776 rhn-package-388777 rhn-package-388778 rhn-package-388779 rhn-package-388780 rhn-package-388782 rhn-package-388783 rhn-package-388784 rhn-package-388785 rhn-package-388786 rhn-package-388787 rhn-package-388788 rhn-package-388789 rhn-package-388790 rhn-package-388791 rhn-package-388792 rhn-package-388793 rhn-package-388794 rhn-package-388795 rhn-package-388796 rhn-package-388797 rhn-package-388798 rhn-package-388799 rhn-package-388800 rhn-package-388801 rhn-package-388802 rhn-package-388803 rhn-package-388804 rhn-package-388805 rhn-package-388806 rhn-package-388807 rhn-package-388808 rhn-package-388809 rhn-package-388810 rhn-package-388811 rhn-package-388812 rhn-package-388813 rhn-package-388814 rhn-package-388815 rhn-package-388816 rhn-package-388817 rhn-package-388818 rhn-package-388819 rhn-package-388820 rhn-package-388821 rhn-package-388822 rhn-package-388823 rhn-package-388824 rhn-package-388825 rhn-package-388826 rhn-package-388827 rhn-package-388828 rhn-package-388829 rhn-package-388830 rhn-package-388831 rhn-package-388832 rhn-package-388833 rhn-package-388834 rhn-package-388835 rhn-package-388836 rhn-package-388837 rhn-package-388838 rhn-package-388839 rhn-package-388840 rhn-package-388841 rhn-package-388842 rhn-package-388843 rhn-package-388844 rhn-package-388845 rhn-package-388846 rhn-package-388847 rhn-package-388848 rhn-package-388849 rhn-package-388850 rhn-package-388851 rhn-package-388852 rhn-package-388853 rhn-package-388854 rhn-package-388855 rhn-package-388856 rhn-package-388857 rhn-package-388858 rhn-package-388859 rhn-package-388860 rhn-package-388861 rhn-package-388862 rhn-package-388863 rhn-package-388864 rhn-package-388865 rhn-package-388866 rhn-package-388867 rhn-package-388868 rhn-package-388869 rhn-package-388870 rhn-package-388871 rhn-package-388872 rhn-package-388873 rhn-package-388874 rhn-package-388875 rhn-package-388876 rhn-package-388877 rhn-package-388878 rhn-package-388879 rhn-package-388880 rhn-package-388881 rhn-package-388882 rhn-package-388883 rhn-package-388884 rhn-package-388885 rhn-package-388886 rhn-package-388887 rhn-package-388888 rhn-package-388889 rhn-package-388890 rhn-package-388891 rhn-package-388892 rhn-package-388893 rhn-package-388894 rhn-package-388895 rhn-package-388896 rhn-package-388897 rhn-package-388898 rhn-package-388899 rhn-package-388900 rhn-package-388901 rhn-package-388902 rhn-package-388903 rhn-package-388904 rhn-package-388905 rhn-package-388906 rhn-package-388907 rhn-package-388908 rhn-package-388909 rhn-package-388910 rhn-package-388911 rhn-package-388912 rhn-package-388913 rhn-package-388914 rhn-package-388915 rhn-package-388916 rhn-package-388917 rhn-package-388918 rhn-package-388919 rhn-package-388920 rhn-package-388921 rhn-package-388922 rhn-package-388923 rhn-package-388924 rhn-package-388925 rhn-package-388926 rhn-package-388927 rhn-package-388928 rhn-package-388929 rhn-package-388930 rhn-package-388931 rhn-package-388932 rhn-package-388933 rhn-package-388934 rhn-package-388935 rhn-package-388936 rhn-package-388937 rhn-package-388938 rhn-package-388939 rhn-package-388940 rhn-package-388941 rhn-package-388942 rhn-package-388943 rhn-package-388944 rhn-package-388945 rhn-package-388946 rhn-package-388947 rhn-package-388948 rhn-package-388950 rhn-package-388952 rhn-package-388953 rhn-package-388954 rhn-package-388955 rhn-package-388956 rhn-package-388957 rhn-package-388958 rhn-package-388959 rhn-package-388960 rhn-package-388961 rhn-package-388962 rhn-package-388963 rhn-package-388964 rhn-package-388965 rhn-package-388966 rhn-package-388967 rhn-package-388968 rhn-package-388969 rhn-package-388970 rhn-package-388971 rhn-package-388972 rhn-package-388973 rhn-package-388974 rhn-package-388975 rhn-package-388976 rhn-package-388977 rhn-package-388978 rhn-package-388979 rhn-package-388980 rhn-package-388981 rhn-package-388982 rhn-package-388983 rhn-package-388984 rhn-package-388985 rhn-package-388986 rhn-package-388987 rhn-package-388988 rhn-package-388989 rhn-package-388990 rhn-package-388991 rhn-package-388992 rhn-package-388993 rhn-package-388994 rhn-package-388995 rhn-package-388996 rhn-package-388997 rhn-package-388998 rhn-package-388999 rhn-package-389000 rhn-package-389001 rhn-package-389002 rhn-package-389003 rhn-package-389004 rhn-package-389005 rhn-package-389006 rhn-package-389007 rhn-package-389008 rhn-package-389009 rhn-package-389010 rhn-package-389011 rhn-package-389012 rhn-package-389013 rhn-package-389014 rhn-package-389015 rhn-package-389016 rhn-package-389018 rhn-package-389019 rhn-package-389020 rhn-package-389021 rhn-package-389022 rhn-package-389023 rhn-package-389024 rhn-package-389025 rhn-package-389026 rhn-package-389027 rhn-package-389028 rhn-package-389031 rhn-package-389032 rhn-package-389033 rhn-package-389034 rhn-package-389035 rhn-package-389036 rhn-package-389037 rhn-package-389038 rhn-package-389039 rhn-package-389040 rhn-package-389041 rhn-package-389042 rhn-package-389043 rhn-package-389044 rhn-package-389045 rhn-package-389046 rhn-package-389047 rhn-package-389048 rhn-package-389049 rhn-package-389050 rhn-package-389051 rhn-package-389052 rhn-package-389053 rhn-package-389054 rhn-package-389055 rhn-package-389056 rhn-package-389057 rhn-package-389058 rhn-package-389059 rhn-package-389060 rhn-package-389061 rhn-package-389062 rhn-package-389063 rhn-package-389064 rhn-package-389065 rhn-package-389066 rhn-package-389067 rhn-package-389068 rhn-package-389069 rhn-package-389070 rhn-package-389071 rhn-package-389072 rhn-package-389073 rhn-package-389074 rhn-package-389075 rhn-package-389076 rhn-package-389077 rhn-package-389078 rhn-package-389079 rhn-package-389080 rhn-package-389081 rhn-package-389082 rhn-package-389083 rhn-package-389084 rhn-package-389085 rhn-package-389086 rhn-package-389087 rhn-package-389088 rhn-package-389089 rhn-package-389090 rhn-package-389091 rhn-package-389092 rhn-package-389093 rhn-package-389094 rhn-package-389095 rhn-package-389096 rhn-package-389097 rhn-package-389098 rhn-package-389099 rhn-package-389100 rhn-package-389101 rhn-package-389102 rhn-package-389103 rhn-package-389104 rhn-package-389105 rhn-package-389106 rhn-package-389107 rhn-package-389108 rhn-package-389109 rhn-package-389110 rhn-package-389111 rhn-package-389112 rhn-package-389113 rhn-package-389114 rhn-package-389115 rhn-package-389116 rhn-package-389117 rhn-package-389118 rhn-package-389119 rhn-package-389120 rhn-package-389121 rhn-package-389122 rhn-package-389123 rhn-package-389124 rhn-package-389125 rhn-package-389126 rhn-package-389127 rhn-package-389128 rhn-package-389129 rhn-package-389130 rhn-package-389131 rhn-package-389132 rhn-package-389133 rhn-package-389134 rhn-package-389135 rhn-package-389136 rhn-package-389137 rhn-package-389138 rhn-package-389139 rhn-package-389140 rhn-package-389141 rhn-package-389142 rhn-package-389143 rhn-package-389144 rhn-package-389145 rhn-package-389146 rhn-package-389147 rhn-package-389148 rhn-package-389149 rhn-package-389150 rhn-package-389151 rhn-package-389152 rhn-package-389153 rhn-package-389154 rhn-package-389155 rhn-package-389156 rhn-package-389157 rhn-package-389158 rhn-package-389159 rhn-package-389160 rhn-package-389161 rhn-package-389162 rhn-package-389163 rhn-package-389164 rhn-package-389165 rhn-package-389166 rhn-package-389167 rhn-package-389168 rhn-package-389169 rhn-package-389170 rhn-package-389171 rhn-package-389172 rhn-package-389173 rhn-package-389174 rhn-package-389175 rhn-package-389176 rhn-package-389177 rhn-package-389178 rhn-package-389179 rhn-package-389180 rhn-package-389181 rhn-package-389182 rhn-package-389183 rhn-package-389184 rhn-package-389185 rhn-package-389186 rhn-package-389187 rhn-package-389188 rhn-package-389189 rhn-package-389190 rhn-package-389191 rhn-package-389192 rhn-package-389193 rhn-package-389194 rhn-package-389195 rhn-package-389197 rhn-package-389198 rhn-package-389199 rhn-package-389200 rhn-package-389201 rhn-package-389202 rhn-package-389203 rhn-package-389204 rhn-package-389205 rhn-package-389206 rhn-package-389207 rhn-package-389208 rhn-package-389209 rhn-package-389210 rhn-package-389211 rhn-package-389212 rhn-package-389213 rhn-package-389214 rhn-package-389215 rhn-package-389216 rhn-package-389218 rhn-package-389219 rhn-package-389220 rhn-package-389221 rhn-package-389222 rhn-package-389223 rhn-package-389224 rhn-package-389225 rhn-package-389226 rhn-package-389227 rhn-package-389228 rhn-package-389229 rhn-package-389230 rhn-package-389231 rhn-package-389232 rhn-package-389233 rhn-package-389234 rhn-package-389235 rhn-package-389236 rhn-package-389237 rhn-package-389238 rhn-package-389239 rhn-package-389240 rhn-package-389241 rhn-package-389242 rhn-package-389243 rhn-package-389244 rhn-package-389245 rhn-package-389247 rhn-package-389248 rhn-package-389249 rhn-package-389250 rhn-package-389251 rhn-package-391048 rhn-package-391049 rhn-package-397439 rhn-package-398166 rhn-package-398174 rhn-package-398181 rhn-package-398182 rhn-package-398183 rhn-package-398184 rhn-package-398185 rhn-package-398186 rhn-package-398207 rhn-package-398214 rhn-package-398215 rhn-package-398216 rhn-package-398217 rhn-package-398218 rhn-package-398219 rhn-package-398220 rhn-package-398221 rhn-package-398222 rhn-package-398223 rhn-package-398224 rhn-package-398225 rhn-package-398226 rhn-package-398227 rhn-package-398228 rhn-package-398229 rhn-package-398230 rhn-package-398231 rhn-package-398232 rhn-package-398311 rhn-package-398313 rhn-package-398318 rhn-package-398321 rhn-package-398324 rhn-package-398336 rhn-package-398343 rhn-package-398346 rhn-package-398356 rhn-package-398358 rhn-package-398361 rhn-package-398362 rhn-package-398379 rhn-package-398385 rhn-package-398388 rhn-package-398390 rhn-package-398393 rhn-package-398408 rhn-package-398410 rhn-package-398411 rhn-package-398415 rhn-package-398435 rhn-package-398443 rhn-package-398447 rhn-package-398451 rhn-package-398453 rhn-package-398459 rhn-package-398466 rhn-package-398467 rhn-package-398479 rhn-package-398488 rhn-package-398492 rhn-package-398498 rhn-package-398501 rhn-package-398512 rhn-package-398514 rhn-package-398515 rhn-package-398520 rhn-package-398528 rhn-package-398531 rhn-package-398533 rhn-package-398534 rhn-package-398535 rhn-package-398539 rhn-package-398540 rhn-package-398542 rhn-package-398546 rhn-package-398555 rhn-package-398557 rhn-package-398563 rhn-package-398569 rhn-package-398571 rhn-package-398574 rhn-package-398585 rhn-package-398594 rhn-package-398605 rhn-package-398612 rhn-package-398648 rhn-package-398649 rhn-package-398652 rhn-package-398655 rhn-package-398657 rhn-package-398660 rhn-package-398666 rhn-package-398667 rhn-package-398671 rhn-package-398674 rhn-package-398703 rhn-package-398706 rhn-package-398713 rhn-package-398881 rhn-package-398882 rhn-package-398883 rhn-package-398884 rhn-package-398885 rhn-package-398886 rhn-package-398887 rhn-package-398888 rhn-package-398889 rhn-package-398890 rhn-package-398891 rhn-package-398892 rhn-package-398893 rhn-package-398894 rhn-package-398895 rhn-package-398896 rhn-package-398897 rhn-package-398898 rhn-package-398899 rhn-package-398900 rhn-package-398901 rhn-package-398902 rhn-package-398903 rhn-package-398912 rhn-package-398915 rhn-package-399133 rhn-package-399134 rhn-package-399461 rhn-package-399500 rhn-package-399609 rhn-package-399614 rhn-package-399620 rhn-package-399625 rhn-package-399629 rhn-package-399843 rhn-package-399850 rhn-package-399863 rhn-package-399901 rhn-package-399925 rhn-package-399934 rhn-package-399945 rhn-package-399949 rhn-package-399952 rhn-package-399955 rhn-package-399957 rhn-package-399959 rhn-package-400074 rhn-package-400688 rhn-package-400690 rhn-package-400691 rhn-package-400745 rhn-package-400750 rhn-package-400762 rhn-package-400780 rhn-package-400945 rhn-package-400948 rhn-package-400951 rhn-package-401076 rhn-package-401078 rhn-package-401083 rhn-package-401087 rhn-package-401090 rhn-package-401091 rhn-package-401093 rhn-package-401095 rhn-package-401101 rhn-package-401106 rhn-package-401108 rhn-package-401109 rhn-package-401111 rhn-package-401114 rhn-package-401115 rhn-package-401118 rhn-package-401134 rhn-package-401136 rhn-package-401144 rhn-package-404173 rhn-package-404174 rhn-package-404175 rhn-package-404179 rhn-package-404180 rhn-package-404184 rhn-package-404185 rhn-package-404187 rhn-package-404903 rhn-package-404906 rhn-package-404926 rhn-package-404955 rhn-package-404980 rhn-package-404999 rhn-package-405011 rhn-package-405021 rhn-package-405026 rhn-package-405032 rhn-package-405065 rhn-package-405068 rhn-package-405075 rhn-package-405079 rhn-package-405087 rhn-package-405091 rhn-package-405096 rhn-package-405097 rhn-package-405099 rhn-package-405100 rhn-package-405102 rhn-package-405106 rhn-package-405112 rhn-package-405113 rhn-package-405119 rhn-package-405124 rhn-package-405131 rhn-package-405141 rhn-package-405151 rhn-package-405208 rhn-package-405210 rhn-package-405222 rhn-package-405225 rhn-package-405435 rhn-package-405437 rhn-package-405482 rhn-package-405489 rhn-package-405493 rhn-package-405509 rhn-package-405724 rhn-package-405736 rhn-package-405747 rhn-package-405789 rhn-package-405806 rhn-package-405808 rhn-package-405824 rhn-package-405829 rhn-package-405833 rhn-package-405836 rhn-package-405839 rhn-package-405840 rhn-package-405844 rhn-package-405845 rhn-package-405852 rhn-package-405853 rhn-package-405866 rhn-package-405934 rhn-package-405936 rhn-package-405939 rhn-package-405940 rhn-package-405941 rhn-package-405943 rhn-package-405944 rhn-package-405948 rhn-package-405950 rhn-package-406007 rhn-package-406013 rhn-package-406053 rhn-package-406060 rhn-package-406070 rhn-package-406164 rhn-package-406169 rhn-package-406251 rhn-package-406262 rhn-package-406279 rhn-package-406472 rhn-package-406541 rhn-package-406548 rhn-package-406571 rhn-package-406572 rhn-package-406581 rhn-package-406607 rhn-package-406647 rhn-package-406651 rhn-package-406652 rhn-package-406661 rhn-package-406668 rhn-package-406925 rhn-package-406993 rhn-package-407864 rhn-package-407874 rhn-package-407891 rhn-package-408228 rhn-package-408233 rhn-package-408265 rhn-package-408555 rhn-package-408568 rhn-package-408576 rhn-package-408654 rhn-package-408655 rhn-package-408656 rhn-package-408660 rhn-package-408665 rhn-package-408668 rhn-package-408670 rhn-package-408671 rhn-package-408715 rhn-package-408730 rhn-package-408835 rhn-package-408837 rhn-package-408979 rhn-package-408982 rhn-package-409179 rhn-package-409185 rhn-package-409191 rhn-package-409199 rhn-package-409247 rhn-package-409256 rhn-package-409258 rhn-package-409267 rhn-package-409305 rhn-package-409307 rhn-package-409312 rhn-package-409318 rhn-package-409321 rhn-package-409328 rhn-package-409331 rhn-package-409333 rhn-package-409341 rhn-package-409345 rhn-package-409499 rhn-package-409501 rhn-package-409690 rhn-package-409692 rhn-package-409696 rhn-package-409701 rhn-package-409707 rhn-package-409754 rhn-package-409757 rhn-package-409759 rhn-package-409761 rhn-package-409766 rhn-package-409769 rhn-package-409770 rhn-package-409772 rhn-package-409863 rhn-package-409871 rhn-package-409872 rhn-package-410188 rhn-package-410191 rhn-package-410193 rhn-package-410198 rhn-package-410203 rhn-package-410205 rhn-package-410210 rhn-package-410219 rhn-package-410223 rhn-package-410224 rhn-package-410230 rhn-package-410285 rhn-package-410286 rhn-package-410288 rhn-package-410320 rhn-package-410476 rhn-package-410479 rhn-package-410502 rhn-package-410570 rhn-package-410580 rhn-package-410593 rhn-package-410607 rhn-package-410614 rhn-package-410650 rhn-package-410652 rhn-package-410666 rhn-package-410719 rhn-package-410722 rhn-package-410723 rhn-package-410746 rhn-package-410764 rhn-package-410765 rhn-package-410766 rhn-package-410767 rhn-package-410768 rhn-package-410771 rhn-package-410803 rhn-package-410822 rhn-package-410826 rhn-package-410832 rhn-package-410833 rhn-package-410837 rhn-package-410838 rhn-package-410862 rhn-package-410864 rhn-package-410866 rhn-package-410867 rhn-package-410874 rhn-package-410875 rhn-package-410949 rhn-package-410950 rhn-package-410951 rhn-package-410952 rhn-package-410954 rhn-package-410965 rhn-package-411001 rhn-package-411002 rhn-package-411003 rhn-package-411004 rhn-package-411011 rhn-package-411074 rhn-package-411076 rhn-package-411131 rhn-package-411151 rhn-package-411156 rhn-package-411165 rhn-package-411166 rhn-package-411167 rhn-package-413075 rhn-package-413098 rhn-package-413117 rhn-package-413121 rhn-package-413131 rhn-package-413133 rhn-package-413134 rhn-package-413247 rhn-package-413260 rhn-package-413276 rhn-package-413296 rhn-package-413310 rhn-package-413318 rhn-package-413335 rhn-package-413343 rhn-package-413397 rhn-package-413443 rhn-package-413454 rhn-package-413461 rhn-package-413462 rhn-package-413468 rhn-package-413484 rhn-package-413749 rhn-package-414342 rhn-package-416549 rhn-package-416550 rhn-package-416553 rhn-package-416566 rhn-package-416585 rhn-package-416632 rhn-package-416729 rhn-package-416769 rhn-package-416774 rhn-package-416775 rhn-package-416779 rhn-package-416969 rhn-package-416970 rhn-package-416971 rhn-package-416979 rhn-package-417156 rhn-package-417159 rhn-package-417161 rhn-package-417166 rhn-package-417168 rhn-package-417170 rhn-package-417172 rhn-package-417179 rhn-package-417208 rhn-package-417213 rhn-package-417218 rhn-package-417258 rhn-package-417268 rhn-package-417273 rhn-package-417278 rhn-package-417292 rhn-package-418141 rhn-package-418155 rhn-package-418196 rhn-package-418197 rhn-package-418221 rhn-package-418222 rhn-package-418223 rhn-package-418224 rhn-package-418232 rhn-package-418238 rhn-package-418247 rhn-package-418262 rhn-package-418263 rhn-package-418265 rhn-package-418270 rhn-package-418285 rhn-package-418298 rhn-package-418306 rhn-package-418322 rhn-package-418340 rhn-package-418363 rhn-package-418477 rhn-package-418502 rhn-package-418506 rhn-package-418533 rhn-package-418534 rhn-package-418537 rhn-package-418538 rhn-package-418543 rhn-package-418546 rhn-package-418551 rhn-package-418560 rhn-package-418575 rhn-package-418581 rhn-package-418582 rhn-package-418783 rhn-package-418786 rhn-package-418789 rhn-package-418790 rhn-package-418792 rhn-package-418794 rhn-package-418798 rhn-package-418802 rhn-package-419033 rhn-package-419043 rhn-package-419044 rhn-package-419064 rhn-package-419113 rhn-package-419260 rhn-package-419262 rhn-package-419291 rhn-package-419297 rhn-package-419309 rhn-package-419541 rhn-package-419543 rhn-package-419544 rhn-package-419580 rhn-package-419586 rhn-package-419588 rhn-package-419593 rhn-package-419841 rhn-package-419847 rhn-package-420045 rhn-package-420048 rhn-package-420049 rhn-package-420055 rhn-package-420060 rhn-package-420061 rhn-package-420066 rhn-package-420067 rhn-package-420075 rhn-package-420084 rhn-package-420233 rhn-package-420259 rhn-package-420581 rhn-package-420582 rhn-package-420583 rhn-package-420584 rhn-package-420585 rhn-package-420586 rhn-package-420587 rhn-package-420589 rhn-package-420590 rhn-package-420591 rhn-package-420592 rhn-package-420593 rhn-package-420594 rhn-package-420595 rhn-package-420596 rhn-package-420597 rhn-package-420598 rhn-package-420599 rhn-package-420600 rhn-package-420601 rhn-package-420602 rhn-package-420603 rhn-package-420604 rhn-package-420605 rhn-package-420606 rhn-package-420607 rhn-package-420609 rhn-package-420629 rhn-package-420631 rhn-package-420634 rhn-package-420641 rhn-package-420642 rhn-package-420643 rhn-package-420647 rhn-package-420648 rhn-package-420650 rhn-package-420651 rhn-package-420652 rhn-package-420653 rhn-package-420660 rhn-package-420662 rhn-package-420671 rhn-package-420678 rhn-package-420694 rhn-package-420696 rhn-package-420698 rhn-package-420707 rhn-package-420710 rhn-package-420721 rhn-package-420730 rhn-package-420731 rhn-package-420732 rhn-package-420738 rhn-package-420740 rhn-package-420743 rhn-package-420754 rhn-package-420764 rhn-package-420765 rhn-package-420772 rhn-package-420786 rhn-package-420798 rhn-package-420811 rhn-package-420817 rhn-package-420820 rhn-package-420832 rhn-package-420837 rhn-package-420838 rhn-package-420850 rhn-package-420851 rhn-package-420854 rhn-package-420864 rhn-package-420867 rhn-package-420871 rhn-package-420880 rhn-package-420882 rhn-package-420884 rhn-package-420887 rhn-package-420891 rhn-package-420893 rhn-package-420895 rhn-package-420898 rhn-package-420904 rhn-package-420909 rhn-package-420920 rhn-package-420923 rhn-package-420934 rhn-package-420944 rhn-package-420945 rhn-package-420955 rhn-package-420965 rhn-package-420976 rhn-package-420999 rhn-package-421021 rhn-package-421030 rhn-package-421032 rhn-package-421040 rhn-package-421042 rhn-package-421054 rhn-package-421070 rhn-package-421076 rhn-package-421103 rhn-package-421107 rhn-package-421108 rhn-package-421113 rhn-package-421114 rhn-package-421116 rhn-package-421117 rhn-package-421119 rhn-package-421121 rhn-package-421123 rhn-package-421126 rhn-package-421132 rhn-package-421134 rhn-package-421135 rhn-package-421136 rhn-package-421139 rhn-package-421144 rhn-package-421153 rhn-package-421154 rhn-package-421156 rhn-package-421159 rhn-package-421160 rhn-package-421162 rhn-package-421165 rhn-package-421167 rhn-package-421173 rhn-package-421181 rhn-package-421192 rhn-package-421193 rhn-package-421196 rhn-package-421215 rhn-package-421246 rhn-package-421249 rhn-package-421255 rhn-package-421266 rhn-package-421276 rhn-package-421284 rhn-package-421301 rhn-package-421306 rhn-package-421320 rhn-package-421323 rhn-package-421352 rhn-package-421353 rhn-package-421354 rhn-package-421355 rhn-package-421356 rhn-package-421358 rhn-package-421359 rhn-package-421360 rhn-package-421361 rhn-package-421462 rhn-package-421515 rhn-package-421520 rhn-package-421555 rhn-package-421568 rhn-package-421587 rhn-package-421599 rhn-package-421612 rhn-package-421627 rhn-package-421631 rhn-package-421632 rhn-package-421633 rhn-package-421634 rhn-package-421635 rhn-package-421648 rhn-package-421652 rhn-package-421658 rhn-package-421659 rhn-package-421666 rhn-package-421670 rhn-package-421671 rhn-package-421679 rhn-package-421680 rhn-package-421685 rhn-package-421687 rhn-package-421689 rhn-package-421697 rhn-package-421701 rhn-package-421702 rhn-package-421704 rhn-package-421705 rhn-package-421707 rhn-package-421711 rhn-package-421715 rhn-package-421722 rhn-package-421733 rhn-package-421737 rhn-package-421743 rhn-package-421744 rhn-package-421745 rhn-package-421756 rhn-package-421764 rhn-package-421771 rhn-package-421773 rhn-package-421775 rhn-package-421776 rhn-package-421785 rhn-package-421788 rhn-package-421798 rhn-package-421816 rhn-package-421824 rhn-package-421829 rhn-package-421855 rhn-package-421872 rhn-package-421873 rhn-package-421874 rhn-package-421875 rhn-package-421876 rhn-package-421877 rhn-package-421878 rhn-package-421879 rhn-package-421880 rhn-package-421881 rhn-package-421882 rhn-package-421883 rhn-package-421884 rhn-package-421885 rhn-package-421886 rhn-package-421887 rhn-package-421888 rhn-package-421889 rhn-package-421890 rhn-package-421891 rhn-package-421892 rhn-package-421893 rhn-package-421894 rhn-package-421895 rhn-package-421898 rhn-package-421908 rhn-package-421914 rhn-package-421915 rhn-package-421923 rhn-package-421939 rhn-package-421956 rhn-package-421992 rhn-package-422001 rhn-package-422013 rhn-package-422014 rhn-package-422019 rhn-package-422022 rhn-package-422029 rhn-package-422035 rhn-package-422039 rhn-package-422043 rhn-package-422054 rhn-package-422060 rhn-package-422067 rhn-package-422071 rhn-package-422075 rhn-package-422086 rhn-package-422104 rhn-package-422107 rhn-package-422118 rhn-package-422119 rhn-package-422122 rhn-package-422134 rhn-package-422136 rhn-package-422153 rhn-package-422154 rhn-package-422158 rhn-package-422161 rhn-package-422162 rhn-package-422163 rhn-package-422164 rhn-package-422169 rhn-package-422172 rhn-package-422173 rhn-package-422174 rhn-package-422175 rhn-package-422177 rhn-package-422207 rhn-package-422211 rhn-package-422215 rhn-package-422218 rhn-package-422225 rhn-package-422229 rhn-package-422230 rhn-package-422235 rhn-package-422243 rhn-package-422249 rhn-package-422261 rhn-package-422265 rhn-package-422273 rhn-package-422279 rhn-package-422287 rhn-package-422293 rhn-package-422295 rhn-package-422296 rhn-package-422303 rhn-package-422304 rhn-package-422323 rhn-package-422325 rhn-package-422329 rhn-package-422337 rhn-package-422338 rhn-package-422343 rhn-package-422346 rhn-package-422349 rhn-package-422363 rhn-package-422371 rhn-package-422377 rhn-package-422380 rhn-package-422384 rhn-package-422385 rhn-package-422386 rhn-package-422387 rhn-package-422397 rhn-package-422399 rhn-package-422401 rhn-package-422404 rhn-package-422429 rhn-package-422433 rhn-package-422434 rhn-package-422435 rhn-package-422437 rhn-package-422440 rhn-package-422456 rhn-package-422460 rhn-package-422461 rhn-package-422470 rhn-package-422478 rhn-package-422480 rhn-package-422484 rhn-package-422490 rhn-package-422496 rhn-package-422501 rhn-package-422506 rhn-package-422514 rhn-package-422520 rhn-package-422527 rhn-package-422528 rhn-package-422539 rhn-package-422544 rhn-package-422548 rhn-package-422549 rhn-package-422552 rhn-package-422567 rhn-package-422571 rhn-package-422583 rhn-package-422584 rhn-package-422588 rhn-package-422589 rhn-package-422590 rhn-package-422592 rhn-package-422595 rhn-package-422596 rhn-package-422597 rhn-package-422598 rhn-package-422603 rhn-package-422604 rhn-package-422614 rhn-package-422623 rhn-package-422627 rhn-package-422631 rhn-package-422635 rhn-package-422644 rhn-package-422650 rhn-package-422651 rhn-package-422705 rhn-package-422706 rhn-package-422709 rhn-package-422719 rhn-package-422748 rhn-package-422749 rhn-package-422751 rhn-package-422758 rhn-package-422951 rhn-package-422959 rhn-package-423004 rhn-package-423016 rhn-package-423116 rhn-package-423117 rhn-package-423118 rhn-package-423122 rhn-package-423124 rhn-package-423132 rhn-package-423142 rhn-package-423151 rhn-package-423158 rhn-package-423159 rhn-package-423164 rhn-package-423167 rhn-package-423168 rhn-package-423172 rhn-package-423174 rhn-package-423177 rhn-package-423182 rhn-package-423184 rhn-package-423192 rhn-package-423194 rhn-package-423195 rhn-package-423197 rhn-package-423202 rhn-package-423203 rhn-package-423206 rhn-package-423211 rhn-package-423212 rhn-package-423217 rhn-package-423220 rhn-package-423227 rhn-package-423229 rhn-package-423240 rhn-package-423244 rhn-package-423248 rhn-package-423253 rhn-package-423254 rhn-package-423259 rhn-package-423273 rhn-package-423289 rhn-package-423294 rhn-package-423311 rhn-package-423318 rhn-package-423320 rhn-package-423321 rhn-package-423322 rhn-package-423323 rhn-package-423324 rhn-package-423329 rhn-package-423330 rhn-package-423333 rhn-package-423346 rhn-package-423349 rhn-package-423356 rhn-package-423361 rhn-package-423414 rhn-package-423419 rhn-package-423420 rhn-package-423514 rhn-package-423530 rhn-package-423532 rhn-package-423535 rhn-package-423544 rhn-package-423554 rhn-package-423564 rhn-package-423610 rhn-package-423613 rhn-package-423614 rhn-package-423615 rhn-package-423619 rhn-package-423628 rhn-package-423685 rhn-package-423697 rhn-package-424953 rhn-package-424958 rhn-package-424959 rhn-package-424963 rhn-package-424971 rhn-package-424972 rhn-package-424975 rhn-package-424983 rhn-package-424989 rhn-package-425825 rhn-package-425827 rhn-package-425831 rhn-package-425838 rhn-package-425846 rhn-package-425849 rhn-package-425859 rhn-package-425861 rhn-package-425940 rhn-package-425982 rhn-package-425983 rhn-package-425984 rhn-package-425995 rhn-package-426054 rhn-package-426078 rhn-package-426091 rhn-package-426095 rhn-package-426119 rhn-package-426277 rhn-package-426279 rhn-package-426282 rhn-package-426284 rhn-package-426287 rhn-package-426311 rhn-package-426313 rhn-package-426324 rhn-package-426325 rhn-package-426329 rhn-package-426336 rhn-package-426367 rhn-package-426370 rhn-package-426371 rhn-package-426372 rhn-package-426373 rhn-package-426897 rhn-package-426898 rhn-package-426994 rhn-package-426998 rhn-package-427039 rhn-package-427044 rhn-package-427046 rhn-package-427050 rhn-package-427051 rhn-package-427053 rhn-package-427062 rhn-package-427064 rhn-package-427067 rhn-package-427072 rhn-package-427092 rhn-package-427098 rhn-package-427145 rhn-package-427147 rhn-package-427642 rhn-package-427655 rhn-package-428029 rhn-package-428033 rhn-package-428036 rhn-package-428039 rhn-package-428041 rhn-package-428048 rhn-package-428051 rhn-package-428470 rhn-package-428548 rhn-package-428581 rhn-package-428590 rhn-package-428591 rhn-package-428758 rhn-package-428773 rhn-package-428776 rhn-package-428779 rhn-package-428789 rhn-package-428791 rhn-package-428797 rhn-package-428804 rhn-package-428805 rhn-package-428819 rhn-package-428823 rhn-package-428826 rhn-package-428827 rhn-package-428828 rhn-package-428829 rhn-package-428839 rhn-package-428871 rhn-package-428898 rhn-package-428899 rhn-package-428904 rhn-package-428972 rhn-package-428992 rhn-package-428994 rhn-package-428997 rhn-package-429007 rhn-package-429013 rhn-package-429112 rhn-package-429114 rhn-package-429241 rhn-package-429247 rhn-package-429333 rhn-package-429334 rhn-package-429340 rhn-package-429342 rhn-package-429347 rhn-package-429503 rhn-package-429517 rhn-package-429518 rhn-package-429522 rhn-package-429535 rhn-package-429538 rhn-package-429541 rhn-package-429542 rhn-package-429545 rhn-package-429554 rhn-package-429557 rhn-package-429559 rhn-package-429569 rhn-package-429611 rhn-package-429612 rhn-package-429656 rhn-package-429661 rhn-package-429709 rhn-package-429719 rhn-package-429732 rhn-package-429918 rhn-package-429919 rhn-package-430007 rhn-package-430022 rhn-package-430024 rhn-package-430074 rhn-package-430080 rhn-package-430082 rhn-package-430091 rhn-package-430104 rhn-package-430105 rhn-package-430112 rhn-package-430123 rhn-package-430136 rhn-package-430145 rhn-package-430410 rhn-package-430418 rhn-package-430429 rhn-package-430430 rhn-package-430524 rhn-package-430529 rhn-package-430530 rhn-package-430532 rhn-package-430533 rhn-package-430534 rhn-package-430535 rhn-package-430536 rhn-package-430537 rhn-package-430538 rhn-package-430539 rhn-package-430540 rhn-package-430541 rhn-package-430542 rhn-package-430543 rhn-package-430544 rhn-package-430545 rhn-package-430546 rhn-package-430547 rhn-package-430548 rhn-package-430549 rhn-package-430550 rhn-package-430551 rhn-package-430552 rhn-package-430553 rhn-package-430554 rhn-package-430555 rhn-package-430556 rhn-package-430557 rhn-package-430558 rhn-package-430559 rhn-package-430560 rhn-package-430561 rhn-package-430562 rhn-package-430563 rhn-package-430564 rhn-package-430565 rhn-package-430566 rhn-package-430567 rhn-package-430568 rhn-package-430569 rhn-package-430570 rhn-package-430571 rhn-package-430572 rhn-package-430573 rhn-package-430574 rhn-package-430577 rhn-package-430584 rhn-package-430585 rhn-package-430594 rhn-package-430599 rhn-package-430606 rhn-package-430612 rhn-package-430616 rhn-package-430617 rhn-package-430631 rhn-package-430636 rhn-package-430663 rhn-package-430665 rhn-package-430677 rhn-package-430678 rhn-package-430686 rhn-package-430687 rhn-package-430689 rhn-package-430697 rhn-package-431073 rhn-package-431076 rhn-package-431077 rhn-package-431078 rhn-package-431082 rhn-package-431086 rhn-package-431482 rhn-package-431493 rhn-package-431504 rhn-package-431513 rhn-package-431604 rhn-package-431609 rhn-package-431611 rhn-package-431616 rhn-package-431625 rhn-package-431626 rhn-package-431633 rhn-package-431639 rhn-package-431642 rhn-package-431647 rhn-package-431653 rhn-package-431659 rhn-package-431664 rhn-package-431665 rhn-package-431676 rhn-package-431684 rhn-package-431685 rhn-package-431687 rhn-package-431691 rhn-package-431692 rhn-package-431693 rhn-package-431697 rhn-package-431699 rhn-package-431701 rhn-package-431704 rhn-package-431749 rhn-package-431754 rhn-package-431755 rhn-package-431756 rhn-package-431876 rhn-package-431881 rhn-package-431885 rhn-package-431886 rhn-package-431890 rhn-package-431893 rhn-package-431894 rhn-package-431896 rhn-package-431898 rhn-package-431901 rhn-package-431904 rhn-package-431925 rhn-package-431932 rhn-package-431938 rhn-package-431939 rhn-package-431954 rhn-package-431957 rhn-package-431958 rhn-package-431959 rhn-package-431982 rhn-package-431987 rhn-package-432223 rhn-package-432469 rhn-package-432470 rhn-package-432478 rhn-package-432480 rhn-package-432509 rhn-package-432674 rhn-package-432676 rhn-package-432808 rhn-package-432811 rhn-package-432812 rhn-package-432814 rhn-package-432816 rhn-package-432821 rhn-package-432822 rhn-package-432830 rhn-package-432831 rhn-package-432835 rhn-package-432909 rhn-package-432915 rhn-package-433072 rhn-package-433075 rhn-package-433076 rhn-package-433080 rhn-package-433088 rhn-package-433157 rhn-package-433161 rhn-package-433238 rhn-package-433239 rhn-package-433241 rhn-package-433383 rhn-package-433401 rhn-package-433409 rhn-package-433410 rhn-package-433430 rhn-package-433439 rhn-package-433469 rhn-package-433471 rhn-package-433482 rhn-package-433488 rhn-package-433491 rhn-package-433495 rhn-package-433704 rhn-package-433710 rhn-package-433711 rhn-package-433717 rhn-package-433721 rhn-package-433734 rhn-package-433738 rhn-package-433739 rhn-package-433766 rhn-package-433767 rhn-package-433781 rhn-package-433828 rhn-package-433831 rhn-package-433834 rhn-package-434251 rhn-package-434254 rhn-package-434255 rhn-package-434257 rhn-package-434260 rhn-package-434263 rhn-package-434266 rhn-package-434274 rhn-package-434275 rhn-package-434279 rhn-package-434400 rhn-package-434409 rhn-package-434410 rhn-package-437315 rhn-package-437317 rhn-package-437319 rhn-package-437320 rhn-package-437328 rhn-package-437329 rhn-package-437330 rhn-package-437338 rhn-package-437343 rhn-package-437350 rhn-package-437359 rhn-package-437836 rhn-package-437837 rhn-package-437838 rhn-package-437842 rhn-package-437961 rhn-package-437970 rhn-package-438018 rhn-package-438025 rhn-package-438208 rhn-package-438213 rhn-package-438216 rhn-package-438217 rhn-package-438283 rhn-package-438501 rhn-package-438606 rhn-package-438617 rhn-package-438996 rhn-package-439002 rhn-package-439164 rhn-package-439170 rhn-package-439185 rhn-package-439196 rhn-package-439211 rhn-package-439244 rhn-package-439269 rhn-package-439614 rhn-package-439616 rhn-package-439621 rhn-package-440235 rhn-package-440241 rhn-package-440242 rhn-package-440243 rhn-package-440247 rhn-package-440249 rhn-package-440253 rhn-package-440258 rhn-package-440262 rhn-package-440264 rhn-package-440324 rhn-package-440560 rhn-package-440590 rhn-package-440593 rhn-package-440671 rhn-package-440673 rhn-package-440809 rhn-package-440817 rhn-package-440820 rhn-package-440828 rhn-package-440832 rhn-package-440837 rhn-package-440838 rhn-package-440850 rhn-package-440851 rhn-package-440859 rhn-package-440865 rhn-package-440876 rhn-package-440877 rhn-package-440878 rhn-package-440883 rhn-package-440895 rhn-package-440902 rhn-package-440904 rhn-package-440909 rhn-package-440925 rhn-package-440927 rhn-package-440929 rhn-package-440930 rhn-package-440936 rhn-package-440945 rhn-package-440952 rhn-package-440954 rhn-package-440961 rhn-package-440966 rhn-package-440974 rhn-package-441004 rhn-package-441005 rhn-package-441006 rhn-package-441007 rhn-package-441008 rhn-package-441009 rhn-package-441010 rhn-package-441011 rhn-package-441012 rhn-package-441013 rhn-package-441014 rhn-package-441015 rhn-package-441016 rhn-package-441017 rhn-package-441018 rhn-package-441019 rhn-package-441020 rhn-package-441021 rhn-package-441022 rhn-package-441023 rhn-package-441024 rhn-package-441025 rhn-package-441026 rhn-package-441030 rhn-package-441034 rhn-package-441038 rhn-package-441041 rhn-package-441049 rhn-package-441051 rhn-package-441053 rhn-package-441066 rhn-package-441069 rhn-package-441072 rhn-package-441082 rhn-package-441086 rhn-package-441088 rhn-package-441091 rhn-package-441092 rhn-package-441098 rhn-package-441102 rhn-package-441106 rhn-package-441107 rhn-package-441130 rhn-package-441138 rhn-package-441140 rhn-package-441151 rhn-package-441155 rhn-package-441156 rhn-package-441216 rhn-package-441226 rhn-package-441227 rhn-package-441234 rhn-package-441242 rhn-package-441245 rhn-package-441247 rhn-package-441248 rhn-package-441261 rhn-package-441266 rhn-package-441267 rhn-package-441270 rhn-package-441272 rhn-package-441278 rhn-package-441296 rhn-package-441301 rhn-package-441304 rhn-package-441308 rhn-package-441316 rhn-package-441317 rhn-package-441327 rhn-package-441331 rhn-package-441335 rhn-package-441337 rhn-package-441340 rhn-package-441342 rhn-package-441348 rhn-package-441352 rhn-package-441358 rhn-package-441359 rhn-package-441362 rhn-package-441373 rhn-package-441375 rhn-package-441379 rhn-package-441389 rhn-package-441390 rhn-package-441391 rhn-package-441392 rhn-package-441393 rhn-package-441394 rhn-package-441395 rhn-package-441396 rhn-package-441397 rhn-package-441398 rhn-package-441399 rhn-package-441400 rhn-package-441401 rhn-package-441402 rhn-package-441403 rhn-package-441404 rhn-package-441405 rhn-package-441406 rhn-package-441407 rhn-package-441408 rhn-package-441409 rhn-package-441410 rhn-package-441411 rhn-package-441412 rhn-package-441413 rhn-package-441414 rhn-package-441415 rhn-package-441416 rhn-package-441417 rhn-package-441418 rhn-package-441420 rhn-package-441421 rhn-package-441422 rhn-package-441423 rhn-package-441424 rhn-package-441425 rhn-package-441426 rhn-package-441427 rhn-package-441428 rhn-package-441429 rhn-package-441430 rhn-package-441431 rhn-package-441434 rhn-package-441436 rhn-package-441437 rhn-package-441439 rhn-package-441440 rhn-package-441441 rhn-package-441442 rhn-package-441443 rhn-package-441444 rhn-package-441445 rhn-package-441446 rhn-package-441447 rhn-package-441448 rhn-package-441449 rhn-package-441450 rhn-package-441451 rhn-package-441452 rhn-package-441455 rhn-package-441456 rhn-package-441457 rhn-package-441459 rhn-package-441460 rhn-package-441461 rhn-package-441462 rhn-package-441463 rhn-package-441464 rhn-package-441465 rhn-package-441466 rhn-package-441467 rhn-package-441468 rhn-package-441469 rhn-package-441470 rhn-package-441471 rhn-package-441472 rhn-package-441473 rhn-package-441474 rhn-package-441475 rhn-package-441476 rhn-package-441478 rhn-package-441479 rhn-package-441480 rhn-package-441483 rhn-package-441484 rhn-package-441485 rhn-package-441487 rhn-package-441488 rhn-package-441489 rhn-package-441490 rhn-package-441491 rhn-package-441492 rhn-package-441493 rhn-package-441494 rhn-package-441495 rhn-package-441496 rhn-package-441497 rhn-package-441498 rhn-package-441499 rhn-package-441500 rhn-package-441501 rhn-package-441502 rhn-package-441503 rhn-package-441504 rhn-package-441505 rhn-package-441506 rhn-package-441507 rhn-package-441508 rhn-package-441510 rhn-package-441511 rhn-package-441512 rhn-package-441513 rhn-package-441514 rhn-package-441515 rhn-package-441516 rhn-package-441518 rhn-package-441519 rhn-package-441520 rhn-package-441521 rhn-package-441522 rhn-package-441523 rhn-package-441524 rhn-package-441525 rhn-package-441526 rhn-package-441527 rhn-package-441528 rhn-package-441529 rhn-package-441530 rhn-package-441531 rhn-package-441532 rhn-package-441533 rhn-package-441534 rhn-package-441535 rhn-package-441536 rhn-package-441537 rhn-package-441612 rhn-package-441613 rhn-package-441614 rhn-package-441615 rhn-package-441616 rhn-package-441617 rhn-package-441618 rhn-package-441619 rhn-package-441620 rhn-package-441621 rhn-package-441622 rhn-package-441623 rhn-package-441624 rhn-package-441625 rhn-package-441626 rhn-package-441627 rhn-package-441628 rhn-package-441629 rhn-package-441630 rhn-package-441631 rhn-package-441633 rhn-package-441634 rhn-package-441635 rhn-package-441636 rhn-package-441638 rhn-package-441639 rhn-package-441640 rhn-package-441641 rhn-package-441642 rhn-package-441643 rhn-package-441644 rhn-package-441645 rhn-package-441646 rhn-package-441647 rhn-package-441648 rhn-package-441649 rhn-package-441650 rhn-package-441651 rhn-package-441652 rhn-package-441653 rhn-package-441654 rhn-package-441655 rhn-package-441656 rhn-package-441657 rhn-package-441658 rhn-package-441659 rhn-package-441660 rhn-package-441661 rhn-package-441662 rhn-package-441663 rhn-package-441664 rhn-package-441665 rhn-package-441666 rhn-package-441667 rhn-package-441668 rhn-package-441669 rhn-package-441670 rhn-package-441671 rhn-package-441672 rhn-package-441673 rhn-package-441674 rhn-package-441675 rhn-package-441676 rhn-package-441677 rhn-package-441678 rhn-package-441679 rhn-package-441680 rhn-package-441681 rhn-package-441682 rhn-package-441683 rhn-package-441684 rhn-package-441685 rhn-package-441686 rhn-package-441687 rhn-package-441688 rhn-package-441689 rhn-package-441690 rhn-package-441691 rhn-package-441693 rhn-package-441694 rhn-package-441695 rhn-package-441696 rhn-package-441697 rhn-package-441698 rhn-package-441699 rhn-package-441700 rhn-package-441701 rhn-package-441702 rhn-package-441703 rhn-package-441704 rhn-package-441705 rhn-package-441706 rhn-package-441707 rhn-package-441710 rhn-package-441711 rhn-package-441713 rhn-package-441714 rhn-package-441715 rhn-package-441716 rhn-package-441717 rhn-package-441718 rhn-package-441719 rhn-package-441721 rhn-package-441722 rhn-package-441723 rhn-package-441724 rhn-package-441725 rhn-package-441726 rhn-package-441727 rhn-package-441728 rhn-package-441729 rhn-package-441730 rhn-package-441731 rhn-package-441732 rhn-package-441733 rhn-package-441734 rhn-package-441735 rhn-package-441736 rhn-package-441737 rhn-package-441738 rhn-package-441747 rhn-package-441748 rhn-package-441749 rhn-package-441750 rhn-package-441751 rhn-package-441752 rhn-package-441753 rhn-package-441754 rhn-package-441755 rhn-package-441756 rhn-package-441757 rhn-package-441758 rhn-package-441759 rhn-package-441760 rhn-package-441761 rhn-package-441762 rhn-package-441763 rhn-package-441764 rhn-package-441765 rhn-package-441768 rhn-package-441769 rhn-package-441770 rhn-package-441771 rhn-package-441772 rhn-package-441773 rhn-package-441774 rhn-package-441775 rhn-package-441776 rhn-package-441777 rhn-package-441778 rhn-package-441779 rhn-package-441780 rhn-package-441781 rhn-package-441782 rhn-package-441783 rhn-package-441784 rhn-package-441785 rhn-package-441786 rhn-package-441787 rhn-package-441788 rhn-package-441789 rhn-package-441791 rhn-package-441792 rhn-package-441793 rhn-package-441794 rhn-package-441795 rhn-package-441796 rhn-package-441797 rhn-package-441800 rhn-package-441801 rhn-package-441802 rhn-package-441803 rhn-package-441804 rhn-package-441805 rhn-package-441806 rhn-package-441807 rhn-package-441808 rhn-package-441809 rhn-package-441810 rhn-package-441811 rhn-package-441812 rhn-package-441813 rhn-package-441814 rhn-package-441815 rhn-package-441816 rhn-package-441817 rhn-package-441818 rhn-package-441819 rhn-package-441820 rhn-package-441821 rhn-package-441822 rhn-package-441823 rhn-package-441824 rhn-package-441826 rhn-package-441827 rhn-package-441828 rhn-package-441829 rhn-package-441830 rhn-package-441831 rhn-package-441832 rhn-package-441833 rhn-package-441835 rhn-package-441836 rhn-package-441837 rhn-package-441838 rhn-package-441839 rhn-package-441840 rhn-package-441841 rhn-package-441842 rhn-package-441843 rhn-package-441844 rhn-package-441845 rhn-package-441846 rhn-package-441847 rhn-package-441848 rhn-package-441849 rhn-package-441850 rhn-package-441851 rhn-package-441852 rhn-package-441853 rhn-package-441854 rhn-package-441855 rhn-package-441856 rhn-package-441857 rhn-package-441858 rhn-package-441859 rhn-package-441860 rhn-package-441861 rhn-package-441862 rhn-package-441863 rhn-package-441864 rhn-package-441865 rhn-package-441866 rhn-package-441867 rhn-package-441868 rhn-package-441869 rhn-package-441870 rhn-package-441871 rhn-package-441872 rhn-package-441873 rhn-package-441874 rhn-package-441875 rhn-package-441876 rhn-package-441879 rhn-package-441880 rhn-package-441881 rhn-package-441882 rhn-package-441883 rhn-package-441884 rhn-package-441885 rhn-package-441886 rhn-package-441887 rhn-package-441888 rhn-package-441889 rhn-package-441890 rhn-package-441891 rhn-package-441892 rhn-package-441893 rhn-package-441894 rhn-package-441895 rhn-package-441896 rhn-package-441897 rhn-package-441898 rhn-package-441899 rhn-package-441901 rhn-package-441904 rhn-package-441905 rhn-package-441906 rhn-package-441907 rhn-package-441908 rhn-package-441909 rhn-package-441910 rhn-package-441911 rhn-package-441912 rhn-package-441913 rhn-package-441915 rhn-package-441916 rhn-package-441917 rhn-package-441918 rhn-package-441919 rhn-package-441920 rhn-package-441921 rhn-package-441922 rhn-package-441923 rhn-package-441924 rhn-package-441925 rhn-package-441926 rhn-package-441927 rhn-package-441928 rhn-package-441929 rhn-package-441930 rhn-package-441931 rhn-package-441932 rhn-package-441933 rhn-package-441934 rhn-package-441935 rhn-package-441936 rhn-package-441937 rhn-package-441938 rhn-package-441939 rhn-package-441941 rhn-package-441942 rhn-package-441968 rhn-package-441977 rhn-package-441978 rhn-package-441980 rhn-package-441996 rhn-package-441997 rhn-package-441998 rhn-package-442022 rhn-package-442023 rhn-package-442037 rhn-package-442051 rhn-package-442167 rhn-package-442178 rhn-package-442263 rhn-package-442298 rhn-package-442310 rhn-package-442312 rhn-package-442326 rhn-package-442354 rhn-package-442362 rhn-package-442382 rhn-package-442385 rhn-package-442407 rhn-package-442408 rhn-package-442454 rhn-package-442455 rhn-package-442501 rhn-package-442503 rhn-package-442514 rhn-package-442524 rhn-package-442526 rhn-package-442530 rhn-package-442534 rhn-package-442536 rhn-package-442537 rhn-package-442540 rhn-package-442549 rhn-package-442550 rhn-package-442555 rhn-package-443389 rhn-package-443391 rhn-package-443392 rhn-package-444065 rhn-package-444126 rhn-package-444143 rhn-package-444146 rhn-package-444212 rhn-package-444219 rhn-package-444225 rhn-package-444232 rhn-package-444239 rhn-package-444343 rhn-package-444431 rhn-package-444437 rhn-package-444446 rhn-package-444447 rhn-package-446645 rhn-package-446655 rhn-package-446656 rhn-package-446657 rhn-package-446662 rhn-package-446675 rhn-package-446679 rhn-package-446766 rhn-package-446769 rhn-package-446772 rhn-package-446782 rhn-package-446843 rhn-package-446846 rhn-package-446849 rhn-package-446854 rhn-package-446861 rhn-package-446862 rhn-package-446863 rhn-package-446866 rhn-package-446867 rhn-package-446873 rhn-package-446888 rhn-package-446903 rhn-package-446911 rhn-package-446913 rhn-package-446919 rhn-package-447096 rhn-package-447131 rhn-package-447137 rhn-package-447143 rhn-package-447144 rhn-package-447262 rhn-package-447267 rhn-package-447403 rhn-package-447435 rhn-package-447634 rhn-package-447641 rhn-package-447650 rhn-package-447651 rhn-package-447653 rhn-package-447657 rhn-package-447660 rhn-package-447789 rhn-package-447795 rhn-package-447799 rhn-package-447805 rhn-package-447813 rhn-package-447821 rhn-package-448454 rhn-package-448461 rhn-package-448465 rhn-package-448501 rhn-package-448506 rhn-package-448509 rhn-package-448516 rhn-package-448526 rhn-package-448537 rhn-package-448538 rhn-package-448542 rhn-package-448549 rhn-package-448551 rhn-package-448553 rhn-package-448560 rhn-package-448581 rhn-package-448582 rhn-package-448589 rhn-package-448590 rhn-package-448601 rhn-package-448607 rhn-package-448617 rhn-package-448627 rhn-package-448630 rhn-package-448632 rhn-package-448636 rhn-package-448663 rhn-package-448665 rhn-package-448667 rhn-package-448670 rhn-package-448685 rhn-package-448687 rhn-package-448704 rhn-package-448723 rhn-package-448749 rhn-package-448774 rhn-package-448780 rhn-package-448788 rhn-package-448817 rhn-package-448830 rhn-package-449054 rhn-package-449061 rhn-package-449068 rhn-package-449069 rhn-package-449070 rhn-package-449071 rhn-package-449072 rhn-package-449073 rhn-package-449074 rhn-package-449075 rhn-package-449076 rhn-package-449077 rhn-package-449078 rhn-package-449079 rhn-package-449080 rhn-package-449081 rhn-package-449082 rhn-package-449083 rhn-package-449084 rhn-package-449085 rhn-package-449086 rhn-package-449087 rhn-package-449088 rhn-package-449089 rhn-package-449090 rhn-package-449124 rhn-package-449125 rhn-package-449128 rhn-package-449129 rhn-package-449133 rhn-package-449139 rhn-package-449141 rhn-package-449142 rhn-package-449148 rhn-package-449160 rhn-package-449358 rhn-package-449705 rhn-package-449709 rhn-package-449712 rhn-package-449714 rhn-package-449718 rhn-package-449723 rhn-package-449732 rhn-package-449945 rhn-package-449950 rhn-package-449952 rhn-package-449953 rhn-package-449959 rhn-package-449960 rhn-package-450117 rhn-package-450122 rhn-package-450128 rhn-package-450131 rhn-package-450145 rhn-package-450149 rhn-package-450161 rhn-package-450164 rhn-package-450166 rhn-package-450168 rhn-package-450169 rhn-package-450185 rhn-package-450207 rhn-package-450263 rhn-package-450269 rhn-package-450278 rhn-package-450284 rhn-package-450286 rhn-package-450310 rhn-package-450321 rhn-package-450324 rhn-package-450399 rhn-package-450401 rhn-package-450403 rhn-package-450404 rhn-package-450412 rhn-package-450414 rhn-package-450420 rhn-package-450426 rhn-package-450496 rhn-package-450501 rhn-package-450507 rhn-package-450510 rhn-package-450849 rhn-package-450853 rhn-package-450857 rhn-package-450867 rhn-package-450870 rhn-package-450872 rhn-package-450875 rhn-package-450884 rhn-package-450887 rhn-package-450989 rhn-package-450990 rhn-package-450997 rhn-package-450999 rhn-package-451115 rhn-package-451117 rhn-package-451118 rhn-package-451125 rhn-package-451128 rhn-package-451129 rhn-package-451132 rhn-package-451134 rhn-package-451136 rhn-package-451140 rhn-package-451141 rhn-package-451142 rhn-package-451147 rhn-package-451149 rhn-package-451155 rhn-package-451159 rhn-package-451168 rhn-package-451178 rhn-package-451179 rhn-package-451490 rhn-package-451495 rhn-package-451499 rhn-package-451501 rhn-package-451510 rhn-package-451521 rhn-package-451524 rhn-package-451531 rhn-package-451546 rhn-package-453863 rhn-package-453870 rhn-package-453873 rhn-package-453879 rhn-package-453887 rhn-package-454061 rhn-package-454325 rhn-package-454452 rhn-package-454453 rhn-package-454455 rhn-package-454457 rhn-package-454467 rhn-package-454481 rhn-package-454486 rhn-package-454491 rhn-package-454496 rhn-package-454593 rhn-package-454603 rhn-package-454607 rhn-package-454631 rhn-package-454768 rhn-package-454773 rhn-package-454776 rhn-package-454780 rhn-package-454783 rhn-package-454785 rhn-package-454793 rhn-package-454794 rhn-package-454800 rhn-package-454804 rhn-package-454952 rhn-package-454955 rhn-package-454956 rhn-package-454963 rhn-package-454980 rhn-package-454982 rhn-package-454993 rhn-package-454996 rhn-package-455153 rhn-package-455171 rhn-package-455223 rhn-package-455225 rhn-package-455226 rhn-package-455302 rhn-package-455313 rhn-package-455339 rhn-package-455352 rhn-package-455357 rhn-package-455602 rhn-package-455605 rhn-package-455607 rhn-package-455701 rhn-package-455702 rhn-package-455708 rhn-package-455710 rhn-package-455771 rhn-package-455773 rhn-package-455774 rhn-package-455966 rhn-package-456001 rhn-package-456005 rhn-package-456008 rhn-package-456009 rhn-package-456013 rhn-package-456026 rhn-package-456226 rhn-package-456230 rhn-package-456234 rhn-package-456243 rhn-package-456247 rhn-package-456253 rhn-package-456254 rhn-package-456256 rhn-package-456265 rhn-package-456276 rhn-package-456279 rhn-package-456342 rhn-package-456344 rhn-package-456412 rhn-package-456432 rhn-package-456449 rhn-package-456455 rhn-package-456456 rhn-package-456533 rhn-package-456537 rhn-package-456540 rhn-package-456543 rhn-package-456547 rhn-package-456557 rhn-package-457416 rhn-package-457419 rhn-package-457423 rhn-package-458031 rhn-package-458034 rhn-package-458039 rhn-package-458158 rhn-package-458161 rhn-package-458178 rhn-package-458181 rhn-package-458189 rhn-package-458382 rhn-package-458383 rhn-package-458384 rhn-package-458394 rhn-package-458398 rhn-package-458410 rhn-package-458411 rhn-package-458413 rhn-package-458419 rhn-package-458427 rhn-package-458439 rhn-package-458588 rhn-package-458589 rhn-package-458591 rhn-package-458594 rhn-package-458598 rhn-package-458599 rhn-package-458607 rhn-package-458609 rhn-package-458610 rhn-package-458611 rhn-package-458612 rhn-package-458622 rhn-package-458624 rhn-package-458633 rhn-package-458637 rhn-package-458644 rhn-package-458680 rhn-package-458684 rhn-package-458798 rhn-package-458871 rhn-package-458895 rhn-package-458904 rhn-package-458922 rhn-package-458942 rhn-package-458943 rhn-package-458944 rhn-package-458949 rhn-package-458962 rhn-package-458963 rhn-package-458964 rhn-package-458969 rhn-package-458990 rhn-package-459233 rhn-package-459236 rhn-package-459237 rhn-package-459255 rhn-package-459256 rhn-package-459257 rhn-package-459258 rhn-package-459259 rhn-package-459260 rhn-package-459261 rhn-package-459262 rhn-package-459263 rhn-package-459266 rhn-package-459304 rhn-package-459430 rhn-package-459443 rhn-package-459445 rhn-package-459460 rhn-package-459490 rhn-package-459492 rhn-package-459807 rhn-package-459808 rhn-package-459812 rhn-package-459813 rhn-package-459814 rhn-package-459819 rhn-package-459879 rhn-package-459888 rhn-package-459891 rhn-package-459892 rhn-package-459901 rhn-package-459906 rhn-package-459910 rhn-package-459914 rhn-package-459916 rhn-package-459917 rhn-package-459930 rhn-package-459932 rhn-package-459934 rhn-package-459942 rhn-package-460233 rhn-package-460234 rhn-package-460237 rhn-package-460254 rhn-package-460255 rhn-package-460270 rhn-package-460297 rhn-package-460298 rhn-package-460307 rhn-package-460309 rhn-package-460325 rhn-package-460334 rhn-package-460418 rhn-package-460759 rhn-package-463513 rhn-package-463525 rhn-package-463535 rhn-package-463550 rhn-package-463580 rhn-package-463595 rhn-package-463598 rhn-package-463601 rhn-package-463602 rhn-package-463606 rhn-package-463608 rhn-package-463610 rhn-package-463616 rhn-package-463622 rhn-package-463630 rhn-package-463648 rhn-package-463649 rhn-package-463652 rhn-package-464556 rhn-package-464581 rhn-package-464593 rhn-package-464596 rhn-package-464767 rhn-package-464768 rhn-package-464774 rhn-package-464795 rhn-package-464808 rhn-package-464810 rhn-package-464814 rhn-package-464854 rhn-package-464856 rhn-package-464858 rhn-package-464861 rhn-package-464862 rhn-package-464866 rhn-package-464873 rhn-package-464875 rhn-package-464880 rhn-package-464883 rhn-package-465046 rhn-package-465050 rhn-package-465052 rhn-package-465054 rhn-package-465056 rhn-package-465067 rhn-package-465078 rhn-package-465079 rhn-package-465092 rhn-package-465095 rhn-package-465110 rhn-package-465199 rhn-package-465204 rhn-package-465234 rhn-package-465412 rhn-package-465415 rhn-package-465417 rhn-package-465420 rhn-package-465491 rhn-package-465493 rhn-package-465503 rhn-package-465504 rhn-package-465615 rhn-package-465618 rhn-package-465896 rhn-package-465905 rhn-package-465906 rhn-package-465927 rhn-package-465929 rhn-package-465932 rhn-package-465933 rhn-package-465939 rhn-package-465949 rhn-package-465950 rhn-package-466114 rhn-package-466119 rhn-package-466121 rhn-package-466122 rhn-package-466128 rhn-package-466140 rhn-package-466147 rhn-package-466165 rhn-package-466186 rhn-package-466480 rhn-package-466483 rhn-package-466515 rhn-package-466583 rhn-package-466659 rhn-package-466661 rhn-package-466670 rhn-package-466679 rhn-package-466699 rhn-package-466707 rhn-package-466708 rhn-package-466711 rhn-package-466713 rhn-package-466715 rhn-package-466716 rhn-package-466718 rhn-package-466730 rhn-package-466732 rhn-package-466866 rhn-package-466875 rhn-package-466876 rhn-package-466878 rhn-package-466900 rhn-package-466902 rhn-package-466915 rhn-package-466927 rhn-package-466935 rhn-package-466948 rhn-package-467190 rhn-package-467239 rhn-package-467249 rhn-package-467260 rhn-package-467266 rhn-package-467272 rhn-package-467316 rhn-package-467335 rhn-package-467341 rhn-package-467344 rhn-package-467353 rhn-package-467355 rhn-package-467360 rhn-package-467417 rhn-package-467424 rhn-package-467445 rhn-package-467448 rhn-package-467472 rhn-package-467482 rhn-package-467489 rhn-package-467491 rhn-package-467568 rhn-package-467571 rhn-package-467584 rhn-package-467589 rhn-package-467592 rhn-package-467597 rhn-package-467599 rhn-package-467600 rhn-package-467603 rhn-package-467609 rhn-package-467621 rhn-package-467625 rhn-package-467626 rhn-package-467632 rhn-package-467645 rhn-package-467655 rhn-package-467933 rhn-package-467959 rhn-package-467971 rhn-package-467984 rhn-package-467988 rhn-package-467992 rhn-package-468002 rhn-package-468005 rhn-package-468008 rhn-package-468009 rhn-package-468011 rhn-package-468012 rhn-package-468014 rhn-package-468016 rhn-package-468018 rhn-package-468024 rhn-package-468034 rhn-package-468037 rhn-package-468046 rhn-package-468050 rhn-package-468054 rhn-package-468079 rhn-package-468086 rhn-package-468096 rhn-package-468097 rhn-package-468107 rhn-package-468109 rhn-package-468111 rhn-package-468112 rhn-package-468114 rhn-package-468118 rhn-package-468121 rhn-package-468123 rhn-package-468125 rhn-package-468129 rhn-package-468132 rhn-package-468139 rhn-package-468140 rhn-package-468145 rhn-package-468150 rhn-package-468163 rhn-package-468165 rhn-package-468180 rhn-package-468181 rhn-package-468195 rhn-package-468199 rhn-package-468204 rhn-package-468206 rhn-package-468208 rhn-package-468209 rhn-package-468230 rhn-package-468236 rhn-package-468239 rhn-package-468247 rhn-package-468252 rhn-package-468261 rhn-package-468263 rhn-package-468265 rhn-package-468266 rhn-package-468274 rhn-package-468278 rhn-package-468281 rhn-package-468284 rhn-package-468286 rhn-package-468288 rhn-package-468289 rhn-package-468294 rhn-package-468304 rhn-package-468306 rhn-package-468307 rhn-package-468315 rhn-package-468318 rhn-package-468323 rhn-package-468324 rhn-package-468328 rhn-package-468329 rhn-package-468336 rhn-package-468338 rhn-package-468340 rhn-package-468350 rhn-package-468352 rhn-package-468353 rhn-package-468355 rhn-package-468359 rhn-package-468361 rhn-package-468364 rhn-package-468366 rhn-package-468370 rhn-package-468378 rhn-package-468385 rhn-package-468388 rhn-package-468400 rhn-package-468405 rhn-package-468408 rhn-package-468434 rhn-package-468435 rhn-package-468442 rhn-package-468444 rhn-package-468445 rhn-package-468446 rhn-package-468454 rhn-package-468456 rhn-package-468458 rhn-package-468471 rhn-package-468473 rhn-package-468479 rhn-package-468485 rhn-package-468492 rhn-package-468498 rhn-package-468503 rhn-package-468515 rhn-package-468519 rhn-package-468520 rhn-package-468526 rhn-package-468551 rhn-package-468552 rhn-package-468560 rhn-package-468563 rhn-package-468565 rhn-package-468566 rhn-package-468567 rhn-package-468568 rhn-package-468569 rhn-package-468571 rhn-package-468579 rhn-package-468583 rhn-package-468594 rhn-package-468603 rhn-package-468604 rhn-package-468605 rhn-package-468607 rhn-package-468611 rhn-package-468613 rhn-package-468622 rhn-package-468623 rhn-package-468624 rhn-package-468627 rhn-package-468629 rhn-package-468632 rhn-package-468640 rhn-package-468654 rhn-package-468658 rhn-package-468659 rhn-package-468660 rhn-package-468664 rhn-package-468665 rhn-package-468679 rhn-package-468688 rhn-package-468689 rhn-package-468693 rhn-package-468697 rhn-package-468700 rhn-package-468702 rhn-package-468703 rhn-package-468706 rhn-package-468712 rhn-package-468722 rhn-package-468729 rhn-package-468730 rhn-package-468736 rhn-package-468751 rhn-package-468766 rhn-package-468767 rhn-package-468768 rhn-package-468769 rhn-package-468771 rhn-package-468779 rhn-package-468803 rhn-package-468812 rhn-package-468819 rhn-package-468829 rhn-package-468832 rhn-package-468843 rhn-package-468860 rhn-package-468862 rhn-package-468870 rhn-package-468881 rhn-package-468884 rhn-package-468886 rhn-package-468894 rhn-package-468898 rhn-package-468902 rhn-package-468907 rhn-package-468922 rhn-package-468927 rhn-package-468934 rhn-package-468936 rhn-package-468938 rhn-package-468949 rhn-package-468952 rhn-package-468953 rhn-package-468961 rhn-package-468964 rhn-package-468965 rhn-package-468967 rhn-package-468990 rhn-package-468993 rhn-package-468994 rhn-package-469008 rhn-package-469009 rhn-package-469016 rhn-package-469021 rhn-package-469022 rhn-package-469023 rhn-package-469026 rhn-package-469039 rhn-package-469040 rhn-package-469042 rhn-package-469048 rhn-package-469049 rhn-package-469052 rhn-package-469058 rhn-package-469064 rhn-package-469070 rhn-package-469075 rhn-package-469076 rhn-package-469084 rhn-package-469103 rhn-package-469106 rhn-package-469109 rhn-package-469110 rhn-package-469117 rhn-package-469122 rhn-package-469127 rhn-package-469136 rhn-package-469137 rhn-package-469150 rhn-package-469151 rhn-package-469173 rhn-package-469177 rhn-package-469180 rhn-package-469190 rhn-package-469192 rhn-package-469200 rhn-package-469203 rhn-package-469207 rhn-package-469221 rhn-package-469223 rhn-package-469232 rhn-package-469234 rhn-package-469238 rhn-package-469243 rhn-package-469245 rhn-package-469254 rhn-package-469262 rhn-package-469264 rhn-package-469272 rhn-package-469275 rhn-package-469277 rhn-package-469283 rhn-package-469289 rhn-package-469312 rhn-package-469326 rhn-package-469332 rhn-package-469335 rhn-package-469346 rhn-package-469350 rhn-package-469366 rhn-package-469397 rhn-package-469405 rhn-package-469409 rhn-package-469412 rhn-package-469425 rhn-package-469427 rhn-package-469437 rhn-package-469438 rhn-package-469439 rhn-package-469440 rhn-package-469442 rhn-package-469444 rhn-package-469457 rhn-package-469460 rhn-package-469463 rhn-package-469465 rhn-package-469477 rhn-package-469481 rhn-package-469487 rhn-package-469490 rhn-package-469492 rhn-package-469493 rhn-package-469495 rhn-package-469519 rhn-package-469532 rhn-package-469536 rhn-package-469541 rhn-package-469542 rhn-package-469544 rhn-package-469548 rhn-package-469555 rhn-package-469557 rhn-package-469558 rhn-package-469565 rhn-package-469568 rhn-package-469572 rhn-package-469579 rhn-package-469583 rhn-package-469585 rhn-package-469590 rhn-package-469599 rhn-package-469609 rhn-package-469613 rhn-package-469621 rhn-package-469624 rhn-package-469626 rhn-package-469629 rhn-package-469631 rhn-package-469633 rhn-package-469637 rhn-package-469645 rhn-package-469647 rhn-package-469650 rhn-package-469670 rhn-package-469677 rhn-package-469697 rhn-package-469702 rhn-package-469704 rhn-package-469712 rhn-package-469732 rhn-package-469741 rhn-package-469747 rhn-package-469750 rhn-package-469752 rhn-package-469753 rhn-package-469754 rhn-package-469755 rhn-package-469773 rhn-package-469776 rhn-package-469790 rhn-package-469791 rhn-package-469795 rhn-package-469796 rhn-package-469801 rhn-package-469803 rhn-package-469806 rhn-package-469811 rhn-package-469823 rhn-package-469826 rhn-package-469843 rhn-package-469850 rhn-package-469853 rhn-package-469865 rhn-package-469868 rhn-package-469870 rhn-package-469872 rhn-package-469883 rhn-package-469886 rhn-package-469890 rhn-package-469892 rhn-package-469901 rhn-package-469905 rhn-package-469906 rhn-package-469910 rhn-package-469916 rhn-package-469923 rhn-package-469925 rhn-package-469929 rhn-package-469941 rhn-package-469943 rhn-package-469944 rhn-package-469947 rhn-package-469967 rhn-package-469968 rhn-package-469976 rhn-package-469977 rhn-package-469978 rhn-package-469981 rhn-package-469985 rhn-package-469995 rhn-package-469999 rhn-package-470002 rhn-package-470006 rhn-package-470024 rhn-package-470029 rhn-package-470053 rhn-package-470054 rhn-package-470056 rhn-package-470057 rhn-package-470064 rhn-package-470067 rhn-package-470069 rhn-package-470089 rhn-package-470094 rhn-package-470104 rhn-package-470124 rhn-package-470126 rhn-package-470130 rhn-package-470133 rhn-package-470142 rhn-package-470148 rhn-package-470162 rhn-package-470164 rhn-package-470165 rhn-package-470166 rhn-package-470172 rhn-package-470174 rhn-package-470176 rhn-package-470187 rhn-package-470188 rhn-package-470190 rhn-package-470195 rhn-package-470197 rhn-package-470200 rhn-package-470205 rhn-package-470206 rhn-package-470209 rhn-package-470214 rhn-package-470219 rhn-package-470220 rhn-package-470221 rhn-package-470224 rhn-package-470225 rhn-package-470228 rhn-package-470232 rhn-package-470235 rhn-package-470243 rhn-package-470246 rhn-package-470247 rhn-package-470249 rhn-package-470253 rhn-package-470254 rhn-package-470259 rhn-package-470260 rhn-package-470277 rhn-package-470280 rhn-package-470285 rhn-package-470286 rhn-package-470291 rhn-package-470305 rhn-package-470308 rhn-package-470315 rhn-package-470317 rhn-package-470318 rhn-package-470329 rhn-package-470331 rhn-package-470332 rhn-package-470342 rhn-package-470349 rhn-package-470354 rhn-package-470358 rhn-package-470359 rhn-package-470362 rhn-package-470366 rhn-package-470369 rhn-package-470373 rhn-package-470375 rhn-package-470384 rhn-package-470388 rhn-package-470397 rhn-package-470400 rhn-package-470401 rhn-package-470403 rhn-package-470407 rhn-package-470412 rhn-package-470417 rhn-package-470433 rhn-package-470434 rhn-package-470440 rhn-package-470446 rhn-package-470449 rhn-package-470469 rhn-package-470471 rhn-package-470472 rhn-package-470474 rhn-package-470482 rhn-package-470496 rhn-package-470497 rhn-package-470506 rhn-package-470514 rhn-package-470526 rhn-package-470537 rhn-package-470547 rhn-package-470565 rhn-package-470568 rhn-package-470571 rhn-package-470574 rhn-package-470945 rhn-package-471604 rhn-package-471605 rhn-package-471614 rhn-package-471618 rhn-package-471619 rhn-package-471633 rhn-package-471640 rhn-package-471651 rhn-package-471956 rhn-package-472049 rhn-package-472057 rhn-package-472094 rhn-package-472095 rhn-package-472101 rhn-package-472102 rhn-package-472108 rhn-package-472109 rhn-package-472111 rhn-package-472113 rhn-package-472119 rhn-package-472123 rhn-package-472211 rhn-package-472215 rhn-package-472216 rhn-package-472229 rhn-package-472233 rhn-package-472238 rhn-package-472265 rhn-package-472272 rhn-package-472291 rhn-package-472428 rhn-package-472458 rhn-package-472546 rhn-package-472621 rhn-package-472628 rhn-package-472670 rhn-package-472686 rhn-package-472712 rhn-package-472727 rhn-package-472778 rhn-package-472783 rhn-package-472784 rhn-package-472794 rhn-package-474748 rhn-package-474754 rhn-package-474755 rhn-package-475008 rhn-package-475010 rhn-package-475011 rhn-package-475019 rhn-package-475100 rhn-package-475115 rhn-package-475131 rhn-package-475132 rhn-package-475133 rhn-package-475225 rhn-package-475228 rhn-package-475234 rhn-package-475263 rhn-package-475267 rhn-package-475268 rhn-package-475283 rhn-package-475314 rhn-package-475340 rhn-package-475352 rhn-package-475353 rhn-package-475937 rhn-package-475938 rhn-package-476031 rhn-package-476032 rhn-package-476041 rhn-package-476046 rhn-package-476059 rhn-package-476060 rhn-package-476062 rhn-package-476089 rhn-package-476091 rhn-package-476095 rhn-package-476096 rhn-package-476098 rhn-package-476250 rhn-package-476251 rhn-package-476264 rhn-package-476266 rhn-package-476275 rhn-package-476538 rhn-package-476540 rhn-package-476546 rhn-package-476565 rhn-package-476574 rhn-package-476577 rhn-package-476584 rhn-package-476596 rhn-package-476597 rhn-package-476598 rhn-package-476605 rhn-package-476606 rhn-package-476607 rhn-package-476616 rhn-package-476620 rhn-package-476621 rhn-package-476626 rhn-package-476634 rhn-package-476643 rhn-package-476644 rhn-package-476645 rhn-package-476650 rhn-package-476653 rhn-package-476658 rhn-package-476661 rhn-package-476662 rhn-package-476667 rhn-package-476676 rhn-package-476679 rhn-package-476683 rhn-package-476949 rhn-package-476953 rhn-package-477036 rhn-package-477037 rhn-package-477054 rhn-package-477055 rhn-package-477058 rhn-package-477059 rhn-package-477065 rhn-package-477067 rhn-package-477074 rhn-package-477075 rhn-package-477076 rhn-package-477078 rhn-package-477084 rhn-package-477086 rhn-package-477088 rhn-package-477090 rhn-package-477092 rhn-package-477112 rhn-package-477117 rhn-package-477118 rhn-package-477138 rhn-package-477288 rhn-package-477294 rhn-package-477299 rhn-package-477302 rhn-package-477367 rhn-package-477371 rhn-package-477372 rhn-package-477373 rhn-package-477374 rhn-package-477380 rhn-package-477383 rhn-package-477395 rhn-package-477397 rhn-package-477404 rhn-package-477413 rhn-package-477416 rhn-package-477422 rhn-package-477428 rhn-package-477530 rhn-package-477533 rhn-package-477540 rhn-package-477548 rhn-package-477555 rhn-package-477652 rhn-package-477656 rhn-package-477668 rhn-package-477676 rhn-package-477679 rhn-package-477682 rhn-package-477697 rhn-package-477699 rhn-package-477701 rhn-package-477708 rhn-package-477740 rhn-package-477746 rhn-package-477754 rhn-package-477779 rhn-package-477781 rhn-package-477786 rhn-package-477796 rhn-package-477855 rhn-package-477858 rhn-package-478145 rhn-package-478150 rhn-package-478160 rhn-package-478165 rhn-package-478178 rhn-package-478185 rhn-package-478191 rhn-package-478194 rhn-package-478195 rhn-package-478210 rhn-package-478214 rhn-package-478219 rhn-package-478220 rhn-package-478221 rhn-package-478230 rhn-package-478231 rhn-package-478246 rhn-package-478247 rhn-package-478251 rhn-package-478392 rhn-package-478394 rhn-package-478396 rhn-package-478408 rhn-package-478482 rhn-package-478484 rhn-package-478497 rhn-package-478566 rhn-package-478603 rhn-package-478616 rhn-package-478886 rhn-package-478896 rhn-package-478900 rhn-package-478908 rhn-package-478911 rhn-package-478917 rhn-package-478925 rhn-package-479001 rhn-package-479002 rhn-package-479006 rhn-package-479007 rhn-package-479012 rhn-package-479014 rhn-package-479018 rhn-package-479019 rhn-package-479023 rhn-package-479033 rhn-package-479047 rhn-package-479054 rhn-package-479056 rhn-package-479058 rhn-package-479063 rhn-package-479072 rhn-package-479074 rhn-package-479197 rhn-package-479210 rhn-package-479248 rhn-package-479286 rhn-package-479298 rhn-package-479301 rhn-package-479302 rhn-package-479327 rhn-package-479335 rhn-package-479338 rhn-package-479340 rhn-package-479341 rhn-package-480977 rhn-package-481050 rhn-package-481235 rhn-package-481238 rhn-package-481248 rhn-package-481437 rhn-package-481439 rhn-package-481447 rhn-package-481952 rhn-package-482053 rhn-package-482059 rhn-package-482061 rhn-package-482066 rhn-package-482074 rhn-package-482075 rhn-package-482086 rhn-package-482091 rhn-package-482094 rhn-package-482100 rhn-package-482102 rhn-package-482106 rhn-package-482107 rhn-package-482113 rhn-package-482114 rhn-package-482187 rhn-package-482189 rhn-package-482202 rhn-package-482206 rhn-package-482207 rhn-package-482227 rhn-package-482229 rhn-package-482234 rhn-package-482245 rhn-package-482374 rhn-package-482376 rhn-package-482386 rhn-package-482387 rhn-package-482391 rhn-package-482393 rhn-package-482514 rhn-package-482555 rhn-package-482557 rhn-package-482560 rhn-package-482562 rhn-package-482744 rhn-package-482805 rhn-package-482808 rhn-package-482828 rhn-package-482832 rhn-package-482835 rhn-package-482846 rhn-package-482848 rhn-package-482858 rhn-package-482875 rhn-package-482876 rhn-package-482878 rhn-package-482882 rhn-package-482884 rhn-package-482886 rhn-package-482892 rhn-package-482896 rhn-package-482905 rhn-package-482909 rhn-package-482930 rhn-package-482931 rhn-package-482933 rhn-package-482969 rhn-package-482973 rhn-package-482982 rhn-package-482987 rhn-package-482991 rhn-package-482994 rhn-package-482995 rhn-package-483006 rhn-package-483019 rhn-package-483031 rhn-package-483039 rhn-package-483056 rhn-package-483294 rhn-package-483301 rhn-package-483305 rhn-package-483309 rhn-package-483315 rhn-package-483318 rhn-package-483325 rhn-package-483327 rhn-package-483331 rhn-package-483333 rhn-package-483337 rhn-package-483350 rhn-package-483352 rhn-package-483356 rhn-package-483358 rhn-package-483360 rhn-package-483366 rhn-package-483377 rhn-package-483379 rhn-package-483392 rhn-package-483396 rhn-package-483407 rhn-package-483431 rhn-package-483432 rhn-package-483434 rhn-package-483435 rhn-package-483448 rhn-package-483497 rhn-package-483503 rhn-package-483505 rhn-package-483513 rhn-package-483522 rhn-package-483524 rhn-package-483577 rhn-package-483578 rhn-package-483582 rhn-package-483648 rhn-package-483701 rhn-package-483702 rhn-package-483705 rhn-package-483706 rhn-package-483714 rhn-package-483715 rhn-package-483717 rhn-package-483718 rhn-package-483722 rhn-package-483732 rhn-package-486587 rhn-package-486589 rhn-package-486590 rhn-package-486597 rhn-package-486601 rhn-package-486610 rhn-package-486614 rhn-package-486620 rhn-package-486631 rhn-package-486632 rhn-package-486696 rhn-package-486716 rhn-package-486717 rhn-package-486719 rhn-package-486722 rhn-package-486727 rhn-package-486736 rhn-package-486761 rhn-package-486764 rhn-package-486788 rhn-package-486937 rhn-package-486938 rhn-package-486946 rhn-package-486948 rhn-package-486983 rhn-package-486988 rhn-package-486991 rhn-package-486993 rhn-package-487042 rhn-package-487044 rhn-package-487048 rhn-package-487049 rhn-package-487051 rhn-package-487052 rhn-package-487053 rhn-package-487061 rhn-package-487066 rhn-package-487072 rhn-package-487348 rhn-package-487357 rhn-package-487414 rhn-package-487416 rhn-package-487417 rhn-package-487420 rhn-package-487433 rhn-package-487441 rhn-package-487465 rhn-package-487471 rhn-package-487478 rhn-package-487480 rhn-package-487481 rhn-package-487486 rhn-package-487490 rhn-package-487504 rhn-package-487506 rhn-package-487507 rhn-package-487514 rhn-package-487523 rhn-package-487535 rhn-package-487536 rhn-package-487537 rhn-package-487649 rhn-package-487786 rhn-package-487883 rhn-package-487884 rhn-package-487887 rhn-package-487890 rhn-package-487991 rhn-package-487992 rhn-package-487997 rhn-package-488004 rhn-package-488008 rhn-package-488010 rhn-package-488023 rhn-package-488027 rhn-package-488125 rhn-package-488126 rhn-package-488129 rhn-package-488133 rhn-package-488139 rhn-package-488140 rhn-package-488147 rhn-package-488151 rhn-package-488329 rhn-package-488335 rhn-package-488338 rhn-package-488344 rhn-package-488435 rhn-package-488436 rhn-package-488438 rhn-package-488442 rhn-package-488449 rhn-package-488450 rhn-package-488451 rhn-package-488453 rhn-package-488455 rhn-package-488467 rhn-package-488581 rhn-package-488584 rhn-package-488586 rhn-package-488587 rhn-package-488588 rhn-package-488671 rhn-package-488675 rhn-package-488680 rhn-package-488682 rhn-package-488685 rhn-package-488687 rhn-package-488693 rhn-package-488709 rhn-package-488729 rhn-package-488730 rhn-package-488734 rhn-package-488748 rhn-package-488751 rhn-package-488779 rhn-package-488780 rhn-package-488790 rhn-package-488791 rhn-package-488793 rhn-package-488797 rhn-package-488862 rhn-package-488867 rhn-package-488900 rhn-package-489006 rhn-package-489026 rhn-package-489135 rhn-package-489194 rhn-package-489195 rhn-package-489196 rhn-package-489200 rhn-package-489205 rhn-package-489321 rhn-package-489324 rhn-package-489448 rhn-package-489453 rhn-package-489456 rhn-package-489457 rhn-package-489460 rhn-package-489463 rhn-package-489467 rhn-package-489470 rhn-package-489474 rhn-package-489479 rhn-package-489712 rhn-package-489715 rhn-package-489726 rhn-package-489748 rhn-package-489754 rhn-package-489755 rhn-package-489756 rhn-package-489758 rhn-package-489763 rhn-package-489764 rhn-package-489765 rhn-package-489775 rhn-package-489781 rhn-package-489784 rhn-package-489787 rhn-package-489788 rhn-package-489789 rhn-package-489790 rhn-package-489797 rhn-package-489798 rhn-package-489802 rhn-package-489809 rhn-package-489810 rhn-package-489814 rhn-package-489822 rhn-package-489824 rhn-package-489825 rhn-package-489829 rhn-package-489830 rhn-package-489831 rhn-package-489833 rhn-package-489834 rhn-package-489837 rhn-package-489843 rhn-package-489851 rhn-package-489852 rhn-package-489854 rhn-package-489855 rhn-package-489857 rhn-package-489864 rhn-package-489867 rhn-package-489870 rhn-package-489872 rhn-package-489875 rhn-package-489878 rhn-package-489885 rhn-package-489887 rhn-package-489889 rhn-package-489891 rhn-package-489898 rhn-package-489901 rhn-package-489902 rhn-package-489905 rhn-package-489906 rhn-package-489908 rhn-package-489909 rhn-package-489911 rhn-package-489912 rhn-package-489914 rhn-package-489915 rhn-package-489916 rhn-package-489918 rhn-package-489920 rhn-package-489922 rhn-package-489923 rhn-package-489924 rhn-package-489927 rhn-package-489931 rhn-package-489932 rhn-package-489937 rhn-package-489940 rhn-package-489943 rhn-package-489946 rhn-package-489947 rhn-package-489953 rhn-package-489958 rhn-package-489962 rhn-package-489963 rhn-package-489964 rhn-package-489967 rhn-package-489971 rhn-package-489973 rhn-package-489977 rhn-package-489978 rhn-package-489979 rhn-package-489983 rhn-package-489984 rhn-package-489986 rhn-package-489994 rhn-package-489997 rhn-package-489998 rhn-package-489999 rhn-package-490002 rhn-package-490004 rhn-package-490005 rhn-package-490010 rhn-package-490011 rhn-package-490013 rhn-package-490014 rhn-package-490015 rhn-package-490016 rhn-package-490019 rhn-package-490020 rhn-package-490022 rhn-package-490028 rhn-package-490029 rhn-package-490030 rhn-package-490036 rhn-package-490039 rhn-package-490040 rhn-package-490041 rhn-package-490043 rhn-package-490044 rhn-package-490048 rhn-package-490051 rhn-package-490053 rhn-package-490057 rhn-package-490060 rhn-package-490061 rhn-package-490063 rhn-package-490067 rhn-package-490069 rhn-package-490074 rhn-package-490076 rhn-package-490080 rhn-package-490088 rhn-package-490091 rhn-package-490097 rhn-package-490098 rhn-package-490099 rhn-package-490100 rhn-package-490102 rhn-package-490120 rhn-package-490121 rhn-package-490127 rhn-package-490130 rhn-package-490132 rhn-package-490134 rhn-package-490135 rhn-package-490136 rhn-package-490138 rhn-package-490144 rhn-package-490147 rhn-package-490149 rhn-package-490150 rhn-package-490151 rhn-package-490152 rhn-package-490158 rhn-package-490159 rhn-package-490167 rhn-package-490169 rhn-package-490172 rhn-package-490173 rhn-package-490175 rhn-package-490183 rhn-package-490185 rhn-package-490186 rhn-package-490192 rhn-package-490197 rhn-package-490198 rhn-package-490200 rhn-package-490203 rhn-package-490204 rhn-package-490205 rhn-package-490208 rhn-package-490212 rhn-package-490215 rhn-package-490216 rhn-package-490219 rhn-package-490223 rhn-package-490232 rhn-package-490234 rhn-package-490239 rhn-package-490242 rhn-package-490247 rhn-package-490249 rhn-package-490258 rhn-package-490260 rhn-package-490264 rhn-package-490266 rhn-package-490272 rhn-package-490274 rhn-package-490276 rhn-package-490277 rhn-package-490280 rhn-package-490285 rhn-package-490287 rhn-package-490292 rhn-package-490294 rhn-package-490299 rhn-package-490301 rhn-package-490311 rhn-package-490322 rhn-package-490323 rhn-package-490324 rhn-package-490331 rhn-package-490337 rhn-package-490342 rhn-package-490343 rhn-package-490346 rhn-package-490348 rhn-package-490351 rhn-package-490352 rhn-package-490354 rhn-package-490361 rhn-package-490363 rhn-package-490366 rhn-package-490368 rhn-package-490369 rhn-package-490375 rhn-package-490377 rhn-package-490378 rhn-package-490397 rhn-package-490402 rhn-package-490403 rhn-package-490416 rhn-package-490424 rhn-package-490433 rhn-package-490436 rhn-package-490438 rhn-package-490439 rhn-package-490440 rhn-package-490442 rhn-package-490451 rhn-package-490453 rhn-package-490458 rhn-package-490462 rhn-package-490465 rhn-package-490474 rhn-package-490476 rhn-package-490481 rhn-package-490488 rhn-package-490489 rhn-package-490490 rhn-package-490492 rhn-package-490498 rhn-package-490499 rhn-package-490500 rhn-package-490507 rhn-package-490509 rhn-package-490512 rhn-package-490513 rhn-package-490515 rhn-package-490521 rhn-package-490523 rhn-package-490528 rhn-package-490530 rhn-package-490534 rhn-package-490536 rhn-package-490546 rhn-package-490552 rhn-package-490553 rhn-package-490579 rhn-package-490581 rhn-package-490584 rhn-package-490587 rhn-package-490594 rhn-package-490596 rhn-package-490601 rhn-package-490605 rhn-package-490609 rhn-package-490610 rhn-package-490611 rhn-package-490615 rhn-package-490617 rhn-package-490618 rhn-package-490621 rhn-package-490624 rhn-package-490625 rhn-package-490627 rhn-package-490629 rhn-package-490634 rhn-package-490641 rhn-package-490651 rhn-package-490657 rhn-package-490663 rhn-package-490671 rhn-package-490678 rhn-package-490679 rhn-package-490685 rhn-package-490687 rhn-package-490690 rhn-package-490693 rhn-package-490699 rhn-package-490700 rhn-package-490704 rhn-package-490709 rhn-package-490711 rhn-package-490719 rhn-package-490726 rhn-package-490737 rhn-package-490739 rhn-package-490742 rhn-package-490745 rhn-package-490752 rhn-package-490756 rhn-package-490759 rhn-package-490776 rhn-package-490777 rhn-package-490783 rhn-package-490784 rhn-package-490785 rhn-package-490793 rhn-package-490800 rhn-package-490808 rhn-package-490814 rhn-package-490817 rhn-package-490823 rhn-package-490827 rhn-package-490829 rhn-package-490831 rhn-package-490844 rhn-package-490849 rhn-package-490850 rhn-package-490852 rhn-package-490861 rhn-package-490867 rhn-package-490870 rhn-package-490872 rhn-package-490880 rhn-package-490889 rhn-package-490897 rhn-package-490898 rhn-package-490906 rhn-package-490915 rhn-package-490924 rhn-package-490925 rhn-package-490931 rhn-package-490938 rhn-package-490943 rhn-package-490944 rhn-package-490945 rhn-package-490959 rhn-package-490961 rhn-package-490964 rhn-package-490965 rhn-package-490991 rhn-package-490998 rhn-package-491002 rhn-package-491003 rhn-package-491010 rhn-package-491014 rhn-package-491025 rhn-package-491031 rhn-package-491035 rhn-package-491039 rhn-package-491040 rhn-package-491055 rhn-package-491056 rhn-package-491064 rhn-package-491073 rhn-package-491074 rhn-package-491075 rhn-package-491080 rhn-package-491084 rhn-package-491088 rhn-package-491092 rhn-package-491098 rhn-package-491100 rhn-package-491101 rhn-package-491110 rhn-package-491113 rhn-package-491117 rhn-package-491126 rhn-package-491133 rhn-package-491135 rhn-package-491136 rhn-package-491137 rhn-package-491143 rhn-package-491160 rhn-package-491173 rhn-package-491175 rhn-package-491186 rhn-package-491188 rhn-package-491189 rhn-package-491196 rhn-package-491198 rhn-package-491201 rhn-package-491211 rhn-package-491216 rhn-package-491222 rhn-package-491226 rhn-package-491236 rhn-package-491243 rhn-package-491252 rhn-package-491253 rhn-package-491260 rhn-package-491261 rhn-package-491267 rhn-package-491268 rhn-package-491286 rhn-package-491290 rhn-package-491294 rhn-package-491318 rhn-package-491326 rhn-package-491331 rhn-package-491349 rhn-package-491364 rhn-package-491386 rhn-package-491397 rhn-package-491407 rhn-package-491410 rhn-package-491416 rhn-package-491428 rhn-package-491459 rhn-package-491464 rhn-package-491465 rhn-package-491484 rhn-package-491493 rhn-package-491499 rhn-package-491500 rhn-package-491539 rhn-package-491549 rhn-package-491558 rhn-package-491572 rhn-package-491617 rhn-package-491656 rhn-package-491669 rhn-package-491699 rhn-package-491715 rhn-package-491724 rhn-package-491743 rhn-package-491774 rhn-package-491795 rhn-package-491805 rhn-package-491829 rhn-package-491837 rhn-package-491840 rhn-package-491841 rhn-package-491853 rhn-package-491872 rhn-package-491883 rhn-package-491898 rhn-package-491914 rhn-package-491922 rhn-package-491931 rhn-package-491944 rhn-package-491950 rhn-package-491953 rhn-package-491977 rhn-package-491993 rhn-package-492014 rhn-package-492030 rhn-package-492033 rhn-package-492085 rhn-package-492093 rhn-package-492097 rhn-package-492130 rhn-package-492202 rhn-package-492206 rhn-package-492239 rhn-package-492292 rhn-package-492374 rhn-package-492575 rhn-package-492640 rhn-package-493060 rhn-package-493063 rhn-package-493064 rhn-package-493065 rhn-package-493069 rhn-package-493083 rhn-package-493085 rhn-package-493089 rhn-package-493100 rhn-package-493331 rhn-package-493339 rhn-package-493340 rhn-package-493342 rhn-package-493346 rhn-package-493362 rhn-package-493744 rhn-package-493750 rhn-package-493757 rhn-package-493758 rhn-package-493765 rhn-package-493773 rhn-package-493779 rhn-package-494060 rhn-package-494064 rhn-package-494065 rhn-package-494068 rhn-package-494101 rhn-package-494108 rhn-package-494213 rhn-package-494282 rhn-package-494291 rhn-package-494315 rhn-package-494330 rhn-package-494516 rhn-package-494522 rhn-package-494575 rhn-package-494576 rhn-package-494586 rhn-package-494648 rhn-package-494652 rhn-package-494654 rhn-package-494660 rhn-package-494666 rhn-package-494668 rhn-package-494673 rhn-package-494674 rhn-package-494676 rhn-package-494680 rhn-package-494687 rhn-package-494694 rhn-package-494729 rhn-package-494732 rhn-package-494736 rhn-package-494745 rhn-package-494762 rhn-package-494777 rhn-package-494960 rhn-package-494962 rhn-package-494994 rhn-package-495155 rhn-package-495165 rhn-package-495183 rhn-package-495201 rhn-package-495206 rhn-package-495211 rhn-package-495229 rhn-package-495230 rhn-package-495238 rhn-package-495239 rhn-package-495344 rhn-package-495349 rhn-package-495352 rhn-package-495353 rhn-package-495366 rhn-package-495372 rhn-package-495376 rhn-package-495445 rhn-package-495575 rhn-package-495579 rhn-package-495580 rhn-package-495581 rhn-package-495582 rhn-package-495583 rhn-package-495584 rhn-package-495791 rhn-package-495814 rhn-package-495817 rhn-package-495819 rhn-package-495847 rhn-package-495848 rhn-package-495850 rhn-package-495853 rhn-package-495870" channel-id="rhn-channel-6949"><rhn-channel-parent-channel><rhn-null/></rhn-channel-parent-channel><rhn-channel-basedir>/</rhn-channel-basedir><rhn-channel-name>Red Hat Enterprise Linux (v. 5 for 32-bit x86)</rhn-channel-name><rhn-channel-summary>Red Hat Enterprise Linux (v. 5 for 32-bit x86 Server)</rhn-channel-summary><rhn-channel-description>Red Hat Enterprise Linux - Server core components (v. 5 for 32-bit x86)</rhn-channel-description><rhn-channel-gpg-key-url>file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release</rhn-channel-gpg-key-url><rhn-channel-receiving-updates>Y</rhn-channel-receiving-updates><rhn-channel-last-modified>1255609387</rhn-channel-last-modified><rhn-channel-product-name>rhel</rhn-channel-product-name><rhn-channel-product-version>5</rhn-channel-product-version><rhn-channel-product-beta>N</rhn-channel-product-beta><rhn-channel-families><rhn-channel-family virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" channel-labels="rhel-i386-as-3 rhel-i386-es-3 rhel-ia64-as-3 rhel-ia64-es-3 rhel-x86_64-as-3 rhel-x86_64-es-3 rhel-ppc-as-3 rhel-i386-as-4 rhel-i386-es-4 rhel-x86_64-as-4 rhel-x86_64-es-4 rhel-ia64-as-4 rhel-ia64-es-4 rhel-ppc-as-4 rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5" virt-sub-level-label="virtualization_free virtualization_platform_free" id="rhn-channel-family-5488" label="rhel-server"/></rhn-channel-families><rhn-dists><rhn-dist release="5Server" channel-arch="channel-ia32" os="Red Hat Linux"/></rhn-dists><source-packages><source-package last-modified="1173828200" id="rhn-source-package-41213" source-rpm="spamassassin-3.1.8-2.el5.src.rpm"/><source-package last-modified="1173831490" id="rhn-source-package-41215" source-rpm="gnupg-1.4.5-13.src.rpm"/><source-package last-modified="1173831886" id="rhn-source-package-41217" source-rpm="tzdata-2007c-1.el5.src.rpm"/><source-package last-modified="1173831901" id="rhn-source-package-41218" source-rpm="emacs-21.4-18.1.el5.src.rpm"/><source-package last-modified="1173832223" id="rhn-source-package-41219" source-rpm="autofs-5.0.1-0.rc2.43.0.2.src.rpm"/><source-package last-modified="1173837656" id="rhn-source-package-41221" source-rpm="php-5.1.6-7.el5.src.rpm"/><source-package last-modified="1173847848" id="rhn-source-package-41222" source-rpm="bind-9.3.3-8.el5.src.rpm"/><source-package last-modified="1173848101" id="rhn-source-package-41223" source-rpm="samba-3.0.23c-2.el5.2.src.rpm"/><source-package last-modified="1173848491" id="rhn-source-package-41224" source-rpm="yelp-2.16.0-14.0.1.el5.src.rpm"/><source-package last-modified="1173848491" id="rhn-source-package-41226" source-rpm="devhelp-0.12-10.0.1.el5.src.rpm"/><source-package last-modified="1173848705" id="rhn-source-package-41227" source-rpm="nss-3.11.5-3.el5.src.rpm"/><source-package last-modified="1173848750" id="rhn-source-package-41228" source-rpm="xen-3.0.3-25.0.3.el5.src.rpm"/><source-package last-modified="1173848794" id="rhn-source-package-41229" source-rpm="postgresql-8.1.8-1.el5.src.rpm"/><source-package last-modified="1173849197" id="rhn-source-package-41230" source-rpm="gcc-4.1.1-52.el5.2.src.rpm"/><source-package last-modified="1173849238" id="rhn-source-package-41231" source-rpm="dhcp-3.0.5-5.el5.src.rpm"/><source-package last-modified="1173849420" id="rhn-source-package-41232" source-rpm="kernel-2.6.18-8.1.1.el5.src.rpm"/><source-package last-modified="1173850747" id="rhn-source-package-41233" source-rpm="evolution-data-server-1.8.0-15.0.2.el5.src.rpm"/><source-package last-modified="1173854091" id="rhn-source-package-41238" source-rpm="module-init-tools-3.3-0.pre3.1.16.0.1.el5.src.rpm"/><source-package last-modified="1173887371" id="rhn-source-package-41239" source-rpm="Deployment_Guide-5.0.0-21.src.rpm"/><source-package last-modified="1173889243" id="rhn-source-package-41243" source-rpm="wireshark-0.99.5-1.el5.src.rpm"/><source-package last-modified="1174644292" id="rhn-source-package-41256" source-rpm="file-4.17-9.el5.src.rpm"/><source-package last-modified="1174687064" id="rhn-source-package-41265" source-rpm="tzdata-2007d-1.el5.src.rpm"/><source-package last-modified="1174928008" id="rhn-source-package-41326" source-rpm="python-imaging-1.1.5-5.el5.src.rpm"/><source-package last-modified="1174928045" id="rhn-source-package-41329" source-rpm="libnotify-0.4.2-6.el5.src.rpm"/><source-package last-modified="1174928055" id="rhn-source-package-41330" source-rpm="perl-5.8.8-10.src.rpm"/><source-package last-modified="1174928802" id="rhn-source-package-41332" source-rpm="samba-3.0.23c-2.src.rpm"/><source-package last-modified="1174928806" id="rhn-source-package-41333" source-rpm="m17n-db-1.3.3-46.el5.src.rpm"/><source-package last-modified="1174928810" id="rhn-source-package-41334" source-rpm="gnome-user-docs-2.16.0-2.fc6.src.rpm"/><source-package last-modified="1174928813" id="rhn-source-package-41335" source-rpm="cdrtools-2.01-10.src.rpm"/><source-package last-modified="1174928815" id="rhn-source-package-41336" source-rpm="lsscsi-0.17-3.el5.src.rpm"/><source-package last-modified="1174928819" id="rhn-source-package-41337" source-rpm="OpenIPMI-2.0.6-5.el5.3.src.rpm"/><source-package last-modified="1174928824" id="rhn-source-package-41338" source-rpm="gnome-panel-2.16.1-6.el5.src.rpm"/><source-package last-modified="1174928846" id="rhn-source-package-41339" source-rpm="fonts-korean-1.0.11-10.el5.src.rpm"/><source-package last-modified="1174928852" id="rhn-source-package-41340" source-rpm="xsane-0.991-4.el5.src.rpm"/><source-package last-modified="1174928853" id="rhn-source-package-41341" source-rpm="setup-2.5.58-1.el5.src.rpm"/><source-package last-modified="1174928866" id="rhn-source-package-41342" source-rpm="vim-7.0.109-3.src.rpm"/><source-package last-modified="1174928869" id="rhn-source-package-41343" source-rpm="star-1.5a75-1.src.rpm"/><source-package last-modified="1174928872" id="rhn-source-package-41344" source-rpm="unixODBC-2.2.11-7.1.src.rpm"/><source-package last-modified="1174928872" id="rhn-source-package-41345" source-rpm="createrepo-0.4.4-2.fc6.src.rpm"/><source-package last-modified="1174928885" id="rhn-source-package-41346" source-rpm="xorg-x11-fonts-7.1-2.1.el5.src.rpm"/><source-package last-modified="1174928886" id="rhn-source-package-41347" source-rpm="perl-XML-SAX-0.14-5.src.rpm"/><source-package last-modified="1174928887" id="rhn-source-package-41348" source-rpm="eog-2.16.0.1-6.el5.src.rpm"/><source-package last-modified="1174928892" id="rhn-source-package-41349" source-rpm="sendmail-8.13.8-2.el5.src.rpm"/><source-package last-modified="1174928932" id="rhn-source-package-41351" source-rpm="gcc-4.1.1-52.el5.src.rpm"/><source-package last-modified="1174928933" id="rhn-source-package-41352" source-rpm="icon-naming-utils-0.8.1-1.fc6.src.rpm"/><source-package last-modified="1174928934" id="rhn-source-package-41353" source-rpm="man-pages-de-0.4-11.src.rpm"/><source-package last-modified="1174928936" id="rhn-source-package-41354" source-rpm="rsync-2.6.8-3.1.src.rpm"/><source-package last-modified="1174928937" id="rhn-source-package-41355" source-rpm="time-1.7-27.2.2.src.rpm"/><source-package last-modified="1174928938" id="rhn-source-package-41356" source-rpm="firstboot-1.4.27.2-1.el5.src.rpm"/><source-package last-modified="1174928945" id="rhn-source-package-41357" source-rpm="kdenetwork-3.5.4-4.fc6.src.rpm"/><source-package last-modified="1174928947" id="rhn-source-package-41358" source-rpm="arts-1.5.4-1.src.rpm"/><source-package last-modified="1174928956" id="rhn-source-package-41359" source-rpm="ghostscript-8.15.2-9.1.el5.src.rpm"/><source-package last-modified="1174929214" id="rhn-source-package-41360" source-rpm="kde-i18n-3.5.4-1.src.rpm"/><source-package last-modified="1174929242" id="rhn-source-package-41363" source-rpm="compat-gcc-32-3.2.3-61.src.rpm"/><source-package last-modified="1174929246" id="rhn-source-package-41364" source-rpm="frysk-0.0.1.2006.12.22.rh1-4.el5.src.rpm"/><source-package last-modified="1174929248" id="rhn-source-package-41365" source-rpm="openhpi-2.4.1-6.el5.1.src.rpm"/><source-package last-modified="1174929249" id="rhn-source-package-41366" source-rpm="bitstream-vera-fonts-1.10-7.src.rpm"/><source-package last-modified="1174929250" id="rhn-source-package-41367" source-rpm="fonts-indic-2.0.13-1.el5.src.rpm"/><source-package last-modified="1174929251" id="rhn-source-package-41368" source-rpm="pcmciautils-014-5.src.rpm"/><source-package last-modified="1174929251" id="rhn-source-package-41369" source-rpm="system-config-display-1.0.48-2.el5.src.rpm"/><source-package last-modified="1174929252" id="rhn-source-package-41370" source-rpm="rwho-0.17-26.src.rpm"/><source-package last-modified="1174929252" id="rhn-source-package-41371" source-rpm="man-pages-cs-0.16-6.src.rpm"/><source-package last-modified="1174929253" id="rhn-source-package-41372" source-rpm="jwhois-3.2.3-8.el5.src.rpm"/><source-package last-modified="1174929254" id="rhn-source-package-41373" source-rpm="nc-1.84-10.fc6.src.rpm"/><source-package last-modified="1174929261" id="rhn-source-package-41374" source-rpm="scim-tables-0.5.6-7.src.rpm"/><source-package last-modified="1174929261" id="rhn-source-package-41375" source-rpm="gtk-doc-1.7-1.fc6.src.rpm"/><source-package last-modified="1174929262" id="rhn-source-package-41376" source-rpm="irqbalance-1.13-9.el5.src.rpm"/><source-package last-modified="1174929263" id="rhn-source-package-41377" source-rpm="postgresql-jdbc-8.1.407-1jpp.4.src.rpm"/><source-package last-modified="1174929264" id="rhn-source-package-41378" source-rpm="fonts-KOI8-R-1.0-9.1.1.src.rpm"/><source-package last-modified="1174929265" id="rhn-source-package-41379" source-rpm="gpm-1.20.1-74.1.src.rpm"/><source-package last-modified="1174929266" id="rhn-source-package-41380" source-rpm="dmraid-1.0.0.rc13-2.el5.src.rpm"/><source-package last-modified="1174929426" id="rhn-source-package-41381" source-rpm="Deployment_Guide-5.0.0-19.src.rpm"/><source-package last-modified="1174929430" id="rhn-source-package-41382" source-rpm="yum-3.0.1-5.el5.src.rpm"/><source-package last-modified="1174929434" id="rhn-source-package-41383" source-rpm="gtk+-1.2.10-56.el5.src.rpm"/><source-package last-modified="1174929459" id="rhn-source-package-41384" source-rpm="compat-gcc-34-3.4.6-4.src.rpm"/><source-package last-modified="1174929461" id="rhn-source-package-41385" source-rpm="sox-12.18.1-1.src.rpm"/><source-package last-modified="1174929469" id="rhn-source-package-41386" source-rpm="openmotif22-2.2.3-18.src.rpm"/><source-package last-modified="1174929470" id="rhn-source-package-41387" source-rpm="aspell-pl-0.51-5.2.2.src.rpm"/><source-package last-modified="1174929484" id="rhn-source-package-41388" source-rpm="compat-gcc-296-2.96-138.src.rpm"/><source-package last-modified="1174929486" id="rhn-source-package-41389" source-rpm="libtermcap-2.0.8-46.1.src.rpm"/><source-package last-modified="1174929491" id="rhn-source-package-41390" source-rpm="gnutls-1.4.1-2.src.rpm"/><source-package last-modified="1174929494" id="rhn-source-package-41391" source-rpm="basesystem-8.0-5.1.1.src.rpm"/><source-package last-modified="1174929534" id="rhn-source-package-41392" source-rpm="firefox-1.5.0.9-10.el5.src.rpm"/><source-package last-modified="1174929535" id="rhn-source-package-41393" source-rpm="xorg-x11-xbitmaps-1.0.1-4.1.src.rpm"/><source-package last-modified="1174929537" id="rhn-source-package-41394" source-rpm="bitmap-fonts-0.3-5.1.1.src.rpm"/><source-package last-modified="1174929537" id="rhn-source-package-41395" source-rpm="dcraw-0.0.20060521-1.1.src.rpm"/><source-package last-modified="1174929538" id="rhn-source-package-41396" source-rpm="gfs2-utils-0.1.25-1.el5.src.rpm"/><source-package last-modified="1174929555" id="rhn-source-package-41397" source-rpm="postgresql-8.1.4-1.1.src.rpm"/><source-package last-modified="1174929565" id="rhn-source-package-41398" source-rpm="cyrus-sasl-2.1.22-4.src.rpm"/><source-package last-modified="1174929566" id="rhn-source-package-41399" source-rpm="pkinit-nss-0.3.5-1.el5.src.rpm"/><source-package last-modified="1174929567" id="rhn-source-package-41400" source-rpm="gnome-nettool-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174929568" id="rhn-source-package-41401" source-rpm="xorg-x11-xfs-1.0.2-3.1.src.rpm"/><source-package last-modified="1174929571" id="rhn-source-package-41402" source-rpm="man-pages-fr-2.39-4.fc6.src.rpm"/><source-package last-modified="1174929572" id="rhn-source-package-41403" source-rpm="mdadm-2.5.4-3.el5.src.rpm"/><source-package last-modified="1174929574" id="rhn-source-package-41404" source-rpm="tcpdump-3.9.4-8.1.src.rpm"/><source-package last-modified="1174929581" id="rhn-source-package-41406" source-rpm="perl-XML-Twig-3.26-1.fc6.src.rpm"/><source-package last-modified="1174929582" id="rhn-source-package-41407" source-rpm="gpart-0.1h-3.1.src.rpm"/><source-package last-modified="1174929585" id="rhn-source-package-41408" source-rpm="java-1.4.2-gcj-compat-1.4.2.0-40jpp.112.src.rpm"/><source-package last-modified="1174929586" id="rhn-source-package-41410" source-rpm="pam_smb-1.1.7-7.2.1.src.rpm"/><source-package last-modified="1174929587" id="rhn-source-package-41411" source-rpm="bluez-hcidump-1.32-1.src.rpm"/><source-package last-modified="1174929587" id="rhn-source-package-41412" source-rpm="redhat-lsb-3.1-12.2.EL.src.rpm"/><source-package last-modified="1174929588" id="rhn-source-package-41413" source-rpm="docbook-utils-0.6.14-5.1.src.rpm"/><source-package last-modified="1174929624" id="rhn-source-package-41414" source-rpm="system-config-network-1.3.99-1.el5.src.rpm"/><source-package last-modified="1174929630" id="rhn-source-package-41415" source-rpm="rhgb-0.16.4-8.el5.src.rpm"/><source-package last-modified="1174929634" id="rhn-source-package-41416" source-rpm="zsh-4.2.6-1.src.rpm"/><source-package last-modified="1174929634" id="rhn-source-package-41417" source-rpm="unix2dos-2.2-26.2.2.src.rpm"/><source-package last-modified="1174929635" id="rhn-source-package-41418" source-rpm="pax-3.4-1.2.2.src.rpm"/><source-package last-modified="1174929636" id="rhn-source-package-41419" source-rpm="aide-0.12-7.src.rpm"/><source-package last-modified="1174929642" id="rhn-source-package-41420" source-rpm="ruby-1.8.5-5.el5.src.rpm"/><source-package last-modified="1174929643" id="rhn-source-package-41421" source-rpm="acl-2.2.39-1.1.src.rpm"/><source-package last-modified="1174929667" id="rhn-source-package-41423" source-rpm="mutt-1.4.2.2-3.el5.src.rpm"/><source-package last-modified="1174929668" id="rhn-source-package-41424" source-rpm="system-config-securitylevel-1.6.29.1-1.el5.src.rpm"/><source-package last-modified="1174929669" id="rhn-source-package-41425" source-rpm="screen-4.0.3-1.el5.src.rpm"/><source-package last-modified="1174929676" id="rhn-source-package-41426" source-rpm="xorg-x11-server-1.1.1-48.13.el5.src.rpm"/><source-package last-modified="1174929677" id="rhn-source-package-41427" source-rpm="dvgrab-2.0-1.2.2.src.rpm"/><source-package last-modified="1174929678" id="rhn-source-package-41428" source-rpm="yelp-2.16.0-13.el5.src.rpm"/><source-package last-modified="1174929678" id="rhn-source-package-41429" source-rpm="netlabel_tools-0.17-9.el5.src.rpm"/><source-package last-modified="1174929679" id="rhn-source-package-41430" source-rpm="aspell-ga-0.50-4.2.2.src.rpm"/><source-package last-modified="1174929684" id="rhn-source-package-41431" source-rpm="swig-1.3.29-2.el5.src.rpm"/><source-package last-modified="1174929692" id="rhn-source-package-41432" source-rpm="tog-pegasus-2.5.2-5.el5.src.rpm"/><source-package last-modified="1174929693" id="rhn-source-package-41433" source-rpm="patchutils-0.2.31-2.2.2.src.rpm"/><source-package last-modified="1174929694" id="rhn-source-package-41434" source-rpm="file-roller-2.16.0-2.fc6.src.rpm"/><source-package last-modified="1174929787" id="rhn-source-package-41435" source-rpm="tetex-3.0-32.fc6.src.rpm"/><source-package last-modified="1174929789" id="rhn-source-package-41436" source-rpm="scim-bridge-0.4.5-7.el5.src.rpm"/><source-package last-modified="1174929793" id="rhn-source-package-41437" source-rpm="alsa-utils-1.0.12-3.fc6.src.rpm"/><source-package last-modified="1174929794" id="rhn-source-package-41438" source-rpm="gtk2-engines-2.8.0-3.el5.src.rpm"/><source-package last-modified="1174929796" id="rhn-source-package-41439" source-rpm="wget-1.10.2-7.el5.src.rpm"/><source-package last-modified="1174929798" id="rhn-source-package-41440" source-rpm="fonts-ISO8859-2-1.0-17.1.src.rpm"/><source-package last-modified="1174929799" id="rhn-source-package-41441" source-rpm="sysfsutils-2.0.0-6.src.rpm"/><source-package last-modified="1174929799" id="rhn-source-package-41442" source-rpm="im-chooser-0.3.3-6.el5.src.rpm"/><source-package last-modified="1174929801" id="rhn-source-package-41443" source-rpm="aspell-sr-0.02-1.2.1.src.rpm"/><source-package last-modified="1174929803" id="rhn-source-package-41445" source-rpm="rootfiles-8.1-1.1.1.src.rpm"/><source-package last-modified="1174929804" id="rhn-source-package-41446" source-rpm="iscsi-initiator-utils-6.2.0.742-0.5.el5.src.rpm"/><source-package last-modified="1174929805" id="rhn-source-package-41447" source-rpm="mod_nss-1.0.3-4.el5.src.rpm"/><source-package last-modified="1174929821" id="rhn-source-package-41448" source-rpm="glibc-2.5-12.src.rpm"/><source-package last-modified="1174929823" id="rhn-source-package-41449" source-rpm="make-3.81-1.1.src.rpm"/><source-package last-modified="1174929823" id="rhn-source-package-41450" source-rpm="xorg-x11-xauth-1.0.1-2.1.src.rpm"/><source-package last-modified="1174929825" id="rhn-source-package-41451" source-rpm="evince-0.6.0-8.el5.src.rpm"/><source-package last-modified="1174929826" id="rhn-source-package-41452" source-rpm="kudzu-1.2.57.1.13-1.src.rpm"/><source-package last-modified="1174929826" id="rhn-source-package-41453" source-rpm="aspell-fr-0.50-9.2.2.src.rpm"/><source-package last-modified="1174929828" id="rhn-source-package-41454" source-rpm="pciutils-2.2.3-4.src.rpm"/><source-package last-modified="1174929830" id="rhn-source-package-41455" source-rpm="vorbis-tools-1.1.1-3.el5.src.rpm"/><source-package last-modified="1174929830" id="rhn-source-package-41456" source-rpm="wvdial-1.54.0-5.2.2.1.src.rpm"/><source-package last-modified="1174929832" id="rhn-source-package-41457" source-rpm="aspell-hr-0.51-4.2.2.src.rpm"/><source-package last-modified="1174929848" id="rhn-source-package-41458" source-rpm="desktop-backgrounds-2.0-37.src.rpm"/><source-package last-modified="1174929849" id="rhn-source-package-41459" source-rpm="perl-DBD-Pg-1.49-1.fc6.src.rpm"/><source-package last-modified="1174929853" id="rhn-source-package-41460" source-rpm="mc-4.6.1a-34.el5.src.rpm"/><source-package last-modified="1174929854" id="rhn-source-package-41461" source-rpm="policycoreutils-1.33.12-3.el5.src.rpm"/><source-package last-modified="1174929860" id="rhn-source-package-41462" source-rpm="gdm-2.16.0-30.el5.src.rpm"/><source-package last-modified="1174929862" id="rhn-source-package-41463" source-rpm="tftp-0.42-3.1.src.rpm"/><source-package last-modified="1174929866" id="rhn-source-package-41464" source-rpm="words-3.0-9.src.rpm"/><source-package last-modified="1174929867" id="rhn-source-package-41465" source-rpm="aspell-is-0.51.1-2.2.2.src.rpm"/><source-package last-modified="1174929870" id="rhn-source-package-41466" source-rpm="sblim-1-20.EL5.src.rpm"/><source-package last-modified="1174929879" id="rhn-source-package-41467" source-rpm="arptables_jf-0.0.8-8.src.rpm"/><source-package last-modified="1174929880" id="rhn-source-package-41468" source-rpm="eject-2.1.5-4.2.el5.src.rpm"/><source-package last-modified="1174929880" id="rhn-source-package-41469" source-rpm="xdelta-1.1.3-20.src.rpm"/><source-package last-modified="1174929885" id="rhn-source-package-41470" source-rpm="net-snmp-5.3.1-14.el5.src.rpm"/><source-package last-modified="1174929887" id="rhn-source-package-41471" source-rpm="bogl-0.1.18-11.2.1.el5.1.src.rpm"/><source-package last-modified="1174929890" id="rhn-source-package-41472" source-rpm="amanda-2.5.0p2-4.src.rpm"/><source-package last-modified="1174929893" id="rhn-source-package-41473" source-rpm="elinks-0.11.1-5.1.el5.src.rpm"/><source-package last-modified="1174929895" id="rhn-source-package-41474" source-rpm="metacity-2.16.0-8.el5.src.rpm"/><source-package last-modified="1174929911" id="rhn-source-package-41475" source-rpm="anaconda-11.1.2.36-1.src.rpm"/><source-package last-modified="1174929917" id="rhn-source-package-41476" source-rpm="xfig-3.2.4-21.2.el5.src.rpm"/><source-package last-modified="1174929923" id="rhn-source-package-41477" source-rpm="sysstat-7.0.0-3.el5.src.rpm"/><source-package last-modified="1174929923" id="rhn-source-package-41478" source-rpm="vlock-1.3-23.src.rpm"/><source-package last-modified="1174929924" id="rhn-source-package-41479" source-rpm="mtools-3.9.10-2.fc6.src.rpm"/><source-package last-modified="1174929925" id="rhn-source-package-41480" source-rpm="ppp-2.4.4-1.el5.src.rpm"/><source-package last-modified="1174929926" id="rhn-source-package-41481" source-rpm="aspell-ca-0.50-4.2.2.src.rpm"/><source-package last-modified="1174929926" id="rhn-source-package-41482" source-rpm="zisofs-tools-1.0.6-3.2.2.src.rpm"/><source-package last-modified="1174929927" id="rhn-source-package-41483" source-rpm="xmlrpc-2.0.1-3jpp.1.src.rpm"/><source-package last-modified="1174929927" id="rhn-source-package-41484" source-rpm="hwbrowser-0.30-1.el5.src.rpm"/><source-package last-modified="1174929928" id="rhn-source-package-41485" source-rpm="iputils-20020927-43.el5.src.rpm"/><source-package last-modified="1174929930" id="rhn-source-package-41486" source-rpm="gnome-system-monitor-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174929931" id="rhn-source-package-41487" source-rpm="chkconfig-1.3.30.1-1.src.rpm"/><source-package last-modified="1174929937" id="rhn-source-package-41488" source-rpm="gimp-print-4.2.7-22.src.rpm"/><source-package last-modified="1174929938" id="rhn-source-package-41489" source-rpm="xorg-x11-xsm-1.0.2-4.fc6.src.rpm"/><source-package last-modified="1174929940" id="rhn-source-package-41490" source-rpm="fonts-arabic-2.0-4.el5.src.rpm"/><source-package last-modified="1174929941" id="rhn-source-package-41491" source-rpm="xorg-x11-xfwp-1.0.1-3.1.src.rpm"/><source-package last-modified="1174929945" id="rhn-source-package-41494" source-rpm="freeglut-2.4.0-7.1.el5.src.rpm"/><source-package last-modified="1174929954" id="rhn-source-package-41496" source-rpm="e2fsprogs-1.39-8.el5.src.rpm"/><source-package last-modified="1174929955" id="rhn-source-package-41497" source-rpm="gok-1.2.0-2.el5.src.rpm"/><source-package last-modified="1174929958" id="rhn-source-package-41498" source-rpm="openssl097a-0.9.7a-9.src.rpm"/><source-package last-modified="1174929959" id="rhn-source-package-41499" source-rpm="talk-0.17-29.2.2.src.rpm"/><source-package last-modified="1174929959" id="rhn-source-package-41500" source-rpm="libaio-0.3.106-3.2.src.rpm"/><source-package last-modified="1174929960" id="rhn-source-package-41501" source-rpm="mlocate-0.15-1.el5.src.rpm"/><source-package last-modified="1174929960" id="rhn-source-package-41502" source-rpm="logrotate-3.7.4-7.src.rpm"/><source-package last-modified="1174929962" id="rhn-source-package-41503" source-rpm="conman-0.1.9.2-4.el5.src.rpm"/><source-package last-modified="1174929966" id="rhn-source-package-41504" source-rpm="pkgconfig-0.21-1.fc6.src.rpm"/><source-package last-modified="1174929968" id="rhn-source-package-41505" source-rpm="openssh-4.3p2-16.el5.src.rpm"/><source-package last-modified="1174929969" id="rhn-source-package-41506" source-rpm="lksctp-tools-1.0.6-1.el5.1.src.rpm"/><source-package last-modified="1174929969" id="rhn-source-package-41507" source-rpm="dtach-0.7-1.2.2.src.rpm"/><source-package last-modified="1174929971" id="rhn-source-package-41508" source-rpm="bluez-utils-3.7-2.src.rpm"/><source-package last-modified="1174930010" id="rhn-source-package-41509" source-rpm="gimp-help-2-0.1.0.10.1.1.src.rpm"/><source-package last-modified="1174930012" id="rhn-source-package-41510" source-rpm="initscripts-8.45.14.EL-1.src.rpm"/><source-package last-modified="1174930014" id="rhn-source-package-41511" source-rpm="gnome-mag-0.13.1-1.fc6.src.rpm"/><source-package last-modified="1174930014" id="rhn-source-package-41512" source-rpm="krb5-auth-dialog-0.7-1.src.rpm"/><source-package last-modified="1174930015" id="rhn-source-package-41513" source-rpm="ipv6calc-0.61-1.src.rpm"/><source-package last-modified="1174930030" id="rhn-source-package-41514" source-rpm="qt-3.3.6-20.el5.src.rpm"/><source-package last-modified="1174930030" id="rhn-source-package-41515" source-rpm="man-pages-da-0.1.1-12.1.1.src.rpm"/><source-package last-modified="1174930031" id="rhn-source-package-41516" source-rpm="sabayon-2.12.4-3.el5.src.rpm"/><source-package last-modified="1174930032" id="rhn-source-package-41517" source-rpm="perl-libxml-perl-0.08-1.2.1.src.rpm"/><source-package last-modified="1174930033" id="rhn-source-package-41518" source-rpm="bc-1.06-21.src.rpm"/><source-package last-modified="1174930033" id="rhn-source-package-41519" source-rpm="perl-XML-Dumper-0.81-2.fc6.src.rpm"/><source-package last-modified="1174930033" id="rhn-source-package-41520" source-rpm="x86info-1.20-1.26.fc6.src.rpm"/><source-package last-modified="1174930034" id="rhn-source-package-41521" source-rpm="hesinfo-3.1.0-1.1.src.rpm"/><source-package last-modified="1174930036" id="rhn-source-package-41522" source-rpm="man-pages-2.39-9.el5.src.rpm"/><source-package last-modified="1174930038" id="rhn-source-package-41523" source-rpm="lftp-3.5.1-2.fc6.src.rpm"/><source-package last-modified="1174930039" id="rhn-source-package-41524" source-rpm="switchdesk-4.0.8-6.src.rpm"/><source-package last-modified="1174930040" id="rhn-source-package-41525" source-rpm="nautilus-cd-burner-2.16.0-7.el5.src.rpm"/><source-package last-modified="1174930041" id="rhn-source-package-41526" source-rpm="lrzsz-0.12.20-22.1.src.rpm"/><source-package last-modified="1174930041" id="rhn-source-package-41527" source-rpm="autofs-5.0.1-0.rc2.42.src.rpm"/><source-package last-modified="1174930043" id="rhn-source-package-41528" source-rpm="dejagnu-1.4.4-5.1.src.rpm"/><source-package last-modified="1174930046" id="rhn-source-package-41529" source-rpm="devhelp-0.12-9.el5.src.rpm"/><source-package last-modified="1174930047" id="rhn-source-package-41530" source-rpm="NetworkManager-0.6.4-6.el5.src.rpm"/><source-package last-modified="1174930048" id="rhn-source-package-41531" source-rpm="cryptsetup-luks-1.0.3-2.2.el5.src.rpm"/><source-package last-modified="1174930048" id="rhn-source-package-41532" source-rpm="dos2unix-3.1-27.1.src.rpm"/><source-package last-modified="1174930049" id="rhn-source-package-41533" source-rpm="perl-Crypt-SSLeay-0.51-11.el5.src.rpm"/><source-package last-modified="1174930053" id="rhn-source-package-41534" source-rpm="kdeutils-3.5.4-5.fc6.src.rpm"/><source-package last-modified="1174930053" id="rhn-source-package-41535" source-rpm="kcc-2.3-24.2.2.src.rpm"/><source-package last-modified="1174930066" id="rhn-source-package-41536" source-rpm="gettext-0.14.6-4.el5.src.rpm"/><source-package last-modified="1174930119" id="rhn-source-package-41537" source-rpm="kernel-2.6.18-8.el5.src.rpm"/><source-package last-modified="1174930121" id="rhn-source-package-41538" source-rpm="bzip2-1.0.3-3.src.rpm"/><source-package last-modified="1174930123" id="rhn-source-package-41539" source-rpm="ccid-1.0.1-6.el5.src.rpm"/><source-package last-modified="1174930126" id="rhn-source-package-41541" source-rpm="system-config-language-1.1.18-1.el5.src.rpm"/><source-package last-modified="1174930126" id="rhn-source-package-41542" source-rpm="ftp-0.17-33.fc6.src.rpm"/><source-package last-modified="1174930278" id="rhn-source-package-41543" source-rpm="specspo-13-1.el5.src.rpm"/><source-package last-modified="1174930278" id="rhn-source-package-41544" source-rpm="anacron-2.3-45.el5.src.rpm"/><source-package last-modified="1174930279" id="rhn-source-package-41545" source-rpm="aspell-sl-0.50-1.2.1.src.rpm"/><source-package last-modified="1174930281" id="rhn-source-package-41546" source-rpm="dhcp-3.0.5-3.el5.src.rpm"/><source-package last-modified="1174930284" id="rhn-source-package-41547" source-rpm="gnome-utils-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930285" id="rhn-source-package-41548" source-rpm="procps-3.2.7-8.1.el5.src.rpm"/><source-package last-modified="1174930285" id="rhn-source-package-41549" source-rpm="system-switch-mail-0.5.25-12.src.rpm"/><source-package last-modified="1174930286" id="rhn-source-package-41550" source-rpm="pam_krb5-2.2.11-1.src.rpm"/><source-package last-modified="1174930297" id="rhn-source-package-41551" source-rpm="krb5-1.5-17.src.rpm"/><source-package last-modified="1174930298" id="rhn-source-package-41552" source-rpm="compat-readline43-4.3-3.src.rpm"/><source-package last-modified="1174930299" id="rhn-source-package-41553" source-rpm="booty-0.80.4-1.src.rpm"/><source-package last-modified="1174930299" id="rhn-source-package-41554" source-rpm="which-2.16-7.src.rpm"/><source-package last-modified="1174930300" id="rhn-source-package-41555" source-rpm="usbutils-0.71-2.1.src.rpm"/><source-package last-modified="1174930300" id="rhn-source-package-41556" source-rpm="bluez-gnome-0.5-5.fc6.src.rpm"/><source-package last-modified="1174930301" id="rhn-source-package-41557" source-rpm="procinfo-18-19.src.rpm"/><source-package last-modified="1174930315" id="rhn-source-package-41558" source-rpm="gdb-6.5-16.el5.src.rpm"/><source-package last-modified="1174930316" id="rhn-source-package-41559" source-rpm="system-config-users-1.2.51-1.el5.src.rpm"/><source-package last-modified="1174930317" id="rhn-source-package-41560" source-rpm="aspell-ru-0.99f7-2.2.2.src.rpm"/><source-package last-modified="1174930317" id="rhn-source-package-41561" source-rpm="pam_ccreds-3-5.src.rpm"/><source-package last-modified="1174930321" id="rhn-source-package-41562" source-rpm="rhn-client-tools-0.4.13-1.el5.src.rpm"/><source-package last-modified="1174930322" id="rhn-source-package-41563" source-rpm="tree-1.5.0-4.src.rpm"/><source-package last-modified="1174930338" id="rhn-source-package-41564" source-rpm="crash-4.0-3.14.src.rpm"/><source-package last-modified="1174930340" id="rhn-source-package-41565" source-rpm="man-pages-es-1.28-10.1.1.src.rpm"/><source-package last-modified="1174930340" id="rhn-source-package-41566" source-rpm="aspell-pt-0.50-10.2.2.src.rpm"/><source-package last-modified="1174930341" id="rhn-source-package-41567" source-rpm="rdist-6.1.5-44.src.rpm"/><source-package last-modified="1174930342" id="rhn-source-package-41568" source-rpm="agg-2.4-2.1.src.rpm"/><source-package last-modified="1174930342" id="rhn-source-package-41569" source-rpm="hal-cups-utils-0.6.2-5.src.rpm"/><source-package last-modified="1174930343" id="rhn-source-package-41570" source-rpm="perl-LDAP-0.33-3.fc6.src.rpm"/><source-package last-modified="1174930358" id="rhn-source-package-41571" source-rpm="fonts-japanese-0.20061016-4.el5.src.rpm"/><source-package last-modified="1174930373" id="rhn-source-package-41572" source-rpm="openldap-2.3.27-5.src.rpm"/><source-package last-modified="1174930374" id="rhn-source-package-41573" source-rpm="apmd-3.2.2-5.src.rpm"/><source-package last-modified="1174930375" id="rhn-source-package-41574" source-rpm="scim-qtimm-0.9.4-5.src.rpm"/><source-package last-modified="1174930384" id="rhn-source-package-41575" source-rpm="hplip-1.6.7-4.1.el5.src.rpm"/><source-package last-modified="1174930385" id="rhn-source-package-41576" source-rpm="desktop-printing-0.19-20.el5.src.rpm"/><source-package last-modified="1174930394" id="rhn-source-package-41577" source-rpm="bind-9.3.3-7.el5.src.rpm"/><source-package last-modified="1174930399" id="rhn-source-package-41578" source-rpm="scim-pinyin-0.5.91-15.el5.src.rpm"/><source-package last-modified="1174930404" id="rhn-source-package-41579" source-rpm="gnome-vfs2-2.16.2-4.el5.src.rpm"/><source-package last-modified="1174930406" id="rhn-source-package-41580" source-rpm="pam_pkcs11-0.5.3-23.src.rpm"/><source-package last-modified="1174930407" id="rhn-source-package-41581" source-rpm="ypbind-1.19-7.el5.src.rpm"/><source-package last-modified="1174930457" id="rhn-source-package-41582" source-rpm="qt4-4.2.1-1.src.rpm"/><source-package last-modified="1174930459" id="rhn-source-package-41583" source-rpm="aspell-sv-0.51-1.2.1.src.rpm"/><source-package last-modified="1174930460" id="rhn-source-package-41584" source-rpm="system-config-date-1.8.12-1.el5.src.rpm"/><source-package last-modified="1174930460" id="rhn-source-package-41585" source-rpm="fbset-2.1-22.src.rpm"/><source-package last-modified="1174930461" id="rhn-source-package-41586" source-rpm="kexec-tools-1.101-164.el5.src.rpm"/><source-package last-modified="1174930462" id="rhn-source-package-41587" source-rpm="setuptool-1.19.2-1.src.rpm"/><source-package last-modified="1174930465" id="rhn-source-package-41588" source-rpm="util-linux-2.13-0.44.el5.src.rpm"/><source-package last-modified="1174930468" id="rhn-source-package-41589" source-rpm="gnuplot-4.0.0-12.src.rpm"/><source-package last-modified="1174930468" id="rhn-source-package-41590" source-rpm="rhel-instnum-1.0.7-1.el5.src.rpm"/><source-package last-modified="1174930472" id="rhn-source-package-41591" source-rpm="libhugetlbfs-1.0.1-1.el5.src.rpm"/><source-package last-modified="1174930472" id="rhn-source-package-41592" source-rpm="convmv-1.10-1.el5.src.rpm"/><source-package last-modified="1174930474" id="rhn-source-package-41593" source-rpm="epic-2.4-1.src.rpm"/><source-package last-modified="1174930475" id="rhn-source-package-41594" source-rpm="gconf-editor-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930476" id="rhn-source-package-41595" source-rpm="man-1.6d-1.1.src.rpm"/><source-package last-modified="1174930476" id="rhn-source-package-41596" source-rpm="xorg-x11-xinit-1.0.2-13.el5.src.rpm"/><source-package last-modified="1174930478" id="rhn-source-package-41597" source-rpm="slrn-0.9.8.1pl1-1.2.2.src.rpm"/><source-package last-modified="1174930480" id="rhn-source-package-41598" source-rpm="shadow-utils-4.0.17-12.el5.src.rpm"/><source-package last-modified="1174930482" id="rhn-source-package-41599" source-rpm="libdbi-drivers-0.8.1a-1.2.2.src.rpm"/><source-package last-modified="1174930483" id="rhn-source-package-41600" source-rpm="mikmod-3.1.6-38.1.src.rpm"/><source-package last-modified="1174930484" id="rhn-source-package-41601" source-rpm="squashfs-tools-3.0-4.src.rpm"/><source-package last-modified="1174930485" id="rhn-source-package-41602" source-rpm="iptables-1.3.5-1.2.1.src.rpm"/><source-package last-modified="1174930485" id="rhn-source-package-41603" source-rpm="amtu-1.0.4-4.src.rpm"/><source-package last-modified="1174930486" id="rhn-source-package-41604" source-rpm="linuxdoc-tools-0.9.21-7.1.src.rpm"/><source-package last-modified="1174930490" id="rhn-source-package-41605" source-rpm="postfix-2.3.3-2.src.rpm"/><source-package last-modified="1174930490" id="rhn-source-package-41606" source-rpm="rsh-0.17-37.el5.src.rpm"/><source-package last-modified="1174930491" id="rhn-source-package-41607" source-rpm="aspell-fo-0.51-4.2.2.src.rpm"/><source-package last-modified="1174930492" id="rhn-source-package-41608" source-rpm="dhcpv6-0.10-33.el5.src.rpm"/><source-package last-modified="1174930493" id="rhn-source-package-41609" source-rpm="tn5250-0.17.3-6.src.rpm"/><source-package last-modified="1174930495" id="rhn-source-package-41610" source-rpm="gnome-audio-2.0.0-3.1.1.src.rpm"/><source-package last-modified="1174930496" id="rhn-source-package-41611" source-rpm="docbook-slides-3.3.1-2.1.1.src.rpm"/><source-package last-modified="1174930499" id="rhn-source-package-41612" source-rpm="netpbm-10.35-6.fc6.src.rpm"/><source-package last-modified="1174930509" id="rhn-source-package-41614" source-rpm="libutempter-1.1.4-3.fc6.src.rpm"/><source-package last-modified="1174930509" id="rhn-source-package-41615" source-rpm="perl-DBD-MySQL-3.0007-1.fc6.src.rpm"/><source-package last-modified="1174930511" id="rhn-source-package-41616" source-rpm="busybox-1.2.0-3.src.rpm"/><source-package last-modified="1174930512" id="rhn-source-package-41617" source-rpm="man-pages-ru-0.97-1.1.1.src.rpm"/><source-package last-modified="1174930513" id="rhn-source-package-41618" source-rpm="docbook-style-dsssl-1.79-4.1.src.rpm"/><source-package last-modified="1174930536" id="rhn-source-package-41619" source-rpm="festival-1.95-5.2.1.src.rpm"/><source-package last-modified="1174930537" id="rhn-source-package-41620" source-rpm="mailcap-2.1.23-1.fc6.src.rpm"/><source-package last-modified="1174930537" id="rhn-source-package-41621" source-rpm="system-config-kdump-1.0.9-3.el5.src.rpm"/><source-package last-modified="1174930538" id="rhn-source-package-41622" source-rpm="ltrace-0.5-6.45svn.fc6.src.rpm"/><source-package last-modified="1174930541" id="rhn-source-package-41623" source-rpm="cvs-1.11.22-5.el5.src.rpm"/><source-package last-modified="1174930542" id="rhn-source-package-41624" source-rpm="adjtimex-1.20-2.1.src.rpm"/><source-package last-modified="1174930544" id="rhn-source-package-41625" source-rpm="kdeadmin-3.5.4-2.fc6.src.rpm"/><source-package last-modified="1174930545" id="rhn-source-package-41626" source-rpm="expect-5.43.0-5.1.src.rpm"/><source-package last-modified="1174930546" id="rhn-source-package-41627" source-rpm="libgnome-java-2.12.4-3.fc6.src.rpm"/><source-package last-modified="1174930547" id="rhn-source-package-41628" source-rpm="dosfstools-2.11-6.2.el5.src.rpm"/><source-package last-modified="1174930548" id="rhn-source-package-41629" source-rpm="nano-1.3.12-1.1.src.rpm"/><source-package last-modified="1174930549" id="rhn-source-package-41630" source-rpm="pinfo-0.6.9-1.fc6.src.rpm"/><source-package last-modified="1174930556" id="rhn-source-package-41631" source-rpm="mesa-6.5.1-7.2.el5.src.rpm"/><source-package last-modified="1174930557" id="rhn-source-package-41632" source-rpm="sysreport-1.4.3-10.el5.src.rpm"/><source-package last-modified="1174930558" id="rhn-source-package-41633" source-rpm="setserial-2.17-19.2.2.src.rpm"/><source-package last-modified="1174930576" id="rhn-source-package-41635" source-rpm="compat-glibc-2.3.4-2.26.src.rpm"/><source-package last-modified="1174930578" id="rhn-source-package-41636" source-rpm="docbook-style-xsl-1.69.1-5.1.src.rpm"/><source-package last-modified="1174930579" id="rhn-source-package-41637" source-rpm="mysql-connector-odbc-3.51.12-2.2.src.rpm"/><source-package last-modified="1174930582" id="rhn-source-package-41638" source-rpm="yum-rhn-plugin-0.4.3-1.el5.src.rpm"/><source-package last-modified="1174930583" id="rhn-source-package-41639" source-rpm="telnet-0.17-38.el5.src.rpm"/><source-package last-modified="1174930584" id="rhn-source-package-41640" source-rpm="audit-1.3.1-1.el5.src.rpm"/><source-package last-modified="1174930590" id="rhn-source-package-41641" source-rpm="isdn4k-utils-3.2-50.1.src.rpm"/><source-package last-modified="1174930594" id="rhn-source-package-41642" source-rpm="nautilus-2.16.2-6.el5.src.rpm"/><source-package last-modified="1174930596" id="rhn-source-package-41643" source-rpm="system-config-lvm-1.0.22-1.0.el5.src.rpm"/><source-package last-modified="1174930597" id="rhn-source-package-41644" source-rpm="nkf-2.07-1.1.fc6.src.rpm"/><source-package last-modified="1174930598" id="rhn-source-package-41645" source-rpm="hdparm-6.6-2.src.rpm"/><source-package last-modified="1174930599" id="rhn-source-package-41646" source-rpm="grub-0.97-13.src.rpm"/><source-package last-modified="1174930601" id="rhn-source-package-41647" source-rpm="tcsh-6.14-12.el5.src.rpm"/><source-package last-modified="1174930601" id="rhn-source-package-41648" source-rpm="xorg-x11-resutils-7.1-2.fc6.src.rpm"/><source-package last-modified="1174930603" id="rhn-source-package-41649" source-rpm="postgresql-odbc-08.01.0200-3.1.src.rpm"/><source-package last-modified="1174930604" id="rhn-source-package-41650" source-rpm="compat-slang-1.4.9-27.2.2.src.rpm"/><source-package last-modified="1174930604" id="rhn-source-package-41651" source-rpm="xmlto-0.0.18-13.1.src.rpm"/><source-package last-modified="1174930605" id="rhn-source-package-41652" source-rpm="statserial-1.1-38.2.2.src.rpm"/><source-package last-modified="1174930606" id="rhn-source-package-41653" source-rpm="openCryptoki-2.2.4-15.el5.src.rpm"/><source-package last-modified="1174930612" id="rhn-source-package-41654" source-rpm="httpd-2.2.3-6.el5.src.rpm"/><source-package last-modified="1174930613" id="rhn-source-package-41655" source-rpm="memtest86+-1.65-4.1.src.rpm"/><source-package last-modified="1174930613" id="rhn-source-package-41656" source-rpm="sos-1.3-1.el5.src.rpm"/><source-package last-modified="1174930614" id="rhn-source-package-41657" source-rpm="attr-2.4.32-1.1.src.rpm"/><source-package last-modified="1174930619" id="rhn-source-package-41658" source-rpm="coreutils-5.97-12.1.el5.src.rpm"/><source-package last-modified="1174930620" id="rhn-source-package-41659" source-rpm="authconfig-5.3.12-2.el5.src.rpm"/><source-package last-modified="1174930622" id="rhn-source-package-41660" source-rpm="system-config-soundcard-2.0.6-1.el5.src.rpm"/><source-package last-modified="1174930623" id="rhn-source-package-41661" source-rpm="psacct-6.3.2-41.1.src.rpm"/><source-package last-modified="1174930625" id="rhn-source-package-41662" source-rpm="gnome-keyring-manager-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930625" id="rhn-source-package-41663" source-rpm="aspell-id-0.50.1-4.2.2.src.rpm"/><source-package last-modified="1174930626" id="rhn-source-package-41664" source-rpm="system-config-services-0.9.4-1.el5.src.rpm"/><source-package last-modified="1174930629" id="rhn-source-package-41665" source-rpm="control-center-2.16.0-14.el5.src.rpm"/><source-package last-modified="1174930630" id="rhn-source-package-41666" source-rpm="rng-utils-2.0-1.14.1.fc6.src.rpm"/><source-package last-modified="1174930631" id="rhn-source-package-41667" source-rpm="sg3_utils-1.20-2.1.src.rpm"/><source-package last-modified="1174930631" id="rhn-source-package-41668" source-rpm="nautilus-open-terminal-0.6-6.el5.src.rpm"/><source-package last-modified="1174930632" id="rhn-source-package-41669" source-rpm="SysVinit-2.86-14.src.rpm"/><source-package last-modified="1174930632" id="rhn-source-package-41670" source-rpm="system-config-rootpassword-1.1.9.1-1.src.rpm"/><source-package last-modified="1174930637" id="rhn-source-package-41671" source-rpm="exim-doc-4.63-2.el5.src.rpm"/><source-package last-modified="1174930637" id="rhn-source-package-41672" source-rpm="perl-XML-NamespaceSupport-1.09-1.2.1.src.rpm"/><source-package last-modified="1174930640" id="rhn-source-package-41673" source-rpm="setroubleshoot-1.8.11-4.el5.src.rpm"/><source-package last-modified="1174930641" id="rhn-source-package-41674" source-rpm="systemtap-0.5.12-1.el5.src.rpm"/><source-package last-modified="1174930642" id="rhn-source-package-41675" source-rpm="aspell-it-0.53-4.2.1.src.rpm"/><source-package last-modified="1174930643" id="rhn-source-package-41676" source-rpm="system-config-printer-0.7.32.5-1.el5.src.rpm"/><source-package last-modified="1174930643" id="rhn-source-package-41677" source-rpm="perl-XML-Grove-0.46alpha-29.1.1.src.rpm"/><source-package last-modified="1174930671" id="rhn-source-package-41678" source-rpm="fonts-chinese-3.02-9.6.el5.src.rpm"/><source-package last-modified="1174930677" id="rhn-source-package-41679" source-rpm="ImageMagick-6.2.8.0-3.el5.4.src.rpm"/><source-package last-modified="1174930678" id="rhn-source-package-41680" source-rpm="hfsutils-3.2.6-7.2.2.src.rpm"/><source-package last-modified="1174930681" id="rhn-source-package-41681" source-rpm="linuxwacom-0.7.4.3-2.el5.src.rpm"/><source-package last-modified="1174930681" id="rhn-source-package-41682" source-rpm="readahead-1.3-7.el5.src.rpm"/><source-package last-modified="1174930682" id="rhn-source-package-41683" source-rpm="mt-st-0.9b-2.2.2.src.rpm"/><source-package last-modified="1174930683" id="rhn-source-package-41684" source-rpm="scim-sinhala-0.2.0-2.fc6.src.rpm"/><source-package last-modified="1174930690" id="rhn-source-package-41685" source-rpm="nss_db-2.2-35.1.src.rpm"/><source-package last-modified="1174930691" id="rhn-source-package-41686" source-rpm="gnome-netstatus-2.12.0-5.el5.src.rpm"/><source-package last-modified="1174930692" id="rhn-source-package-41687" source-rpm="cpio-2.6-20.src.rpm"/><source-package last-modified="1174930694" id="rhn-source-package-41689" source-rpm="dogtail-0.6.1-2.el5.src.rpm"/><source-package last-modified="1174930694" id="rhn-source-package-41690" source-rpm="mkbootdisk-1.5.3-2.1.src.rpm"/><source-package last-modified="1174930696" id="rhn-source-package-41691" source-rpm="iproute-2.6.18-4.el5.src.rpm"/><source-package last-modified="1174930697" id="rhn-source-package-41692" source-rpm="xterm-215-4.el5.src.rpm"/><source-package last-modified="1174930699" id="rhn-source-package-41693" source-rpm="gftp-2.0.18-3.2.2.src.rpm"/><source-package last-modified="1174930700" id="rhn-source-package-41694" source-rpm="pump-0.8.24-1.2.2.1.src.rpm"/><source-package last-modified="1174930700" id="rhn-source-package-41695" source-rpm="rhdb-utils-8.1.1-1.2.2.src.rpm"/><source-package last-modified="1174930705" id="rhn-source-package-41696" source-rpm="anthy-7900-4.el5.src.rpm"/><source-package last-modified="1174930714" id="rhn-source-package-41698" source-rpm="compat-db-4.2.52-5.1.src.rpm"/><source-package last-modified="1174930715" id="rhn-source-package-41699" source-rpm="minicom-2.1-3.src.rpm"/><source-package last-modified="1174930715" id="rhn-source-package-41700" source-rpm="aspell-gl-0.50-4.2.2.src.rpm"/><source-package last-modified="1174930718" id="rhn-source-package-41701" source-rpm="gnome-terminal-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930719" id="rhn-source-package-41702" source-rpm="aspell-de-0.50-11.2.2.src.rpm"/><source-package last-modified="1174930719" id="rhn-source-package-41703" source-rpm="at-3.1.8-82.fc6.src.rpm"/><source-package last-modified="1174930721" id="rhn-source-package-41704" source-rpm="texinfo-4.8-14.el5.src.rpm"/><source-package last-modified="1174930723" id="rhn-source-package-41705" source-rpm="aspell-0.60.3-7.1.src.rpm"/><source-package last-modified="1174930727" id="rhn-source-package-41706" source-rpm="scim-hangul-0.2.2-7.fc6.src.rpm"/><source-package last-modified="1174930727" id="rhn-source-package-41707" source-rpm="python-ldap-2.2.0-2.1.src.rpm"/><source-package last-modified="1174930728" id="rhn-source-package-41708" source-rpm="ed-0.2-38.2.2.src.rpm"/><source-package last-modified="1174930731" id="rhn-source-package-41709" source-rpm="gnome-themes-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174930732" id="rhn-source-package-41710" source-rpm="gnome-session-2.16.0-6.el5.src.rpm"/><source-package last-modified="1174930733" id="rhn-source-package-41711" source-rpm="scim-chewing-0.3.1-10.el5.src.rpm"/><source-package last-modified="1174930734" id="rhn-source-package-41712" source-rpm="man-pages-it-0.3.0-17.1.src.rpm"/><source-package last-modified="1174930747" id="rhn-source-package-41713" source-rpm="gimp-2.2.13-1.fc6.src.rpm"/><source-package last-modified="1174930748" id="rhn-source-package-41714" source-rpm="vixie-cron-4.1-66.1.el5.src.rpm"/><source-package last-modified="1174930748" id="rhn-source-package-41715" source-rpm="quota-3.13-1.2.3.2.el5.src.rpm"/><source-package last-modified="1174930750" id="rhn-source-package-41716" source-rpm="gnome-bluetooth-0.7.0-10.2.el5.src.rpm"/><source-package last-modified="1174930750" id="rhn-source-package-41717" source-rpm="xinetd-2.3.14-10.el5.src.rpm"/><source-package last-modified="1174930751" id="rhn-source-package-41718" source-rpm="tcp_wrappers-7.6-40.2.1.src.rpm"/><source-package last-modified="1174930752" id="rhn-source-package-41719" source-rpm="microcode_ctl-1.15-1.40.el5.src.rpm"/><source-package last-modified="1174930758" id="rhn-source-package-41720" source-rpm="openmotif-2.3.0-0.3.el5.src.rpm"/><source-package last-modified="1174930759" id="rhn-source-package-41721" source-rpm="tsclient-0.148-6.el5.src.rpm"/><source-package last-modified="1174930759" id="rhn-source-package-41722" source-rpm="rdesktop-1.4.1-4.src.rpm"/><source-package last-modified="1174930760" id="rhn-source-package-41723" source-rpm="mkinitrd-5.1.19.6-1.src.rpm"/><source-package last-modified="1174930761" id="rhn-source-package-41724" source-rpm="pm-utils-0.19-3.src.rpm"/><source-package last-modified="1174930791" id="rhn-source-package-41725" source-rpm="esc-1.0.0-20.el5.src.rpm"/><source-package last-modified="1174930793" id="rhn-source-package-41726" source-rpm="joe-3.4-3.src.rpm"/><source-package last-modified="1174930795" id="rhn-source-package-41727" source-rpm="totem-2.16.4-2.el5.src.rpm"/><source-package last-modified="1174930796" id="rhn-source-package-41728" source-rpm="irda-utils-0.9.17-2.fc6.src.rpm"/><source-package last-modified="1174930798" id="rhn-source-package-41729" source-rpm="setools-3.0-3.el5.src.rpm"/><source-package last-modified="1174930801" id="rhn-source-package-41730" source-rpm="termcap-5.5-1.20060701.1.src.rpm"/><source-package last-modified="1174930807" id="rhn-source-package-41731" source-rpm="cachefilesd-0.7-6.el5.src.rpm"/><source-package last-modified="1174930817" id="rhn-source-package-41732" source-rpm="nfs-utils-1.0.9-16.el5.src.rpm"/><source-package last-modified="1174930817" id="rhn-source-package-41733" source-rpm="pam_passwdqc-1.0.2-1.2.2.src.rpm"/><source-package last-modified="1174930859" id="rhn-source-package-41735" source-rpm="aspell-el-0.50-4.2.2.src.rpm"/><source-package last-modified="1174930862" id="rhn-source-package-41736" source-rpm="xcdroast-0.98a15-12.2.2.src.rpm"/><source-package last-modified="1174930864" id="rhn-source-package-41737" source-rpm="prelink-0.3.9-2.src.rpm"/><source-package last-modified="1174930865" id="rhn-source-package-41738" source-rpm="distcache-1.4.5-14.1.src.rpm"/><source-package last-modified="1174930866" id="rhn-source-package-41739" source-rpm="avahi-0.6.16-1.el5.src.rpm"/><source-package last-modified="1174930868" id="rhn-source-package-41740" source-rpm="gnome-backgrounds-2.15.92-1.fc6.src.rpm"/><source-package last-modified="1174930869" id="rhn-source-package-41741" source-rpm="aspell-en-6.0-2.1.src.rpm"/><source-package last-modified="1174930869" id="rhn-source-package-41742" source-rpm="xorg-x11-drivers-7.1-4.1.el5.src.rpm"/><source-package last-modified="1174930871" id="rhn-source-package-41743" source-rpm="aspell-cs-0.51-3.2.2.src.rpm"/><source-package last-modified="1174930873" id="rhn-source-package-41744" source-rpm="gnome-power-manager-2.16.0-7.el5.src.rpm"/><source-package last-modified="1174930880" id="rhn-source-package-41745" source-rpm="vnc-4.1.2-9.el5.src.rpm"/><source-package last-modified="1174930881" id="rhn-source-package-41746" source-rpm="aspell-bg-0.50-11.2.2.src.rpm"/><source-package last-modified="1174930884" id="rhn-source-package-41747" source-rpm="dejavu-lgc-fonts-2.10-1.src.rpm"/><source-package last-modified="1174930885" id="rhn-source-package-41748" source-rpm="dump-0.4b41-2.fc6.src.rpm"/><source-package last-modified="1174930887" id="rhn-source-package-41749" source-rpm="hal-0.5.8.1-19.el5.src.rpm"/><source-package last-modified="1174930905" id="rhn-source-package-41750" source-rpm="mysql-5.0.22-2.1.src.rpm"/><source-package last-modified="1174930930" id="rhn-source-package-41751" source-rpm="kdebase-3.5.4-13.5.el5.src.rpm"/><source-package last-modified="1174930933" id="rhn-source-package-41752" source-rpm="oprofile-0.9.2-6.el5.src.rpm"/><source-package last-modified="1174930935" id="rhn-source-package-41753" source-rpm="spamassassin-3.1.7-4.el5.src.rpm"/><source-package last-modified="1174930949" id="rhn-source-package-41754" source-rpm="redhat-logos-4.9.16-1.src.rpm"/><source-package last-modified="1174930950" id="rhn-source-package-41755" source-rpm="kbd-1.12-19.el5.src.rpm"/><source-package last-modified="1174930952" id="rhn-source-package-41756" source-rpm="parted-1.8.1-4.el5.src.rpm"/><source-package last-modified="1174930952" id="rhn-source-package-41757" source-rpm="sysklogd-1.4.1-39.2.src.rpm"/><source-package last-modified="1174930954" id="rhn-source-package-41758" source-rpm="unzip-5.52-2.2.1.src.rpm"/><source-package last-modified="1174930955" id="rhn-source-package-41759" source-rpm="scim-anthy-1.2.0-5.el5.src.rpm"/><source-package last-modified="1174930955" id="rhn-source-package-41760" source-rpm="perl-Convert-ASN1-0.20-1.1.src.rpm"/><source-package last-modified="1174930957" id="rhn-source-package-41761" source-rpm="synaptics-0.14.4-8.fc6.src.rpm"/><source-package last-modified="1174930957" id="rhn-source-package-41762" source-rpm="authd-1.4.3-9.src.rpm"/><source-package last-modified="1174930958" id="rhn-source-package-41763" source-rpm="aspell-da-0.50-12.2.2.src.rpm"/><source-package last-modified="1174930959" id="rhn-source-package-41764" source-rpm="file-4.17-8.src.rpm"/><source-package last-modified="1174930960" id="rhn-source-package-41765" source-rpm="aspell-no-0.50.1-9.2.2.src.rpm"/><source-package last-modified="1174930964" id="rhn-source-package-41766" source-rpm="cups-1.2.4-11.5.el5.src.rpm"/><source-package last-modified="1174930964" id="rhn-source-package-41767" source-rpm="rp-pppoe-3.5-32.1.src.rpm"/><source-package last-modified="1174930966" id="rhn-source-package-41768" source-rpm="brltty-3.7.2-1.fc6.src.rpm"/><source-package last-modified="1174930967" id="rhn-source-package-41769" source-rpm="sane-frontends-1.0.14-1.2.2.src.rpm"/><source-package last-modified="1174930969" id="rhn-source-package-41770" source-rpm="scim-m17n-0.2.0-6.fc6.src.rpm"/><source-package last-modified="1174930970" id="rhn-source-package-41771" source-rpm="sudo-1.6.8p12-10.src.rpm"/><source-package last-modified="1174930981" id="rhn-source-package-41772" source-rpm="rpm-4.4.2-37.el5.src.rpm"/><source-package last-modified="1174930982" id="rhn-source-package-41773" source-rpm="passwd-0.73-1.src.rpm"/><source-package last-modified="1174930983" id="rhn-source-package-41774" source-rpm="keyutils-1.2-1.el5.src.rpm"/><source-package last-modified="1174930984" id="rhn-source-package-41775" source-rpm="scim-chinese-standard-0.0.2-1.el5.src.rpm"/><source-package last-modified="1174930985" id="rhn-source-package-41776" source-rpm="libgtk-java-2.8.7-3.el5.src.rpm"/><source-package last-modified="1174930985" id="rhn-source-package-41777" source-rpm="finger-0.17-32.2.1.1.src.rpm"/><source-package last-modified="1174930994" id="rhn-source-package-41778" source-rpm="kdeaccessibility-3.5.4-1.fc6.src.rpm"/><source-package last-modified="1174930996" id="rhn-source-package-41779" source-rpm="sound-juicer-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930997" id="rhn-source-package-41780" source-rpm="stunnel-4.15-2.src.rpm"/><source-package last-modified="1174930997" id="rhn-source-package-41781" source-rpm="dvd+rw-tools-7.0-0.el5.3.src.rpm"/><source-package last-modified="1174931000" id="rhn-source-package-41782" source-rpm="lynx-2.8.5-28.1.src.rpm"/><source-package last-modified="1174931001" id="rhn-source-package-41783" source-rpm="man-pages-ko-1.48-15.1.1.src.rpm"/><source-package last-modified="1174931001" id="rhn-source-package-41784" source-rpm="cpuspeed-1.2.1-1.45.el5.src.rpm"/><source-package last-modified="1174931002" id="rhn-source-package-41785" source-rpm="alacarte-0.10.0-1.fc6.src.rpm"/><source-package last-modified="1174931003" id="rhn-source-package-41786" source-rpm="m2crypto-0.16-6.el5.1.src.rpm"/><source-package last-modified="1174931004" id="rhn-source-package-41787" source-rpm="aspell-af-0.50-4.2.2.src.rpm"/><source-package last-modified="1174931004" id="rhn-source-package-41788" source-rpm="aspell-gd-0.50-4.2.2.src.rpm"/><source-package last-modified="1174931005" id="rhn-source-package-41789" source-rpm="vino-2.13.5-6.el5.src.rpm"/><source-package last-modified="1174931006" id="rhn-source-package-41790" source-rpm="acpid-1.0.4-5.src.rpm"/><source-package last-modified="1174931007" id="rhn-source-package-41791" source-rpm="zip-2.31-1.2.2.src.rpm"/><source-package last-modified="1174931008" id="rhn-source-package-41792" source-rpm="lsof-4.78-3.src.rpm"/><source-package last-modified="1174931009" id="rhn-source-package-41793" source-rpm="pirut-1.2.10-1.el5.src.rpm"/><source-package last-modified="1174931009" id="rhn-source-package-41794" source-rpm="cdparanoia-alpha9.8-27.2.src.rpm"/><source-package last-modified="1174931011" id="rhn-source-package-41795" source-rpm="wireless-tools-28-2.el5.src.rpm"/><source-package last-modified="1174931012" id="rhn-source-package-41796" source-rpm="ipsec-tools-0.6.5-6.src.rpm"/><source-package last-modified="1174931016" id="rhn-source-package-41798" source-rpm="gnupg-1.4.5-12.src.rpm"/><source-package last-modified="1174931017" id="rhn-source-package-41799" source-rpm="stardict-2.4.5-5.src.rpm"/><source-package last-modified="1174931019" id="rhn-source-package-41800" source-rpm="coolkey-1.0.1-16.el5.src.rpm"/><source-package last-modified="1174931019" id="rhn-source-package-41801" source-rpm="filesystem-2.4.0-1.src.rpm"/><source-package last-modified="1174931021" id="rhn-source-package-41802" source-rpm="fonts-hebrew-0.100-4.1.1.src.rpm"/><source-package last-modified="1174931021" id="rhn-source-package-41803" source-rpm="xhtml1-dtds-1.0-7.1.1.src.rpm"/><source-package last-modified="1174931023" id="rhn-source-package-41804" source-rpm="x3270-3.3.4p7-3.el5.1.src.rpm"/><source-package last-modified="1174931025" id="rhn-source-package-41805" source-rpm="orca-1.0.0-5.el5.src.rpm"/><source-package last-modified="1174931026" id="rhn-source-package-41806" source-rpm="selinux-policy-2.4.6-30.el5.src.rpm"/><source-package last-modified="1174931026" id="rhn-source-package-41807" source-rpm="fonts-sinhala-0.2.2-1.src.rpm"/><source-package last-modified="1174931028" id="rhn-source-package-41809" source-rpm="nss_ldap-253-3.src.rpm"/><source-package last-modified="1174931028" id="rhn-source-package-41810" source-rpm="bridge-utils-1.1-2.src.rpm"/><source-package last-modified="1174931029" id="rhn-source-package-41811" source-rpm="oddjob-0.27-7.src.rpm"/><source-package last-modified="1174931030" id="rhn-source-package-41812" source-rpm="bug-buddy-2.16.0-2.el5.src.rpm"/><source-package last-modified="1174931031" id="rhn-source-package-41813" source-rpm="vconfig-1.9-2.1.src.rpm"/><source-package last-modified="1174931031" id="rhn-source-package-41814" source-rpm="system-config-samba-1.2.39-1.el5.src.rpm"/><source-package last-modified="1174931032" id="rhn-source-package-41815" source-rpm="xrestop-0.2-6.2.2.src.rpm"/><source-package last-modified="1174931032" id="rhn-source-package-41816" source-rpm="symlinks-1.2-24.2.2.src.rpm"/><source-package last-modified="1174931033" id="rhn-source-package-41817" source-rpm="system-config-boot-0.2.13-1.el5.src.rpm"/><source-package last-modified="1174931033" id="rhn-source-package-41818" source-rpm="aspell-br-0.50-4.2.2.src.rpm"/><source-package last-modified="1174931034" id="rhn-source-package-41819" source-rpm="gnome-volume-manager-2.15.0-4.el5.src.rpm"/><source-package last-modified="1174931035" id="rhn-source-package-41820" source-rpm="libgconf-java-2.12.4-6.el5.src.rpm"/><source-package last-modified="1174931038" id="rhn-source-package-41821" source-rpm="gnome-media-2.16.1-3.el5.src.rpm"/><source-package last-modified="1174931041" id="rhn-source-package-41822" source-rpm="am-utils-6.1.5-4.1.el5.src.rpm"/><source-package last-modified="1174931046" id="rhn-source-package-41823" source-rpm="gimp-data-extras-2.0.1-1.1.1.src.rpm"/><source-package last-modified="1174931046" id="rhn-source-package-41824" source-rpm="perl-DateManip-5.44-1.2.1.src.rpm"/><source-package last-modified="1174931050" id="rhn-source-package-41825" source-rpm="man-pages-ja-20060815-2.src.rpm"/><source-package last-modified="1174931052" id="rhn-source-package-41826" source-rpm="xorg-x11-apps-7.1-4.el5.src.rpm"/><source-package last-modified="1174931053" id="rhn-source-package-41828" source-rpm="setarch-2.0-1.1.src.rpm"/><source-package last-modified="1174931066" id="rhn-source-package-41829" source-rpm="binutils-2.17.50.0.6-2.el5.src.rpm"/><source-package last-modified="1174931066" id="rhn-source-package-41830" source-rpm="iptstate-1.4-1.1.2.2.src.rpm"/><source-package last-modified="1174931072" id="rhn-source-package-41831" source-rpm="dasher-4.2.0-2.el5.src.rpm"/><source-package last-modified="1174931075" id="rhn-source-package-41832" source-rpm="gnome-screensaver-2.16.1-5.el5.src.rpm"/><source-package last-modified="1174931076" id="rhn-source-package-41833" source-rpm="enscript-1.6.4-4.fc6.src.rpm"/><source-package last-modified="1174931079" id="rhn-source-package-41834" source-rpm="flex-2.5.4a-41.fc6.src.rpm"/><source-package last-modified="1174931079" id="rhn-source-package-41835" source-rpm="crontabs-1.10-8.src.rpm"/><source-package last-modified="1174931080" id="rhn-source-package-41836" source-rpm="lslk-1.29-17.src.rpm"/><source-package last-modified="1174931080" id="rhn-source-package-41837" source-rpm="eruby-1.0.5-6.1.src.rpm"/><source-package last-modified="1174931083" id="rhn-source-package-41838" source-rpm="a2ps-4.13b-57.1.el5.src.rpm"/><source-package last-modified="1174931084" id="rhn-source-package-41839" source-rpm="redhat-rpm-config-8.0.45-17.el5.src.rpm"/><source-package last-modified="1174931084" id="rhn-source-package-41840" source-rpm="logwatch-7.3-5.src.rpm"/><source-package last-modified="1174931085" id="rhn-source-package-41841" source-rpm="lv-4.51-8.1.src.rpm"/><source-package last-modified="1174931087" id="rhn-source-package-41842" source-rpm="xorg-x11-utils-7.1-2.fc6.src.rpm"/><source-package last-modified="1174931087" id="rhn-source-package-41843" source-rpm="joystick-1.2.15-20.2.2.src.rpm"/><source-package last-modified="1174931088" id="rhn-source-package-41844" source-rpm="libglade-java-2.12.5-3.fc6.src.rpm"/><source-package last-modified="1174931095" id="rhn-source-package-41845" source-rpm="gnome-applets-2.16.0.1-19.el5.src.rpm"/><source-package last-modified="1174931096" id="rhn-source-package-41846" source-rpm="iptraf-3.0.0-5.el5.src.rpm"/><source-package last-modified="1174931098" id="rhn-source-package-41847" source-rpm="emacspeak-23.0-2.1.src.rpm"/><source-package last-modified="1174931099" id="rhn-source-package-41848" source-rpm="aspell-cy-0.50-4.2.2.src.rpm"/><source-package last-modified="1174931099" id="rhn-source-package-41849" source-rpm="units-1.85-1.2.2.src.rpm"/><source-package last-modified="1174931101" id="rhn-source-package-41850" source-rpm="strace-4.5.15-1.el5.src.rpm"/><source-package last-modified="1174931107" id="rhn-source-package-41851" source-rpm="cadaver-0.22.3-4.el5.src.rpm"/><source-package last-modified="1174931109" id="rhn-source-package-41852" source-rpm="xchat-2.6.6-8.el5.src.rpm"/><source-package last-modified="1174931111" id="rhn-source-package-41853" source-rpm="xmlsec1-1.2.9-8.1.src.rpm"/><source-package last-modified="1174931111" id="rhn-source-package-41854" source-rpm="traceroute-2.0.1-2.el5.src.rpm"/><source-package last-modified="1174931115" id="rhn-source-package-41855" source-rpm="man-pages-pl-0.24-2.1.src.rpm"/><source-package last-modified="1174931117" id="rhn-source-package-41856" source-rpm="exim-4.63-3.el5.src.rpm"/><source-package last-modified="1174931159" id="rhn-source-package-41859" source-rpm="xen-3.0.3-25.el5.src.rpm"/><source-package last-modified="1174931169" id="rhn-source-package-41863" source-rpm="ant-1.6.5-2jpp.2.src.rpm"/><source-package last-modified="1174931170" id="rhn-source-package-41864" source-rpm="ctags-5.6-1.1.src.rpm"/><source-package last-modified="1174931172" id="rhn-source-package-41865" source-rpm="libchewing-0.3.0-7.el5.src.rpm"/><source-package last-modified="1174931174" id="rhn-source-package-41866" source-rpm="xml-commons-1.3.02-0.b2.7jpp.10.src.rpm"/><source-package last-modified="1174931175" id="rhn-source-package-41867" source-rpm="javacc-4.0-3jpp.3.src.rpm"/><source-package last-modified="1174931176" id="rhn-source-package-41868" source-rpm="junit-3.8.2-3jpp.1.src.rpm"/><source-package last-modified="1174931189" id="rhn-source-package-41869" source-rpm="boost-1.33.1-10.el5.src.rpm"/><source-package last-modified="1174931191" id="rhn-source-package-41870" source-rpm="bison-2.3-2.1.src.rpm"/><source-package last-modified="1174931193" id="rhn-source-package-41871" source-rpm="libwvstreams-4.2.2-2.1.src.rpm"/><source-package last-modified="1174931199" id="rhn-source-package-41872" source-rpm="tomcat5-5.5.17-8jpp.2.src.rpm"/><source-package last-modified="1174931204" id="rhn-source-package-41873" source-rpm="xalan-j2-2.7.0-6jpp.1.src.rpm"/><source-package last-modified="1174931206" id="rhn-source-package-41874" source-rpm="castor-0.9.5-1jpp.7.src.rpm"/><source-package last-modified="1174931208" id="rhn-source-package-41875" source-rpm="libgnomeui-2.16.0-5.el5.src.rpm"/><source-package last-modified="1174931209" id="rhn-source-package-41876" source-rpm="velocity-1.4-6jpp.1.src.rpm"/><source-package last-modified="1174931211" id="rhn-source-package-41877" source-rpm="m17n-lib-1.3.3-1.1.fc6.src.rpm"/><source-package last-modified="1174931212" id="rhn-source-package-41878" source-rpm="libdv-0.104-4.fc6.1.src.rpm"/><source-package last-modified="1174931220" id="rhn-source-package-41879" source-rpm="lam-7.1.2-8.fc6.src.rpm"/><source-package last-modified="1174931233" id="rhn-source-package-41880" source-rpm="openib-1.1-5.el5.src.rpm"/><source-package last-modified="1174931234" id="rhn-source-package-41881" source-rpm="gtkspell-2.0.11-2.1.src.rpm"/><source-package last-modified="1174931238" id="rhn-source-package-41882" source-rpm="tk-8.4.13-3.fc6.src.rpm"/><source-package last-modified="1174931241" id="rhn-source-package-41883" source-rpm="ncurses-5.5-24.20060715.src.rpm"/><source-package last-modified="1174931244" id="rhn-source-package-41884" source-rpm="splint-3.1.1-16.el5.src.rpm"/><source-package last-modified="1174931245" id="rhn-source-package-41885" source-rpm="Xaw3d-1.5E-10.1.src.rpm"/><source-package last-modified="1174931246" id="rhn-source-package-41886" source-rpm="libmusicbrainz-2.1.1-4.1.src.rpm"/><source-package last-modified="1174931272" id="rhn-source-package-41887" source-rpm="emacs-21.4-17.src.rpm"/><source-package last-modified="1174931274" id="rhn-source-package-41888" source-rpm="libexif-0.6.13-4.el5.src.rpm"/><source-package last-modified="1174931276" id="rhn-source-package-41889" source-rpm="libtheora-1.0alpha7-1.src.rpm"/><source-package last-modified="1174931277" id="rhn-source-package-41890" source-rpm="libXtst-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931278" id="rhn-source-package-41891" source-rpm="audiofile-0.2.6-5.src.rpm"/><source-package last-modified="1174931279" id="rhn-source-package-41892" source-rpm="imake-1.0.2-3.src.rpm"/><source-package last-modified="1174931281" id="rhn-source-package-41893" source-rpm="avalon-logkit-1.2-4jpp.3.src.rpm"/><source-package last-modified="1174931282" id="rhn-source-package-41894" source-rpm="xorg-x11-drv-via-0.2.1-9.src.rpm"/><source-package last-modified="1174931283" id="rhn-source-package-41895" source-rpm="mx4j-3.0.1-6jpp.4.src.rpm"/><source-package last-modified="1174931287" id="rhn-source-package-41896" source-rpm="lm_sensors-2.10.0-3.1.src.rpm"/><source-package last-modified="1174931296" id="rhn-source-package-41897" source-rpm="php-5.1.6-5.el5.src.rpm"/><source-package last-modified="1174931305" id="rhn-source-package-41898" source-rpm="iso-codes-0.53-1.src.rpm"/><source-package last-modified="1174931305" id="rhn-source-package-41899" source-rpm="libiec61883-1.0.0-11.fc6.src.rpm"/><source-package last-modified="1174931307" id="rhn-source-package-41900" source-rpm="cman-2.0.60-1.el5.src.rpm"/><source-package last-modified="1174931307" id="rhn-source-package-41901" source-rpm="jakarta-commons-pool-1.3-5jpp.1.src.rpm"/><source-package last-modified="1174931314" id="rhn-source-package-41902" source-rpm="subversion-1.4.2-2.el5.src.rpm"/><source-package last-modified="1174931393" id="rhn-source-package-41903" source-rpm="eclipse-3.2.1-18.el5.src.rpm"/><source-package last-modified="1174931396" id="rhn-source-package-41904" source-rpm="jlex-1.2.6-5jpp.1.src.rpm"/><source-package last-modified="1174931398" id="rhn-source-package-41905" source-rpm="jakarta-commons-lang-2.1-5jpp.1.src.rpm"/><source-package last-modified="1174931399" id="rhn-source-package-41906" source-rpm="indent-2.2.9-14.fc6.src.rpm"/><source-package last-modified="1174931399" id="rhn-source-package-41907" source-rpm="byacc-1.9-29.2.2.src.rpm"/><source-package last-modified="1174931400" id="rhn-source-package-41908" source-rpm="libcroco-0.6.1-2.1.src.rpm"/><source-package last-modified="1174931401" id="rhn-source-package-41909" source-rpm="libXi-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931407" id="rhn-source-package-41910" source-rpm="lapack-3.0-37.el5.src.rpm"/><source-package last-modified="1174931415" id="rhn-source-package-41911" source-rpm="freeradius-1.1.3-1.1.el5.src.rpm"/><source-package last-modified="1174931416" id="rhn-source-package-41912" source-rpm="classpathx-mail-1.1.1-4jpp.2.src.rpm"/><source-package last-modified="1174931438" id="rhn-source-package-41913" source-rpm="python-docs-2.4.3-1.1.src.rpm"/><source-package last-modified="1174931445" id="rhn-source-package-41914" source-rpm="libXft-2.1.10-1.1.src.rpm"/><source-package last-modified="1174931450" id="rhn-source-package-41915" source-rpm="kdesdk-3.5.4-3.el5.src.rpm"/><source-package last-modified="1174931461" id="rhn-source-package-41916" source-rpm="jakarta-commons-collections-3.1-6jpp.1.src.rpm"/><source-package last-modified="1174931468" id="rhn-source-package-41917" source-rpm="pam-0.99.6.2-3.14.el5.src.rpm"/><source-package last-modified="1174931469" id="rhn-source-package-41918" source-rpm="radvd-0.9.1-4.src.rpm"/><source-package last-modified="1174931471" id="rhn-source-package-41919" source-rpm="libidn-0.6.5-1.1.src.rpm"/><source-package last-modified="1174931474" id="rhn-source-package-41920" source-rpm="libxslt-1.1.17-2.src.rpm"/><source-package last-modified="1174931475" id="rhn-source-package-41921" source-rpm="libdhcp-1.17-1.el5.src.rpm"/><source-package last-modified="1174931479" id="rhn-source-package-41922" source-rpm="axis-1.2.1-2jpp.6.src.rpm"/><source-package last-modified="1174931480" id="rhn-source-package-41923" source-rpm="jakarta-commons-logging-1.0.4-6jpp.1.src.rpm"/><source-package last-modified="1174931488" id="rhn-source-package-41924" source-rpm="python-2.4.3-19.el5.src.rpm"/><source-package last-modified="1174931490" id="rhn-source-package-41925" source-rpm="xdoclet-1.2.3-7jpp.2.src.rpm"/><source-package last-modified="1174931494" id="rhn-source-package-41926" source-rpm="libSM-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931494" id="rhn-source-package-41927" source-rpm="jakarta-commons-el-1.0-7jpp.1.src.rpm"/><source-package last-modified="1174931495" id="rhn-source-package-41928" source-rpm="libraw1394-1.2.1-1.fc6.src.rpm"/><source-package last-modified="1174931499" id="rhn-source-package-41929" source-rpm="mod_perl-2.0.2-6.1.src.rpm"/><source-package last-modified="1174931502" id="rhn-source-package-41930" source-rpm="squid-2.6.STABLE6-3.el5.src.rpm"/><source-package last-modified="1174931505" id="rhn-source-package-41931" source-rpm="xerces-j2-2.7.1-7jpp.2.src.rpm"/><source-package last-modified="1174931507" id="rhn-source-package-41932" source-rpm="nasm-0.98.39-3.2.2.src.rpm"/><source-package last-modified="1174931512" id="rhn-source-package-41933" source-rpm="valgrind-3.2.1-6.el5.src.rpm"/><source-package last-modified="1174931517" id="rhn-source-package-41934" source-rpm="gphoto2-2.2.0-3.el5.src.rpm"/><source-package last-modified="1174931519" id="rhn-source-package-41935" source-rpm="gnome-desktop-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174931520" id="rhn-source-package-41936" source-rpm="libICE-1.0.1-2.1.src.rpm"/><source-package last-modified="1174931521" id="rhn-source-package-41937" source-rpm="zlib-1.2.3-3.src.rpm"/><source-package last-modified="1174931523" id="rhn-source-package-41938" source-rpm="libwmf-0.2.8.4-10.1.src.rpm"/><source-package last-modified="1174931524" id="rhn-source-package-41939" source-rpm="jsch-0.1.28-1jpp.5.src.rpm"/><source-package last-modified="1174931526" id="rhn-source-package-41940" source-rpm="pvm-3.4.5-7.fc6.1.src.rpm"/><source-package last-modified="1174931529" id="rhn-source-package-41941" source-rpm="ORBit2-2.14.3-4.el5.src.rpm"/><source-package last-modified="1174931529" id="rhn-source-package-41942" source-rpm="hardlink-1.0-1.26.src.rpm"/><source-package last-modified="1174931530" id="rhn-source-package-41943" source-rpm="avalon-framework-4.1.4-2jpp.13.src.rpm"/><source-package last-modified="1174931530" id="rhn-source-package-41944" source-rpm="libXext-1.0.1-2.1.src.rpm"/><source-package last-modified="1174931531" id="rhn-source-package-41945" source-rpm="device-mapper-multipath-0.4.7-8.el5.src.rpm"/><source-package last-modified="1174931532" id="rhn-source-package-41946" source-rpm="xml-commons-resolver-1.1-1jpp.12.src.rpm"/><source-package last-modified="1174931533" id="rhn-source-package-41947" source-rpm="libgsf-1.14.1-6.1.src.rpm"/><source-package last-modified="1174931533" id="rhn-source-package-41948" source-rpm="gob2-2.0.14-1.1.src.rpm"/><source-package last-modified="1174931536" id="rhn-source-package-41949" source-rpm="cyrus-imapd-2.3.7-1.1.el5.src.rpm"/><source-package last-modified="1174931537" id="rhn-source-package-41950" source-rpm="mtr-0.71-3.1.src.rpm"/><source-package last-modified="1174931538" id="rhn-source-package-41951" source-rpm="gdk-pixbuf-0.22.0-25.el5.src.rpm"/><source-package last-modified="1174931540" id="rhn-source-package-41952" source-rpm="expat-1.95.8-8.2.1.src.rpm"/><source-package last-modified="1174931543" id="rhn-source-package-41953" source-rpm="antlr-2.7.6-4jpp.2.src.rpm"/><source-package last-modified="1174931544" id="rhn-source-package-41954" source-rpm="jakarta-commons-modeler-1.1-8jpp.1.src.rpm"/><source-package last-modified="1174931544" id="rhn-source-package-41955" source-rpm="ElectricFence-2.2.2-20.2.2.src.rpm"/><source-package last-modified="1174931546" id="rhn-source-package-41956" source-rpm="sqlite-3.3.6-2.src.rpm"/><source-package last-modified="1174931547" id="rhn-source-package-41957" source-rpm="jakarta-oro-2.0.8-3jpp.1.src.rpm"/><source-package last-modified="1174931549" id="rhn-source-package-41958" source-rpm="scim-1.4.4-39.el5.src.rpm"/><source-package last-modified="1174931566" id="rhn-source-package-41961" source-rpm="giflib-4.1.3-7.1.el5.1.src.rpm"/><source-package last-modified="1174931568" id="rhn-source-package-41962" source-rpm="fontconfig-2.4.1-6.el5.src.rpm"/><source-package last-modified="1174931570" id="rhn-source-package-41963" source-rpm="GConf2-2.14.0-9.el5.src.rpm"/><source-package last-modified="1174931572" id="rhn-source-package-41964" source-rpm="libgnome-2.16.0-6.el5.src.rpm"/><source-package last-modified="1174931582" id="rhn-source-package-41965" source-rpm="system-config-bind-4.0.3-2.el5.src.rpm"/><source-package last-modified="1174931583" id="rhn-source-package-41966" source-rpm="speex-1.0.5-4.src.rpm"/><source-package last-modified="1174931585" id="rhn-source-package-41967" source-rpm="elfutils-0.125-3.el5.src.rpm"/><source-package last-modified="1174931585" id="rhn-source-package-41968" source-rpm="libXvMC-1.0.2-2.1.src.rpm"/><source-package last-modified="1174931589" id="rhn-source-package-41969" source-rpm="ksh-20060214-1.4.src.rpm"/><source-package last-modified="1174931594" id="rhn-source-package-41970" source-rpm="poppler-0.5.4-4.el5.src.rpm"/><source-package last-modified="1174931594" id="rhn-source-package-41971" source-rpm="jakarta-commons-digester-1.7-5jpp.1.src.rpm"/><source-package last-modified="1174931596" id="rhn-source-package-41972" source-rpm="apr-1.2.7-11.src.rpm"/><source-package last-modified="1174931599" id="rhn-source-package-41973" source-rpm="openmpi-1.1.1-5.el5.src.rpm"/><source-package last-modified="1174931600" id="rhn-source-package-41974" source-rpm="libXrandr-1.1.1-3.1.src.rpm"/><source-package last-modified="1174931601" id="rhn-source-package-41975" source-rpm="libgssapi-0.10-2.src.rpm"/><source-package last-modified="1174931603" id="rhn-source-package-41976" source-rpm="jakarta-commons-httpclient-3.0-7jpp.1.src.rpm"/><source-package last-modified="1174931604" id="rhn-source-package-41977" source-rpm="gnome-keyring-0.6.0-1.fc6.src.rpm"/><source-package last-modified="1174931605" id="rhn-source-package-41978" source-rpm="jakarta-taglibs-standard-1.1.1-7jpp.1.src.rpm"/><source-package last-modified="1174931610" id="rhn-source-package-41979" source-rpm="log4j-1.2.13-3jpp.2.src.rpm"/><source-package last-modified="1174931611" id="rhn-source-package-41980" source-rpm="PyQt-3.16-4.src.rpm"/><source-package last-modified="1174931612" id="rhn-source-package-41981" source-rpm="lockdev-1.0.1-10.src.rpm"/><source-package last-modified="1174931612" id="rhn-source-package-41982" source-rpm="xjavadoc-1.1-4jpp.1.src.rpm"/><source-package last-modified="1174931613" id="rhn-source-package-41983" source-rpm="libdrm-2.0.2-1.1.src.rpm"/><source-package last-modified="1174931614" id="rhn-source-package-41984" source-rpm="libXmu-1.0.2-5.src.rpm"/><source-package last-modified="1174931616" id="rhn-source-package-41985" source-rpm="libgtop2-2.14.4-3.el5.src.rpm"/><source-package last-modified="1174931616" id="rhn-source-package-41986" source-rpm="xferstats-2.16-14.1.src.rpm"/><source-package last-modified="1174931617" id="rhn-source-package-41987" source-rpm="libIDL-0.8.7-1.fc6.src.rpm"/><source-package last-modified="1174931632" id="rhn-source-package-41988" source-rpm="kdelibs-3.5.4-11.el5.src.rpm"/><source-package last-modified="1174931634" id="rhn-source-package-41989" source-rpm="libbonobo-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174931636" id="rhn-source-package-41990" source-rpm="pygtk2-2.10.1-8.el5.src.rpm"/><source-package last-modified="1174931639" id="rhn-source-package-41991" source-rpm="sip-4.4.5-3.src.rpm"/><source-package last-modified="1174931640" id="rhn-source-package-41992" source-rpm="esound-0.2.36-3.src.rpm"/><source-package last-modified="1174931653" id="rhn-source-package-41995" source-rpm="icu-3.6-5.9.src.rpm"/><source-package last-modified="1174931654" id="rhn-source-package-41996" source-rpm="gd-2.0.33-9.3.fc6.src.rpm"/><source-package last-modified="1174931655" id="rhn-source-package-41997" source-rpm="tclx-8.4.0-5.fc6.src.rpm"/><source-package last-modified="1174931656" id="rhn-source-package-41998" source-rpm="cairo-java-1.0.5-3.fc6.src.rpm"/><source-package last-modified="1174931657" id="rhn-source-package-41999" source-rpm="mgetty-1.1.33-9.fc6.src.rpm"/><source-package last-modified="1174931658" id="rhn-source-package-42000" source-rpm="tux-3.2.18-9.fc6.src.rpm"/><source-package last-modified="1174931661" id="rhn-source-package-42001" source-rpm="bcel-5.1-8jpp.1.src.rpm"/><source-package last-modified="1174931662" id="rhn-source-package-42002" source-rpm="gnome-menus-2.16.0-2.fc6.src.rpm"/><source-package last-modified="1174931663" id="rhn-source-package-42003" source-rpm="jakarta-commons-daemon-1.0.1-6jpp.1.src.rpm"/><source-package last-modified="1174931664" id="rhn-source-package-42004" source-rpm="libXaw-1.0.2-8.1.src.rpm"/><source-package last-modified="1174931700" id="rhn-source-package-42022" source-rpm="ibmasm-3.0-9.src.rpm"/><source-package last-modified="1174931702" id="rhn-source-package-42023" source-rpm="pycairo-1.2.0-1.1.src.rpm"/><source-package last-modified="1174931703" id="rhn-source-package-42024" source-rpm="libbtctl-0.6.0-9.2.el5.src.rpm"/><source-package last-modified="1174931705" id="rhn-source-package-42025" source-rpm="libpng-1.2.10-7.src.rpm"/><source-package last-modified="1174931705" id="rhn-source-package-42026" source-rpm="libavc1394-0.5.3-1.fc6.src.rpm"/><source-package last-modified="1174931707" id="rhn-source-package-42027" source-rpm="xorg-x11-proto-devel-7.1-9.fc6.src.rpm"/><source-package last-modified="1174931708" id="rhn-source-package-42028" source-rpm="mockobjects-0.09-14jpp.3.src.rpm"/><source-package last-modified="1174931708" id="rhn-source-package-42029" source-rpm="mod_auth_pgsql-2.0.3-2.3.1.src.rpm"/><source-package last-modified="1174931709" id="rhn-source-package-42030" source-rpm="mtx-1.2.18-8.2.2.src.rpm"/><source-package last-modified="1174931710" id="rhn-source-package-42031" source-rpm="libmng-1.0.9-5.1.src.rpm"/><source-package last-modified="1174931720" id="rhn-source-package-42037" source-rpm="libXxf86misc-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931723" id="rhn-source-package-42038" source-rpm="htdig-3.2.0b6-9.el5.src.rpm"/><source-package last-modified="1174931726" id="rhn-source-package-42039" source-rpm="inn-2.4.3-6.fc6.src.rpm"/><source-package last-modified="1174931727" id="rhn-source-package-42040" source-rpm="liboil-0.3.8-2.1.src.rpm"/><source-package last-modified="1174931729" id="rhn-source-package-42041" source-rpm="libX11-1.0.3-8.el5.src.rpm"/><source-package last-modified="1174931730" id="rhn-source-package-42042" source-rpm="bluez-libs-3.7-1.src.rpm"/><source-package last-modified="1174931732" id="rhn-source-package-42043" source-rpm="autoconf-2.59-12.src.rpm"/><source-package last-modified="1174931735" id="rhn-source-package-42044" source-rpm="tix-8.4.0-11.fc6.src.rpm"/><source-package last-modified="1174931739" id="rhn-source-package-42045" source-rpm="cairo-1.2.4-1.fc6.src.rpm"/><source-package last-modified="1174931741" id="rhn-source-package-42046" source-rpm="libpfm-3.2-0.060926.4.el5.src.rpm"/><source-package last-modified="1174931741" id="rhn-source-package-42047" source-rpm="libFS-1.0.0-3.1.src.rpm"/><source-package last-modified="1174931742" id="rhn-source-package-42048" source-rpm="libvte-java-0.12.1-6.el5.src.rpm"/><source-package last-modified="1174931743" id="rhn-source-package-42049" source-rpm="libgnomecanvas-2.14.0-4.1.src.rpm"/><source-package last-modified="1174931745" id="rhn-source-package-42050" source-rpm="neon-0.25.5-5.1.src.rpm"/><source-package last-modified="1174931745" id="rhn-source-package-42051" source-rpm="jakarta-commons-codec-1.3-7jpp.2.src.rpm"/><source-package last-modified="1174931746" id="rhn-source-package-42052" source-rpm="libevent-1.1a-3.2.1.src.rpm"/><source-package last-modified="1174931748" id="rhn-source-package-42053" source-rpm="automake17-1.7.9-7.src.rpm"/><source-package last-modified="1174931749" id="rhn-source-package-42054" source-rpm="regexp-1.4-2jpp.2.src.rpm"/><source-package last-modified="1174931758" id="rhn-source-package-42055" source-rpm="kdevelop-3.3.4-1.fc6.src.rpm"/><source-package last-modified="1174931759" id="rhn-source-package-42056" source-rpm="libgail-gnome-1.1.3-1.2.1.src.rpm"/><source-package last-modified="1174931759" id="rhn-source-package-42057" source-rpm="diffstat-1.41-1.2.2.src.rpm"/><source-package last-modified="1174931760" id="rhn-source-package-42058" source-rpm="check-0.9.3-5.fc6.src.rpm"/><source-package last-modified="1174931761" id="rhn-source-package-42059" source-rpm="libXinerama-1.0.1-2.1.src.rpm"/><source-package last-modified="1174931762" id="rhn-source-package-42060" source-rpm="slang-2.0.6-4.el5.src.rpm"/><source-package last-modified="1174931762" id="rhn-source-package-42061" source-rpm="pstack-1.2-7.2.2.src.rpm"/><source-package last-modified="1174931763" id="rhn-source-package-42063" source-rpm="rdate-1.4-6.src.rpm"/><source-package last-modified="1174931764" id="rhn-source-package-42064" source-rpm="libXp-1.0.0-8.src.rpm"/><source-package last-modified="1174931767" id="rhn-source-package-42065" source-rpm="glib2-2.12.3-2.fc6.src.rpm"/><source-package last-modified="1174931768" id="rhn-source-package-42066" source-rpm="gtksourceview-1.8.0-1.fc6.src.rpm"/><source-package last-modified="1174931769" id="rhn-source-package-42067" source-rpm="openais-0.80.2-1.el5.src.rpm"/><source-package last-modified="1174931771" id="rhn-source-package-42068" source-rpm="libgpg-error-1.4-2.src.rpm"/><source-package last-modified="1174931772" id="rhn-source-package-42069" source-rpm="libxklavier-3.0-3.el5.src.rpm"/><source-package last-modified="1174931773" id="rhn-source-package-42070" source-rpm="libXfontcache-1.0.2-3.1.src.rpm"/><source-package last-modified="1174931773" id="rhn-source-package-42071" source-rpm="libselinux-1.33.4-2.el5.src.rpm"/><source-package last-modified="1174931779" id="rhn-source-package-42072" source-rpm="struts-1.2.9-4jpp.5.src.rpm"/><source-package last-modified="1174931780" id="rhn-source-package-42073" source-rpm="pcsc-lite-1.3.1-7.src.rpm"/><source-package last-modified="1174931783" id="rhn-source-package-42075" source-rpm="libusb-0.1.12-5.1.src.rpm"/><source-package last-modified="1174931783" id="rhn-source-package-42076" source-rpm="hesiod-3.1.0-8.src.rpm"/><source-package last-modified="1174931785" id="rhn-source-package-42077" source-rpm="lucene-1.4.3-1jpp.16.src.rpm"/><source-package last-modified="1174931786" id="rhn-source-package-42078" source-rpm="libXv-1.0.1-4.1.src.rpm"/><source-package last-modified="1174931786" id="rhn-source-package-42079" source-rpm="rcs-5.7-30.1.src.rpm"/><source-package last-modified="1174931789" id="rhn-source-package-42080" source-rpm="ibutils-1.0-3.el5.src.rpm"/><source-package last-modified="1174931790" id="rhn-source-package-42081" source-rpm="php-pear-1.4.9-4.src.rpm"/><source-package last-modified="1174931794" id="rhn-source-package-42082" source-rpm="sane-backends-1.0.18-5.el5.src.rpm"/><source-package last-modified="1174931795" id="rhn-source-package-42083" source-rpm="lcms-1.15-1.2.2.src.rpm"/><source-package last-modified="1174931796" id="rhn-source-package-42084" source-rpm="libxkbfile-1.0.3-3.1.src.rpm"/><source-package last-modified="1174931797" id="rhn-source-package-42085" source-rpm="system-config-nfs-1.3.23-1.el5.src.rpm"/><source-package last-modified="1174931798" id="rhn-source-package-42086" source-rpm="uucp-1.07-12.src.rpm"/><source-package last-modified="1174931799" id="rhn-source-package-42087" source-rpm="libXt-1.0.2-3.1.fc6.src.rpm"/><source-package last-modified="1174931802" id="rhn-source-package-42088" source-rpm="quagga-0.98.6-2.1.src.rpm"/><source-package last-modified="1174931802" id="rhn-source-package-42089" source-rpm="Pyrex-0.9.4-2.fc6.src.rpm"/><source-package last-modified="1174931803" id="rhn-source-package-42090" source-rpm="pygobject2-2.12.1-5.el5.src.rpm"/><source-package last-modified="1174931804" id="rhn-source-package-42091" source-rpm="kdbg-2.0.2-1.2.1.src.rpm"/><source-package last-modified="1174931806" id="rhn-source-package-42092" source-rpm="beecrypt-4.1.2-10.1.1.src.rpm"/><source-package last-modified="1174931807" id="rhn-source-package-42093" source-rpm="pango-1.14.9-3.el5.src.rpm"/><source-package last-modified="1174931809" id="rhn-source-package-42094" source-rpm="mrtg-2.14.5-2.src.rpm"/><source-package last-modified="1174931811" id="rhn-source-package-42095" source-rpm="jdom-1.0-4jpp.1.src.rpm"/><source-package last-modified="1174931812" id="rhn-source-package-42096" source-rpm="jakarta-commons-validator-1.1.4-5jpp.1.src.rpm"/><source-package last-modified="1174931818" id="rhn-source-package-42097" source-rpm="tcl-8.4.13-3.fc6.src.rpm"/><source-package last-modified="1174931820" id="rhn-source-package-42098" source-rpm="fetchmail-6.3.6-1.el5.src.rpm"/><source-package last-modified="1174931824" id="rhn-source-package-42101" source-rpm="libXpm-3.5.5-3.src.rpm"/><source-package last-modified="1174931827" id="rhn-source-package-42102" source-rpm="doxygen-1.4.7-1.1.src.rpm"/><source-package last-modified="1174931828" id="rhn-source-package-42103" source-rpm="mod_authz_ldap-0.26-7.1.src.rpm"/><source-package last-modified="1174931829" id="rhn-source-package-42104" source-rpm="jakarta-commons-launcher-0.9-6jpp.1.src.rpm"/><source-package last-modified="1174931829" id="rhn-source-package-42105" source-rpm="ypserv-2.19-3.src.rpm"/><source-package last-modified="1174931830" id="rhn-source-package-42106" source-rpm="atk-1.12.2-1.fc6.src.rpm"/><source-package last-modified="1174931831" id="rhn-source-package-42107" source-rpm="bootparamd-0.17-24.devel.2.1.src.rpm"/><source-package last-modified="1174931834" id="rhn-source-package-42108" source-rpm="nss-3.11.5-1.el5.src.rpm"/><source-package last-modified="1174931836" id="rhn-source-package-42109" source-rpm="dbus-glib-0.70-5.src.rpm"/><source-package last-modified="1174931836" id="rhn-source-package-42110" source-rpm="openobex-1.3-3.1.src.rpm"/><source-package last-modified="1174931841" id="rhn-source-package-42111" source-rpm="guile-1.8.0-8.20060831cvs.src.rpm"/><source-package last-modified="1174931842" id="rhn-source-package-42112" source-rpm="system-config-httpd-1.3.3.1-1.el5.src.rpm"/><source-package last-modified="1174931844" id="rhn-source-package-42113" source-rpm="libXfixes-4.0.1-2.1.src.rpm"/><source-package last-modified="1174931845" id="rhn-source-package-42114" source-rpm="jdepend-2.6-6jpp.2.src.rpm"/><source-package last-modified="1174931846" id="rhn-source-package-42115" source-rpm="libvorbis-1.1.2-2.src.rpm"/><source-package last-modified="1174931848" id="rhn-source-package-42116" source-rpm="automake-1.9.6-2.1.src.rpm"/><source-package last-modified="1174931848" id="rhn-source-package-42117" source-rpm="webalizer-2.01_10-30.1.src.rpm"/><source-package last-modified="1174931849" id="rhn-source-package-42118" source-rpm="java_cup-0.10-0.k.6jpp.1.src.rpm"/><source-package last-modified="1174931849" id="rhn-source-package-42119" source-rpm="gnu-efi-3.0c-1.1.src.rpm"/><source-package last-modified="1174931850" id="rhn-source-package-42120" source-rpm="rarpd-ss981107-22.2.2.src.rpm"/><source-package last-modified="1174931850" id="rhn-source-package-42121" source-rpm="libsepol-1.15.2-1.el5.src.rpm"/><source-package last-modified="1174931851" id="rhn-source-package-42122" source-rpm="libdaemon-0.10-5.el5.src.rpm"/><source-package last-modified="1174931852" id="rhn-source-package-42123" source-rpm="mod_auth_kerb-5.1-3.src.rpm"/><source-package last-modified="1174931854" id="rhn-source-package-42124" source-rpm="glade2-2.12.1-6.el5.src.rpm"/><source-package last-modified="1174931856" id="rhn-source-package-42126" source-rpm="glib-1.2.10-20.el5.src.rpm"/><source-package last-modified="1174931856" id="rhn-source-package-42127" source-rpm="libXdmcp-1.0.1-2.1.src.rpm"/><source-package last-modified="1174931857" id="rhn-source-package-42128" source-rpm="libao-0.8.6-5.src.rpm"/><source-package last-modified="1174931864" id="rhn-source-package-42129" source-rpm="db4-4.3.29-9.fc6.src.rpm"/><source-package last-modified="1174931865" id="rhn-source-package-42130" source-rpm="apr-util-1.2.7-6.src.rpm"/><source-package last-modified="1174931868" id="rhn-source-package-42131" source-rpm="SDL-1.2.10-8.el5.src.rpm"/><source-package last-modified="1174931869" id="rhn-source-package-42132" source-rpm="libnl-1.0-0.10.pre5.4.src.rpm"/><source-package last-modified="1174931870" id="rhn-source-package-42133" source-rpm="librsvg2-2.16.1-1.el5.src.rpm"/><source-package last-modified="1174931870" id="rhn-source-package-42134" source-rpm="numactl-0.9.8-2.el5.src.rpm"/><source-package last-modified="1174931872" id="rhn-source-package-42135" source-rpm="icon-slicer-0.3-7.2.2.src.rpm"/><source-package last-modified="1174931872" id="rhn-source-package-42136" source-rpm="libfontenc-1.0.2-2.2.el5.src.rpm"/><source-package last-modified="1174931874" id="rhn-source-package-42137" source-rpm="mod_python-3.2.8-3.1.src.rpm"/><source-package last-modified="1174931878" id="rhn-source-package-42138" source-rpm="gnome-mount-0.5-3.el5.src.rpm"/><source-package last-modified="1174931880" id="rhn-source-package-42139" source-rpm="gstreamer-plugins-good-0.10.4-2.el5.src.rpm"/><source-package last-modified="1174931881" id="rhn-source-package-42140" source-rpm="wsdl4j-1.5.2-4jpp.1.src.rpm"/><source-package last-modified="1174931882" id="rhn-source-package-42141" source-rpm="gnome-speech-0.4.5-1.fc6.src.rpm"/><source-package last-modified="1174931883" id="rhn-source-package-42142" source-rpm="jakarta-commons-fileupload-1.0-6jpp.1.src.rpm"/><source-package last-modified="1174931890" id="rhn-source-package-42143" source-rpm="evolution-data-server-1.8.0-15.el5.src.rpm"/><source-package last-modified="1174931890" id="rhn-source-package-42144" source-rpm="libXevie-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931891" id="rhn-source-package-42145" source-rpm="jakarta-commons-beanutils-1.7.0-5jpp.1.src.rpm"/><source-package last-modified="1174931892" id="rhn-source-package-42146" source-rpm="classpathx-jaf-1.0-9jpp.1.src.rpm"/><source-package last-modified="1174931894" id="rhn-source-package-42147" source-rpm="libXxf86dga-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931894" id="rhn-source-package-42148" source-rpm="bsf-2.3.0-11jpp.1.src.rpm"/><source-package last-modified="1174931895" id="rhn-source-package-42149" source-rpm="pfmon-3.2-0.060926.4.el5.src.rpm"/><source-package last-modified="1174931896" id="rhn-source-package-42150" source-rpm="gtkhtml2-2.11.0-3.src.rpm"/><source-package last-modified="1174931897" id="rhn-source-package-42151" source-rpm="gamin-0.1.7-8.el5.src.rpm"/><source-package last-modified="1174931898" id="rhn-source-package-42152" source-rpm="libglade2-2.6.0-2.src.rpm"/><source-package last-modified="1174931898" id="rhn-source-package-42153" source-rpm="libXScrnSaver-1.1.0-3.1.src.rpm"/><source-package last-modified="1174931899" id="rhn-source-package-42154" source-rpm="libXdamage-1.0.3-2.1.src.rpm"/><source-package last-modified="1174931904" id="rhn-source-package-42155" source-rpm="gucharmap-1.8.0-1.fc6.src.rpm"/><source-package last-modified="1174931905" id="rhn-source-package-42156" source-rpm="startup-notification-0.8-4.1.src.rpm"/><source-package last-modified="1174931910" id="rhn-source-package-42157" source-rpm="kdebindings-3.5.4-1.fc6.src.rpm"/><source-package last-modified="1174931912" id="rhn-source-package-42158" source-rpm="pyorbit-2.14.1-1.1.src.rpm"/><source-package last-modified="1174931913" id="rhn-source-package-42159" source-rpm="libXcursor-1.1.7-1.1.src.rpm"/><source-package last-modified="1174931913" id="rhn-source-package-42160" source-rpm="mod_auth_mysql-3.0.0-3.1.src.rpm"/><source-package last-modified="1174931915" id="rhn-source-package-42161" source-rpm="dovecot-1.0-1.2.rc15.el5.src.rpm"/><source-package last-modified="1174931918" id="rhn-source-package-42162" source-rpm="dbus-1.0.0-6.el5.src.rpm"/><source-package last-modified="1174931918" id="rhn-source-package-42163" source-rpm="automake16-1.6.3-8.src.rpm"/><source-package last-modified="1174931921" id="rhn-source-package-42164" source-rpm="pcre-6.6-1.1.src.rpm"/><source-package last-modified="1174931929" id="rhn-source-package-42165" source-rpm="kdewebdev-3.5.4-2.fc6.src.rpm"/><source-package last-modified="1174931935" id="rhn-source-package-42166" source-rpm="gail-1.9.2-1.fc6.src.rpm"/><source-package last-modified="1174931936" id="rhn-source-package-42167" source-rpm="libXxf86vm-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931936" id="rhn-source-package-42168" source-rpm="jakarta-commons-discovery-0.3-4jpp.1.src.rpm"/><source-package last-modified="1174931937" id="rhn-source-package-42169" source-rpm="adaptx-0.9.13-3jpp.1.src.rpm"/><source-package last-modified="1174931938" id="rhn-source-package-42170" source-rpm="vsftpd-2.0.5-10.el5.src.rpm"/><source-package last-modified="1174931940" id="rhn-source-package-42171" source-rpm="werken-xpath-0.9.4-0.beta.12jpp.1.src.rpm"/><source-package last-modified="1174931944" id="rhn-source-package-42172" source-rpm="glib-java-0.2.6-3.fc6.src.rpm"/><source-package last-modified="1174931945" id="rhn-source-package-42173" source-rpm="eel2-2.16.1-1.el5.src.rpm"/><source-package last-modified="1174931947" id="rhn-source-package-42174" source-rpm="curl-7.15.5-2.el5.src.rpm"/><source-package last-modified="1174931948" id="rhn-source-package-42175" source-rpm="newt-0.52.2-9.src.rpm"/><source-package last-modified="1174931948" id="rhn-source-package-42176" source-rpm="unifdef-1.171-5.fc6.src.rpm"/><source-package last-modified="1174931950" id="rhn-source-package-42177" source-rpm="libgcrypt-1.2.3-1.src.rpm"/><source-package last-modified="1174931951" id="rhn-source-package-42178" source-rpm="alchemist-1.0.36-2.el5.src.rpm"/><source-package last-modified="1174931952" id="rhn-source-package-42179" source-rpm="nfs-utils-lib-1.0.8-7.2.src.rpm"/><source-package last-modified="1174931953" id="rhn-source-package-42180" source-rpm="libXcomposite-0.3-5.1.src.rpm"/><source-package last-modified="1174931954" id="rhn-source-package-42181" source-rpm="libtiff-3.8.2-7.el5.src.rpm"/><source-package last-modified="1174931955" id="rhn-source-package-42182" source-rpm="libXau-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931956" id="rhn-source-package-42183" source-rpm="libieee1284-0.2.9-4.el5.src.rpm"/><source-package last-modified="1174931958" id="rhn-source-package-42184" source-rpm="opensp-1.5.2-4.src.rpm"/><source-package last-modified="1174931959" id="rhn-source-package-42185" source-rpm="libbonoboui-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174931962" id="rhn-source-package-42186" source-rpm="libXfont-1.2.2-1.fc6.src.rpm"/><source-package last-modified="1174931962" id="rhn-source-package-42187" source-rpm="libXTrap-1.0.0-3.1.src.rpm"/><source-package last-modified="1174931963" id="rhn-source-package-42188" source-rpm="libjpeg-6b-37.src.rpm"/><source-package last-modified="1174931964" id="rhn-source-package-42189" source-rpm="psgml-1.2.5-4.3.src.rpm"/><source-package last-modified="1174931966" id="rhn-source-package-42190" source-rpm="privoxy-3.0.3-9.2.2.src.rpm"/><source-package last-modified="1174931967" id="rhn-source-package-42191" source-rpm="libgnomeprintui22-2.12.1-6.src.rpm"/><source-package last-modified="1174931968" id="rhn-source-package-42192" source-rpm="automake14-1.4p6-13.src.rpm"/><source-package last-modified="1174931970" id="rhn-source-package-42193" source-rpm="libc-client-2004g-2.2.1.src.rpm"/><source-package last-modified="1174931972" id="rhn-source-package-42194" source-rpm="libsoup-2.2.98-2.el5.src.rpm"/><source-package last-modified="1174931972" id="rhn-source-package-42195" source-rpm="libXrender-0.9.1-3.1.src.rpm"/><source-package last-modified="1174931975" id="rhn-source-package-42196" source-rpm="openssl-0.9.8b-8.3.el5.src.rpm"/><source-package last-modified="1174931989" id="rhn-source-package-42197" source-rpm="wireshark-0.99.4-2.el5.src.rpm"/><source-package last-modified="1174931990" id="rhn-source-package-42198" source-rpm="libgnomecups-0.2.2-8.src.rpm"/><source-package last-modified="1174931990" id="rhn-source-package-42199" source-rpm="libdmx-1.0.2-3.1.src.rpm"/><source-package last-modified="1174931991" id="rhn-source-package-42200" source-rpm="libwnck-2.16.0-4.fc6.src.rpm"/><source-package last-modified="1174931993" id="rhn-source-package-42201" source-rpm="flac-1.1.2-27.src.rpm"/><source-package last-modified="1174931994" id="rhn-source-package-42202" source-rpm="libgnomeprint22-2.12.1-9.el5.src.rpm"/><source-package last-modified="1174931996" id="rhn-source-package-42203" source-rpm="xorg-x11-drv-i810-1.6.5-9.2.el5.src.rpm"/><source-package last-modified="1174932000" id="rhn-source-package-42204" source-rpm="libxml2-2.6.26-2.1.2.src.rpm"/><source-package last-modified="1174932002" id="rhn-source-package-42205" source-rpm="dev86-0.16.17-2.2.src.rpm"/><source-package last-modified="1174932002" id="rhn-source-package-42206" source-rpm="libcap-1.10-26.src.rpm"/><source-package last-modified="1174932006" id="rhn-source-package-42207" source-rpm="MySQL-python-1.2.1-1.src.rpm"/><source-package last-modified="1174932021" id="rhn-source-package-42208" source-rpm="gmp-4.1.4-10.el5.src.rpm"/><source-package last-modified="1174932024" id="rhn-source-package-42209" source-rpm="PyXML-0.8.4-4.src.rpm"/><source-package last-modified="1174932025" id="rhn-source-package-42210" source-rpm="checkpolicy-1.33.1-2.el5.src.rpm"/><source-package last-modified="1174932040" id="rhn-source-package-42211" source-rpm="cracklib-2.8.9-3.1.src.rpm"/><source-package last-modified="1174932045" id="rhn-source-package-42212" source-rpm="dbus-python-0.70-7.el5.src.rpm"/><source-package last-modified="1174932046" id="rhn-source-package-42213" source-rpm="desktop-file-utils-0.10-7.src.rpm"/><source-package last-modified="1174932047" id="rhn-source-package-42214" source-rpm="device-mapper-1.02.13-1.el5.src.rpm"/><source-package last-modified="1174932047" id="rhn-source-package-42215" source-rpm="dhcdbd-2.2-1.el5.src.rpm"/><source-package last-modified="1174932060" id="rhn-source-package-42216" source-rpm="diffutils-2.8.1-15.2.2.src.rpm"/><source-package last-modified="1174932061" id="rhn-source-package-42217" source-rpm="docbook-dtds-1.0-30.1.src.rpm"/><source-package last-modified="1174932063" id="rhn-source-package-42218" source-rpm="findutils-4.2.27-4.1.src.rpm"/><source-package last-modified="1174932066" id="rhn-source-package-42219" source-rpm="gawk-3.1.5-14.el5.src.rpm"/><source-package last-modified="1174932070" id="rhn-source-package-42220" source-rpm="geronimo-specs-1.0-0.M2.2jpp.12.src.rpm"/><source-package last-modified="1174932072" id="rhn-source-package-42221" source-rpm="gjdoc-0.7.7-12.el5.src.rpm"/><source-package last-modified="1174932073" id="rhn-source-package-42222" source-rpm="gnome-doc-utils-0.8.0-2.fc6.src.rpm"/><source-package last-modified="1174932075" id="rhn-source-package-42223" source-rpm="gnome-icon-theme-2.16.0.1-4.el5.src.rpm"/><source-package last-modified="1174932080" id="rhn-source-package-42224" source-rpm="gnome-mime-data-2.4.2-3.1.src.rpm"/><source-package last-modified="1174932081" id="rhn-source-package-42225" source-rpm="gnome-python2-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174932082" id="rhn-source-package-42226" source-rpm="gnome-python2-desktop-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174932094" id="rhn-source-package-42227" source-rpm="gnu-crypto-2.1.0-2jpp.1.src.rpm"/><source-package last-modified="1174932096" id="rhn-source-package-42228" source-rpm="gperf-3.0.1-7.2.2.src.rpm"/><source-package last-modified="1174932098" id="rhn-source-package-42229" source-rpm="grep-2.5.1-54.2.el5.src.rpm"/><source-package last-modified="1174932101" id="rhn-source-package-42230" source-rpm="groff-1.18.1.1-11.1.src.rpm"/><source-package last-modified="1174932102" id="rhn-source-package-42231" source-rpm="gzip-1.3.5-9.el5.src.rpm"/><source-package last-modified="1174932102" id="rhn-source-package-42232" source-rpm="htmlview-4.0.0-1.el5.src.rpm"/><source-package last-modified="1174932103" id="rhn-source-package-42233" source-rpm="hwdata-0.194-1.src.rpm"/><source-package last-modified="1174932104" id="rhn-source-package-42234" source-rpm="intltool-0.35.0-2.src.rpm"/><source-package last-modified="1174932104" id="rhn-source-package-42235" source-rpm="jadetex-3.12-13.1.1.src.rpm"/><source-package last-modified="1174932105" id="rhn-source-package-42236" source-rpm="jpackage-utils-1.7.3-1jpp.2.el5.src.rpm"/><source-package last-modified="1174932108" id="rhn-source-package-42237" source-rpm="jrefactory-2.8.9-6jpp.3.src.rpm"/><source-package last-modified="1174932109" id="rhn-source-package-42238" source-rpm="latex2html-2002.2.1-6.src.rpm"/><source-package last-modified="1174932110" id="rhn-source-package-42239" source-rpm="less-394-5.el5.src.rpm"/><source-package last-modified="1174932111" id="rhn-source-package-42240" source-rpm="m4-1.4.5-3.el5.1.src.rpm"/><source-package last-modified="1174932112" id="rhn-source-package-42241" source-rpm="mailx-8.1.1-44.2.2.src.rpm"/><source-package last-modified="1174932112" id="rhn-source-package-42242" source-rpm="mktemp-1.5-23.2.2.src.rpm"/><source-package last-modified="1174932113" id="rhn-source-package-42243" source-rpm="module-init-tools-3.3-0.pre3.1.16.el5.src.rpm"/><source-package last-modified="1174932117" id="rhn-source-package-42246" source-rpm="patch-2.5.4-29.2.2.src.rpm"/><source-package last-modified="1174932118" id="rhn-source-package-42247" source-rpm="perl-Compress-Zlib-1.42-1.fc6.src.rpm"/><source-package last-modified="1174932118" id="rhn-source-package-42248" source-rpm="perl-DBI-1.52-1.fc6.src.rpm"/><source-package last-modified="1174932119" id="rhn-source-package-42249" source-rpm="perl-HTML-Parser-3.55-1.fc6.src.rpm"/><source-package last-modified="1174932120" id="rhn-source-package-42250" source-rpm="perl-IO-Socket-SSL-1.01-1.fc6.src.rpm"/><source-package last-modified="1174932121" id="rhn-source-package-42251" source-rpm="perl-Net-DNS-0.59-1.fc6.src.rpm"/><source-package last-modified="1174932122" id="rhn-source-package-42252" source-rpm="perl-SGMLSpm-1.03ii-16.2.1.src.rpm"/><source-package last-modified="1174932123" id="rhn-source-package-42253" source-rpm="perl-URI-1.35-3.src.rpm"/><source-package last-modified="1174932123" id="rhn-source-package-42254" source-rpm="perl-XML-LibXML-1.58-5.src.rpm"/><source-package last-modified="1174932124" id="rhn-source-package-42255" source-rpm="perl-XML-LibXML-Common-0.13-8.2.2.src.rpm"/><source-package last-modified="1174932124" id="rhn-source-package-42256" source-rpm="perl-XML-Parser-2.34-6.1.2.2.1.src.rpm"/><source-package last-modified="1174932125" id="rhn-source-package-42257" source-rpm="perl-XML-Simple-2.14-4.fc6.src.rpm"/><source-package last-modified="1174932126" id="rhn-source-package-42259" source-rpm="pykickstart-0.43-1.el5.src.rpm"/><source-package last-modified="1174932127" id="rhn-source-package-42260" source-rpm="python-numeric-23.7-2.2.2.src.rpm"/><source-package last-modified="1174932127" id="rhn-source-package-42261" source-rpm="python-urlgrabber-3.1.0-2.src.rpm"/><source-package last-modified="1174932129" id="rhn-source-package-42263" source-rpm="scrollkeeper-0.3.14-9.el5.src.rpm"/><source-package last-modified="1174932130" id="rhn-source-package-42264" source-rpm="sed-4.1.5-5.fc6.src.rpm"/><source-package last-modified="1174932130" id="rhn-source-package-42265" source-rpm="sgml-common-0.6.3-18.src.rpm"/><source-package last-modified="1174932131" id="rhn-source-package-42266" source-rpm="sharutils-4.6.1-2.src.rpm"/><source-package last-modified="1174932134" id="rhn-source-package-42267" source-rpm="tar-1.15.1-23.el5.src.rpm"/><source-package last-modified="1174932135" id="rhn-source-package-42268" source-rpm="texi2html-1.76-4.fc6.src.rpm"/><source-package last-modified="1174932136" id="rhn-source-package-42269" source-rpm="transfig-3.2.4-16.src.rpm"/><source-package last-modified="1174932137" id="rhn-source-package-42270" source-rpm="usermode-1.88-3.el5.src.rpm"/><source-package last-modified="1174932140" id="rhn-source-package-42271" source-rpm="w3m-0.5.1-15.el5.src.rpm"/><source-package last-modified="1174932141" id="rhn-source-package-42272" source-rpm="wpa_supplicant-0.4.8-10.1.fc6.src.rpm"/><source-package last-modified="1174932144" id="rhn-source-package-42277" source-rpm="net-tools-1.60-73.src.rpm"/><source-package last-modified="1174932144" id="rhn-source-package-42278" source-rpm="chkfontpath-1.10.1-1.1.src.rpm"/><source-package last-modified="1174932146" id="rhn-source-package-42279" source-rpm="xorg-x11-drv-jamstudio-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932146" id="rhn-source-package-42280" source-rpm="xorg-x11-drv-microtouch-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932147" id="rhn-source-package-42281" source-rpm="xorg-x11-drv-evdev-1.0.0.5-2.el5.src.rpm"/><source-package last-modified="1174932148" id="rhn-source-package-42282" source-rpm="xorg-x11-drv-calcomp-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932148" id="rhn-source-package-42283" source-rpm="xorg-x11-drv-tseng-1.1.0-3.1.src.rpm"/><source-package last-modified="1174932149" id="rhn-source-package-42284" source-rpm="xorg-x11-drv-elographics-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932149" id="rhn-source-package-42285" source-rpm="yp-tools-2.9-0.1.src.rpm"/><source-package last-modified="1174932150" id="rhn-source-package-42286" source-rpm="comps-extras-11.1-1.1.src.rpm"/><source-package last-modified="1174932151" id="rhn-source-package-42287" source-rpm="xorg-x11-drv-dmc-1.1.0-2.src.rpm"/><source-package last-modified="1174932151" id="rhn-source-package-42288" source-rpm="perl-IO-Socket-INET6-2.51-2.fc6.src.rpm"/><source-package last-modified="1174932151" id="rhn-source-package-42289" source-rpm="mingetty-1.07-5.2.2.src.rpm"/><source-package last-modified="1174932152" id="rhn-source-package-42290" source-rpm="MAKEDEV-3.23-1.2.src.rpm"/><source-package last-modified="1174932153" id="rhn-source-package-42291" source-rpm="ethtool-5-1.el5.src.rpm"/><source-package last-modified="1174932153" id="rhn-source-package-42292" source-rpm="xorg-x11-drv-v4l-0.1.1-4.src.rpm"/><source-package last-modified="1174932154" id="rhn-source-package-42293" source-rpm="xorg-x11-drv-i740-1.1.0-2.1.src.rpm"/><source-package last-modified="1174932154" id="rhn-source-package-42294" source-rpm="xorg-x11-drv-joystick-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932165" id="rhn-source-package-42295" source-rpm="redhat-artwork-5.0.9-1.el5.src.rpm"/><source-package last-modified="1174932165" id="rhn-source-package-42296" source-rpm="perl-Digest-HMAC-1.01-15.src.rpm"/><source-package last-modified="1174932166" id="rhn-source-package-42297" source-rpm="ifd-egate-0.05-15.src.rpm"/><source-package last-modified="1174932167" id="rhn-source-package-42298" source-rpm="notify-python-0.1.0-3.fc6.src.rpm"/><source-package last-modified="1174932167" id="rhn-source-package-42299" source-rpm="docbook-simple-1.0-2.1.1.src.rpm"/><source-package last-modified="1174932171" id="rhn-source-package-42300" source-rpm="passivetex-1.25-5.1.1.src.rpm"/><source-package last-modified="1174932172" id="rhn-source-package-42301" source-rpm="gnome-python2-extras-2.14.2-4.fc6.src.rpm"/><source-package last-modified="1174932172" id="rhn-source-package-42302" source-rpm="perl-Net-IP-1.25-2.fc6.src.rpm"/><source-package last-modified="1174932173" id="rhn-source-package-42304" source-rpm="xorg-x11-drv-sisusb-0.8.1-4.1.src.rpm"/><source-package last-modified="1174932314" id="rhn-source-package-42313" source-rpm="perl-String-CRC32-1.4-2.fc6.src.rpm"/><source-package last-modified="1174932316" id="rhn-source-package-42315" source-rpm="gcalctool-5.8.25-1.el5.src.rpm"/><source-package last-modified="1174932317" id="rhn-source-package-42316" source-rpm="xorg-x11-drv-apm-1.1.1-2.1.src.rpm"/><source-package last-modified="1174932318" id="rhn-source-package-42318" source-rpm="pyparted-1.8.1-4.el5.src.rpm"/><source-package last-modified="1174932319" id="rhn-source-package-42319" source-rpm="python-pyblock-0.25-1.src.rpm"/><source-package last-modified="1174932319" id="rhn-source-package-42320" source-rpm="perl-Archive-Tar-1.30-1.fc6.src.rpm"/><source-package last-modified="1174932320" id="rhn-source-package-42321" source-rpm="tzdata-2006m-2.fc6.src.rpm"/><source-package last-modified="1174932320" id="rhn-source-package-42322" source-rpm="pyspi-0.6.1-1.el5.src.rpm"/><source-package last-modified="1174932321" id="rhn-source-package-42323" source-rpm="xorg-x11-drv-elo2300-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932322" id="rhn-source-package-42324" source-rpm="xorg-x11-drv-keyboard-1.1.0-2.1.src.rpm"/><source-package last-modified="1174932323" id="rhn-source-package-42325" source-rpm="xorg-x11-drv-dummy-0.2.0-2.1.src.rpm"/><source-package last-modified="1174932323" id="rhn-source-package-42326" source-rpm="xorg-x11-drv-vesa-1.2.1-5.2.el5.src.rpm"/><source-package last-modified="1174932324" id="rhn-source-package-42327" source-rpm="xorg-x11-drv-digitaledge-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932325" id="rhn-source-package-42328" source-rpm="rhnlib-2.2.5-1.el5.src.rpm"/><source-package last-modified="1174932327" id="rhn-source-package-42329" source-rpm="xorg-x11-drv-i128-1.2.0-4.src.rpm"/><source-package last-modified="1174932327" id="rhn-source-package-42330" source-rpm="perl-Socket6-0.19-3.fc6.src.rpm"/><source-package last-modified="1174932329" id="rhn-source-package-42331" source-rpm="xorg-x11-drv-glint-1.1.1-4.1.src.rpm"/><source-package last-modified="1174932329" id="rhn-source-package-42332" source-rpm="xorg-x11-drv-ark-0.6.0-2.1.src.rpm"/><source-package last-modified="1174932330" id="rhn-source-package-42333" source-rpm="xorg-x11-drv-vmware-10.13.0-2.1.src.rpm"/><source-package last-modified="1174932331" id="rhn-source-package-42334" source-rpm="ghostscript-fonts-5.50-13.1.1.src.rpm"/><source-package last-modified="1174932332" id="rhn-source-package-42335" source-rpm="xorg-x11-drv-penmount-1.1.0-2.1.src.rpm"/><source-package last-modified="1174932333" id="rhn-source-package-42336" source-rpm="dialog-1.0.20051107-1.2.2.src.rpm"/><source-package last-modified="1174932333" id="rhn-source-package-42337" source-rpm="xorg-x11-drv-neomagic-1.1.1-2.1.src.rpm"/><source-package last-modified="1174932335" id="rhn-source-package-42338" source-rpm="perl-Net-SSLeay-1.30-4.fc6.src.rpm"/><source-package last-modified="1174932335" id="rhn-source-package-42339" source-rpm="xorg-x11-drv-tdfx-1.2.1-3.1.src.rpm"/><source-package last-modified="1174932336" id="rhn-source-package-42340" source-rpm="xorg-x11-drv-nv-1.2.0-4.fc6.src.rpm"/><source-package last-modified="1174932337" id="rhn-source-package-42341" source-rpm="perl-IO-Zlib-1.04-4.2.1.src.rpm"/><source-package last-modified="1174932337" id="rhn-source-package-42342" source-rpm="xorg-x11-drv-magictouch-1.0.0.5-2.1.src.rpm"/><source-package last-modified="1174932339" id="rhn-source-package-42343" source-rpm="xorg-x11-drv-sis-0.9.1-7.src.rpm"/><source-package last-modified="1174932339" id="rhn-source-package-42344" source-rpm="xorg-x11-drv-fbdev-0.3.0-2.src.rpm"/><source-package last-modified="1174932343" id="rhn-source-package-42345" source-rpm="notification-daemon-0.3.5-8.el5.src.rpm"/><source-package last-modified="1174932344" id="rhn-source-package-42346" source-rpm="redhat-menus-6.7.8-1.el5.src.rpm"/><source-package last-modified="1174932345" id="rhn-source-package-42347" source-rpm="lvm2-2.02.16-3.el5.src.rpm"/><source-package last-modified="1174932346" id="rhn-source-package-42348" source-rpm="xorg-x11-drv-ati-6.6.3-3.2.el5.src.rpm"/><source-package last-modified="1174932347" id="rhn-source-package-42349" source-rpm="procmail-3.22-17.1.src.rpm"/><source-package last-modified="1174932348" id="rhn-source-package-42350" source-rpm="xorg-x11-drv-chips-1.1.1-2.1.src.rpm"/><source-package last-modified="1174932349" id="rhn-source-package-42351" source-rpm="xorg-x11-drv-ur98-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932349" id="rhn-source-package-42352" source-rpm="xorg-x11-drv-magellan-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932350" id="rhn-source-package-42353" source-rpm="xorg-x11-drv-void-1.1.0-3.1.src.rpm"/><source-package last-modified="1174932350" id="rhn-source-package-42354" source-rpm="dmidecode-2.7-1.28.2.el5.src.rpm"/><source-package last-modified="1174932351" id="rhn-source-package-42355" source-rpm="xorg-x11-drv-mouse-1.1.1-1.1.src.rpm"/><source-package last-modified="1174932351" id="rhn-source-package-42356" source-rpm="perl-Carp-Clan-5.3-1.2.1.src.rpm"/><source-package last-modified="1174932352" id="rhn-source-package-42357" source-rpm="perl-HTML-Tagset-3.10-2.1.1.src.rpm"/><source-package last-modified="1174932352" id="rhn-source-package-42358" source-rpm="perl-libwww-perl-5.805-1.1.1.src.rpm"/><source-package last-modified="1174932354" id="rhn-source-package-42359" source-rpm="mx-2.0.6-2.2.2.src.rpm"/><source-package last-modified="1174932356" id="rhn-source-package-42360" source-rpm="xorg-x11-drv-dynapro-1.1.0-2.src.rpm"/><source-package last-modified="1174932357" id="rhn-source-package-42361" source-rpm="psmisc-22.2-5.src.rpm"/><source-package last-modified="1174932358" id="rhn-source-package-42362" source-rpm="xorg-x11-drv-vga-4.1.0-2.1.src.rpm"/><source-package last-modified="1174932358" id="rhn-source-package-42363" source-rpm="perl-BSD-Resource-1.28-1.fc6.1.src.rpm"/><source-package last-modified="1174932359" id="rhn-source-package-42364" source-rpm="kasumi-2.0.1-1.1.fc6.src.rpm"/><source-package last-modified="1174932359" id="rhn-source-package-42365" source-rpm="xorg-x11-drv-spaceorb-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932360" id="rhn-source-package-42366" source-rpm="python-sqlite-1.1.7-1.2.1.src.rpm"/><source-package last-modified="1174932360" id="rhn-source-package-42367" source-rpm="xorg-x11-drv-fpit-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932361" id="rhn-source-package-42368" source-rpm="xmltex-20020625-8.src.rpm"/><source-package last-modified="1174932361" id="rhn-source-package-42369" source-rpm="ttmkfdir-3.0.9-23.el5.src.rpm"/><source-package last-modified="1174932361" id="rhn-source-package-42370" source-rpm="rhnsd-4.6.1-1.el5.src.rpm"/><source-package last-modified="1174932363" id="rhn-source-package-42371" source-rpm="xorg-x11-xkb-utils-1.0.2-2.1.src.rpm"/><source-package last-modified="1174932366" id="rhn-source-package-42372" source-rpm="xorg-x11-drv-savage-2.1.1-5.fc6.src.rpm"/><source-package last-modified="1174932369" id="rhn-source-package-42373" source-rpm="ntp-4.2.2p1-5.el5.src.rpm"/><source-package last-modified="1174932370" id="rhn-source-package-42374" source-rpm="xorg-x11-drv-trident-1.2.1-3.fc6.src.rpm"/><source-package last-modified="1174932371" id="rhn-source-package-42375" source-rpm="xorg-x11-drv-ast-0.81.0-3.src.rpm"/><source-package last-modified="1174932371" id="rhn-source-package-42376" source-rpm="xorg-x11-drv-summa-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932372" id="rhn-source-package-42377" source-rpm="perl-Bit-Vector-6.4-2.2.2.1.src.rpm"/><source-package last-modified="1174932373" id="rhn-source-package-42378" source-rpm="xorg-x11-drv-palmax-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932373" id="rhn-source-package-42379" source-rpm="xorg-x11-drv-cirrus-1.1.0-2.fc6.src.rpm"/><source-package last-modified="1174932379" id="rhn-source-package-42380" source-rpm="urw-fonts-2.3-6.1.1.src.rpm"/><source-package last-modified="1174932379" id="rhn-source-package-42381" source-rpm="xorg-x11-drv-vmmouse-12.4.0-2.1.src.rpm"/><source-package last-modified="1174932380" id="rhn-source-package-42382" source-rpm="xorg-x11-drv-hyperpen-1.1.0-2.src.rpm"/><source-package last-modified="1174932381" id="rhn-source-package-42383" source-rpm="xorg-x11-drv-rendition-4.1.0-3.1.src.rpm"/><source-package last-modified="1174932383" id="rhn-source-package-42384" source-rpm="xorg-x11-drv-siliconmotion-1.4.1-2.1.src.rpm"/><source-package last-modified="1174932383" id="rhn-source-package-42385" source-rpm="python-elementtree-1.2.6-5.src.rpm"/><source-package last-modified="1174932384" id="rhn-source-package-42386" source-rpm="xorg-x11-drv-s3virge-1.9.1-2.1.src.rpm"/><source-package last-modified="1174932385" id="rhn-source-package-42387" source-rpm="xkeyboard-config-0.8-7.fc6.src.rpm"/><source-package last-modified="1174932388" id="rhn-source-package-42388" source-rpm="xorg-x11-server-utils-7.1-4.fc6.src.rpm"/><source-package last-modified="1174932391" id="rhn-source-package-42389" source-rpm="gthumb-2.7.8-5.el5.src.rpm"/><source-package last-modified="1174932392" id="rhn-source-package-42390" source-rpm="xorg-x11-drv-nsc-2.8.1-2.1.src.rpm"/><source-package last-modified="1174932392" id="rhn-source-package-42391" source-rpm="portmap-4.0-65.2.2.1.src.rpm"/><source-package last-modified="1174932394" id="rhn-source-package-42392" source-rpm="cdrdao-1.2.1-2.src.rpm"/><source-package last-modified="1174932394" id="rhn-source-package-42393" source-rpm="perl-Digest-SHA1-2.11-1.2.1.src.rpm"/><source-package last-modified="1174932395" id="rhn-source-package-42394" source-rpm="xorg-x11-drv-cyrix-1.1.0-4.src.rpm"/><source-package last-modified="1174932396" id="rhn-source-package-42395" source-rpm="xorg-x11-drv-tek4957-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932396" id="rhn-source-package-42396" source-rpm="xorg-x11-drv-citron-2.2.0-1.1.src.rpm"/><source-package last-modified="1174932397" id="rhn-source-package-42397" source-rpm="xorg-x11-drv-mutouch-1.1.0-2.src.rpm"/><source-package last-modified="1174932398" id="rhn-source-package-42398" source-rpm="xorg-x11-drv-s3-0.4.1-2.1.src.rpm"/><source-package last-modified="1174932398" id="rhn-source-package-42399" source-rpm="rhpxl-0.41-1.el5.src.rpm"/><source-package last-modified="1174932399" id="rhn-source-package-42400" source-rpm="xorg-x11-drv-aiptek-1.0.1-2.src.rpm"/><source-package last-modified="1174932400" id="rhn-source-package-42401" source-rpm="shared-mime-info-0.19-3.el5.src.rpm"/><source-package last-modified="1174932401" id="rhn-source-package-42402" source-rpm="xorg-x11-drv-mga-1.4.2-5.el5.src.rpm"/><source-package last-modified="1174932401" id="rhn-source-package-42403" source-rpm="mpage-2.5.4-7.1.src.rpm"/><source-package last-modified="1174932402" id="rhn-source-package-42404" source-rpm="perl-IO-String-1.08-1.1.1.src.rpm"/><source-package last-modified="1174932472" id="rhn-source-package-42406" source-rpm="redhat-release-5Server-5.0.0.9.src.rpm"/><source-package last-modified="1174932476" id="rhn-source-package-42407" source-rpm="redhat-release-notes-5Server-5.src.rpm"/><source-package last-modified="1175179614" id="rhn-source-package-42450" source-rpm="net-snmp-5.3.1-14.0.1.el5.src.rpm"/><source-package last-modified="1175623874" id="rhn-source-package-42475" source-rpm="krb5-1.5-23.src.rpm"/><source-package last-modified="1175624969" id="rhn-source-package-42476" source-rpm="libXfont-1.2.2-1.0.2.el5.src.rpm"/><source-package last-modified="1175625793" id="rhn-source-package-42478" source-rpm="xorg-x11-server-1.1.1-48.13.0.1.el5.src.rpm"/><source-package last-modified="1175626387" id="rhn-source-package-42479" source-rpm="squid-2.6.STABLE6-4.el5.src.rpm"/><source-package last-modified="1176722952" id="rhn-source-package-42503" source-rpm="freetype-2.2.1-17.el5.src.rpm"/><source-package last-modified="1176723787" id="rhn-source-package-42506" source-rpm="cups-1.2.4-11.5.1.el5.src.rpm"/><source-package last-modified="1176738095" id="rhn-source-package-42511" source-rpm="xorg-x11-apps-7.1-4.0.1.el5.src.rpm"/><source-package last-modified="1176738095" id="rhn-source-package-42512" source-rpm="libX11-1.0.3-8.0.1.el5.src.rpm"/><source-package last-modified="1177062384" id="rhn-source-package-42525" source-rpm="php-5.1.6-11.el5.src.rpm"/><source-package last-modified="1177950686" id="rhn-source-package-42751" source-rpm="kernel-2.6.18-8.1.3.el5.src.rpm"/><source-package last-modified="1178637852" id="rhn-source-package-42780" source-rpm="postgresql-8.1.9-1.el5.src.rpm"/><source-package last-modified="1178639068" id="rhn-source-package-42782" source-rpm="php-5.1.6-12.el5.src.rpm"/><source-package last-modified="1178716269" id="rhn-source-package-42791" source-rpm="vim-7.0.109-3.el5.3.src.rpm"/><source-package last-modified="1178804159" id="rhn-source-package-42796" source-rpm="cman-2.0.62-1.el5.src.rpm"/><source-package last-modified="1178812686" id="rhn-source-package-42800" source-rpm="freeradius-1.1.3-1.2.el5.src.rpm"/><source-package last-modified="1179155325" id="rhn-source-package-42833" source-rpm="samba-3.0.23c-2.el5.2.0.2.src.rpm"/><source-package last-modified="1179161928" id="rhn-source-package-42836" source-rpm="tomcat5-5.5.23-0jpp.1.0.3.el5.src.rpm"/><source-package last-modified="1179161928" id="rhn-source-package-42837" source-rpm="jakarta-commons-modeler-1.1-8jpp.1.0.2.el5.src.rpm"/><source-package last-modified="1179338448" id="rhn-source-package-42843" source-rpm="yum-rhn-plugin-0.4.3-2.el5.src.rpm"/><source-package last-modified="1179340066" id="rhn-source-package-42844" source-rpm="kernel-2.6.18-8.1.4.el5.src.rpm"/><source-package last-modified="1179411401" id="rhn-source-package-42848" source-rpm="ipsec-tools-0.6.5-8.el5.src.rpm"/><source-package last-modified="1179411519" id="rhn-source-package-42851" source-rpm="vixie-cron-4.1-70.el5.src.rpm"/><source-package last-modified="1179413374" id="rhn-source-package-42856" source-rpm="squirrelmail-1.4.8-4.0.1.el5.src.rpm"/><source-package last-modified="1179437773" id="rhn-source-package-42859" source-rpm="libpng-1.2.10-7.0.2.src.rpm"/><source-package last-modified="1179496299" id="rhn-source-package-42865" source-rpm="cman-2.0.64-1.el5.src.rpm"/><source-package last-modified="1179751939" id="rhn-source-package-42871" source-rpm="gimp-2.2.13-2.el5.src.rpm"/><source-package last-modified="1180011489" id="rhn-source-package-42900" source-rpm="redhat-rpm-config-8.0.45-17.0.1.el5.src.rpm"/><source-package last-modified="1180516316" id="rhn-source-package-42905" source-rpm="evolution-data-server-1.8.0-15.0.3.el5.src.rpm"/><source-package last-modified="1180517266" id="rhn-source-package-42907" source-rpm="quagga-0.98.6-2.1.0.1.el5.src.rpm"/><source-package last-modified="1180517957" id="rhn-source-package-42910" source-rpm="file-4.17-9.0.1.el5.src.rpm"/><source-package last-modified="1180574784" id="rhn-source-package-42915" source-rpm="firefox-1.5.0.12-1.el5.src.rpm"/><source-package last-modified="1180574784" id="rhn-source-package-42916" source-rpm="devhelp-0.12-11.el5.src.rpm"/><source-package last-modified="1180574784" id="rhn-source-package-42918" source-rpm="yelp-2.16.0-15.el5.src.rpm"/><source-package last-modified="1180943776" id="rhn-source-package-42927" source-rpm="mutt-1.4.2.2-3.0.2.el5.src.rpm"/><source-package last-modified="1181203175" id="rhn-source-package-42930" source-rpm="fetchmail-6.3.6-1.0.1.el5.src.rpm"/><source-package last-modified="1181549495" id="rhn-source-package-42999" source-rpm="freetype-2.2.1-19.el5.src.rpm"/><source-package last-modified="1181750122" id="rhn-source-package-43026" source-rpm="spamassassin-3.1.9-1.el5.src.rpm"/><source-package last-modified="1181814996" id="rhn-source-package-43032" source-rpm="iscsi-initiator-utils-6.2.0.742-0.6.el5.src.rpm"/><source-package last-modified="1181815313" id="rhn-source-package-43034" source-rpm="mod_perl-2.0.2-6.3.el5.src.rpm"/><source-package last-modified="1181832624" id="rhn-source-package-43041" source-rpm="kernel-2.6.18-8.1.6.el5.src.rpm"/><source-package last-modified="1181844745" id="rhn-source-package-43043" source-rpm="libexif-0.6.13-4.0.2.el5.src.rpm"/><source-package last-modified="1182155397" id="rhn-source-package-43056" source-rpm="nspr-4.6.5-1.0.1.el5.src.rpm"/><source-package last-modified="1182778701" id="rhn-source-package-43067" source-rpm="evolution-data-server-1.8.0-15.0.4.el5.src.rpm"/><source-package last-modified="1182871284" id="rhn-source-package-43073" source-rpm="httpd-2.2.3-7.el5.src.rpm"/><source-package last-modified="1182883654" id="rhn-source-package-43077" source-rpm="krb5-1.5-26.src.rpm"/><source-package last-modified="1182947345" id="rhn-source-package-43078" source-rpm="sysreport-1.4.3-12.el5.src.rpm"/><source-package last-modified="1182947428" id="rhn-source-package-43079" source-rpm="xterm-215-5.el5.src.rpm"/><source-package last-modified="1182947522" id="rhn-source-package-43080" source-rpm="hardlink-1.0-1.27.src.rpm"/><source-package last-modified="1182947568" id="rhn-source-package-43081" source-rpm="enscript-1.6.4-4.1.el5.src.rpm"/><source-package last-modified="1182947709" id="rhn-source-package-43082" source-rpm="fonts-chinese-3.02-9.9.el5.src.rpm"/><source-package last-modified="1182947876" id="rhn-source-package-43084" source-rpm="sos-1.5-1.el5.src.rpm"/><source-package last-modified="1182948057" id="rhn-source-package-43085" source-rpm="cracklib-2.8.9-3.3.src.rpm"/><source-package last-modified="1182948234" id="rhn-source-package-43086" source-rpm="rhpxl-0.41.1-1.el5.src.rpm"/><source-package last-modified="1182948319" id="rhn-source-package-43087" source-rpm="mc-4.6.1a-35.el5.src.rpm"/><source-package last-modified="1183015999" id="rhn-source-package-43102" source-rpm="cman-2.0.64-1.0.1.el5.src.rpm"/><source-package last-modified="1183649434" id="rhn-source-package-43182" source-rpm="perl-TimeDate-1.16-5.el5.src.rpm"/><source-package last-modified="1183649540" id="rhn-source-package-43183" source-rpm="prelink-0.3.9-2.1.src.rpm"/><source-package last-modified="1183649671" id="rhn-source-package-43184" source-rpm="conman-0.1.9.2-8.el5.src.rpm"/><source-package last-modified="1183649777" id="rhn-source-package-43185" source-rpm="mod_auth_kerb-5.1-3.el5.src.rpm"/><source-package last-modified="1183649876" id="rhn-source-package-43186" source-rpm="mod_authz_ldap-0.26-8.el5.src.rpm"/><source-package last-modified="1184039694" id="rhn-source-package-43188" source-rpm="kernel-2.6.18-8.1.8.el5.src.rpm"/><source-package last-modified="1184230888" id="rhn-source-package-43193" source-rpm="perl-Net-DNS-0.59-3.el5.src.rpm"/><source-package last-modified="1184231901" id="rhn-source-package-43194" source-rpm="xorg-x11-xfs-1.0.2-4.src.rpm"/><source-package last-modified="1184668510" id="rhn-source-package-43216" source-rpm="tomcat5-5.5.23-0jpp.1.0.4.el5.src.rpm"/><source-package last-modified="1184770290" id="rhn-source-package-43218" source-rpm="man-pages-2.39-10.el5.src.rpm"/><source-package last-modified="1184770575" id="rhn-source-package-43219" source-rpm="system-config-kdump-1.0.10-1.el5.src.rpm"/><source-package last-modified="1184770766" id="rhn-source-package-43220" source-rpm="fetchmail-6.3.6-1.1.el5.src.rpm"/><source-package last-modified="1184792490" id="rhn-source-package-43228" source-rpm="man-pages-ja-20060815-5.src.rpm"/><source-package last-modified="1184812911" id="rhn-source-package-43234" source-rpm="firefox-1.5.0.12-3.el5.src.rpm"/><source-package last-modified="1184850750" id="rhn-source-package-43238" source-rpm="tzdata-2007f-1.el5.src.rpm"/><source-package last-modified="1185284803" id="rhn-source-package-43497" source-rpm="bind-9.3.3-9.0.1.el5.src.rpm"/><source-package last-modified="1185484552" id="rhn-source-package-43504" source-rpm="acl-2.2.39-2.1.el5.src.rpm"/><source-package last-modified="1185484595" id="rhn-source-package-43512" source-rpm="binutils-2.17.50.0.6-5.el5.src.rpm"/><source-package last-modified="1185484602" id="rhn-source-package-43515" source-rpm="cairo-1.2.4-2.el5.src.rpm"/><source-package last-modified="1185484885" id="rhn-source-package-43526" source-rpm="dhcp-3.0.5-7.el5.src.rpm"/><source-package last-modified="1185484931" id="rhn-source-package-43531" source-rpm="emacs-21.4-19.el5.src.rpm"/><source-package last-modified="1185485009" id="rhn-source-package-43534" source-rpm="evolution-data-server-1.8.0-25.el5.src.rpm"/><source-package last-modified="1185485193" id="rhn-source-package-43549" source-rpm="icu-3.6-5.11.src.rpm"/><source-package last-modified="1185485303" id="rhn-source-package-43559" source-rpm="liberation-fonts-0.2-2.el5.src.rpm"/><source-package last-modified="1185485304" id="rhn-source-package-43560" source-rpm="libselinux-1.33.4-4.el5.src.rpm"/><source-package last-modified="1185485336" id="rhn-source-package-43573" source-rpm="nspr-4.6.5-3.el5.src.rpm"/><source-package last-modified="1185485344" id="rhn-source-package-43575" source-rpm="nss_ldap-253-5.el5.src.rpm"/><source-package last-modified="1185485349" id="rhn-source-package-43576" source-rpm="ntp-4.2.2p1-7.el5.src.rpm"/><source-package last-modified="1185485352" id="rhn-source-package-43578" source-rpm="openCryptoki-2.2.4-16.el5.src.rpm"/><source-package last-modified="1185485398" id="rhn-source-package-43582" source-rpm="openldap-2.3.27-8.src.rpm"/><source-package last-modified="1185819966" id="rhn-source-package-43595" source-rpm="cups-1.2.4-11.5.3.el5.src.rpm"/><source-package last-modified="1185821879" id="rhn-source-package-43596" source-rpm="poppler-0.5.4-4.1.el5.src.rpm"/><source-package last-modified="1185828304" id="rhn-source-package-43601" source-rpm="openssh-4.3p2-24.el5.src.rpm"/><source-package last-modified="1185828315" id="rhn-source-package-43603" source-rpm="pam_krb5-2.2.14-1.src.rpm"/><source-package last-modified="1185828327" id="rhn-source-package-43610" source-rpm="redhat-lsb-3.1-12.3.EL.src.rpm"/><source-package last-modified="1185828372" id="rhn-source-package-43620" source-rpm="sysklogd-1.4.1-40.el5.src.rpm"/><source-package last-modified="1185828373" id="rhn-source-package-43621" source-rpm="sysreport-1.4.3-13.el5.src.rpm"/><source-package last-modified="1185828376" id="rhn-source-package-43622" source-rpm="systemtap-0.5.14-1.el5.src.rpm"/><source-package last-modified="1185828398" id="rhn-source-package-43628" source-rpm="util-linux-2.13-0.45.el5.src.rpm"/><source-package last-modified="1185904157" id="rhn-source-package-43650" source-rpm="qt-3.3.6-21.el5.src.rpm"/><source-package last-modified="1185960834" id="rhn-source-package-43677" source-rpm="tetex-3.0-33.1.el5.src.rpm"/><source-package last-modified="1186514351" id="rhn-source-package-43700" source-rpm="gdm-2.16.0-31.0.1.el5.src.rpm"/><source-package last-modified="1187872660" id="rhn-source-package-43759" source-rpm="tar-1.15.1-23.0.1.el5.src.rpm"/><source-package last-modified="1188480717" id="rhn-source-package-43905" source-rpm="mysql-5.0.22-2.1.0.1.src.rpm"/><source-package last-modified="1188914520" id="rhn-source-package-43908" source-rpm="aide-0.13.1-2.0.4.el5.src.rpm"/><source-package last-modified="1188917451" id="rhn-source-package-43913" source-rpm="star-1.5a75-2.src.rpm"/><source-package last-modified="1188929562" id="rhn-source-package-43915" source-rpm="krb5-1.5-28.src.rpm"/><source-package last-modified="1189167226" id="rhn-source-package-43928" source-rpm="krb5-1.5-29.src.rpm"/><source-package last-modified="1189674517" id="rhn-source-package-43933" source-rpm="kernel-2.6.18-8.1.10.el5.src.rpm"/><source-package last-modified="1189699429" id="rhn-source-package-43937" source-rpm="qt-3.3.6-23.el5.src.rpm"/><source-package last-modified="1190222218" id="rhn-source-package-44015" source-rpm="libvorbis-1.1.2-3.el5.0.src.rpm"/><source-package last-modified="1190293563" id="rhn-source-package-44016" source-rpm="php-5.1.6-15.el5.src.rpm"/><source-package last-modified="1190794387" id="rhn-source-package-44055" source-rpm="gimp-2.2.13-2.0.7.el5.src.rpm"/><source-package last-modified="1190794572" id="rhn-source-package-44058" source-rpm="tomcat5-5.5.23-0jpp.3.0.2.el5.src.rpm"/><source-package last-modified="1190924207" id="rhn-source-package-44061" source-rpm="kernel-2.6.18-8.1.14.el5.src.rpm"/><source-package last-modified="1191358376" id="rhn-source-package-44075" source-rpm="xen-3.0.3-25.0.4.el5.src.rpm"/><source-package last-modified="1191358472" id="rhn-source-package-44076" source-rpm="nfs-utils-lib-1.0.8-7.2.z2.src.rpm"/><source-package last-modified="1191426218" id="rhn-source-package-44078" source-rpm="elinks-0.11.1-5.1.0.1.el5.src.rpm"/><source-package last-modified="1191505134" id="rhn-source-package-44084" source-rpm="tzdata-2007h-1.el5.src.rpm"/><source-package last-modified="1191829373" id="rhn-source-package-44085" source-rpm="kdebase-3.5.4-15.el5.src.rpm"/><source-package last-modified="1191830694" id="rhn-source-package-44088" source-rpm="kdelibs-3.5.4-13.el5.src.rpm"/><source-package last-modified="1192127121" id="rhn-source-package-44098" source-rpm="hplip-1.6.7-4.1.el5_0.3.src.rpm"/><source-package last-modified="1192186797" id="rhn-source-package-44099" source-rpm="openssl-0.9.8b-8.3.el5_0.2.src.rpm"/><source-package last-modified="1192807897" id="rhn-source-package-44104" source-rpm="firefox-1.5.0.12-6.el5.src.rpm"/><source-package last-modified="1193050083" id="rhn-source-package-44113" source-rpm="kernel-2.6.18-8.1.15.el5.src.rpm"/><source-package last-modified="1193067711" id="rhn-source-package-44115" source-rpm="flac-1.1.2-28.el5_0.1.src.rpm"/><source-package last-modified="1193157868" id="rhn-source-package-44132" source-rpm="libpng-1.2.10-7.1.el5_0.1.src.rpm"/><source-package last-modified="1193755341" id="rhn-source-package-44156" source-rpm="net-snmp-5.3.1-19.el5.src.rpm"/><source-package last-modified="1193756229" id="rhn-source-package-44158" source-rpm="mozldap-6.0.4-1.el5.src.rpm"/><source-package last-modified="1193756241" id="rhn-source-package-44159" source-rpm="svrcore-4.0.4-3.el5.src.rpm"/><source-package last-modified="1193756255" id="rhn-source-package-44160" source-rpm="perl-Mozilla-LDAP-1.5.2-4.el5.src.rpm"/><source-package last-modified="1193756264" id="rhn-source-package-44161" source-rpm="nfs4-acl-tools-0.3.1-1.el5.1.src.rpm"/><source-package last-modified="1193756276" id="rhn-source-package-44162" source-rpm="system-config-kdump-1.0.12-1.el5.src.rpm"/><source-package last-modified="1193756310" id="rhn-source-package-44163" source-rpm="sos-1.7-9.1.el5.src.rpm"/><source-package last-modified="1193756320" id="rhn-source-package-44165" source-rpm="redhat-release-5Server-5.1.0.2.src.rpm"/><source-package last-modified="1193756356" id="rhn-source-package-44166" source-rpm="ldapjdk-4.18-2jpp.3.el5.src.rpm"/><source-package last-modified="1193756646" id="rhn-source-package-44167" source-rpm="module-init-tools-3.3-0.pre3.1.34.el5.src.rpm"/><source-package last-modified="1193756657" id="rhn-source-package-44168" source-rpm="strace-4.5.16-1.el5.1.src.rpm"/><source-package last-modified="1193756723" id="rhn-source-package-44169" source-rpm="nss-3.11.7-1.3.el5.src.rpm"/><source-package last-modified="1193756782" id="rhn-source-package-44170" source-rpm="system-config-network-1.3.99-2.el5.src.rpm"/><source-package last-modified="1193756818" id="rhn-source-package-44171" source-rpm="ypbind-1.19-8.el5.src.rpm"/><source-package last-modified="1193756831" id="rhn-source-package-44172" source-rpm="xorg-x11-drv-mga-1.4.2-6.el5.src.rpm"/><source-package last-modified="1193756839" id="rhn-source-package-44173" source-rpm="redhat-menus-6.7.8-2.el5.src.rpm"/><source-package last-modified="1193757031" id="rhn-source-package-44176" source-rpm="cachefilesd-0.8-2.el5.src.rpm"/><source-package last-modified="1193757051" id="rhn-source-package-44177" source-rpm="initscripts-8.45.17.EL-1.src.rpm"/><source-package last-modified="1193757081" id="rhn-source-package-44178" source-rpm="krb5-1.6.1-17.el5.src.rpm"/><source-package last-modified="1193757109" id="rhn-source-package-44179" source-rpm="kernel-2.6.18-53.el5.src.rpm"/><source-package last-modified="1193757177" id="rhn-source-package-44180" source-rpm="gdb-6.5-25.el5.src.rpm"/><source-package last-modified="1193757205" id="rhn-source-package-44181" source-rpm="crash-4.0-4.6.1.src.rpm"/><source-package last-modified="1193757223" id="rhn-source-package-44182" source-rpm="quagga-0.98.6-5.el5.src.rpm"/><source-package last-modified="1193757238" id="rhn-source-package-44183" source-rpm="openhpi-2.8.1-2.el5.7.src.rpm"/><source-package last-modified="1193757388" id="rhn-source-package-44184" source-rpm="gfs2-utils-0.1.38-1.el5.src.rpm"/><source-package last-modified="1193757398" id="rhn-source-package-44185" source-rpm="cman-2.0.73-1.el5.src.rpm"/><source-package last-modified="1193757411" id="rhn-source-package-44186" source-rpm="openais-0.80.3-7.el5.src.rpm"/><source-package last-modified="1193758413" id="rhn-source-package-44187" source-rpm="edac-utils-0.9-5.el5.src.rpm"/><source-package last-modified="1193758527" id="rhn-source-package-44188" source-rpm="audit-1.5.5-7.el5.src.rpm"/><source-package last-modified="1193758661" id="rhn-source-package-44192" source-rpm="kudzu-1.2.57.1.15-1.src.rpm"/><source-package last-modified="1193758877" id="rhn-source-package-44194" source-rpm="mesa-6.5.1-7.5.el5.src.rpm"/><source-package last-modified="1193758955" id="rhn-source-package-44197" source-rpm="openib-1.2-6.el5.src.rpm"/><source-package last-modified="1193758983" id="rhn-source-package-44198" source-rpm="mkinitrd-5.1.19.6-19.src.rpm"/><source-package last-modified="1193759079" id="rhn-source-package-44199" source-rpm="cups-1.2.4-11.14.el5.src.rpm"/><source-package last-modified="1193759272" id="rhn-source-package-44203" source-rpm="cpufreq-utils-002-1.1.43.el5.src.rpm"/><source-package last-modified="1193759331" id="rhn-source-package-44204" source-rpm="xen-3.0.3-41.el5.src.rpm"/><source-package last-modified="1193759547" id="rhn-source-package-44206" source-rpm="yum-utils-1.0.4-3.el5.src.rpm"/><source-package last-modified="1193759566" id="rhn-source-package-44207" source-rpm="hwdata-0.211-1.src.rpm"/><source-package last-modified="1193759599" id="rhn-source-package-44208" source-rpm="xorg-x11-drv-i810-1.6.5-9.6.el5.src.rpm"/><source-package last-modified="1193759612" id="rhn-source-package-44209" source-rpm="xorg-x11-drv-nv-2.1.2-1.el5.src.rpm"/><source-package last-modified="1193760216" id="rhn-source-package-44211" source-rpm="parted-1.8.1-12.el5.src.rpm"/><source-package last-modified="1193760232" id="rhn-source-package-44212" source-rpm="device-mapper-multipath-0.4.7-12.el5.src.rpm"/><source-package last-modified="1193760233" id="rhn-source-package-44213" source-rpm="rpm-4.4.2-47.el5.src.rpm"/><source-package last-modified="1193760434" id="rhn-source-package-44215" source-rpm="kexec-tools-1.101-194.4.el5.src.rpm"/><source-package last-modified="1193760626" id="rhn-source-package-44216" source-rpm="gtk2-2.10.4-19.el5.src.rpm"/><source-package last-modified="1193760685" id="rhn-source-package-44217" source-rpm="nfs-utils-1.0.9-24.el5.src.rpm"/><source-package last-modified="1193760688" id="rhn-source-package-44218" source-rpm="selinux-policy-2.4.6-104.el5.src.rpm"/><source-package last-modified="1193760707" id="rhn-source-package-44220" source-rpm="fonts-chinese-3.02-12.el5.src.rpm"/><source-package last-modified="1193760734" id="rhn-source-package-44221" source-rpm="hal-0.5.8.1-25.el5.src.rpm"/><source-package last-modified="1193760951" id="rhn-source-package-44222" source-rpm="sblim-1-29.EL5.src.rpm"/><source-package last-modified="1193760965" id="rhn-source-package-44223" source-rpm="Deployment_Guide-5.1.0-11.src.rpm"/><source-package last-modified="1193760992" id="rhn-source-package-44224" source-rpm="jakarta-commons-modeler-1.1-8jpp.3.el5.src.rpm"/><source-package last-modified="1193761007" id="rhn-source-package-44225" source-rpm="pm-utils-0.99.3-6.el5.17.src.rpm"/><source-package last-modified="1193761011" id="rhn-source-package-44226" source-rpm="autofs-5.0.1-0.rc2.55.src.rpm"/><source-package last-modified="1193761028" id="rhn-source-package-44227" source-rpm="sabayon-2.12.4-5.el5.src.rpm"/><source-package last-modified="1193761040" id="rhn-source-package-44229" source-rpm="irqbalance-0.55-6.el5.src.rpm"/><source-package last-modified="1193761055" id="rhn-source-package-44230" source-rpm="tog-pegasus-2.6.1-2.el5.src.rpm"/><source-package last-modified="1193761105" id="rhn-source-package-44232" source-rpm="lvm2-2.02.26-3.el5.src.rpm"/><source-package last-modified="1193761167" id="rhn-source-package-44233" source-rpm="redhat-release-notes-5Server-9.src.rpm"/><source-package last-modified="1193761264" id="rhn-source-package-44235" source-rpm="dmraid-1.0.0.rc13-4.el5.src.rpm"/><source-package last-modified="1193761300" id="rhn-source-package-44236" source-rpm="newt-perl-1.08-9.2.2.src.rpm"/><source-package last-modified="1193761300" id="rhn-source-package-44237" source-rpm="crypto-utils-2.3-1.src.rpm"/><source-package last-modified="1193761338" id="rhn-source-package-44238" source-rpm="iscsi-initiator-utils-6.2.0.865-0.8.el5.src.rpm"/><source-package last-modified="1193761352" id="rhn-source-package-44239" source-rpm="yum-rhn-plugin-0.5.2-3.el5.src.rpm"/><source-package last-modified="1193761659" id="rhn-source-package-44240" source-rpm="wireshark-0.99.6-1.el5.src.rpm"/><source-package last-modified="1193770704" id="rhn-source-package-44253" source-rpm="rhn-client-tools-0.4.16-1.el5.src.rpm"/><source-package last-modified="1193771307" id="rhn-source-package-44255" source-rpm="OpenIPMI-2.0.6-5.el5.4.src.rpm"/><source-package last-modified="1193771537" id="rhn-source-package-44256" source-rpm="pkinit-nss-0.7.3-1.el5.src.rpm"/><source-package last-modified="1193779644" id="rhn-source-package-44257" source-rpm="watchdog-5.3.1-7.el5.src.rpm"/><source-package last-modified="1193779865" id="rhn-source-package-44258" source-rpm="openmpi-1.2.3-4.el5.src.rpm"/><source-package last-modified="1193779875" id="rhn-source-package-44259" source-rpm="ibutils-1.2-2.el5.src.rpm"/><source-package last-modified="1193780050" id="rhn-source-package-44260" source-rpm="libdhcp-1.20-2.el5.src.rpm"/><source-package last-modified="1193784223" id="rhn-source-package-44262" source-rpm="esc-1.0.0-32.el5.src.rpm"/><source-package last-modified="1193784320" id="rhn-source-package-44264" source-rpm="frysk-0.0.1.2007.06.21.rh2-4.el5.src.rpm"/><source-package last-modified="1193784641" id="rhn-source-package-44265" source-rpm="libXp-1.0.0-8.1.el5.src.rpm"/><source-package last-modified="1193784999" id="rhn-source-package-44269" source-rpm="python-pyblock-0.26-1.el5.src.rpm"/><source-package last-modified="1193784999" id="rhn-source-package-44270" source-rpm="anaconda-11.1.2.87-1.src.rpm"/><source-package last-modified="1193785039" id="rhn-source-package-44271" source-rpm="microcode_ctl-1.17-1.42.el5.src.rpm"/><source-package last-modified="1193785052" id="rhn-source-package-44272" source-rpm="xorg-x11-drv-evdev-1.0.0.5-3.el5.src.rpm"/><source-package last-modified="1193785106" id="rhn-source-package-44273" source-rpm="totem-2.16.7-1.el5.src.rpm"/><source-package last-modified="1193785111" id="rhn-source-package-44274" source-rpm="device-mapper-1.02.20-1.el5.src.rpm"/><source-package last-modified="1193785171" id="rhn-source-package-44275" source-rpm="policycoreutils-1.33.12-12.el5.src.rpm"/><source-package last-modified="1193785194" id="rhn-source-package-44276" source-rpm="bind-9.3.3-10.el5.src.rpm"/><source-package last-modified="1193785230" id="rhn-source-package-44277" source-rpm="xorg-x11-drv-vesa-1.3.0-8.1.el5.src.rpm"/><source-package last-modified="1193785242" id="rhn-source-package-44278" source-rpm="firstboot-1.4.27.3-1.el5.src.rpm"/><source-package last-modified="1193785257" id="rhn-source-package-44279" source-rpm="alsa-utils-1.0.14-2.rc4.el5.src.rpm"/><source-package last-modified="1193785257" id="rhn-source-package-44280" source-rpm="alsa-lib-1.0.14-1.rc4.el5.src.rpm"/><source-package last-modified="1193785275" id="rhn-source-package-44281" source-rpm="gnome-power-manager-2.16.0-8.el5.src.rpm"/><source-package last-modified="1193785290" id="rhn-source-package-44282" source-rpm="udev-095-14.9.el5.src.rpm"/><source-package last-modified="1193785323" id="rhn-source-package-44283" source-rpm="glibc-2.5-18.src.rpm"/><source-package last-modified="1193785415" id="rhn-source-package-44284" source-rpm="tcp_wrappers-7.6-40.4.el5.src.rpm"/><source-package last-modified="1193785428" id="rhn-source-package-44285" source-rpm="vixie-cron-4.1-72.el5.src.rpm"/><source-package last-modified="1193785443" id="rhn-source-package-44286" source-rpm="e2fsprogs-1.39-10.el5.src.rpm"/><source-package last-modified="1193785475" id="rhn-source-package-44287" source-rpm="samba-3.0.25b-0.el5.4.src.rpm"/><source-package last-modified="1193785502" id="rhn-source-package-44288" source-rpm="libuser-0.54.7-2.el5.2.src.rpm"/><source-package last-modified="1193785559" id="rhn-source-package-44289" source-rpm="gcc-4.1.2-14.el5.src.rpm"/><source-package last-modified="1193785639" id="rhn-source-package-44290" source-rpm="gstreamer-plugins-good-0.10.4-4.el5.src.rpm"/><source-package last-modified="1193785961" id="rhn-source-package-44291" source-rpm="pam-0.99.6.2-3.26.el5.src.rpm"/><source-package last-modified="1193838431" id="rhn-source-package-44292" source-rpm="cups-1.2.4-11.14.el5_1.1.src.rpm"/><source-package last-modified="1194278790" id="rhn-source-package-44307" source-rpm="pcre-6.6-2.el5_0.1.src.rpm"/><source-package last-modified="1194279147" id="rhn-source-package-44310" source-rpm="perl-5.8.8-10.el5_0.2.src.rpm"/><source-package last-modified="1194453806" id="rhn-source-package-44322" source-rpm="glibc-2.5-18.el5_1.1.src.rpm"/><source-package last-modified="1194454259" id="rhn-source-package-44323" source-rpm="openib-1.2-6.el5_1.1.src.rpm"/><source-package last-modified="1194454347" id="rhn-source-package-44324" source-rpm="cman-2.0.73-1.el5_1.1.src.rpm"/><source-package last-modified="1194454435" id="rhn-source-package-44325" source-rpm="selinux-policy-2.4.6-106.el5_1.3.src.rpm"/><source-package last-modified="1194454555" id="rhn-source-package-44326" source-rpm="hal-0.5.8.1-25.el5_1.1.src.rpm"/><source-package last-modified="1194457459" id="rhn-source-package-44327" source-rpm="cups-1.2.4-11.14.el5_1.3.src.rpm"/><source-package last-modified="1194458911" id="rhn-source-package-44331" source-rpm="poppler-0.5.4-4.3.el5_1.src.rpm"/><source-package last-modified="1194528992" id="rhn-source-package-44337" source-rpm="tetex-3.0-33.2.el5_1.2.src.rpm"/><source-package last-modified="1194540736" id="rhn-source-package-44339" source-rpm="openldap-2.3.27-8.el5_1.1.src.rpm"/><source-package last-modified="1194668039" id="rhn-source-package-44348" source-rpm="pcre-6.6-2.el5_1.1.src.rpm"/><source-package last-modified="1194946597" id="rhn-source-package-44369" source-rpm="ruby-1.8.5-5.el5_1.1.src.rpm"/><source-package last-modified="1195133181" id="rhn-source-package-44505" source-rpm="rsh-0.17-38.el5.src.rpm"/><source-package last-modified="1195134460" id="rhn-source-package-44506" source-rpm="libchewing-0.3.0-8.el5.src.rpm"/><source-package last-modified="1195135587" id="rhn-source-package-44507" source-rpm="logrotate-3.7.4-8.src.rpm"/><source-package last-modified="1195136668" id="rhn-source-package-44508" source-rpm="xorg-x11-drv-keyboard-1.1.0-3.src.rpm"/><source-package last-modified="1195137186" id="rhn-source-package-44509" source-rpm="telnet-0.17-39.el5.src.rpm"/><source-package last-modified="1195141427" id="rhn-source-package-44515" source-rpm="util-linux-2.13-0.45.el5_1.1.src.rpm"/><source-package last-modified="1195144012" id="rhn-source-package-44517" source-rpm="samba-3.0.25b-1.el5_1.2.src.rpm"/><source-package last-modified="1195145236" id="rhn-source-package-44520" source-rpm="net-snmp-5.3.1-19.el5_1.1.src.rpm"/><source-package last-modified="1195582425" id="rhn-source-package-44532" source-rpm="net-snmp-5.3.1-19.el5_1.2.src.rpm"/><source-package last-modified="1195646301" id="rhn-source-package-44533" source-rpm="php-pear-1.4.9-4.el5.1.src.rpm"/><source-package last-modified="1195646529" id="rhn-source-package-44534" source-rpm="psmisc-22.2-6.src.rpm"/><source-package last-modified="1195646607" id="rhn-source-package-44535" source-rpm="acl-2.2.39-3.el5.src.rpm"/><source-package last-modified="1195646677" id="rhn-source-package-44536" source-rpm="desktop-printing-0.19-20.1.el5.src.rpm"/><source-package last-modified="1195648561" id="rhn-source-package-44540" source-rpm="emacspeak-23.0-3.el5.src.rpm"/><source-package last-modified="1195652988" id="rhn-source-package-44541" source-rpm="rhn-client-tools-0.4.16-2.el5_1.9.src.rpm"/><source-package last-modified="1196117002" id="rhn-source-package-44587" source-rpm="firefox-1.5.0.12-7.el5.src.rpm"/><source-package last-modified="1196278273" id="rhn-source-package-44588" source-rpm="ltrace-0.5-7.45svn.el5.src.rpm"/><source-package last-modified="1196278311" id="rhn-source-package-44589" source-rpm="xorg-x11-xinit-1.0.2-15.el5.src.rpm"/><source-package last-modified="1196347202" id="rhn-source-package-44592" source-rpm="kernel-2.6.18-53.1.4.el5.src.rpm"/><source-package last-modified="1196347771" id="rhn-source-package-44593" source-rpm="pcre-6.6-2.el5_1.7.src.rpm"/><source-package last-modified="1196349673" id="rhn-source-package-44597" source-rpm="cairo-1.2.4-3.el5_1.src.rpm"/><source-package last-modified="1197473868" id="rhn-source-package-44665" source-rpm="x3270-3.3.4p7-3.el5.3.src.rpm"/><source-package last-modified="1197473994" id="rhn-source-package-44666" source-rpm="openhpi-2.8.1-2.el5.9.src.rpm"/><source-package last-modified="1197474450" id="rhn-source-package-44667" source-rpm="openmotif-2.3.0-0.4.el5.src.rpm"/><source-package last-modified="1197474582" id="rhn-source-package-44668" source-rpm="traceroute-2.0.1-3.el5.src.rpm"/><source-package last-modified="1197474711" id="rhn-source-package-44669" source-rpm="system-config-users-1.2.51-3.el5.src.rpm"/><source-package last-modified="1197476266" id="rhn-source-package-44670" source-rpm="net-snmp-5.3.1-19.el5_1.3.src.rpm"/><source-package last-modified="1197577108" id="rhn-source-package-44672" source-rpm="mcstrans-0.2.6-1.el5_1.1.src.rpm"/><source-package last-modified="1197662794" id="rhn-source-package-44673" source-rpm="mozldap-6.0.5-1.el5.src.rpm"/><source-package last-modified="1197993449" id="rhn-source-package-44679" source-rpm="squid-2.6.STABLE6-5.el5_1.2.src.rpm"/><source-package last-modified="1197994882" id="rhn-source-package-44681" source-rpm="mysql-5.0.22-2.2.el5_1.1.src.rpm"/><source-package last-modified="1198078376" id="rhn-source-package-44685" source-rpm="libexif-0.6.13-4.0.2.el5_1.1.src.rpm"/><source-package last-modified="1198168654" id="rhn-source-package-44693" source-rpm="metacity-2.16.0-9.el5.src.rpm"/><source-package last-modified="1198168765" id="rhn-source-package-44694" source-rpm="nss_db-2.2-35.3.src.rpm"/><source-package last-modified="1198169149" id="rhn-source-package-44696" source-rpm="createrepo-0.4.11-1.el5.src.rpm"/><source-package last-modified="1198169182" id="rhn-source-package-44697" source-rpm="gthumb-2.7.8-8.el5.src.rpm"/><source-package last-modified="1198169274" id="rhn-source-package-44698" source-rpm="xsane-0.991-5.el5.src.rpm"/><source-package last-modified="1198178547" id="rhn-source-package-44699" source-rpm="autofs-5.0.1-0.rc2.55.el5.2.src.rpm"/><source-package last-modified="1199357948" id="rhn-source-package-44709" source-rpm="shared-mime-info-0.19-5.el5.src.rpm"/><source-package last-modified="1199358062" id="rhn-source-package-44710" source-rpm="totem-2.16.7-2.el5.src.rpm"/><source-package last-modified="1199358304" id="rhn-source-package-44711" source-rpm="emacs-21.4-20.el5.src.rpm"/><source-package last-modified="1199358465" id="rhn-source-package-44712" source-rpm="libraw1394-1.3.0-1.el5.src.rpm"/><source-package last-modified="1199358465" id="rhn-source-package-44713" source-rpm="dvgrab-3.0-1.el5.src.rpm"/><source-package last-modified="1199385189" id="rhn-source-package-44717" source-rpm="tzdata-2007k-1.el5.src.rpm"/><source-package last-modified="1199473237" id="rhn-source-package-44719" source-rpm="fontconfig-2.4.1-7.el5.src.rpm"/><source-package last-modified="1199730173" id="rhn-source-package-44722" source-rpm="tog-pegasus-2.6.1-2.el5_1.1.src.rpm"/><source-package last-modified="1199731096" id="rhn-source-package-44725" source-rpm="e2fsprogs-1.39-10.el5_1.1.src.rpm"/><source-package last-modified="1199892494" id="rhn-source-package-44779" source-rpm="man-pages-ja-20060815-6.el5.src.rpm"/><source-package last-modified="1199892526" id="rhn-source-package-44780" source-rpm="htmlview-4.0.0-2.el5.src.rpm"/><source-package last-modified="1200053596" id="rhn-source-package-44790" source-rpm="libxml2-2.6.26-2.1.2.1.src.rpm"/><source-package last-modified="1200054531" id="rhn-source-package-44793" source-rpm="postgresql-8.1.11-1.el5_1.1.src.rpm"/><source-package last-modified="1200389808" id="rhn-source-package-44827" source-rpm="httpd-2.2.3-11.el5_1.3.src.rpm"/><source-package last-modified="1200492281" id="rhn-source-package-44834" source-rpm="oddjob-0.27-9.el5.src.rpm"/><source-package last-modified="1200492437" id="rhn-source-package-44835" source-rpm="m17n-db-1.3.3-48.el5.src.rpm"/><source-package last-modified="1200492585" id="rhn-source-package-44836" source-rpm="amtu-1.0.6-1.el5.src.rpm"/><source-package last-modified="1200492713" id="rhn-source-package-44837" source-rpm="gedit-2.16.0-9.el5.src.rpm"/><source-package last-modified="1200492892" id="rhn-source-package-44838" source-rpm="gnome-utils-2.16.0-5.el5.src.rpm"/><source-package last-modified="1200493128" id="rhn-source-package-44839" source-rpm="m2crypto-0.16-6.el5.2.src.rpm"/><source-package last-modified="1200493256" id="rhn-source-package-44840" source-rpm="apr-util-1.2.7-7.el5.src.rpm"/><source-package last-modified="1200493392" id="rhn-source-package-44841" source-rpm="crypto-utils-2.3-2.el5.src.rpm"/><source-package last-modified="1200498845" id="rhn-source-package-44842" source-rpm="sysklogd-1.4.1-42.el5.src.rpm"/><source-package last-modified="1200599925" id="rhn-source-package-44843" source-rpm="libXfont-1.2.2-1.0.3.el5_1.src.rpm"/><source-package last-modified="1200600196" id="rhn-source-package-44844" source-rpm="xorg-x11-server-1.1.1-48.26.el5_1.4.src.rpm"/><source-package last-modified="1200706007" id="rhn-source-package-44848" source-rpm="xorg-x11-server-1.1.1-48.26.el5_1.5.src.rpm"/><source-package last-modified="1200903768" id="rhn-source-package-44854" source-rpm="wireshark-0.99.7-1.el5.src.rpm"/><source-package last-modified="1201077990" id="rhn-source-package-44861" source-rpm="yum-rhn-plugin-0.5.2-5.el5_1.2.src.rpm"/><source-package last-modified="1201096656" id="rhn-source-package-44862" source-rpm="hwbrowser-0.30-2.el5.src.rpm"/><source-package last-modified="1201096764" id="rhn-source-package-44863" source-rpm="pygtk2-2.10.1-11.el5.src.rpm"/><source-package last-modified="1201096862" id="rhn-source-package-44864" source-rpm="ntp-4.2.2p1-8.el5.src.rpm"/><source-package last-modified="1201097059" id="rhn-source-package-44865" source-rpm="kdeadmin-3.5.4-3.el5.src.rpm"/><source-package last-modified="1201097551" id="rhn-source-package-44868" source-rpm="a2ps-4.13b-57.2.el5.src.rpm"/><source-package last-modified="1201097658" id="rhn-source-package-44869" source-rpm="gnome-screensaver-2.16.1-6.el5.src.rpm"/><source-package last-modified="1201097861" id="rhn-source-package-44870" source-rpm="gnome-panel-2.16.1-7.el5.src.rpm"/><source-package last-modified="1201098308" id="rhn-source-package-44871" source-rpm="scim-pinyin-0.5.91-16.el5.src.rpm"/><source-package last-modified="1201100324" id="rhn-source-package-44872" source-rpm="kernel-2.6.18-53.1.6.el5.src.rpm"/><source-package last-modified="1201267616" id="rhn-source-package-44875" source-rpm="icu-3.6-5.11.1.src.rpm"/><source-package last-modified="1201705440" id="rhn-source-package-44890" source-rpm="gnome-python2-desktop-2.16.0-2.el5.src.rpm"/><source-package last-modified="1201705555" id="rhn-source-package-44891" source-rpm="gzip-1.3.5-10.el5.src.rpm"/><source-package last-modified="1201705649" id="rhn-source-package-44892" source-rpm="system-config-printer-0.7.32.8-1.el5.src.rpm"/><source-package last-modified="1201705986" id="rhn-source-package-44894" source-rpm="pygtk2-2.10.1-12.el5.src.rpm"/><source-package last-modified="1201706926" id="rhn-source-package-44896" source-rpm="device-mapper-multipath-0.4.7-12.el5_1.2.src.rpm"/><source-package last-modified="1201868812" id="rhn-source-package-44902" source-rpm="autofs-5.0.1-0.rc2.55.el5.3.src.rpm"/><source-package last-modified="1202324388" id="rhn-source-package-44918" source-rpm="liberation-fonts-1.0-1.el5.src.rpm"/><source-package last-modified="1202324417" id="rhn-source-package-44919" source-rpm="pkgconfig-0.21-2.el5.src.rpm"/><source-package last-modified="1202324456" id="rhn-source-package-44920" source-rpm="libgnomeprint22-2.12.1-10.el5.src.rpm"/><source-package last-modified="1202409597" id="rhn-source-package-44923" source-rpm="gdb-6.5-25.el5_1.1.src.rpm"/><source-package last-modified="1202436957" id="rhn-source-package-44930" source-rpm="firefox-1.5.0.12-9.el5.src.rpm"/><source-package last-modified="1202834773" id="rhn-source-package-44932" source-rpm="kernel-2.6.18-53.1.13.el5.src.rpm"/><source-package last-modified="1202937428" id="rhn-source-package-44937" source-rpm="libao-0.8.6-7.src.rpm"/><source-package last-modified="1203077022" id="rhn-source-package-44945" source-rpm="net-snmp-5.3.1-19.el5_1.4.src.rpm"/><source-package last-modified="1203135432" id="rhn-source-package-44982" source-rpm="firefox-1.5.0.12-11.el5_1.src.rpm"/><source-package last-modified="1203542257" id="rhn-source-package-44986" source-rpm="lam-7.1.2-11.el5.src.rpm"/><source-package last-modified="1203627947" id="rhn-source-package-44990" source-rpm="openldap-2.3.27-8.el5_1.3.src.rpm"/><source-package last-modified="1203628854" id="rhn-source-package-44993" source-rpm="tk-8.4.13-5.el5_1.1.src.rpm"/><source-package last-modified="1203629330" id="rhn-source-package-44994" source-rpm="cups-1.2.4-11.14.el5_1.4.src.rpm"/><source-package last-modified="1204129778" id="rhn-source-package-45009" source-rpm="gnome-volume-manager-2.15.0-5.el5.src.rpm"/><source-package last-modified="1204129820" id="rhn-source-package-45010" source-rpm="x3270-3.3.4p7-3.el5.4.src.rpm"/><source-package last-modified="1204133388" id="rhn-source-package-45012" source-rpm="system-config-users-1.2.51-4.el5.src.rpm"/><source-package last-modified="1204147656" id="rhn-source-package-45013" source-rpm="dbus-1.0.0-6.3.el5_1.src.rpm"/><source-package last-modified="1204149429" id="rhn-source-package-45016" source-rpm="ghostscript-8.15.2-9.1.el5_1.1.src.rpm"/><source-package last-modified="1204191646" id="rhn-source-package-45019" source-rpm="gd-2.0.33-9.4.el5_1.1.src.rpm"/><source-package last-modified="1204725003" id="rhn-source-package-45093" source-rpm="kernel-2.6.18-53.1.14.el5.src.rpm"/><source-package last-modified="1205158981" id="rhn-source-package-45098" source-rpm="tzdata-2007k-2.el5.src.rpm"/><source-package last-modified="1205166269" id="rhn-source-package-45101" source-rpm="device-mapper-multipath-0.4.7-12.el5_1.3.src.rpm"/><source-package last-modified="1205182885" id="rhn-source-package-45102" source-rpm="paps-0.6.6-17.el5.src.rpm"/><source-package last-modified="1205182907" id="rhn-source-package-45108" source-rpm="logwatch-7.3-6.el5.src.rpm"/><source-package last-modified="1205182925" id="rhn-source-package-45119" source-rpm="sg3_utils-1.25-1.el5.src.rpm"/><source-package last-modified="1205183006" id="rhn-source-package-45124" source-rpm="nautilus-2.16.2-7.el5.src.rpm"/><source-package last-modified="1205183008" id="rhn-source-package-45126" source-rpm="aspell-es-0.50-13.2.2.src.rpm"/><source-package last-modified="1205183020" id="rhn-source-package-45128" source-rpm="tcpdump-3.9.4-12.el5.src.rpm"/><source-package last-modified="1205183021" id="rhn-source-package-45129" source-rpm="kbd-1.12-20.el5.src.rpm"/><source-package last-modified="1205183056" id="rhn-source-package-45131" source-rpm="aspell-nl-0.1e-1.fc6.src.rpm"/><source-package last-modified="1205183306" id="rhn-source-package-45146" source-rpm="kdeartwork-3.5.4-1.fc6.src.rpm"/><source-package last-modified="1205183307" id="rhn-source-package-45147" source-rpm="dstat-0.6.6-3.el5.src.rpm"/><source-package last-modified="1205183391" id="rhn-source-package-45154" source-rpm="kdebase-3.5.4-18.el5.src.rpm"/><source-package last-modified="1205183396" id="rhn-source-package-45159" source-rpm="xorg-x11-twm-1.0.1-3.1.src.rpm"/><source-package last-modified="1205183396" id="rhn-source-package-45160" source-rpm="rhel-instnum-1.0.8-1.el5.src.rpm"/><source-package last-modified="1205183449" id="rhn-source-package-45164" source-rpm="rpm-4.4.2-48.el5.src.rpm"/><source-package last-modified="1205183719" id="rhn-source-package-45172" source-rpm="shadow-utils-4.0.17-13.el5.src.rpm"/><source-package last-modified="1205183743" id="rhn-source-package-45176" source-rpm="smartmontools-5.36-4.el5.src.rpm"/><source-package last-modified="1205183743" id="rhn-source-package-45177" source-rpm="iptables-1.3.5-4.el5.src.rpm"/><source-package last-modified="1205183751" id="rhn-source-package-45180" source-rpm="fonts-indic-2.1.7-2.el5.src.rpm"/><source-package last-modified="1205183758" id="rhn-source-package-45183" source-rpm="sblim-1-31.el5.src.rpm"/><source-package last-modified="1205183766" id="rhn-source-package-45190" source-rpm="system-config-keyboard-1.2.11-1.el5.src.rpm"/><source-package last-modified="1205183767" id="rhn-source-package-45191" source-rpm="notification-daemon-0.3.5-9.el5.src.rpm"/><source-package last-modified="1205183774" id="rhn-source-package-45193" source-rpm="coreutils-5.97-14.el5.src.rpm"/><source-package last-modified="1205183780" id="rhn-source-package-45196" source-rpm="sysstat-7.0.2-1.el5.src.rpm"/><source-package last-modified="1205183794" id="rhn-source-package-45201" source-rpm="redhat-rpm-config-8.0.45-24.el5.src.rpm"/><source-package last-modified="1205183801" id="rhn-source-package-45205" source-rpm="spamassassin-3.2.4-1.el5.src.rpm"/><source-package last-modified="1205183812" id="rhn-source-package-45211" source-rpm="pciutils-2.2.3-5.src.rpm"/><source-package last-modified="1205183817" id="rhn-source-package-45215" source-rpm="scim-anthy-1.2.0-6.el5.src.rpm"/><source-package last-modified="1205183819" id="rhn-source-package-45216" source-rpm="openssh-4.3p2-26.el5.src.rpm"/><source-package last-modified="1205183824" id="rhn-source-package-45220" source-rpm="busybox-1.2.0-4.el5.src.rpm"/><source-package last-modified="1205183899" id="rhn-source-package-45225" source-rpm="procps-3.2.7-9.el5.src.rpm"/><source-package last-modified="1205183971" id="rhn-source-package-45238" source-rpm="libtool-1.5.22-6.1.src.rpm"/><source-package last-modified="1205183974" id="rhn-source-package-45239" source-rpm="gstreamer-0.10.9-3.el5.src.rpm"/><source-package last-modified="1205183978" id="rhn-source-package-45240" source-rpm="ksh-20060214-1.7.src.rpm"/><source-package last-modified="1205183980" id="rhn-source-package-45242" source-rpm="vte-0.14.0-2.el5.src.rpm"/><source-package last-modified="1205183981" id="rhn-source-package-45243" source-rpm="xorg-x11-xtrans-devel-1.0.1-1.1.fc6.src.rpm"/><source-package last-modified="1205183981" id="rhn-source-package-45244" source-rpm="libart_lgpl-2.3.17-4.src.rpm"/><source-package last-modified="1205183998" id="rhn-source-package-45246" source-rpm="gtk2-2.10.4-20.el5.src.rpm"/><source-package last-modified="1205184000" id="rhn-source-package-45249" source-rpm="kdnssd-avahi-0.1.3-0.1.20060713svn.fc6.src.rpm"/><source-package last-modified="1205184011" id="rhn-source-package-45253" source-rpm="mailman-2.1.9-4.el5.src.rpm"/><source-package last-modified="1205184106" id="rhn-source-package-45257" source-rpm="pcsc-lite-1.4.4-0.1.el5.src.rpm"/><source-package last-modified="1205184127" id="rhn-source-package-45259" source-rpm="kdelibs-3.5.4-16.el5.src.rpm"/><source-package last-modified="1205184129" id="rhn-source-package-45261" source-rpm="cscope-15.5-15.fc6.1.src.rpm"/><source-package last-modified="1205184132" id="rhn-source-package-45262" source-rpm="cairo-1.2.4-5.el5.src.rpm"/><source-package last-modified="1205184134" id="rhn-source-package-45264" source-rpm="libogg-1.1.3-3.el5.src.rpm"/><source-package last-modified="1205184142" id="rhn-source-package-45265" source-rpm="python-2.4.3-21.el5.src.rpm"/><source-package last-modified="1205184147" id="rhn-source-package-45269" source-rpm="libX11-1.0.3-9.el5.src.rpm"/><source-package last-modified="1205184185" id="rhn-source-package-45272" source-rpm="libXres-1.0.1-3.1.src.rpm"/><source-package last-modified="1205184185" id="rhn-source-package-45273" source-rpm="automake15-1.5-16.src.rpm"/><source-package last-modified="1205184188" id="rhn-source-package-45274" source-rpm="nmap-4.11-1.1.src.rpm"/><source-package last-modified="1205184207" id="rhn-source-package-45283" source-rpm="pam-0.99.6.2-3.27.el5.src.rpm"/><source-package last-modified="1205184211" id="rhn-source-package-45286" source-rpm="libsemanage-1.9.1-3.el5.src.rpm"/><source-package last-modified="1205184214" id="rhn-source-package-45289" source-rpm="jakarta-commons-dbcp-1.2.1-7jpp.1.src.rpm"/><source-package last-modified="1205184214" id="rhn-source-package-45290" source-rpm="vsftpd-2.0.5-12.el5.src.rpm"/><source-package last-modified="1205184227" id="rhn-source-package-45294" source-rpm="php-5.1.6-20.el5.src.rpm"/><source-package last-modified="1205184230" id="rhn-source-package-45296" source-rpm="gdbm-1.8.0-26.2.1.src.rpm"/><source-package last-modified="1205184231" id="rhn-source-package-45297" source-rpm="bsh-1.3.0-9jpp.1.src.rpm"/><source-package last-modified="1205184234" id="rhn-source-package-45301" source-rpm="newt-0.52.2-10.el5.src.rpm"/><source-package last-modified="1205184252" id="rhn-source-package-45308" source-rpm="libselinux-1.33.4-5.el5.src.rpm"/><source-package last-modified="1205184253" id="rhn-source-package-45309" source-rpm="xorg-x11-font-utils-7.1-2.src.rpm"/><source-package last-modified="1205184255" id="rhn-source-package-45313" source-rpm="xorg-x11-filesystem-7.1-2.fc6.src.rpm"/><source-package last-modified="1205184261" id="rhn-source-package-45319" source-rpm="module-init-tools-3.3-0.pre3.1.37.el5.src.rpm"/><source-package last-modified="1205184262" id="rhn-source-package-45320" source-rpm="openjade-1.3.2-27.src.rpm"/><source-package last-modified="1205184262" id="rhn-source-package-45321" source-rpm="python-iniparse-0.2.3-4.el5.src.rpm"/><source-package last-modified="1205184263" id="rhn-source-package-45322" source-rpm="ncompress-4.2.4-47.src.rpm"/><source-package last-modified="1205184263" id="rhn-source-package-45323" source-rpm="xorg-x11-util-macros-1.0.2-4.fc6.src.rpm"/><source-package last-modified="1205184263" id="rhn-source-package-45324" source-rpm="hicolor-icon-theme-0.9-2.1.src.rpm"/><source-package last-modified="1205184264" id="rhn-source-package-45325" source-rpm="psutils-1.17-26.1.src.rpm"/><source-package last-modified="1205184268" id="rhn-source-package-45328" source-rpm="xorg-x11-drv-sis-0.9.1-7.1.el5.src.rpm"/><source-package last-modified="1205184277" id="rhn-source-package-45334" source-rpm="python-setuptools-0.6c5-2.el5.src.rpm"/><source-package last-modified="1205232584" id="rhn-source-package-45356" source-rpm="tomcat5-5.5.23-0jpp.3.0.3.el5_1.src.rpm"/><source-package last-modified="1205868261" id="rhn-source-package-45384" source-rpm="krb5-1.6.1-17.el5_1.1.src.rpm"/><source-package last-modified="1206398593" id="rhn-source-package-45400" source-rpm="cman-2.0.73-1.el5_1.5.src.rpm"/><source-package last-modified="1206578483" id="rhn-source-package-45401" source-rpm="firefox-1.5.0.12-14.el5_1.src.rpm"/><source-package last-modified="1207058891" id="rhn-source-package-45408" source-rpm="cups-1.2.4-11.14.el5_1.6.src.rpm"/><source-package last-modified="1207135924" id="rhn-source-package-45413" source-rpm="gnome-screensaver-2.16.1-5.el5_1.1.src.rpm"/><source-package last-modified="1207234634" id="rhn-source-package-45416" source-rpm="gnome-screensaver-2.16.1-8.el5.src.rpm"/><source-package last-modified="1207670166" id="rhn-source-package-45428" source-rpm="sos-1.7-9.2.el5.src.rpm"/><source-package last-modified="1207697341" id="rhn-source-package-45432" source-rpm="squid-2.6.STABLE6-5.el5_1.3.src.rpm"/><source-package last-modified="1208389641" id="rhn-source-package-45550" source-rpm="speex-1.0.5-4.el5_1.1.src.rpm"/><source-package last-modified="1208393492" id="rhn-source-package-45555" source-rpm="firefox-1.5.0.12-15.el5_1.src.rpm"/><source-package last-modified="1208394648" id="rhn-source-package-45558" source-rpm="ImageMagick-6.2.8.0-4.el5_1.1.src.rpm"/><source-package last-modified="1208452524" id="rhn-source-package-45574" source-rpm="poppler-0.5.4-4.4.el5_1.src.rpm"/><source-package last-modified="1210145414" id="rhn-source-package-45677" source-rpm="kernel-2.6.18-53.1.19.el5.src.rpm"/><source-package last-modified="1210341530" id="rhn-source-package-45685" source-rpm="mcstrans-0.2.7-1.el5.src.rpm"/><source-package last-modified="1210681609" id="rhn-source-package-45753" source-rpm="xen-3.0.3-41.el5_1.5.src.rpm"/><source-package last-modified="1210750482" id="rhn-source-package-45756" source-rpm="libvorbis-1.1.2-3.el5_1.2.src.rpm"/><source-package last-modified="1210934130" id="rhn-source-package-45766" source-rpm="device-mapper-multipath-0.4.7-12.el5_1.4.src.rpm"/><source-package last-modified="1211226849" id="rhn-source-package-45793" source-rpm="ipsec-tools-0.6.5-9.el5.src.rpm"/><source-package last-modified="1211226892" id="rhn-source-package-45794" source-rpm="mkinitrd-5.1.19.6-28.src.rpm"/><source-package last-modified="1211226923" id="rhn-source-package-45795" source-rpm="system-config-lvm-1.1.3-2.0.el5.src.rpm"/><source-package last-modified="1211226957" id="rhn-source-package-45796" source-rpm="metacity-2.16.0-10.el5.src.rpm"/><source-package last-modified="1211226981" id="rhn-source-package-45797" source-rpm="libnl-1.0-0.10.pre5.5.src.rpm"/><source-package last-modified="1211227043" id="rhn-source-package-45798" source-rpm="openmotif-2.3.0-0.5.el5.src.rpm"/><source-package last-modified="1211227220" id="rhn-source-package-45802" source-rpm="dbus-1.0.0-7.el5.src.rpm"/><source-package last-modified="1211227437" id="rhn-source-package-45805" source-rpm="java-1.4.2-gcj-compat-1.4.2.0-40jpp.115.src.rpm"/><source-package last-modified="1211227505" id="rhn-source-package-45807" source-rpm="redhat-release-5Server-5.2.0.4.src.rpm"/><source-package last-modified="1211230462" id="rhn-source-package-45809" source-rpm="Deployment_Guide-5.2-9.src.rpm"/><source-package last-modified="1211230589" id="rhn-source-package-45811" source-rpm="mpi-selector-1.0.0-2.el5.src.rpm"/><source-package last-modified="1211230589" id="rhn-source-package-45812" source-rpm="lam-7.1.2-14.el5.src.rpm"/><source-package last-modified="1211230589" id="rhn-source-package-45813" source-rpm="openmpi-1.2.5-5.el5.src.rpm"/><source-package last-modified="1211230623" id="rhn-source-package-45814" source-rpm="iscsi-initiator-utils-6.2.0.868-0.7.el5.src.rpm"/><source-package last-modified="1211230753" id="rhn-source-package-45815" source-rpm="tomcat5-5.5.23-0jpp.7.el5.src.rpm"/><source-package last-modified="1211230871" id="rhn-source-package-45817" source-rpm="nss-3.11.99.5-2.el5.src.rpm"/><source-package last-modified="1211230899" id="rhn-source-package-45818" source-rpm="ecryptfs-utils-41-1.el5.src.rpm"/><source-package last-modified="1211236221" id="rhn-source-package-45820" source-rpm="sysklogd-1.4.1-44.el5.src.rpm"/><source-package last-modified="1211236259" id="rhn-source-package-45821" source-rpm="cachefilesd-0.8-5.el5.src.rpm"/><source-package last-modified="1211236300" id="rhn-source-package-45822" source-rpm="openhpi-2.10.2-1.el5.src.rpm"/><source-package last-modified="1211236324" id="rhn-source-package-45823" source-rpm="irqbalance-0.55-10.el5.src.rpm"/><source-package last-modified="1211236346" id="rhn-source-package-45824" source-rpm="freeipmi-0.5.1-5.el5.src.rpm"/><source-package last-modified="1211236358" id="rhn-source-package-45825" source-rpm="xorg-x11-drv-nv-2.1.6-6.el5.src.rpm"/><source-package last-modified="1211236518" id="rhn-source-package-45827" source-rpm="openais-0.80.3-15.el5.src.rpm"/><source-package last-modified="1211236536" id="rhn-source-package-45828" source-rpm="xorg-x11-drv-i810-1.6.5-9.13.el5.src.rpm"/><source-package last-modified="1211236571" id="rhn-source-package-45829" source-rpm="nfs-utils-1.0.9-33.el5.src.rpm"/><source-package last-modified="1211238541" id="rhn-source-package-45831" source-rpm="gdm-2.16.0-46.el5.src.rpm"/><source-package last-modified="1211238551" id="rhn-source-package-45832" source-rpm="system-config-kdump-1.0.14-1.el5.src.rpm"/><source-package last-modified="1211238584" id="rhn-source-package-45833" source-rpm="openswan-2.6.12-2.el5.src.rpm"/><source-package last-modified="1211238675" id="rhn-source-package-45834" source-rpm="anaconda-11.1.2.113-1.src.rpm"/><source-package last-modified="1211238693" id="rhn-source-package-45835" source-rpm="createrepo-0.4.11-3.el5.src.rpm"/><source-package last-modified="1211238761" id="rhn-source-package-45836" source-rpm="microcode_ctl-1.17-1.47.el5.src.rpm"/><source-package last-modified="1211260138" id="rhn-source-package-45844" source-rpm="NetworkManager-0.6.4-8.el5.src.rpm"/><source-package last-modified="1211260139" id="rhn-source-package-45845" source-rpm="audit-1.6.5-9.el5.src.rpm"/><source-package last-modified="1211260140" id="rhn-source-package-45846" source-rpm="authconfig-5.3.21-3.el5.src.rpm"/><source-package last-modified="1211260141" id="rhn-source-package-45847" source-rpm="autofs-5.0.1-0.rc2.88.src.rpm"/><source-package last-modified="1211260146" id="rhn-source-package-45848" source-rpm="bind-9.3.4-6.P1.el5.src.rpm"/><source-package last-modified="1211260147" id="rhn-source-package-45849" source-rpm="cman-2.0.84-2.el5.src.rpm"/><source-package last-modified="1211260148" id="rhn-source-package-45850" source-rpm="device-mapper-multipath-0.4.7-17.el5.src.rpm"/><source-package last-modified="1211260186" id="rhn-source-package-45852" source-rpm="control-center-2.16.0-16.el5.src.rpm"/><source-package last-modified="1211260204" id="rhn-source-package-45853" source-rpm="crash-4.0-5.0.3.src.rpm"/><source-package last-modified="1211260209" id="rhn-source-package-45854" source-rpm="cups-1.2.4-11.18.el5.src.rpm"/><source-package last-modified="1211260211" id="rhn-source-package-45855" source-rpm="dapl-2.0.7-2.el5.src.rpm"/><source-package last-modified="1211260212" id="rhn-source-package-45856" source-rpm="devhelp-0.12-16.el5.src.rpm"/><source-package last-modified="1211260214" id="rhn-source-package-45857" source-rpm="dhcp-3.0.5-13.el5.src.rpm"/><source-package last-modified="1211260223" id="rhn-source-package-45859" source-rpm="dhcpv6-1.0.10-4.el5.src.rpm"/><source-package last-modified="1211260225" id="rhn-source-package-45860" source-rpm="dovecot-1.0.7-2.el5.src.rpm"/><source-package last-modified="1211260229" id="rhn-source-package-45861" source-rpm="e2fsprogs-1.39-15.el5.src.rpm"/><source-package last-modified="1211260229" id="rhn-source-package-45862" source-rpm="efax-0.9-27.2.1.src.rpm"/><source-package last-modified="1211260257" id="rhn-source-package-45864" source-rpm="file-4.17-13.src.rpm"/><source-package last-modified="1211260297" id="rhn-source-package-45865" source-rpm="firefox-3.0-0.beta5.6.el5.src.rpm"/><source-package last-modified="1211260312" id="rhn-source-package-45866" source-rpm="frysk-0.0.1.2008.03.19.rh1-1.el5.src.rpm"/><source-package last-modified="1211260350" id="rhn-source-package-45867" source-rpm="gcc-4.1.2-42.el5.src.rpm"/><source-package last-modified="1211260351" id="rhn-source-package-45868" source-rpm="gfs2-utils-0.1.44-1.el5.src.rpm"/><source-package last-modified="1211260367" id="rhn-source-package-45869" source-rpm="glibc-2.5-24.src.rpm"/><source-package last-modified="1211260370" id="rhn-source-package-45870" source-rpm="gstreamer-plugins-base-0.10.9-6.el5.src.rpm"/><source-package last-modified="1211260372" id="rhn-source-package-45871" source-rpm="hal-0.5.8.1-35.el5.src.rpm"/><source-package last-modified="1211260372" id="rhn-source-package-45872" source-rpm="hal-cups-utils-0.6.2-5.2.el5.src.rpm"/><source-package last-modified="1211260373" id="rhn-source-package-45873" source-rpm="hwdata-0.213.6-1.el5.src.rpm"/><source-package last-modified="1211260374" id="rhn-source-package-45874" source-rpm="infiniband-diags-1.3.6-1.el5.src.rpm"/><source-package last-modified="1211260434" id="rhn-source-package-45875" source-rpm="kernel-2.6.18-92.el5.src.rpm"/><source-package last-modified="1211260436" id="rhn-source-package-45876" source-rpm="kexec-tools-1.102pre-21.el5.src.rpm"/><source-package last-modified="1211260451" id="rhn-source-package-45877" source-rpm="krb5-1.6.1-25.el5.src.rpm"/><source-package last-modified="1211260452" id="rhn-source-package-45878" source-rpm="kudzu-1.2.57.1.17-1.src.rpm"/><source-package last-modified="1211260452" id="rhn-source-package-45879" source-rpm="libcxgb3-1.1.4-1.el5.src.rpm"/><source-package last-modified="1211260454" id="rhn-source-package-45880" source-rpm="libdbi-0.8.1-2.1.src.rpm"/><source-package last-modified="1211260454" id="rhn-source-package-45881" source-rpm="libdhcp-1.20-5.el5.src.rpm"/><source-package last-modified="1211260455" id="rhn-source-package-45882" source-rpm="libibcm-1.0.2-1.el5.src.rpm"/><source-package last-modified="1211260456" id="rhn-source-package-45883" source-rpm="libibcommon-1.0.8-1.el5.src.rpm"/><source-package last-modified="1211260457" id="rhn-source-package-45884" source-rpm="libibmad-1.1.6-1.el5.src.rpm"/><source-package last-modified="1211260458" id="rhn-source-package-45885" source-rpm="libibumad-1.1.7-1.el5.src.rpm"/><source-package last-modified="1211260459" id="rhn-source-package-45886" source-rpm="libibverbs-1.1.1-9.el5.src.rpm"/><source-package last-modified="1211260461" id="rhn-source-package-45888" source-rpm="libmlx4-1.0-3.el5.src.rpm"/><source-package last-modified="1211260462" id="rhn-source-package-45889" source-rpm="librdmacm-1.0.7-1.el5.src.rpm"/><source-package last-modified="1211260463" id="rhn-source-package-45890" source-rpm="libsdp-1.1.99-9.el5.src.rpm"/><source-package last-modified="1211260465" id="rhn-source-package-45891" source-rpm="libuser-0.54.7-2.el5.5.src.rpm"/><source-package last-modified="1211260469" id="rhn-source-package-45893" source-rpm="lvm2-2.02.32-4.el5.src.rpm"/><source-package last-modified="1211260470" id="rhn-source-package-45894" source-rpm="make-3.81-3.el5.src.rpm"/><source-package last-modified="1211260472" id="rhn-source-package-45895" source-rpm="mstflint-1.3-1.el5.src.rpm"/><source-package last-modified="1211260495" id="rhn-source-package-45896" source-rpm="mysql-5.0.45-7.el5.src.rpm"/><source-package last-modified="1211260500" id="rhn-source-package-45897" source-rpm="net-snmp-5.3.1-24.el5.src.rpm"/><source-package last-modified="1211260501" id="rhn-source-package-45898" source-rpm="net-tools-1.60-78.el5.src.rpm"/><source-package last-modified="1211260502" id="rhn-source-package-45899" source-rpm="nspluginwrapper-0.9.91.5-21.el5.src.rpm"/><source-package last-modified="1211260504" id="rhn-source-package-45900" source-rpm="nspr-4.7.0.99.2-1.el5.src.rpm"/><source-package last-modified="1211260505" id="rhn-source-package-45901" source-rpm="nss_ldap-253-12.el5.src.rpm"/><source-package last-modified="1211260505" id="rhn-source-package-45902" source-rpm="ofed-docs-1.3-3.el5.src.rpm"/><source-package last-modified="1211260507" id="rhn-source-package-45903" source-rpm="openCryptoki-2.2.4-21.el5.src.rpm"/><source-package last-modified="1211260507" id="rhn-source-package-45904" source-rpm="openib-1.3-3.el5.src.rpm"/><source-package last-modified="1211260740" id="rhn-source-package-45906" source-rpm="parted-1.8.1-17.el5.src.rpm"/><source-package last-modified="1211260740" id="rhn-source-package-45907" source-rpm="perftest-1.2-10.el5.src.rpm"/><source-package last-modified="1211260742" id="rhn-source-package-45909" source-rpm="qlvnictools-0.0.1-8.el5.src.rpm"/><source-package last-modified="1211260749" id="rhn-source-package-45913" source-rpm="rhpxl-0.41.1-6.el5.src.rpm"/><source-package last-modified="1211260767" id="rhn-source-package-45914" source-rpm="samba-3.0.28-0.el5.8.src.rpm"/><source-package last-modified="1211260768" id="rhn-source-package-45915" source-rpm="selinux-policy-2.4.6-137.el5.src.rpm"/><source-package last-modified="1211260769" id="rhn-source-package-45916" source-rpm="srptools-0.0.4-2.el5.src.rpm"/><source-package last-modified="1211260771" id="rhn-source-package-45917" source-rpm="setroubleshoot-2.0.5-3.el5.src.rpm"/><source-package last-modified="1211260773" id="rhn-source-package-45918" source-rpm="setroubleshoot-plugins-2.0.4-2.el5.src.rpm"/><source-package last-modified="1211260774" id="rhn-source-package-45919" source-rpm="sudo-1.6.8p12-12.el5.src.rpm"/><source-package last-modified="1211260777" id="rhn-source-package-45920" source-rpm="systemtap-0.6.2-1.el5.src.rpm"/><source-package last-modified="1211260778" id="rhn-source-package-45921" source-rpm="system-config-kickstart-2.6.19.6-1.el5.src.rpm"/><source-package last-modified="1211260779" id="rhn-source-package-45922" source-rpm="system-config-netboot-0.1.45.1-1.el5.src.rpm"/><source-package last-modified="1211260782" id="rhn-source-package-45923" source-rpm="system-config-network-1.3.99.10-2.el5.src.rpm"/><source-package last-modified="1211260783" id="rhn-source-package-45924" source-rpm="tmpwatch-2.9.7-1.1.el5.1.src.rpm"/><source-package last-modified="1211260783" id="rhn-source-package-45925" source-rpm="system-config-securitylevel-1.6.29.1-2.1.el5.src.rpm"/><source-package last-modified="1211260790" id="rhn-source-package-45926" source-rpm="tog-pegasus-2.7.0-2.el5.src.rpm"/><source-package last-modified="1211260792" id="rhn-source-package-45927" source-rpm="trousers-0.3.1-4.el5.src.rpm"/><source-package last-modified="1211260793" id="rhn-source-package-45928" source-rpm="tvflash-0.9.0-2.el5.src.rpm"/><source-package last-modified="1211260794" id="rhn-source-package-45929" source-rpm="udev-095-14.16.el5.src.rpm"/><source-package last-modified="1211260852" id="rhn-source-package-45933" source-rpm="xen-3.0.3-64.el5.src.rpm"/><source-package last-modified="1211260854" id="rhn-source-package-45934" source-rpm="yelp-2.16.0-18.el5.src.rpm"/><source-package last-modified="1211260855" id="rhn-source-package-45935" source-rpm="yum-3.2.8-9.el5.src.rpm"/><source-package last-modified="1211260857" id="rhn-source-package-45936" source-rpm="xorg-x11-drv-ati-6.6.3-3.13.el5.src.rpm"/><source-package last-modified="1211260867" id="rhn-source-package-45937" source-rpm="xorg-x11-server-1.1.1-48.41.el5.src.rpm"/><source-package last-modified="1211260868" id="rhn-source-package-45938" source-rpm="yum-utils-1.1.10-9.el5.src.rpm"/><source-package last-modified="1211260902" id="rhn-source-package-45939" source-rpm="xulrunner-1.9-0.beta5.6.el5.src.rpm"/><source-package last-modified="1211260903" id="rhn-source-package-45940" source-rpm="yum-rhn-plugin-0.5.3-6.el5.src.rpm"/><source-package last-modified="1211260906" id="rhn-source-package-45944" source-rpm="gtk-vnc-0.3.2-3.el5.src.rpm"/><source-package last-modified="1211260911" id="rhn-source-package-45949" source-rpm="pirut-1.3.28-13.el5.src.rpm"/><source-package last-modified="1211260912" id="rhn-source-package-45950" source-rpm="qperf-0.4.0-1.el5.src.rpm"/><source-package last-modified="1211260921" id="rhn-source-package-45951" source-rpm="redhat-release-notes-5Server-12.src.rpm"/><source-package last-modified="1211268671" id="rhn-source-package-45958" source-rpm="xenpv-0.1-9.el5.src.rpm"/><source-package last-modified="1211271106" id="rhn-source-package-45960" source-rpm="xen-3.0.3-41.el5_1.6.src.rpm"/><source-package last-modified="1211294723" id="rhn-source-package-45968" source-rpm="OpenIPMI-2.0.6-6.el5.src.rpm"/><source-package last-modified="1211294724" id="rhn-source-package-45969" source-rpm="alsa-utils-1.0.14-3.rc4.el5.src.rpm"/><source-package last-modified="1211294726" id="rhn-source-package-45970" source-rpm="at-spi-1.7.11-3.el5.src.rpm"/><source-package last-modified="1211294730" id="rhn-source-package-45971" source-rpm="bash-3.2-21.el5.src.rpm"/><source-package last-modified="1211294743" id="rhn-source-package-45972" source-rpm="binutils-2.17.50.0.6-6.el5.src.rpm"/><source-package last-modified="1211294745" id="rhn-source-package-45973" source-rpm="booty-0.80.4-6.src.rpm"/><source-package last-modified="1211294745" id="rhn-source-package-45974" source-rpm="coolkey-1.1.0-6.el5.src.rpm"/><source-package last-modified="1211294746" id="rhn-source-package-45975" source-rpm="cpuspeed-1.2.1-3.el5.src.rpm"/><source-package last-modified="1211294746" id="rhn-source-package-45976" source-rpm="device-mapper-1.02.24-1.el5.src.rpm"/><source-package last-modified="1211294747" id="rhn-source-package-45977" source-rpm="dmraid-1.0.0.rc13-9.el5.src.rpm"/><source-package last-modified="1211294811" id="rhn-source-package-45978" source-rpm="gnutls-1.4.1-3.el5_1.src.rpm"/><source-package last-modified="1211294826" id="rhn-source-package-45979" source-rpm="eclipse-3.2.1-19.el5.src.rpm"/><source-package last-modified="1211294859" id="rhn-source-package-45980" source-rpm="esc-1.0.0-33.el5.src.rpm"/><source-package last-modified="1211294875" id="rhn-source-package-45982" source-rpm="gdb-6.5-37.el5.src.rpm"/><source-package last-modified="1211294878" id="rhn-source-package-45983" source-rpm="gnome-power-manager-2.16.0-9.el5.src.rpm"/><source-package last-modified="1211294879" id="rhn-source-package-45984" source-rpm="gnome-python2-extras-2.14.2-6.el5.src.rpm"/><source-package last-modified="1211294880" id="rhn-source-package-45985" source-rpm="grub-0.97-13.2.src.rpm"/><source-package last-modified="1211294882" id="rhn-source-package-45986" source-rpm="gtkhtml3-3.16.3-1.el5.src.rpm"/><source-package last-modified="1211294886" id="rhn-source-package-45988" source-rpm="ibsim-0.4-2.el5.src.rpm"/><source-package last-modified="1211294890" id="rhn-source-package-45989" source-rpm="ibutils-1.2-3.el5.src.rpm"/><source-package last-modified="1211294892" id="rhn-source-package-45990" source-rpm="initscripts-8.45.19.EL-1.src.rpm"/><source-package last-modified="1211294893" id="rhn-source-package-45991" source-rpm="libmthca-1.0.4-9.el5.src.rpm"/><source-package last-modified="1211294894" id="rhn-source-package-45992" source-rpm="libnes-0.5-2.el5.src.rpm"/><source-package last-modified="1211294895" id="rhn-source-package-45993" source-rpm="mdadm-2.6.4-1.el5.src.rpm"/><source-package last-modified="1211294897" id="rhn-source-package-45994" source-rpm="opensm-3.1.8-1.el5.src.rpm"/><source-package last-modified="1211294900" id="rhn-source-package-45995" source-rpm="openssl-0.9.8b-10.el5.src.rpm"/><source-package last-modified="1211294901" id="rhn-source-package-45996" source-rpm="oprofile-0.9.3-16.el5.src.rpm"/><source-package last-modified="1211294902" id="rhn-source-package-45997" source-rpm="pexpect-2.3-1.el5.src.rpm"/><source-package last-modified="1211294903" id="rhn-source-package-45998" source-rpm="policycoreutils-1.33.12-14.el5.src.rpm"/><source-package last-modified="1211294904" id="rhn-source-package-45999" source-rpm="rsyslog-2.0.0-11.el5.src.rpm"/><source-package last-modified="1211294916" id="rhn-source-package-46001" source-rpm="system-config-language-1.1.18-2.el5.src.rpm"/><source-package last-modified="1211294918" id="rhn-source-package-46002" source-rpm="totem-2.16.7-4.el5.src.rpm"/><source-package last-modified="1211294919" id="rhn-source-package-46003" source-rpm="tpm-tools-1.3.1-1.el5.src.rpm"/><source-package last-modified="1211294920" id="rhn-source-package-46004" source-rpm="udftools-1.0.0b3-0.1.el5.src.rpm"/><source-package last-modified="1211294921" id="rhn-source-package-46005" source-rpm="usermode-1.88-3.el5.1.src.rpm"/><source-package last-modified="1211294924" id="rhn-source-package-46006" source-rpm="util-linux-2.13-0.47.el5.src.rpm"/><source-package last-modified="1211294924" id="rhn-source-package-46007" source-rpm="wdaemon-0.13-1.src.rpm"/><source-package last-modified="1211294926" id="rhn-source-package-46008" source-rpm="wpa_supplicant-0.4.8-10.2.el5.src.rpm"/><source-package last-modified="1211294927" id="rhn-source-package-46009" source-rpm="yum-updatesd-0.9-2.el5.src.rpm"/><source-package last-modified="1211294928" id="rhn-source-package-46010" source-rpm="xorg-x11-drv-mga-1.4.2-7.el5.src.rpm"/><source-package last-modified="1211294928" id="rhn-source-package-46011" source-rpm="yum-metadata-parser-1.1.2-2.el5.src.rpm"/><source-package last-modified="1211294929" id="rhn-source-package-46013" source-rpm="libhugetlbfs-1.2-5.el5.src.rpm"/><source-package last-modified="1211354109" id="rhn-source-package-46019" source-rpm="libxslt-1.1.17-2.el5_1.1.src.rpm"/><source-package last-modified="1211382848" id="rhn-source-package-46024" source-rpm="gdb-6.5-37.el5_2.1.src.rpm"/><source-package last-modified="1211383741" id="rhn-source-package-46026" source-rpm="xen-3.0.3-64.el5_2.1.src.rpm"/><source-package last-modified="1211385351" id="rhn-source-package-46027" source-rpm="redhat-release-notes-5Server-15.src.rpm"/><source-package last-modified="1211386924" id="rhn-source-package-46029" source-rpm="yum-rhn-plugin-0.5.3-6.el5_2.6.src.rpm"/><source-package last-modified="1211387661" id="rhn-source-package-46030" source-rpm="yum-3.2.8-9.el5_2.1.src.rpm"/><source-package last-modified="1211964965" id="rhn-source-package-46062" source-rpm="tzdata-2008b-3.el5.src.rpm"/><source-package last-modified="1211973546" id="rhn-source-package-46070" source-rpm="samba-3.0.28-1.el5_2.1.src.rpm"/><source-package last-modified="1212589109" id="rhn-source-package-46299" source-rpm="cups-1.2.4-11.18.el5_2.1.src.rpm"/><source-package last-modified="1212659133" id="rhn-source-package-46302" source-rpm="kernel-2.6.18-92.1.1.el5.src.rpm"/><source-package last-modified="1212670179" id="rhn-source-package-46304" source-rpm="ipsec-tools-0.6.5-9.el5_2.1.src.rpm"/><source-package last-modified="1213012868" id="rhn-source-package-46311" source-rpm="dhcpv6-1.0.10-4.el5_2.2.src.rpm"/><source-package last-modified="1213105959" id="rhn-source-package-46330" source-rpm="net-snmp-5.3.1-24.el5_2.1.src.rpm"/><source-package last-modified="1213169390" id="rhn-source-package-46345" source-rpm="openswan-2.6.14-1.el5_2.1.src.rpm"/><source-package last-modified="1213210291" id="rhn-source-package-46352" source-rpm="perl-5.8.8-10.el5_2.3.src.rpm"/><source-package last-modified="1213212743" id="rhn-source-package-46354" source-rpm="xorg-x11-server-1.1.1-48.41.el5_2.1.src.rpm"/><source-package last-modified="1213261305" id="rhn-source-package-46390" source-rpm="ghostscript-8.15.2-9.3.el5.src.rpm"/><source-package last-modified="1213266148" id="rhn-source-package-46392" source-rpm="gdb-6.5-37.el5_2.2.src.rpm"/><source-package last-modified="1213969756" id="rhn-source-package-46464" source-rpm="freetype-2.2.1-20.el5_2.src.rpm"/><source-package last-modified="1214298543" id="rhn-source-package-46470" source-rpm="sblim-1-31.el5_2.1.src.rpm"/><source-package last-modified="1214402850" id="rhn-source-package-46493" source-rpm="Deployment_Guide-5.2-11.src.rpm"/><source-package last-modified="1214408093" id="rhn-source-package-46495" source-rpm="kernel-2.6.18-92.1.6.el5.src.rpm"/><source-package last-modified="1214589715" id="rhn-source-package-46532" source-rpm="gfs2-utils-0.1.44-1.el5_2.1.src.rpm"/><source-package last-modified="1215002041" id="rhn-source-package-46538" source-rpm="yelp-2.16.0-19.el5.src.rpm"/><source-package last-modified="1215002042" id="rhn-source-package-46539" source-rpm="xulrunner-1.9-1.el5.src.rpm"/><source-package last-modified="1215002042" id="rhn-source-package-46540" source-rpm="devhelp-0.12-17.el5.src.rpm"/><source-package last-modified="1215002042" id="rhn-source-package-46541" source-rpm="firefox-3.0-2.el5.src.rpm"/><source-package last-modified="1215022644" id="rhn-source-package-46567" source-rpm="nss-3.12.0.3-1.el5.src.rpm"/><source-package last-modified="1215022644" id="rhn-source-package-46568" source-rpm="nspr-4.7.1-1.el5.src.rpm"/><source-package last-modified="1215539655" id="rhn-source-package-46621" source-rpm="bind-9.3.4-6.0.1.P1.el5_2.src.rpm"/><source-package last-modified="1215539655" id="rhn-source-package-46622" source-rpm="selinux-policy-2.4.6-137.1.el5_2.src.rpm"/><source-package last-modified="1215612901" id="rhn-source-package-46628" source-rpm="openldap-2.3.27-8.el5_2.4.src.rpm"/><source-package last-modified="1215719366" id="rhn-source-package-46633" source-rpm="bind-9.3.4-6.0.2.P1.el5_2.src.rpm"/><source-package last-modified="1215766216" id="rhn-source-package-46639" source-rpm="libsdp-1.1.99-10.el5_2.src.rpm"/><source-package last-modified="1215766216" id="rhn-source-package-46640" source-rpm="openib-mstflint-1.3-1.el5_2.src.rpm"/><source-package last-modified="1215766216" id="rhn-source-package-46641" source-rpm="openib-perftest-1.2-11.el5_2.src.rpm"/><source-package last-modified="1215766216" id="rhn-source-package-46642" source-rpm="openib-tvflash-0.9.2-8.el5_2.src.rpm"/><source-package last-modified="1216041282" id="rhn-source-package-46670" source-rpm="ruby-1.8.5-5.el5_2.3.src.rpm"/><source-package last-modified="1216043252" id="rhn-source-package-46674" source-rpm="bluez-utils-3.7-2.2.src.rpm"/><source-package last-modified="1216043252" id="rhn-source-package-46675" source-rpm="bluez-libs-3.7-1.1.src.rpm"/><source-package last-modified="1216200464" id="rhn-source-package-46707" source-rpm="php-5.1.6-20.el5_2.1.src.rpm"/><source-package last-modified="1216212868" id="rhn-source-package-46716" source-rpm="devhelp-0.12-18.el5.src.rpm"/><source-package last-modified="1216212868" id="rhn-source-package-46717" source-rpm="xulrunner-1.9.0.1-1.el5.src.rpm"/><source-package last-modified="1216212868" id="rhn-source-package-46718" source-rpm="yelp-2.16.0-20.el5.src.rpm"/><source-package last-modified="1216212868" id="rhn-source-package-46719" source-rpm="firefox-3.0.1-1.el5.src.rpm"/><source-package last-modified="1216250700" id="rhn-source-package-46725" source-rpm="nspluginwrapper-0.9.91.5-22.el5.src.rpm"/><source-package last-modified="1216919509" id="rhn-source-package-47332" source-rpm="rdesktop-1.4.1-6.src.rpm"/><source-package last-modified="1217260790" id="rhn-source-package-47370" source-rpm="nss_ldap-253-13.el5_2.1.src.rpm"/><source-package last-modified="1217517944" id="rhn-source-package-47401" source-rpm="libxslt-1.1.17-2.el5_2.2.src.rpm"/><source-package last-modified="1217518293" id="rhn-source-package-47403" source-rpm="nfs-utils-1.0.9-35z.el5_2.src.rpm"/><source-package last-modified="1217872472" id="rhn-source-package-47429" source-rpm="kernel-2.6.18-92.1.10.el5.src.rpm"/><source-package last-modified="1218016252" id="rhn-source-package-47438" source-rpm="strace-4.5.16-1.el5_2.2.src.rpm"/><source-package last-modified="1218439751" id="rhn-source-package-47452" source-rpm="kexec-tools-1.102pre-21.el5_2.2.src.rpm"/><source-package last-modified="1218473987" id="rhn-source-package-47456" source-rpm="dnsmasq-2.45-1.el5_2.1.src.rpm"/><source-package last-modified="1218572058" id="rhn-source-package-47467" source-rpm="hplip-1.6.7-4.1.el5_2.4.src.rpm"/><source-package last-modified="1218719167" id="rhn-source-package-47480" source-rpm="yum-rhn-plugin-0.5.3-12.el5_2.9.src.rpm"/><source-package last-modified="1218741244" id="rhn-source-package-47484" source-rpm="postfix-2.3.3-2.1.el5_2.src.rpm"/><source-package last-modified="1219333859" id="rhn-source-package-47500" source-rpm="libxml2-2.6.26-2.1.2.3.src.rpm"/><source-package last-modified="1219406231" id="rhn-source-package-47505" source-rpm="openssh-4.3p2-26.el5_2.1.src.rpm"/><source-package last-modified="1219738263" id="rhn-source-package-47514" source-rpm="libxml2-2.6.26-2.1.2.4.src.rpm"/><source-package last-modified="1219777490" id="rhn-source-package-47523" source-rpm="ipsec-tools-0.6.5-9.el5_2.3.src.rpm"/><source-package last-modified="1219857059" id="rhn-source-package-47539" source-rpm="tomcat5-5.5.23-0jpp.7.el5_2.1.src.rpm"/><source-package last-modified="1219961389" id="rhn-source-package-47557" source-rpm="libtiff-3.8.2-7.el5_2.2.src.rpm"/><source-package last-modified="1220043919" id="rhn-source-package-47564" source-rpm="tzdata-2008e-1.el5.src.rpm"/><source-package last-modified="1220342022" id="rhn-source-package-47567" source-rpm="sos-1.7-9.2.el5_2.2.src.rpm"/><source-package last-modified="1220375950" id="rhn-source-package-47568" source-rpm="libxml2-2.6.26-2.1.2.5.src.rpm"/><source-package last-modified="1221139827" id="rhn-source-package-47665" source-rpm="libxml2-2.6.26-2.1.2.6.src.rpm"/><source-package last-modified="1221568092" id="rhn-source-package-47703" source-rpm="bzip2-1.0.3-4.el5_2.src.rpm"/><source-package last-modified="1221666493" id="rhn-source-package-47724" source-rpm="perl-5.8.8-15.el5_2.1.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47832" source-rpm="firefox-3.0.2-3.el5.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47834" source-rpm="nss-3.12.1.1-1.el5.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47835" source-rpm="devhelp-0.12-19.el5.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47836" source-rpm="yelp-2.16.0-21.el5.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47837" source-rpm="xulrunner-1.9.0.2-5.el5.src.rpm"/><source-package last-modified="1222280505" id="rhn-source-package-47850" source-rpm="kernel-2.6.18-92.1.13.el5.src.rpm"/><source-package last-modified="1222371764" id="rhn-source-package-47864" source-rpm="cman-2.0.84-2.el5_2.1.src.rpm"/><source-package last-modified="1222771381" id="rhn-source-package-47912" source-rpm="initscripts-8.45.19.1.EL-1.src.rpm"/><source-package last-modified="1222873571" id="rhn-source-package-47919" source-rpm="xen-3.0.3-64.el5_2.3.src.rpm"/><source-package last-modified="1222873605" id="rhn-source-package-47920" source-rpm="wireshark-1.0.3-4.el5_2.src.rpm"/><source-package last-modified="1222944609" id="rhn-source-package-47926" source-rpm="dhcpv6-1.0.10-4.el5_2.3.src.rpm"/><source-package last-modified="1222951063" id="rhn-source-package-47927" source-rpm="krb5-1.6.1-25.el5_2.1.src.rpm"/><source-package last-modified="1222955826" id="rhn-source-package-47928" source-rpm="pam_krb5-2.2.14-1.el5_2.1.src.rpm"/><source-package last-modified="1223470078" id="rhn-source-package-47964" source-rpm="tzdata-2008f-3.el5.src.rpm"/><source-package last-modified="1223623400" id="rhn-source-package-47983" source-rpm="cups-1.2.4-11.18.el5_2.2.src.rpm"/><source-package last-modified="1223912332" id="rhn-source-package-47993" source-rpm="libdhcp-1.20-5.el5_2.1.src.rpm"/><source-package last-modified="1224058135" id="rhn-source-package-48108" source-rpm="OpenIPMI-2.0.6-6.el5_2.2.src.rpm"/><source-package last-modified="1224599859" id="rhn-source-package-48134" source-rpm="ruby-1.8.5-5.el5_2.5.src.rpm"/><source-package last-modified="1224601649" id="rhn-source-package-48142" source-rpm="ed-0.2-39.el5_2.src.rpm"/><source-package last-modified="1225126270" id="rhn-source-package-48193" source-rpm="lynx-2.8.5-28.1.el5_2.1.src.rpm"/><source-package last-modified="1225722984" id="rhn-source-package-48447" source-rpm="net-snmp-5.3.1-24.el5_2.2.src.rpm"/><source-package last-modified="1225792914" id="rhn-source-package-48451" source-rpm="kernel-2.6.18-92.1.17.el5.src.rpm"/><source-package last-modified="1225826680" id="rhn-source-package-48452" source-rpm="systemtap-0.6.2-1.el5_2.2.src.rpm"/><source-package last-modified="1225888921" id="rhn-source-package-48462" source-rpm="tzdata-2008i-1.el5.src.rpm"/><source-package last-modified="1225907248" id="rhn-source-package-48464" source-rpm="lvm2-2.02.32-4.el5_2.1.src.rpm"/><source-package last-modified="1225909972" id="rhn-source-package-48466" source-rpm="dmraid-1.0.0.rc13-14.el5_2.1.src.rpm"/><source-package last-modified="1226426860" id="rhn-source-package-48529" source-rpm="httpd-2.2.3-11.el5_2.4.src.rpm"/><source-package last-modified="1226427696" id="rhn-source-package-48530" source-rpm="gnutls-1.4.1-3.el5_2.1.src.rpm"/><source-package last-modified="1226481673" id="rhn-source-package-48540" source-rpm="kernel-2.6.18-92.1.18.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48552" source-rpm="yelp-2.16.0-22.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48553" source-rpm="firefox-3.0.4-1.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48554" source-rpm="nss-3.12.1.1-3.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48555" source-rpm="devhelp-0.12-20.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48556" source-rpm="xulrunner-1.9.0.4-1.el5.src.rpm"/><source-package last-modified="1226937458" id="rhn-source-package-48563" source-rpm="libxml2-2.6.26-2.1.2.7.src.rpm"/><source-package last-modified="1227602325" id="rhn-source-package-48598" source-rpm="vim-7.0.109-4.el5_2.4z.src.rpm"/><source-package last-modified="1227603768" id="rhn-source-package-48602" source-rpm="tog-pegasus-2.7.0-2.el5_2.1.src.rpm"/><source-package last-modified="1227605042" id="rhn-source-package-48603" source-rpm="dmraid-1.0.0.rc13-15.el5_2.1.src.rpm"/><source-package last-modified="1227646398" id="rhn-source-package-48605" source-rpm="cman-2.0.84-2.el5_2.2.src.rpm"/><source-package last-modified="1228131828" id="rhn-source-package-48607" source-rpm="evolution-data-server-1.12.3-6.el5_2.3.src.rpm"/><source-package last-modified="1228236988" id="rhn-source-package-48610" source-rpm="glibc-2.5-24.el5_2.2.src.rpm"/><source-package last-modified="1228405398" id="rhn-source-package-48633" source-rpm="ruby-1.8.5-5.el5_2.6.src.rpm"/><source-package last-modified="1228941420" id="rhn-source-package-48662" source-rpm="cman-2.0.84-2.el5_2.3.src.rpm"/><source-package last-modified="1228992862" id="rhn-source-package-48663" source-rpm="autofs-5.0.1-0.rc2.88.el5_2.1.src.rpm"/><source-package last-modified="1229345375" id="rhn-source-package-48672" source-rpm="enscript-1.6.4-4.1.1.el5_2.src.rpm"/><source-package last-modified="1229347397" id="rhn-source-package-48676" source-rpm="cups-1.2.4-11.18.el5_2.3.src.rpm"/><source-package last-modified="1229412119" id="rhn-source-package-48680" source-rpm="kernel-2.6.18-92.1.22.el5.src.rpm"/><source-package last-modified="1229475848" id="rhn-source-package-48686" source-rpm="nss-3.12.2.0-2.el5.src.rpm"/><source-package last-modified="1229475848" id="rhn-source-package-48687" source-rpm="nspr-4.7.3-2.el5.src.rpm"/><source-package last-modified="1229475848" id="rhn-source-package-48688" source-rpm="xulrunner-1.9.0.5-1.el5_2.src.rpm"/><source-package last-modified="1229475848" id="rhn-source-package-48690" source-rpm="firefox-3.0.5-1.el5_2.src.rpm"/><source-package last-modified="1231324322" id="rhn-source-package-48766" source-rpm="xen-3.0.3-64.el5_2.9.src.rpm"/><source-package last-modified="1231325528" id="rhn-source-package-48772" source-rpm="xterm-215-5.el5_2.2.src.rpm"/><source-package last-modified="1231333540" id="rhn-source-package-48776" source-rpm="openssl097a-0.9.7a-9.el5_2.1.src.rpm"/><source-package last-modified="1231333540" id="rhn-source-package-48782" source-rpm="openssl-0.9.8b-10.el5_2.1.src.rpm"/><source-package last-modified="1231334901" id="rhn-source-package-48783" source-rpm="dbus-1.0.0-7.el5_2.1.src.rpm"/><source-package last-modified="1231335395" id="rhn-source-package-48784" source-rpm="lcms-1.15-1.2.2.el5_2.2.src.rpm"/><source-package last-modified="1231438002" id="rhn-source-package-48793" source-rpm="bind-9.3.4-6.0.3.P1.el5_2.src.rpm"/><source-package last-modified="1231750545" id="rhn-source-package-48803" source-rpm="krb5-1.6.1-25.el5_2.2.src.rpm"/><source-package last-modified="1231769161" id="rhn-source-package-48804" source-rpm="squirrelmail-1.4.8-5.el5_2.2.src.rpm"/><source-package last-modified="1231769191" id="rhn-source-package-48807" source-rpm="avahi-0.6.16-1.el5_2.1.src.rpm"/><source-package last-modified="1231970739" id="rhn-source-package-48833" source-rpm="xterm-215-8.el5.src.rpm"/><source-package last-modified="1232398062" id="rhn-source-package-48852" source-rpm="rhnlib-2.2.6-2.el5.src.rpm"/><source-package last-modified="1232398112" id="rhn-source-package-48853" source-rpm="php-5.1.6-23.el5.src.rpm"/><source-package last-modified="1232398135" id="rhn-source-package-48855" source-rpm="dosfstools-2.11-7.el5.src.rpm"/><source-package last-modified="1232398809" id="rhn-source-package-48856" source-rpm="squirrelmail-1.4.8-5.el5_2.3.src.rpm"/><source-package last-modified="1232399255" id="rhn-source-package-48860" source-rpm="libutempter-1.1.4-4.el5.src.rpm"/><source-package last-modified="1232399314" id="rhn-source-package-48861" source-rpm="unzip-5.52-3.el5.src.rpm"/><source-package last-modified="1232399524" id="rhn-source-package-48862" source-rpm="audit-1.7.7-6.el5.src.rpm"/><source-package last-modified="1232399603" id="rhn-source-package-48863" source-rpm="pykickstart-0.43.3-1.el5.src.rpm"/><source-package last-modified="1232399685" id="rhn-source-package-48865" source-rpm="ypserv-2.19-5.el5.src.rpm"/><source-package last-modified="1232399741" id="rhn-source-package-48867" source-rpm="iscsi-initiator-utils-6.2.0.868-0.18.el5.src.rpm"/><source-package last-modified="1232399782" id="rhn-source-package-48868" source-rpm="initscripts-8.45.25-1.el5.src.rpm"/><source-package last-modified="1232399899" id="rhn-source-package-48870" source-rpm="neon-0.25.5-10.el5.src.rpm"/><source-package last-modified="1232399931" id="rhn-source-package-48871" source-rpm="libcxgb3-1.2.2-1.el5.src.rpm"/><source-package last-modified="1232399968" id="rhn-source-package-48872" source-rpm="diffstat-1.41-1.2.3.el5.src.rpm"/><source-package last-modified="1232400032" id="rhn-source-package-48873" source-rpm="gcc43-4.3.2-7.el5.src.rpm"/><source-package last-modified="1232400170" id="rhn-source-package-48876" source-rpm="pm-utils-0.99.3-10.el5.src.rpm"/><source-package last-modified="1232400278" id="rhn-source-package-48877" source-rpm="yum-utils-1.1.16-13.el5.src.rpm"/><source-package last-modified="1232400292" id="rhn-source-package-48878" source-rpm="paps-0.6.6-18.el5.src.rpm"/><source-package last-modified="1232400343" id="rhn-source-package-48879" source-rpm="smartmontools-5.38-2.el5.src.rpm"/><source-package last-modified="1232400350" id="rhn-source-package-48880" source-rpm="ksh-20080202-2.el5.src.rpm"/><source-package last-modified="1232400359" id="rhn-source-package-48881" source-rpm="bind-9.3.4-10.P1.el5.src.rpm"/><source-package last-modified="1232400525" id="rhn-source-package-48883" source-rpm="ppp-2.4.4-2.el5.src.rpm"/><source-package last-modified="1232400571" id="rhn-source-package-48884" source-rpm="rdate-1.4-8.el5.src.rpm"/><source-package last-modified="1232400580" id="rhn-source-package-48885" source-rpm="scim-bridge-0.4.5-8.el5.src.rpm"/><source-package last-modified="1232400664" id="rhn-source-package-48886" source-rpm="gnuplot-4.0.0-14.el5.src.rpm"/><source-package last-modified="1232400782" id="rhn-source-package-48887" source-rpm="mesa-6.5.1-7.7.el5.src.rpm"/><source-package last-modified="1232400788" id="rhn-source-package-48888" source-rpm="dovecot-1.0.7-7.el5.src.rpm"/><source-package last-modified="1232400789" id="rhn-source-package-48889" source-rpm="cryptsetup-luks-1.0.3-4.el5.src.rpm"/><source-package last-modified="1232400790" id="rhn-source-package-48890" source-rpm="xorg-x11-drv-mga-1.4.2-10.el5.src.rpm"/><source-package last-modified="1232400808" id="rhn-source-package-48891" source-rpm="kexec-tools-1.102pre-56.el5.src.rpm"/><source-package last-modified="1232400918" id="rhn-source-package-48892" source-rpm="vnc-4.1.2-14.el5.src.rpm"/><source-package last-modified="1232401045" id="rhn-source-package-48894" source-rpm="kdebindings-3.5.4-6.el5.src.rpm"/><source-package last-modified="1232401068" id="rhn-source-package-48895" source-rpm="iputils-20020927-45.el5.src.rpm"/><source-package last-modified="1232401090" id="rhn-source-package-48896" source-rpm="rhn-client-tools-0.4.19-17.el5.src.rpm"/><source-package last-modified="1232401095" id="rhn-source-package-48898" source-rpm="dapl-2.0.13-4.el5.src.rpm"/><source-package last-modified="1232401103" id="rhn-source-package-48899" source-rpm="e4fsprogs-1.41.1-2.el5.src.rpm"/><source-package last-modified="1232401125" id="rhn-source-package-48900" source-rpm="vixie-cron-4.1-76.el5.src.rpm"/><source-package last-modified="1232401129" id="rhn-source-package-48901" source-rpm="gstreamer-plugins-good-0.10.9-1.el5.src.rpm"/><source-package last-modified="1232401130" id="rhn-source-package-48902" source-rpm="m2crypto-0.16-6.el5.3.src.rpm"/><source-package last-modified="1232401200" id="rhn-source-package-48903" source-rpm="usermode-1.88-3.el5.2.src.rpm"/><source-package last-modified="1232401226" id="rhn-source-package-48904" source-rpm="man-pages-2.39-12.el5.src.rpm"/><source-package last-modified="1232401234" id="rhn-source-package-48905" source-rpm="libibcommon-1.1.1-1.el5.src.rpm"/><source-package last-modified="1232401284" id="rhn-source-package-48906" source-rpm="binutils-2.17.50.0.6-9.el5.src.rpm"/><source-package last-modified="1232401316" id="rhn-source-package-48907" source-rpm="nfs-utils-1.0.9-40.el5.src.rpm"/><source-package last-modified="1232401321" id="rhn-source-package-48908" source-rpm="lvm2-2.02.40-6.el5.src.rpm"/><source-package last-modified="1232401350" id="rhn-source-package-48909" source-rpm="procps-3.2.7-11.1.el5.src.rpm"/><source-package last-modified="1232401355" id="rhn-source-package-48910" source-rpm="bash-3.2-24.el5.src.rpm"/><source-package last-modified="1232401405" id="rhn-source-package-48912" source-rpm="tcsh-6.14-14.el5.src.rpm"/><source-package last-modified="1232401466" id="rhn-source-package-48913" source-rpm="libhugetlbfs-1.3-3.el5.src.rpm"/><source-package last-modified="1232401545" id="rhn-source-package-48916" source-rpm="ypbind-1.19-11.el5.src.rpm"/><source-package last-modified="1232401658" id="rhn-source-package-48917" source-rpm="nss_ldap-253-17.el5.src.rpm"/><source-package last-modified="1232401660" id="rhn-source-package-48918" source-rpm="module-init-tools-3.3-0.pre3.1.42.el5.src.rpm"/><source-package last-modified="1232401737" id="rhn-source-package-48919" source-rpm="openssh-4.3p2-29.el5.src.rpm"/><source-package last-modified="1232401792" id="rhn-source-package-48920" source-rpm="freeradius-1.1.3-1.4.el5.src.rpm"/><source-package last-modified="1232401800" id="rhn-source-package-48921" source-rpm="edac-utils-0.9-6.el5.src.rpm"/><source-package last-modified="1232401814" id="rhn-source-package-48922" source-rpm="openmotif-2.3.1-2.el5.src.rpm"/><source-package last-modified="1232401844" id="rhn-source-package-48923" source-rpm="man-pages-ja-20060815-9.el5.src.rpm"/><source-package last-modified="1232401900" id="rhn-source-package-48924" source-rpm="libdhcp-1.20-6.el5.src.rpm"/><source-package last-modified="1232402028" id="rhn-source-package-48926" source-rpm="pam-0.99.6.2-4.el5.src.rpm"/><source-package last-modified="1232402043" id="rhn-source-package-48927" source-rpm="python-2.4.3-24.el5.src.rpm"/><source-package last-modified="1232402046" id="rhn-source-package-48928" source-rpm="redhat-rpm-config-8.0.45-29.el5.src.rpm"/><source-package last-modified="1232402058" id="rhn-source-package-48929" source-rpm="mlocate-0.15-1.el5.1.src.rpm"/><source-package last-modified="1232402083" id="rhn-source-package-48930" source-rpm="device-mapper-multipath-0.4.7-23.el5.src.rpm"/><source-package last-modified="1232402098" id="rhn-source-package-48931" source-rpm="python-pyblock-0.26-3.el5.src.rpm"/><source-package last-modified="1232402325" id="rhn-source-package-48932" source-rpm="quota-3.13-1.2.5.el5.src.rpm"/><source-package last-modified="1232402326" id="rhn-source-package-48933" source-rpm="libibmad-1.2.1-1.el5.src.rpm"/><source-package last-modified="1232402333" id="rhn-source-package-48934" source-rpm="words-3.0-9.1.src.rpm"/><source-package last-modified="1232402451" id="rhn-source-package-48935" source-rpm="ntp-4.2.2p1-9.el5.src.rpm"/><source-package last-modified="1232402456" id="rhn-source-package-48936" source-rpm="ibutils-1.2-9.el5.src.rpm"/><source-package last-modified="1232402515" id="rhn-source-package-48937" source-rpm="desktop-printing-0.19-20.2.el5.src.rpm"/><source-package last-modified="1232402551" id="rhn-source-package-48938" source-rpm="ORBit2-2.14.3-5.el5.src.rpm"/><source-package last-modified="1232402568" id="rhn-source-package-48939" source-rpm="strace-4.5.18-2.el5.src.rpm"/><source-package last-modified="1232402607" id="rhn-source-package-48940" source-rpm="cman-2.0.98-1.el5.src.rpm"/><source-package last-modified="1232402680" id="rhn-source-package-48942" source-rpm="xorg-x11-drv-mutouch-1.1.0-3.src.rpm"/><source-package last-modified="1232402694" id="rhn-source-package-48943" source-rpm="freeipmi-0.5.1-6.el5.src.rpm"/><source-package last-modified="1232402809" id="rhn-source-package-48944" source-rpm="file-4.17-15.src.rpm"/><source-package last-modified="1232402820" id="rhn-source-package-48945" source-rpm="zip-2.31-2.el5.src.rpm"/><source-package last-modified="1232402823" id="rhn-source-package-48948" source-rpm="acpid-1.0.4-7.el5.src.rpm"/><source-package last-modified="1232402862" id="rhn-source-package-48949" source-rpm="mvapich-1.1.0-0.2931.3.el5.src.rpm"/><source-package last-modified="1232402939" id="rhn-source-package-48951" source-rpm="ktune-0.2-3.el5.src.rpm"/><source-package last-modified="1232402952" id="rhn-source-package-48952" source-rpm="rhpxl-0.41.1-7.el5.src.rpm"/><source-package last-modified="1232402959" id="rhn-source-package-48953" source-rpm="perl-DBD-MySQL-3.0007-2.el5.src.rpm"/><source-package last-modified="1232402963" id="rhn-source-package-48954" source-rpm="python-urlgrabber-3.1.0-5.el5.src.rpm"/><source-package last-modified="1232402965" id="rhn-source-package-48955" source-rpm="dbus-1.1.2-12.el5.src.rpm"/><source-package last-modified="1232403002" id="rhn-source-package-48956" source-rpm="mpitests-3.0-2.el5.src.rpm"/><source-package last-modified="1232403020" id="rhn-source-package-48957" source-rpm="traceroute-2.0.1-5.el5.src.rpm"/><source-package last-modified="1232403078" id="rhn-source-package-48959" source-rpm="hwdata-0.213.11-1.el5.src.rpm"/><source-package last-modified="1232403091" id="rhn-source-package-48960" source-rpm="pkinit-nss-0.7.6-1.el5.src.rpm"/><source-package last-modified="1232403093" id="rhn-source-package-48961" source-rpm="iproute-2.6.18-9.el5.src.rpm"/><source-package last-modified="1232403110" id="rhn-source-package-48962" source-rpm="parted-1.8.1-23.el5.src.rpm"/><source-package last-modified="1232403138" id="rhn-source-package-48963" source-rpm="anaconda-11.1.2.168-1.src.rpm"/><source-package last-modified="1232403164" id="rhn-source-package-48964" source-rpm="xorg-x11-drv-ati-6.6.3-3.22.el5.src.rpm"/><source-package last-modified="1232403218" id="rhn-source-package-48965" source-rpm="samba-3.0.33-3.7.el5.src.rpm"/><source-package last-modified="1232403220" id="rhn-source-package-48966" source-rpm="ofed-docs-1.3.2-0.20080728.0355.1.el5.src.rpm"/><source-package last-modified="1232403232" id="rhn-source-package-48968" source-rpm="elfutils-0.137-3.el5.src.rpm"/><source-package last-modified="1232403241" id="rhn-source-package-48969" source-rpm="dhcp-3.0.5-18.el5.src.rpm"/><source-package last-modified="1232403285" id="rhn-source-package-48970" source-rpm="gdb-6.8-27.el5.src.rpm"/><source-package last-modified="1232403299" id="rhn-source-package-48971" source-rpm="libibumad-1.2.1-1.el5.src.rpm"/><source-package last-modified="1232403336" id="rhn-source-package-48973" source-rpm="mod_perl-2.0.4-6.el5.src.rpm"/><source-package last-modified="1232403346" id="rhn-source-package-48974" source-rpm="gstreamer-plugins-base-0.10.20-3.el5.src.rpm"/><source-package last-modified="1232403377" id="rhn-source-package-48975" source-rpm="libibverbs-1.1.2-1.el5.src.rpm"/><source-package last-modified="1232403430" id="rhn-source-package-48976" source-rpm="libselinux-1.33.4-5.1.el5.src.rpm"/><source-package last-modified="1232403474" id="rhn-source-package-48977" source-rpm="qlvnictools-0.0.1-10.el5.src.rpm"/><source-package last-modified="1232403540" id="rhn-source-package-48978" source-rpm="gstreamer-0.10.20-3.el5.src.rpm"/><source-package last-modified="1232403564" id="rhn-source-package-48979" source-rpm="authconfig-5.3.21-5.el5.src.rpm"/><source-package last-modified="1232403566" id="rhn-source-package-48980" source-rpm="dbus-glib-0.73-8.el5.src.rpm"/><source-package last-modified="1232403605" id="rhn-source-package-48981" source-rpm="qperf-0.4.1-2.el5.src.rpm"/><source-package last-modified="1232403644" id="rhn-source-package-48982" source-rpm="shadow-utils-4.0.17-14.el5.src.rpm"/><source-package last-modified="1232403649" id="rhn-source-package-48983" source-rpm="readline-5.1-1.1.src.rpm"/><source-package last-modified="1232403761" id="rhn-source-package-48984" source-rpm="dmraid-1.0.0.rc13-33.el5.src.rpm"/><source-package last-modified="1232403762" id="rhn-source-package-48985" source-rpm="pam_krb5-2.2.14-10.src.rpm"/><source-package last-modified="1232403792" id="rhn-source-package-48986" source-rpm="net-snmp-5.3.2.2-5.el5.src.rpm"/><source-package last-modified="1232403807" id="rhn-source-package-48987" source-rpm="librdmacm-1.0.8-1.el5.src.rpm"/><source-package last-modified="1232403809" id="rhn-source-package-48988" source-rpm="sabayon-2.12.4-6.el5.src.rpm"/><source-package last-modified="1232403867" id="rhn-source-package-48989" source-rpm="krb5-1.6.1-31.el5.src.rpm"/><source-package last-modified="1232403875" id="rhn-source-package-48990" source-rpm="fonts-indic-2.3.1-1.el5.src.rpm"/><source-package last-modified="1232403879" id="rhn-source-package-48991" source-rpm="system-config-printer-0.7.32.10-1.el5.src.rpm"/><source-package last-modified="1232404483" id="rhn-source-package-48993" source-rpm="cpufreq-utils-005-1.el5.src.rpm"/><source-package last-modified="1232404487" id="rhn-source-package-48994" source-rpm="udev-095-14.19.el5.src.rpm"/><source-package last-modified="1232404495" id="rhn-source-package-48995" source-rpm="xorg-x11-drv-i810-1.6.5-9.21.el5.src.rpm"/><source-package last-modified="1232404587" id="rhn-source-package-48996" source-rpm="newt-0.52.2-12.el5.src.rpm"/><source-package last-modified="1232404615" id="rhn-source-package-48997" source-rpm="perl-DBI-1.52-2.el5.src.rpm"/><source-package last-modified="1232404647" id="rhn-source-package-48998" source-rpm="scim-1.4.4-41.el5.src.rpm"/><source-package last-modified="1232404651" id="rhn-source-package-48999" source-rpm="gnupg-1.4.5-14.src.rpm"/><source-package last-modified="1232404665" id="rhn-source-package-49000" source-rpm="tmpwatch-2.9.7-1.1.el5.2.src.rpm"/><source-package last-modified="1232404697" id="rhn-source-package-49001" source-rpm="tog-pegasus-2.7.1-2.el5.src.rpm"/><source-package last-modified="1232404728" id="rhn-source-package-49002" source-rpm="perl-DBD-Pg-1.49-2.el5.src.rpm"/><source-package last-modified="1232404914" id="rhn-source-package-49006" source-rpm="sos-1.7-9.16.el5.src.rpm"/><source-package last-modified="1232404917" id="rhn-source-package-49007" source-rpm="mpi-selector-1.0.1-1.el5.src.rpm"/><source-package last-modified="1232404921" id="rhn-source-package-49008" source-rpm="alsa-utils-1.0.17-1.el5.src.rpm"/><source-package last-modified="1232404925" id="rhn-source-package-49009" source-rpm="opensm-3.2.2-3.el5.src.rpm"/><source-package last-modified="1232404928" id="rhn-source-package-49010" source-rpm="system-config-samba-1.2.41-3.el5.src.rpm"/><source-package last-modified="1232404970" id="rhn-source-package-49011" source-rpm="redhat-menus-6.7.8-3.el5.src.rpm"/><source-package last-modified="1232405062" id="rhn-source-package-49014" source-rpm="hal-0.5.8.1-38.el5.src.rpm"/><source-package last-modified="1232405067" id="rhn-source-package-49015" source-rpm="gfs2-utils-0.1.53-1.el5.src.rpm"/><source-package last-modified="1232405124" id="rhn-source-package-49017" source-rpm="perftest-1.2-11.el5.src.rpm"/><source-package last-modified="1232405133" id="rhn-source-package-49018" source-rpm="dhcdbd-2.2-2.el5.src.rpm"/><source-package last-modified="1232405136" id="rhn-source-package-49019" source-rpm="wdaemon-0.14-2.src.rpm"/><source-package last-modified="1232405182" id="rhn-source-package-49021" source-rpm="logrotate-3.7.4-9.src.rpm"/><source-package last-modified="1232405218" id="rhn-source-package-49022" source-rpm="kdelibs-3.5.4-18.el5.src.rpm"/><source-package last-modified="1232405242" id="rhn-source-package-49023" source-rpm="mkinitrd-5.1.19.6-44.src.rpm"/><source-package last-modified="1232405257" id="rhn-source-package-49024" source-rpm="xen-3.0.3-80.el5.src.rpm"/><source-package last-modified="1232405662" id="rhn-source-package-49025" source-rpm="device-mapper-1.02.28-2.el5.src.rpm"/><source-package last-modified="1232405668" id="rhn-source-package-49026" source-rpm="libsmi-0.4.5-2.el5.src.rpm"/><source-package last-modified="1232405716" id="rhn-source-package-49027" source-rpm="openib-1.3.2-0.20080728.0355.3.el5.src.rpm"/><source-package last-modified="1232405722" id="rhn-source-package-49028" source-rpm="mod_nss-1.0.3-6.el5.src.rpm"/><source-package last-modified="1232405729" id="rhn-source-package-49029" source-rpm="util-linux-2.13-0.50.el5.src.rpm"/><source-package last-modified="1232405828" id="rhn-source-package-49030" source-rpm="pfmon-3.2-0.060926.5.el5.src.rpm"/><source-package last-modified="1232405833" id="rhn-source-package-49031" source-rpm="gimp-print-4.2.7-22.2.el5.src.rpm"/><source-package last-modified="1232405837" id="rhn-source-package-49032" source-rpm="openais-0.80.3-22.el5.src.rpm"/><source-package last-modified="1232405842" id="rhn-source-package-49033" source-rpm="xorg-x11-drv-nv-2.1.12-3.el5.src.rpm"/><source-package last-modified="1232405854" id="rhn-source-package-49034" source-rpm="system-config-network-1.3.99.12-1.el5.src.rpm"/><source-package last-modified="1232405931" id="rhn-source-package-49035" source-rpm="spamassassin-3.2.5-1.el5.src.rpm"/><source-package last-modified="1232405978" id="rhn-source-package-49038" source-rpm="systemtap-0.7.2-2.el5.src.rpm"/><source-package last-modified="1232405991" id="rhn-source-package-49039" source-rpm="subversion-1.4.2-4.el5.src.rpm"/><source-package last-modified="1232406043" id="rhn-source-package-49041" source-rpm="tcp_wrappers-7.6-40.6.el5.src.rpm"/><source-package last-modified="1232406050" id="rhn-source-package-49042" source-rpm="setup-2.5.58-4.el5.src.rpm"/><source-package last-modified="1232406063" id="rhn-source-package-49043" source-rpm="rpm-4.4.2.3-9.el5.src.rpm"/><source-package last-modified="1232406068" id="rhn-source-package-49044" source-rpm="ipsec-tools-0.6.5-13.el5.src.rpm"/><source-package last-modified="1232406107" id="rhn-source-package-49045" source-rpm="glibc-2.5-34.src.rpm"/><source-package last-modified="1232406213" id="rhn-source-package-49046" source-rpm="openmpi-1.2.7-6.el5.src.rpm"/><source-package last-modified="1232406256" id="rhn-source-package-49047" source-rpm="yum-rhn-plugin-0.5.3-30.el5.src.rpm"/><source-package last-modified="1232406281" id="rhn-source-package-49048" source-rpm="infiniband-diags-1.4.1-2.el5.src.rpm"/><source-package last-modified="1232406352" id="rhn-source-package-49049" source-rpm="patch-2.5.4-29.2.3.el5.src.rpm"/><source-package last-modified="1232406387" id="rhn-source-package-49050" source-rpm="libmthca-1.0.5-1.el5.src.rpm"/><source-package last-modified="1232406400" id="rhn-source-package-49051" source-rpm="policycoreutils-1.33.12-14.2.el5.src.rpm"/><source-package last-modified="1232406449" id="rhn-source-package-49052" source-rpm="perl-5.8.8-18.el5.src.rpm"/><source-package last-modified="1232406458" id="rhn-source-package-49053" source-rpm="tcpdump-3.9.4-14.el5.src.rpm"/><source-package last-modified="1232406485" id="rhn-source-package-49054" source-rpm="cups-1.3.7-8.el5.src.rpm"/><source-package last-modified="1232406489" id="rhn-source-package-49055" source-rpm="inn-2.4.3-8.el5.src.rpm"/><source-package last-modified="1232406521" id="rhn-source-package-49056" source-rpm="crash-4.0-7.2.3.src.rpm"/><source-package last-modified="1232406531" id="rhn-source-package-49057" source-rpm="nedit-5.5-21.el5.src.rpm"/><source-package last-modified="1232406554" id="rhn-source-package-49059" source-rpm="openldap-2.3.43-3.el5.src.rpm"/><source-package last-modified="1232406569" id="rhn-source-package-49060" source-rpm="gnome-power-manager-2.16.0-10.el5.src.rpm"/><source-package last-modified="1232406590" id="rhn-source-package-49061" source-rpm="yum-3.2.19-18.el5.src.rpm"/><source-package last-modified="1232406630" id="rhn-source-package-49062" source-rpm="system-config-kdump-1.0.14-4.el5.src.rpm"/><source-package last-modified="1232406661" id="rhn-source-package-49063" source-rpm="kdebase-3.5.4-19.el5.src.rpm"/><source-package last-modified="1232406664" id="rhn-source-package-49064" source-rpm="system-config-kickstart-2.6.19.8-2.el5.src.rpm"/><source-package last-modified="1232406679" id="rhn-source-package-49065" source-rpm="mvapich2-1.0.3-3.el5.src.rpm"/><source-package last-modified="1232406682" id="rhn-source-package-49066" source-rpm="ibsim-0.4-3.el5.src.rpm"/><source-package last-modified="1232406703" id="rhn-source-package-49067" source-rpm="system-config-bind-4.0.3-4.el5.src.rpm"/><source-package last-modified="1232406726" id="rhn-source-package-49069" source-rpm="sudo-1.6.9p17-3.el5.src.rpm"/><source-package last-modified="1232406743" id="rhn-source-package-49070" source-rpm="xfig-3.2.4-21.3.el5.src.rpm"/><source-package last-modified="1232406750" id="rhn-source-package-49071" source-rpm="privoxy-3.0.3-9.3.el5.src.rpm"/><source-package last-modified="1232406758" id="rhn-source-package-49072" source-rpm="httpd-2.2.3-22.el5.src.rpm"/><source-package last-modified="1232406763" id="rhn-source-package-49073" source-rpm="ethtool-6-2.el5.src.rpm"/><source-package last-modified="1232406807" id="rhn-source-package-49074" source-rpm="stunnel-4.15-2.el5.1.src.rpm"/><source-package last-modified="1232406818" id="rhn-source-package-49075" source-rpm="libmlx4-1.0-4.el5.src.rpm"/><source-package last-modified="1232406828" id="rhn-source-package-49076" source-rpm="dhcpv6-1.0.10-16.el5.src.rpm"/><source-package last-modified="1232406852" id="rhn-source-package-49077" source-rpm="redhat-release-notes-5Server-25.src.rpm"/><source-package last-modified="1232406898" id="rhn-source-package-49078" source-rpm="xorg-x11-server-1.1.1-48.52.el5.src.rpm"/><source-package last-modified="1232406903" id="rhn-source-package-49079" source-rpm="firstboot-1.4.27.7-1.el5.src.rpm"/><source-package last-modified="1232406913" id="rhn-source-package-49080" source-rpm="compat-libcom_err-1.0-7.src.rpm"/><source-package last-modified="1232406980" id="rhn-source-package-49081" source-rpm="gcc-4.1.2-44.el5.src.rpm"/><source-package last-modified="1232407197" id="rhn-source-package-49082" source-rpm="java-1.6.0-openjdk-1.6.0.0-0.25.b09.el5.src.rpm"/><source-package last-modified="1232407202" id="rhn-source-package-49083" source-rpm="rsyslog-2.0.6-1.el5.src.rpm"/><source-package last-modified="1232407244" id="rhn-source-package-49084" source-rpm="libibcm-1.0.3-1.el5.src.rpm"/><source-package last-modified="1232407251" id="rhn-source-package-49085" source-rpm="fipscheck-1.0.3-1.el5.src.rpm"/><source-package last-modified="1232408485" id="rhn-source-package-49086" source-rpm="rhel-instnum-1.0.9-1.el5.src.rpm"/><source-package last-modified="1232408511" id="rhn-source-package-49087" source-rpm="SysVinit-2.86-15.el5.src.rpm"/><source-package last-modified="1232408545" id="rhn-source-package-49088" source-rpm="squid-2.6.STABLE21-3.el5.src.rpm"/><source-package last-modified="1232408577" id="rhn-source-package-49089" source-rpm="ftp-0.17-35.el5.src.rpm"/><source-package last-modified="1232408590" id="rhn-source-package-49090" source-rpm="kdenetwork-3.5.4-8.el5.src.rpm"/><source-package last-modified="1232408595" id="rhn-source-package-49091" source-rpm="kbd-1.12-21.el5.src.rpm"/><source-package last-modified="1232408688" id="rhn-source-package-49092" source-rpm="NetworkManager-0.7.0-3.el5.src.rpm"/><source-package last-modified="1232408899" id="rhn-source-package-49093" source-rpm="sgpio-1.2.0_10-2.el5.src.rpm"/><source-package last-modified="1232408943" id="rhn-source-package-49094" source-rpm="ccid-1.3.8-1.el5.src.rpm"/><source-package last-modified="1232408961" id="rhn-source-package-49095" source-rpm="booty-0.80.6-5.src.rpm"/><source-package last-modified="1232408977" id="rhn-source-package-49096" source-rpm="libnes-0.5-4.el5.src.rpm"/><source-package last-modified="1232408987" id="rhn-source-package-49097" source-rpm="cdrtools-2.01-10.7.el5.src.rpm"/><source-package last-modified="1232408995" id="rhn-source-package-49098" source-rpm="selinux-policy-2.4.6-203.el5.src.rpm"/><source-package last-modified="1232409022" id="rhn-source-package-49100" source-rpm="kudzu-1.2.57.1.21-1.src.rpm"/><source-package last-modified="1232409066" id="rhn-source-package-49101" source-rpm="openCryptoki-2.2.4-22.el5.src.rpm"/><source-package last-modified="1232409101" id="rhn-source-package-49102" source-rpm="filesystem-2.4.0-2.src.rpm"/><source-package last-modified="1232409108" id="rhn-source-package-49103" source-rpm="OpenIPMI-2.0.6-11.el5.src.rpm"/><source-package last-modified="1232409137" id="rhn-source-package-49104" source-rpm="system-config-lvm-1.1.5-1.0.el5.src.rpm"/><source-package last-modified="1232409171" id="rhn-source-package-49106" source-rpm="redhat-release-5Server-5.3.0.3.src.rpm"/><source-package last-modified="1232409174" id="rhn-source-package-49107" source-rpm="psacct-6.3.2-44.el5.src.rpm"/><source-package last-modified="1232409270" id="rhn-source-package-49109" source-rpm="oprofile-0.9.3-18.el5.src.rpm"/><source-package last-modified="1232409276" id="rhn-source-package-49110" source-rpm="openssl-0.9.8e-7.el5.src.rpm"/><source-package last-modified="1232409282" id="rhn-source-package-49111" source-rpm="ecryptfs-utils-56-8.el5.src.rpm"/><source-package last-modified="1232409352" id="rhn-source-package-49113" source-rpm="libgcrypt-1.2.4-1.el5.src.rpm"/><source-package last-modified="1232409404" id="rhn-source-package-49114" source-rpm="wpa_supplicant-0.5.10-8.el5.src.rpm"/><source-package last-modified="1232409406" id="rhn-source-package-49115" source-rpm="findutils-4.2.27-5.el5.src.rpm"/><source-package last-modified="1232409454" id="rhn-source-package-49116" source-rpm="linuxwacom-0.7.8.3-5.el5.src.rpm"/><source-package last-modified="1232409605" id="rhn-source-package-49117" source-rpm="mcstrans-0.2.11-3.el5.src.rpm"/><source-package last-modified="1232409671" id="rhn-source-package-49118" source-rpm="numactl-0.9.8-7.el5.src.rpm"/><source-package last-modified="1232409739" id="rhn-source-package-49119" source-rpm="sysstat-7.0.2-3.el5.src.rpm"/><source-package last-modified="1232409742" id="rhn-source-package-49120" source-rpm="gnome-terminal-2.16.0-5.3.el5.src.rpm"/><source-package last-modified="1232409747" id="rhn-source-package-49121" source-rpm="cpuspeed-1.2.1-5.el5.src.rpm"/><source-package last-modified="1232410156" id="rhn-source-package-49123" source-rpm="prelink-0.4.0-2.el5.src.rpm"/><source-package last-modified="1232410159" id="rhn-source-package-49124" source-rpm="lm_sensors-2.10.7-4.el5.src.rpm"/><source-package last-modified="1232410176" id="rhn-source-package-49125" source-rpm="autofs-5.0.1-0.rc2.102.src.rpm"/><source-package last-modified="1232410229" id="rhn-source-package-49126" source-rpm="wacomexpresskeys-0.4.1-1.el5.src.rpm"/><source-package last-modified="1232410237" id="rhn-source-package-49127" source-rpm="metacity-2.16.0-12.el5.src.rpm"/><source-package last-modified="1232410250" id="rhn-source-package-49128" source-rpm="alsa-lib-1.0.17-1.el5.src.rpm"/><source-package last-modified="1232410251" id="rhn-source-package-49129" source-rpm="perl-Archive-Zip-1.16-1.2.1.src.rpm"/><source-package last-modified="1232410284" id="rhn-source-package-49130" source-rpm="coreutils-5.97-19.el5.src.rpm"/><source-package last-modified="1232410341" id="rhn-source-package-49131" source-rpm="ghostscript-8.15.2-9.4.el5.src.rpm"/><source-package last-modified="1232410344" id="rhn-source-package-49132" source-rpm="esc-1.0.0-39.el5.src.rpm"/><source-package last-modified="1232459632" id="rhn-source-package-49137" source-rpm="module-init-tools-3.3-0.pre3.1.37.el5_2.1.src.rpm"/><source-package last-modified="1232489751" id="rhn-source-package-49141" source-rpm="crash-4.0-7.2.3.el5_3.1.src.rpm"/><source-package last-modified="1232489764" id="rhn-source-package-49142" source-rpm="kexec-tools-1.102pre-56.el5_3.1.src.rpm"/><source-package last-modified="1232490104" id="rhn-source-package-49143" source-rpm="strace-4.5.18-2.el5_3.2.src.rpm"/><source-package last-modified="1233221465" id="rhn-source-package-49260" source-rpm="ntp-4.2.2p1-9.el5_3.1.src.rpm"/><source-package last-modified="1233737075" id="rhn-source-package-49576" source-rpm="firefox-3.0.6-1.el5.src.rpm"/><source-package last-modified="1233737075" id="rhn-source-package-49577" source-rpm="nss-3.12.2.0-4.el5.src.rpm"/><source-package last-modified="1233737075" id="rhn-source-package-49578" source-rpm="xulrunner-1.9.0.6-1.el5.src.rpm"/><source-package last-modified="1233849341" id="rhn-source-package-49631" source-rpm="sudo-1.6.9p17-3.el5_3.1.src.rpm"/><source-package last-modified="1233923900" id="rhn-source-package-49636" source-rpm="gstreamer-plugins-good-0.10.9-1.el5_3.1.src.rpm"/><source-package last-modified="1234280500" id="rhn-source-package-49644" source-rpm="kernel-2.6.18-128.1.1.el5.src.rpm"/><source-package last-modified="1234362522" id="rhn-source-package-49645" source-rpm="dos2unix-3.1-27.2.el5.src.rpm"/><source-package last-modified="1234362529" id="rhn-source-package-49646" source-rpm="hwbrowser-0.30-3.el5.src.rpm"/><source-package last-modified="1234362542" id="rhn-source-package-49647" source-rpm="system-config-date-1.8.12-4.el5.src.rpm"/><source-package last-modified="1234370305" id="rhn-source-package-49650" source-rpm="netpbm-10.35-6.1.el5_3.1.src.rpm"/><source-package last-modified="1234371327" id="rhn-source-package-49651" source-rpm="mod_auth_mysql-3.0.0-3.2.el5_3.src.rpm"/><source-package last-modified="1234371517" id="rhn-source-package-49653" source-rpm="vnc-4.1.2-14.el5_3.1.src.rpm"/><source-package last-modified="1234951245" id="rhn-source-package-49666" source-rpm="unix2dos-2.2-26.2.3.el5.src.rpm"/><source-package last-modified="1234975295" id="rhn-source-package-49667" source-rpm="strace-4.5.18-2.el5_3.3.src.rpm"/><source-package last-modified="1235512939" id="rhn-source-package-49682" source-rpm="gfs2-utils-0.1.53-1.el5_3.1.src.rpm"/><source-package last-modified="1235749521" id="rhn-source-package-49687" source-rpm="device-mapper-multipath-0.4.7-23.el5_3.1.src.rpm"/><source-package last-modified="1236193446" id="rhn-source-package-49701" source-rpm="wireshark-1.0.6-2.el5_3.src.rpm"/><source-package last-modified="1236193625" id="rhn-source-package-49704" source-rpm="libpng-1.2.10-7.1.el5_3.2.src.rpm"/><source-package last-modified="1236210974" id="rhn-source-package-49709" source-rpm="xulrunner-1.9.0.7-1.el5.src.rpm"/><source-package last-modified="1236210974" id="rhn-source-package-49710" source-rpm="firefox-3.0.7-1.el5.src.rpm"/><source-package last-modified="1236787732" id="rhn-source-package-49976" source-rpm="mod_authz_ldap-0.26-9.el5.src.rpm"/><source-package last-modified="1236787878" id="rhn-source-package-49977" source-rpm="htdig-3.2.0b6-11.el5.src.rpm"/><source-package last-modified="1236866978" id="rhn-source-package-49998" source-rpm="icu-3.6-5.11.2.src.rpm"/><source-package last-modified="1237210830" id="rhn-source-package-50003" source-rpm="libsoup-2.2.98-2.el5_3.1.src.rpm"/><source-package last-modified="1237211194" id="rhn-source-package-50005" source-rpm="evolution-data-server-1.12.3-10.el5_3.3.src.rpm"/><source-package last-modified="1237388126" id="rhn-source-package-50010" source-rpm="jadetex-3.12-15.el5.src.rpm"/><source-package last-modified="1237388248" id="rhn-source-package-50011" source-rpm="cpio-2.6-23.el5.src.rpm"/><source-package last-modified="1237388438" id="rhn-source-package-50012" source-rpm="ltrace-0.5-13.45svn.el5.src.rpm"/><source-package last-modified="1237474961" id="rhn-source-package-50018" source-rpm="lcms-1.18-0.1.beta1.el5_3.2.src.rpm"/><source-package last-modified="1237475352" id="rhn-source-package-50022" source-rpm="curl-7.15.5-2.1.el5_3.4.src.rpm"/><source-package last-modified="1237476796" id="rhn-source-package-50025" source-rpm="ghostscript-8.15.2-9.4.el5_3.4.src.rpm"/><source-package last-modified="1237895801" id="rhn-source-package-50044" source-rpm="glib2-2.12.3-4.el5_3.1.src.rpm"/><source-package last-modified="1237984158" id="rhn-source-package-50050" source-rpm="numactl-0.9.8-8.el5.src.rpm"/><source-package last-modified="1237984344" id="rhn-source-package-50051" source-rpm="db4-4.3.29-10.el5.src.rpm"/><source-package last-modified="1237989317" id="rhn-source-package-50053" source-rpm="NetworkManager-0.7.0-4.el5_3.src.rpm"/><source-package last-modified="1238082570" id="rhn-source-package-50055" source-rpm="systemtap-0.7.2-3.el5_3.src.rpm"/><source-package last-modified="1238195400" id="rhn-source-package-50087" source-rpm="xulrunner-1.9.0.7-3.el5.src.rpm"/><source-package last-modified="1238423485" id="rhn-source-package-50101" source-rpm="xen-3.0.3-80.el5_3.2.src.rpm"/><source-package last-modified="1238431767" id="rhn-source-package-50102" source-rpm="openswan-2.6.14-1.el5_3.2.src.rpm"/><source-package last-modified="1238488706" id="rhn-source-package-50103" source-rpm="mod_nss-1.0.3-7.el5_3.1.src.rpm"/><source-package last-modified="1238573732" id="rhn-source-package-50106" source-rpm="kernel-2.6.18-128.1.6.el5.src.rpm"/><source-package last-modified="1238575521" id="rhn-source-package-50107" source-rpm="iproute-2.6.18-10.el5.src.rpm"/><source-package last-modified="1238575797" id="rhn-source-package-50108" source-rpm="gnome-python2-desktop-2.16.0-3.el5.src.rpm"/><source-package last-modified="1238684145" id="rhn-source-package-50148" source-rpm="perl-5.8.8-18.el5_3.1.src.rpm"/><source-package last-modified="1239035288" id="rhn-source-package-50154" source-rpm="gstreamer-plugins-base-0.10.20-3.0.1.el5_3.src.rpm"/><source-package last-modified="1239035300" id="rhn-source-package-50155" source-rpm="php-5.1.6-23.2.el5_3.src.rpm"/><source-package last-modified="1239129265" id="rhn-source-package-50163" source-rpm="krb5-1.6.1-31.el5_3.3.src.rpm"/><source-package last-modified="1239129272" id="rhn-source-package-50167" source-rpm="java-1.6.0-openjdk-1.6.0.0-0.30.b09.el5.src.rpm"/><source-package last-modified="1239129436" id="rhn-source-package-50168" source-rpm="device-mapper-multipath-0.4.7-23.el5_3.2.src.rpm"/><source-package last-modified="1239176743" id="rhn-source-package-50171" source-rpm="lksctp-tools-1.0.6-3.el5.src.rpm"/><source-package last-modified="1239176764" id="rhn-source-package-50172" source-rpm="less-394-6.el5.src.rpm"/><source-package last-modified="1239176867" id="rhn-source-package-50173" source-rpm="tcl-8.4.13-4.el5.src.rpm"/><source-package last-modified="1239307153" id="rhn-source-package-50183" source-rpm="cman-2.0.98-1.el5_3.1.src.rpm"/><source-package last-modified="1239307231" id="rhn-source-package-50184" source-rpm="openais-0.80.3-22.el5_3.4.src.rpm"/><source-package last-modified="1239307432" id="rhn-source-package-50185" source-rpm="gfs2-utils-0.1.53-1.el5_3.2.src.rpm"/><source-package last-modified="1239731456" id="rhn-source-package-50193" source-rpm="ghostscript-8.15.2-9.4.el5_3.7.src.rpm"/><source-package last-modified="1239786942" id="rhn-source-package-50197" source-rpm="tzdata-2009f-1.el5.src.rpm"/><source-package last-modified="1239789435" id="rhn-source-package-50198" source-rpm="rsh-0.17-40.el5.src.rpm"/><source-package last-modified="1239790480" id="rhn-source-package-50200" source-rpm="dump-0.4b41-4.el5.src.rpm"/><source-package last-modified="1239791165" id="rhn-source-package-50201" source-rpm="scim-bridge-0.4.5-9.el5.src.rpm"/><source-package last-modified="1239910316" id="rhn-source-package-50209" source-rpm="udev-095-14.20.el5_3.src.rpm"/><source-package last-modified="1239919080" id="rhn-source-package-50212" source-rpm="cups-1.3.7-8.el5_3.4.src.rpm"/><source-package last-modified="1239975231" id="rhn-source-package-50218" source-rpm="device-mapper-multipath-0.4.7-23.el5_3.4.src.rpm"/><source-package last-modified="1240363553" id="rhn-source-package-50265" source-rpm="firefox-3.0.9-1.el5.src.rpm"/><source-package last-modified="1240363553" id="rhn-source-package-50267" source-rpm="xulrunner-1.9.0.9-1.el5.src.rpm"/><source-package last-modified="1240404139" id="rhn-source-package-50268" source-rpm="sudo-1.6.9p17-5.el5.src.rpm"/><source-package last-modified="1240404250" id="rhn-source-package-50269" source-rpm="psmisc-22.2-7.src.rpm"/><source-package last-modified="1240404398" id="rhn-source-package-50270" source-rpm="yum-metadata-parser-1.1.2-3.el5.src.rpm"/><source-package last-modified="1240404603" id="rhn-source-package-50271" source-rpm="sqlite-3.3.6-5.src.rpm"/><source-package last-modified="1240404715" id="rhn-source-package-50272" source-rpm="authd-1.4.3-14.src.rpm"/><source-package last-modified="1240404886" id="rhn-source-package-50273" source-rpm="audit-1.7.7-6.el5_3.2.src.rpm"/><source-package last-modified="1240421649" id="rhn-source-package-50274" source-rpm="giflib-4.1.3-7.1.el5_3.1.src.rpm"/><source-package last-modified="1240864918" id="rhn-source-package-50284" source-rpm="firefox-3.0.10-1.el5.src.rpm"/><source-package last-modified="1240864918" id="rhn-source-package-50285" source-rpm="xulrunner-1.9.0.10-1.el5.src.rpm"/><source-package last-modified="1241012373" id="rhn-source-package-50291" source-rpm="kdenetwork-3.5.4-9.el5.src.rpm"/><source-package last-modified="1241012560" id="rhn-source-package-50292" source-rpm="tcp_wrappers-7.6-40.7.el5.src.rpm"/><source-package last-modified="1241095412" id="rhn-source-package-50317" source-rpm="file-4.17-15.el5_3.1.src.rpm"/><source-package last-modified="1241122231" id="rhn-source-package-50324" source-rpm="libwmf-0.2.8.4-10.2.src.rpm"/><source-package last-modified="1241606742" id="rhn-source-package-50341" source-rpm="sos-1.7-9.16.el5_3.5.src.rpm"/><source-package last-modified="1241623776" id="rhn-source-package-50344" source-rpm="ypbind-1.19-12.el5.src.rpm"/><source-package last-modified="1241623888" id="rhn-source-package-50345" source-rpm="zsh-4.2.6-3.el5.src.rpm"/><source-package last-modified="1241624111" id="rhn-source-package-50347" source-rpm="binutils-2.17.50.0.6-12.el5.src.rpm"/><source-package last-modified="1241689733" id="rhn-source-package-50349" source-rpm="kexec-tools-1.102pre-56.el5_3.2.src.rpm"/><source-package last-modified="1241693068" id="rhn-source-package-50355" source-rpm="kernel-2.6.18-128.1.10.el5.src.rpm"/><source-package last-modified="1241696250" id="rhn-source-package-50359" source-rpm="acpid-1.0.4-7.el5_3.1.src.rpm"/><source-package last-modified="1241697346" id="rhn-source-package-50360" source-rpm="audit-1.7.7-6.el5_3.3.src.rpm"/><source-package last-modified="1241772894" id="rhn-source-package-50366" source-rpm="pango-1.14.9-5.el5_3.src.rpm"/><source-package last-modified="1241804597" id="rhn-source-package-50367" source-rpm="gfs2-utils-0.1.53-1.el5_3.3.src.rpm"/><source-package last-modified="1242224643" id="rhn-source-package-50372" source-rpm="perl-DBD-Pg-1.49-2.el5_3.1.src.rpm"/><source-package last-modified="1242224949" id="rhn-source-package-50373" source-rpm="poppler-0.5.4-4.4.el5_3.9.src.rpm"/><source-package last-modified="1242286340" id="rhn-source-package-50382" source-rpm="grep-2.5.1-55.el5.src.rpm"/><source-package last-modified="1242286522" id="rhn-source-package-50383" source-rpm="authconfig-5.3.21-6.el5.src.rpm"/><source-package last-modified="1242286685" id="rhn-source-package-50384" source-rpm="man-pages-ja-20060815-11.el5.src.rpm"/><source-package last-modified="1242286854" id="rhn-source-package-50385" source-rpm="setup-2.5.58-7.el5.src.rpm"/><source-package last-modified="1242677163" id="rhn-source-package-50489" source-rpm="ipsec-tools-0.6.5-13.el5_3.1.src.rpm"/><source-package last-modified="1242678540" id="rhn-source-package-50490" source-rpm="ntp-4.2.2p1-9.el5_3.2.src.rpm"/><source-package last-modified="1242811334" id="rhn-source-package-50509" source-rpm="pyorbit-2.14.1-3.el5.src.rpm"/><source-package last-modified="1242813826" id="rhn-source-package-50511" source-rpm="cpuspeed-1.2.1-8.el5.src.rpm"/><source-package last-modified="1242993563" id="rhn-source-package-50521" source-rpm="freetype-2.2.1-21.el5_3.src.rpm"/><source-package last-modified="1243357474" id="rhn-source-package-50528" source-rpm="squirrelmail-1.4.8-5.el5_3.7.src.rpm"/><source-package last-modified="1243411419" id="rhn-source-package-50540" source-rpm="vsftpd-2.0.5-12.el5_3.1.src.rpm"/><source-package last-modified="1243412086" id="rhn-source-package-50541" source-rpm="net-snmp-5.3.2.2-5.el5_3.1.src.rpm"/><source-package last-modified="1243431955" id="rhn-source-package-50542" source-rpm="aspell-nl-0.1e-2.el5.src.rpm"/><source-package last-modified="1243432018" id="rhn-source-package-50543" source-rpm="php-pear-1.4.9-6.el5.src.rpm"/><source-package last-modified="1243432116" id="rhn-source-package-50544" source-rpm="dvd+rw-tools-7.0-1.el5.src.rpm"/><source-package last-modified="1243432180" id="rhn-source-package-50545" source-rpm="aide-0.13.1-4.el5.src.rpm"/><source-package last-modified="1243432235" id="rhn-source-package-50546" source-rpm="system-config-language-1.1.18-3.el5.src.rpm"/><source-package last-modified="1243433692" id="rhn-source-package-50547" source-rpm="httpd-2.2.3-22.el5_3.1.src.rpm"/><source-package last-modified="1244033497" id="rhn-source-package-50556" source-rpm="readline-5.1-3.el5.src.rpm"/><source-package last-modified="1244033616" id="rhn-source-package-50557" source-rpm="gnome-session-2.16.0-7.el5.src.rpm"/><source-package last-modified="1244033684" id="rhn-source-package-50558" source-rpm="setroubleshoot-2.0.5-5.el5.src.rpm"/><source-package last-modified="1244043021" id="rhn-source-package-50564" source-rpm="cups-1.3.7-8.el5_3.6.src.rpm"/><source-package last-modified="1244633001" id="rhn-source-package-50576" source-rpm="redhat-rpm-config-8.0.45-32.el5.src.rpm"/><source-package last-modified="1244633082" id="rhn-source-package-50577" source-rpm="iputils-20020927-46.el5.src.rpm"/><source-package last-modified="1244647648" id="rhn-source-package-50578" source-rpm="mkinitrd-5.1.19.6-44.1.src.rpm"/><source-package last-modified="1244712474" id="rhn-source-package-50615" source-rpm="xen-3.0.3-80.el5_3.3.src.rpm"/><source-package last-modified="1244759193" id="rhn-source-package-50617" source-rpm="firefox-3.0.11-2.el5_3.src.rpm"/><source-package last-modified="1244759193" id="rhn-source-package-50618" source-rpm="xulrunner-1.9.0.11-3.el5_3.src.rpm"/><source-package last-modified="1245049819" id="rhn-source-package-50629" source-rpm="iscsi-initiator-utils-6.2.0.868-0.18.el5_3.1.src.rpm"/><source-package last-modified="1245096858" id="rhn-source-package-50638" source-rpm="wireshark-1.0.8-1.el5_3.1.src.rpm"/><source-package last-modified="1245100039" id="rhn-source-package-50642" source-rpm="cscope-15.5-15.1.el5_3.1.src.rpm"/><source-package last-modified="1245137388" id="rhn-source-package-50643" source-rpm="cman-2.0.98-1.el5_3.4.src.rpm"/><source-package last-modified="1245156936" id="rhn-source-package-50644" source-rpm="openais-0.80.3-22.el5_3.8.src.rpm"/><source-package last-modified="1245167499" id="rhn-source-package-50647" source-rpm="tzdata-2009i-2.el5.src.rpm"/><source-package last-modified="1245186787" id="rhn-source-package-50648" source-rpm="kernel-2.6.18-128.1.14.el5.src.rpm"/><source-package last-modified="1245188091" id="rhn-source-package-50650" source-rpm="apr-util-1.2.7-7.el5_3.1.src.rpm"/><source-package last-modified="1245249782" id="rhn-source-package-50652" source-rpm="pciutils-2.2.3-7.el5.src.rpm"/><source-package last-modified="1245249881" id="rhn-source-package-50653" source-rpm="wdaemon-0.14-4.src.rpm"/><source-package last-modified="1245250064" id="rhn-source-package-50654" source-rpm="isdn4k-utils-3.2-56.el5.src.rpm"/><source-package last-modified="1245250076" id="rhn-source-package-50655" source-rpm="efax-0.9-28.el5.src.rpm"/><source-package last-modified="1245345072" id="rhn-source-package-50661" source-rpm="cyrus-imapd-2.3.7-2.el5_3.2.src.rpm"/><source-package last-modified="1245691628" id="rhn-source-package-50667" source-rpm="vim-7.0.109-6.el5.src.rpm"/><source-package last-modified="1245694218" id="rhn-source-package-50668" source-rpm="tetex-3.0-33.8.el5.src.rpm"/><source-package last-modified="1245694415" id="rhn-source-package-50669" source-rpm="avahi-0.6.16-6.el5.src.rpm"/><source-package last-modified="1245694565" id="rhn-source-package-50670" source-rpm="cyrus-imapd-2.3.7-7.el5.src.rpm"/><source-package last-modified="1245694660" id="rhn-source-package-50671" source-rpm="vino-2.13.5-7.el5.src.rpm"/><source-package last-modified="1245938594" id="rhn-source-package-50674" source-rpm="icu-3.6-5.11.4.src.rpm"/><source-package last-modified="1245939029" id="rhn-source-package-50675" source-rpm="gstreamer-plugins-good-0.10.9-1.el5_3.2.src.rpm"/><source-package last-modified="1245944161" id="rhn-source-package-50679" source-rpm="kdelibs-3.5.4-22.el5_3.src.rpm"/><source-package last-modified="1246018238" id="rhn-source-package-50687" source-rpm="autofs-5.0.1-0.rc2.102.el5_3.1.src.rpm"/><source-package last-modified="1246350314" id="rhn-source-package-50689" source-rpm="kernel-2.6.18-128.1.16.el5.src.rpm"/><source-package last-modified="1246362442" id="rhn-source-package-50706" source-rpm="pango-1.14.9-6.el5.src.rpm"/><source-package last-modified="1246364605" id="rhn-source-package-50753" source-rpm="crash-4.0-8.9.1.el5.src.rpm"/><source-package last-modified="1246366355" id="rhn-source-package-50784" source-rpm="evince-0.6.0-9.el5.src.rpm"/><source-package last-modified="1246367075" id="rhn-source-package-50798" source-rpm="cryptsetup-luks-1.0.3-5.el5.src.rpm"/><source-package last-modified="1246368582" id="rhn-source-package-50809" source-rpm="kdebase-3.5.4-20.el5.src.rpm"/><source-package last-modified="1246368782" id="rhn-source-package-50813" source-rpm="irqbalance-0.55-15.el5.src.rpm"/><source-package last-modified="1246372650" id="rhn-source-package-50860" source-rpm="foomatic-3.0.2-38.3.el5.src.rpm"/><source-package last-modified="1246374642" id="rhn-source-package-50880" source-rpm="xorg-x11-xdm-1.0.5-6.el5.src.rpm"/><source-package last-modified="1246530866" id="rhn-source-package-50909" source-rpm="bind-9.3.4-10.P1.el5_3.1.src.rpm"/><source-package last-modified="1246546767" id="rhn-source-package-50910" source-rpm="openswan-2.6.14-1.el5_3.3.src.rpm"/><source-package last-modified="1246552727" id="rhn-source-package-50913" source-rpm="ruby-1.8.5-5.el5_3.7.src.rpm"/><source-package last-modified="1246606077" id="rhn-source-package-50916" source-rpm="yum-3.2.19-18.el5_3.1.src.rpm"/><source-package last-modified="1247155587" id="rhn-source-package-50978" source-rpm="httpd-2.2.3-22.el5_3.2.src.rpm"/><source-package last-modified="1247238073" id="rhn-source-package-51000" source-rpm="samba-3.0.33-3.7.el5_3.1.src.rpm"/><source-package last-modified="1247562136" id="rhn-source-package-51006" source-rpm="kernel-2.6.18-128.2.1.el5.src.rpm"/><source-package last-modified="1247771313" id="rhn-source-package-51027" source-rpm="libtiff-3.8.2-7.el5_3.4.src.rpm"/><source-package last-modified="1248074800" id="rhn-source-package-51036" source-rpm="nss-3.12.3.99.3-1.el5_3.2.src.rpm"/><source-package last-modified="1248074800" id="rhn-source-package-51037" source-rpm="nspr-4.7.4-1.el5_3.1.src.rpm"/><source-package last-modified="1248209166" id="rhn-source-package-51041" source-rpm="tomcat5-5.5.23-0jpp.7.el5_3.2.src.rpm"/><source-package last-modified="1248221589" id="rhn-source-package-51042" source-rpm="xulrunner-1.9.0.12-1.el5_3.src.rpm"/><source-package last-modified="1248221589" id="rhn-source-package-51043" source-rpm="firefox-3.0.12-1.el5_3.src.rpm"/><source-package last-modified="1248246871" id="rhn-source-package-51047" source-rpm="ksh-20080202-2.el5_3.1.src.rpm"/><source-package last-modified="1248282282" id="rhn-source-package-51062" source-rpm="esc-1.1.0-9.el5.src.rpm"/><source-package last-modified="1248686340" id="rhn-source-package-51095" source-rpm="python-2.4.3-24.el5_3.6.src.rpm"/><source-package last-modified="1248889231" id="rhn-source-package-51101" source-rpm="bind-9.3.4-10.P1.el5_3.2.src.rpm"/><source-package last-modified="1248907966" id="rhn-source-package-51107" source-rpm="bind-9.3.4-10.P1.el5_3.3.src.rpm"/><source-package last-modified="1249284752" id="rhn-source-package-51120" source-rpm="openais-0.80.3-22.el5_3.9.src.rpm"/><source-package last-modified="1249285048" id="rhn-source-package-51121" source-rpm="cman-2.0.98-1.el5_3.7.src.rpm"/><source-package last-modified="1249390877" id="rhn-source-package-51124" source-rpm="kernel-2.6.18-128.4.1.el5.src.rpm"/><source-package last-modified="1249593151" id="rhn-source-package-51140" source-rpm="java-1.6.0-openjdk-1.6.0.0-1.2.b09.el5.src.rpm"/><source-package last-modified="1249634951" id="rhn-source-package-51141" source-rpm="glibc-2.5-34.el5_3.1.src.rpm"/><source-package last-modified="1249922126" id="rhn-source-package-51142" source-rpm="subversion-1.4.2-4.el5_3.1.src.rpm"/><source-package last-modified="1249923708" id="rhn-source-package-51144" source-rpm="apr-1.2.7-11.el5_3.1.src.rpm"/><source-package last-modified="1249923708" id="rhn-source-package-51147" source-rpm="apr-util-1.2.7-7.el5_3.2.src.rpm"/><source-package last-modified="1249926432" id="rhn-source-package-51152" source-rpm="libxml2-2.6.26-2.1.2.8.src.rpm"/><source-package last-modified="1250172789" id="rhn-source-package-51159" source-rpm="curl-7.15.5-2.1.el5_3.5.src.rpm"/><source-package last-modified="1250513801" id="rhn-source-package-51166" source-rpm="tzdata-2009k-1.el5.src.rpm"/><source-package last-modified="1250586921" id="rhn-source-package-51169" source-rpm="net-snmp-5.3.2.2-5.el5_3.2.src.rpm"/><source-package last-modified="1250618136" id="rhn-source-package-51176" source-rpm="libvorbis-1.1.2-3.el5_3.3.src.rpm"/><source-package last-modified="1251112134" id="rhn-source-package-51187" source-rpm="kernel-2.6.18-128.7.1.el5.src.rpm"/><source-package last-modified="1251297019" id="rhn-source-package-51206" source-rpm="gnutls-1.4.1-3.el5_3.5.src.rpm"/><source-package last-modified="1251378276" id="rhn-source-package-51207" source-rpm="mdadm-2.6.9-2.el5.src.rpm"/><source-package last-modified="1251378334" id="rhn-source-package-51208" source-rpm="device-mapper-multipath-0.4.7-30.el5.src.rpm"/><source-package last-modified="1251378342" id="rhn-source-package-51209" source-rpm="nfs4-acl-tools-0.3.3-1.el5.src.rpm"/><source-package last-modified="1251378387" id="rhn-source-package-51210" source-rpm="util-linux-2.13-0.52.el5.src.rpm"/><source-package last-modified="1251378442" id="rhn-source-package-51212" source-rpm="xorg-x11-server-1.1.1-48.67.el5.src.rpm"/><source-package last-modified="1251378492" id="rhn-source-package-51213" source-rpm="xorg-x11-drv-mga-1.4.10-5.el5.src.rpm"/><source-package last-modified="1251378707" id="rhn-source-package-51214" source-rpm="openswan-2.6.21-5.el5.src.rpm"/><source-package last-modified="1251378735" id="rhn-source-package-51215" source-rpm="xen-3.0.3-94.el5.src.rpm"/><source-package last-modified="1251378932" id="rhn-source-package-51217" source-rpm="perl-5.8.8-27.el5.src.rpm"/><source-package last-modified="1251379084" id="rhn-source-package-51218" source-rpm="anaconda-11.1.2.195-1.src.rpm"/><source-package last-modified="1251379266" id="rhn-source-package-51219" source-rpm="oprofile-0.9.4-11.el5.src.rpm"/><source-package last-modified="1251379271" id="rhn-source-package-51220" source-rpm="libcxgb3-1.2.3-1.el5.src.rpm"/><source-package last-modified="1251379350" id="rhn-source-package-51221" source-rpm="openssl-0.9.8e-12.el5.src.rpm"/><source-package last-modified="1251379372" id="rhn-source-package-51222" source-rpm="rhnsd-4.7.0-4.el5.src.rpm"/><source-package last-modified="1251379410" id="rhn-source-package-51223" source-rpm="yum-rhn-plugin-0.5.4-13.el5.src.rpm"/><source-package last-modified="1251379604" id="rhn-source-package-51224" source-rpm="glibc-2.5-42.src.rpm"/><source-package last-modified="1251379751" id="rhn-source-package-51225" source-rpm="grub-0.97-13.5.src.rpm"/><source-package last-modified="1251379956" id="rhn-source-package-51226" source-rpm="bind-9.3.6-4.P1.el5.src.rpm"/><source-package last-modified="1251380315" id="rhn-source-package-51228" source-rpm="m2crypto-0.16-6.el5.6.src.rpm"/><source-package last-modified="1251380332" id="rhn-source-package-51229" source-rpm="OpenIPMI-2.0.16-5.el5.src.rpm"/><source-package last-modified="1251380784" id="rhn-source-package-51231" source-rpm="sblim-1-35.el5.src.rpm"/><source-package last-modified="1251380785" id="rhn-source-package-51232" source-rpm="pykickstart-0.43.5-1.el5.src.rpm"/><source-package last-modified="1251381084" id="rhn-source-package-51233" source-rpm="openais-0.80.6-8.el5.src.rpm"/><source-package last-modified="1251381138" id="rhn-source-package-51234" source-rpm="rdesktop-1.6.0-3.src.rpm"/><source-package last-modified="1251381327" id="rhn-source-package-51235" source-rpm="xorg-x11-proto-devel-7.1-13.el5.src.rpm"/><source-package last-modified="1251381399" id="rhn-source-package-51236" source-rpm="hwdata-0.213.16-1.el5.src.rpm"/><source-package last-modified="1251381471" id="rhn-source-package-51237" source-rpm="gfs2-utils-0.1.62-1.el5.src.rpm"/><source-package last-modified="1251381485" id="rhn-source-package-51238" source-rpm="autofs-5.0.1-0.rc2.131.el5.src.rpm"/><source-package last-modified="1251381702" id="rhn-source-package-51239" source-rpm="selinux-policy-2.4.6-255.el5.src.rpm"/><source-package last-modified="1251382174" id="rhn-source-package-51240" source-rpm="mysql-5.0.77-3.el5.src.rpm"/><source-package last-modified="1251382392" id="rhn-source-package-51242" source-rpm="kernel-2.6.18-164.el5.src.rpm"/><source-package last-modified="1251382562" id="rhn-source-package-51243" source-rpm="sos-1.7-9.27.el5.src.rpm"/><source-package last-modified="1251382771" id="rhn-source-package-51244" source-rpm="sg3_utils-1.25-4.el5.src.rpm"/><source-package last-modified="1251382887" id="rhn-source-package-51245" source-rpm="system-config-network-1.3.99.18-1.el5.src.rpm"/><source-package last-modified="1251383081" id="rhn-source-package-51246" source-rpm="kexec-tools-1.102pre-77.el5.src.rpm"/><source-package last-modified="1251383831" id="rhn-source-package-51247" source-rpm="net-snmp-5.3.2.2-7.el5.src.rpm"/><source-package last-modified="1251384753" id="rhn-source-package-51249" source-rpm="system-config-samba-1.2.41-5.el5.src.rpm"/><source-package last-modified="1251384904" id="rhn-source-package-51252" source-rpm="rpm-4.4.2.3-18.el5.src.rpm"/><source-package last-modified="1251385028" id="rhn-source-package-51253" source-rpm="cman-2.0.115-1.el5.src.rpm"/><source-package last-modified="1251385221" id="rhn-source-package-51254" source-rpm="evolution-data-server-1.12.3-18.el5.src.rpm"/><source-package last-modified="1251385906" id="rhn-source-package-51256" source-rpm="pth-2.0.7-6.el5.src.rpm"/><source-package last-modified="1251386048" id="rhn-source-package-51257" source-rpm="httpd-2.2.3-31.el5.src.rpm"/><source-package last-modified="1251386996" id="rhn-source-package-51260" source-rpm="module-init-tools-3.3-0.pre3.1.54.el5.src.rpm"/><source-package last-modified="1251387058" id="rhn-source-package-51261" source-rpm="findutils-4.2.27-6.el5.src.rpm"/><source-package last-modified="1251388299" id="rhn-source-package-51264" source-rpm="ethtool-6-3.el5.src.rpm"/><source-package last-modified="1251388769" id="rhn-source-package-51267" source-rpm="busybox-1.2.0-7.el5.src.rpm"/><source-package last-modified="1251389199" id="rhn-source-package-51268" source-rpm="iscsi-initiator-utils-6.2.0.871-0.10.el5.src.rpm"/><source-package last-modified="1251389370" id="rhn-source-package-51269" source-rpm="hal-0.5.8.1-52.el5.src.rpm"/><source-package last-modified="1251389709" id="rhn-source-package-51270" source-rpm="rhn-client-tools-0.4.20-9.el5.src.rpm"/><source-package last-modified="1251390130" id="rhn-source-package-51271" source-rpm="dhcpv6-1.0.10-17.el5.src.rpm"/><source-package last-modified="1251390242" id="rhn-source-package-51273" source-rpm="ksh-20080202-14.el5.src.rpm"/><source-package last-modified="1251390924" id="rhn-source-package-51276" source-rpm="amanda-2.5.0p2-8.el5.src.rpm"/><source-package last-modified="1251391067" id="rhn-source-package-51277" source-rpm="yum-3.2.22-20.el5.src.rpm"/><source-package last-modified="1251391969" id="rhn-source-package-51278" source-rpm="openib-1.4.1-3.el5.src.rpm"/><source-package last-modified="1251392244" id="rhn-source-package-51279" source-rpm="openssh-4.3p2-36.el5.src.rpm"/><source-package last-modified="1251393000" id="rhn-source-package-51282" source-rpm="coreutils-5.97-23.el5.src.rpm"/><source-package last-modified="1251393088" id="rhn-source-package-51283" source-rpm="xorg-x11-drv-qxl-0.0.4-1.1.el5.src.rpm"/><source-package last-modified="1251393231" id="rhn-source-package-51284" source-rpm="xorg-x11-drv-ati-6.6.3-3.27.el5.src.rpm"/><source-package last-modified="1251393279" id="rhn-source-package-51285" source-rpm="libksba-1.0.5-2.el5.src.rpm"/><source-package last-modified="1251394307" id="rhn-source-package-51286" source-rpm="rds-tools-1.4-2.el5.src.rpm"/><source-package last-modified="1251395284" id="rhn-source-package-51287" source-rpm="gtk-vnc-0.3.8-3.el5.src.rpm"/><source-package last-modified="1251395433" id="rhn-source-package-51288" source-rpm="redhat-release-5Server-5.4.0.3.src.rpm"/><source-package last-modified="1251396677" id="rhn-source-package-51290" source-rpm="dmraid-1.0.0.rc13-53.el5.src.rpm"/><source-package last-modified="1251397261" id="rhn-source-package-51291" source-rpm="policycoreutils-1.33.12-14.6.el5.src.rpm"/><source-package last-modified="1251397325" id="rhn-source-package-51292" source-rpm="libsemanage-1.9.1-4.4.el5.src.rpm"/><source-package last-modified="1251397720" id="rhn-source-package-51293" source-rpm="initscripts-8.45.30-2.el5.src.rpm"/><source-package last-modified="1251398606" id="rhn-source-package-51295" source-rpm="e4fsprogs-1.41.5-3.el5.src.rpm"/><source-package last-modified="1251399102" id="rhn-source-package-51296" source-rpm="redhat-release-notes-5Server-29.src.rpm"/><source-package last-modified="1251399725" id="rhn-source-package-51297" source-rpm="e2fsprogs-1.39-23.el5.src.rpm"/><source-package last-modified="1251449616" id="rhn-source-package-51299" source-rpm="xorg-x11-drv-nv-2.1.12-6.el5.src.rpm"/><source-package last-modified="1251449622" id="rhn-source-package-51301" source-rpm="libsdp-1.1.99-11.el5.src.rpm"/><source-package last-modified="1251449623" id="rhn-source-package-51302" source-rpm="mkinitrd-5.1.19.6-54.src.rpm"/><source-package last-modified="1251449625" id="rhn-source-package-51303" source-rpm="libdhcp-1.20-10.el5.src.rpm"/><source-package last-modified="1251449627" id="rhn-source-package-51304" source-rpm="iptables-1.3.5-5.3.el5.src.rpm"/><source-package last-modified="1251449629" id="rhn-source-package-51305" source-rpm="libhbaapi-2.2-4.el5.src.rpm"/><source-package last-modified="1251449634" id="rhn-source-package-51307" source-rpm="libassuan-1.0.4-5.el5.src.rpm"/><source-package last-modified="1251449639" id="rhn-source-package-51308" source-rpm="blktrace-1.0.0-6.el5.src.rpm"/><source-package last-modified="1251449642" id="rhn-source-package-51309" source-rpm="microcode_ctl-1.17-1.48.el5.src.rpm"/><source-package last-modified="1251449646" id="rhn-source-package-51310" source-rpm="opensm-3.2.6-2.el5.src.rpm"/><source-package last-modified="1251449649" id="rhn-source-package-51311" source-rpm="lvm2-2.02.46-8.el5.src.rpm"/><source-package last-modified="1251449650" id="rhn-source-package-51312" source-rpm="perftest-1.2-14.el5.src.rpm"/><source-package last-modified="1251449653" id="rhn-source-package-51313" source-rpm="nfs-utils-lib-1.0.8-7.6.el5.src.rpm"/><source-package last-modified="1251449690" id="rhn-source-package-51314" source-rpm="mvapich-1.1.0-0.3355.2.el5.src.rpm"/><source-package last-modified="1251449692" id="rhn-source-package-51315" source-rpm="nss_ldap-253-21.el5.src.rpm"/><source-package last-modified="1251449704" id="rhn-source-package-51317" source-rpm="gnupg2-2.0.10-3.el5.src.rpm"/><source-package last-modified="1251449708" id="rhn-source-package-51318" source-rpm="libgcrypt-1.4.4-5.el5.src.rpm"/><source-package last-modified="1251449711" id="rhn-source-package-51319" source-rpm="linuxwacom-0.7.8.3-6.el5.src.rpm"/><source-package last-modified="1251449719" id="rhn-source-package-51320" source-rpm="NetworkManager-0.7.0-9.el5.src.rpm"/><source-package last-modified="1251449726" id="rhn-source-package-51321" source-rpm="netpbm-10.35.58-8.el5.src.rpm"/><source-package last-modified="1251449728" id="rhn-source-package-51322" source-rpm="libibmad-1.2.3-1.el5.src.rpm"/><source-package last-modified="1251449731" id="rhn-source-package-51323" source-rpm="ecryptfs-utils-75-5.el5.src.rpm"/><source-package last-modified="1251449735" id="rhn-source-package-51325" source-rpm="librdmacm-1.0.8-5.el5.src.rpm"/><source-package last-modified="1251449737" id="rhn-source-package-51326" source-rpm="fipscheck-1.2.0-1.el5.src.rpm"/><source-package last-modified="1251449753" id="rhn-source-package-51327" source-rpm="pam-0.99.6.2-6.el5.src.rpm"/><source-package last-modified="1251449758" id="rhn-source-package-51329" source-rpm="libmlx4-1.0.1-2.el5.src.rpm"/><source-package last-modified="1251449761" id="rhn-source-package-51330" source-rpm="fuse-2.7.4-8.el5.src.rpm"/><source-package last-modified="1251449777" id="rhn-source-package-51332" source-rpm="openmpi-1.3.2-2.el5.src.rpm"/><source-package last-modified="1251449794" id="rhn-source-package-51333" source-rpm="cyrus-sasl-2.1.22-5.el5.src.rpm"/><source-package last-modified="1251449795" id="rhn-source-package-51334" source-rpm="acpid-1.0.4-9.el5.src.rpm"/><source-package last-modified="1251449814" id="rhn-source-package-51335" source-rpm="python-2.4.3-27.el5.src.rpm"/><source-package last-modified="1251449818" id="rhn-source-package-51336" source-rpm="libX11-1.0.3-11.el5.src.rpm"/><source-package last-modified="1251449821" id="rhn-source-package-51337" source-rpm="infiniband-diags-1.4.4-1.el5.src.rpm"/><source-package last-modified="1251449826" id="rhn-source-package-51338" source-rpm="dapl-2.0.19-2.el5.src.rpm"/><source-package last-modified="1251449837" id="rhn-source-package-51339" source-rpm="openhpi-2.14.0-5.el5.src.rpm"/><source-package last-modified="1251449840" id="rhn-source-package-51340" source-rpm="libnes-0.6-2.el5.src.rpm"/><source-package last-modified="1251449853" id="rhn-source-package-51341" source-rpm="gdm-2.16.0-56.el5.src.rpm"/><source-package last-modified="1251449855" id="rhn-source-package-51342" source-rpm="libsepol-1.15.2-2.el5.src.rpm"/><source-package last-modified="1251449859" id="rhn-source-package-51343" source-rpm="wget-1.11.4-2.el5.src.rpm"/><source-package last-modified="1251449868" id="rhn-source-package-51344" source-rpm="ibutils-1.2-10.el5.src.rpm"/><source-package last-modified="1251449870" id="rhn-source-package-51345" source-rpm="qlvnictools-0.0.1-11.el5.src.rpm"/><source-package last-modified="1251449872" id="rhn-source-package-51346" source-rpm="libibverbs-1.1.2-4.el5.src.rpm"/><source-package last-modified="1251449874" id="rhn-source-package-51347" source-rpm="udev-095-14.21.el5.src.rpm"/><source-package last-modified="1251449876" id="rhn-source-package-51348" source-rpm="device-mapper-1.02.32-1.el5.src.rpm"/><source-package last-modified="1251449880" id="rhn-source-package-51349" source-rpm="mstflint-1.4-1.el5.src.rpm"/><source-package last-modified="1251449917" id="rhn-source-package-51350" source-rpm="krb5-1.6.1-36.el5.src.rpm"/><source-package last-modified="1251449920" id="rhn-source-package-51351" source-rpm="xkeyboard-config-0.8-9.el5.src.rpm"/><source-package last-modified="1251450034" id="rhn-source-package-51353" source-rpm="samba-3.0.33-3.14.el5.src.rpm"/><source-package last-modified="1251450040" id="rhn-source-package-51354" source-rpm="libibcommon-1.1.2-1.el5.src.rpm"/><source-package last-modified="1251450042" id="rhn-source-package-51355" source-rpm="libibumad-1.2.3-1.el5.src.rpm"/><source-package last-modified="1251450048" id="rhn-source-package-51357" source-rpm="mpitests-3.1-3.el5.src.rpm"/><source-package last-modified="1251450049" id="rhn-source-package-51358" source-rpm="srptools-0.0.4-6.el5.src.rpm"/><source-package last-modified="1251450058" id="rhn-source-package-51359" source-rpm="cvs-1.11.22-7.el5.src.rpm"/><source-package last-modified="1251450110" id="rhn-source-package-51361" source-rpm="mvapich2-1.2-0.p1.3.el5.src.rpm"/><source-package last-modified="1251450113" id="rhn-source-package-51362" source-rpm="pinentry-0.7.3-3.el5.src.rpm"/><source-package last-modified="1251450114" id="rhn-source-package-51363" source-rpm="fcoe-utils-1.0.7-4.el5.src.rpm"/><source-package last-modified="1251450117" id="rhn-source-package-51364" source-rpm="pdksh-5.2.14-36.el5.src.rpm"/><source-package last-modified="1251450122" id="rhn-source-package-51365" source-rpm="totem-2.16.7-6.el5.src.rpm"/><source-package last-modified="1251450123" id="rhn-source-package-51366" source-rpm="python-pyblock-0.26-4.el5.src.rpm"/><source-package last-modified="1251450157" id="rhn-source-package-51367" source-rpm="gdb-6.8-37.el5.src.rpm"/><source-package last-modified="1251450159" id="rhn-source-package-51368" source-rpm="hmaccalc-0.9.6-1.el5.src.rpm"/><source-package last-modified="1251450163" id="rhn-source-package-51370" source-rpm="tftp-0.49-2.src.rpm"/><source-package last-modified="1251450166" id="rhn-source-package-51371" source-rpm="dhcp-3.0.5-21.el5.src.rpm"/><source-package last-modified="1251450168" id="rhn-source-package-51372" source-rpm="vsftpd-2.0.5-16.el5.src.rpm"/><source-package last-modified="1251450170" id="rhn-source-package-51373" source-rpm="mlocate-0.15-1.el5.2.src.rpm"/><source-package last-modified="1251450172" id="rhn-source-package-51374" source-rpm="mod_nss-1.0.3-8.el5.src.rpm"/><source-package last-modified="1251450174" id="rhn-source-package-51375" source-rpm="libhbalinux-1.0.7-3.el5.src.rpm"/><source-package last-modified="1251450177" id="rhn-source-package-51376" source-rpm="nfs-utils-1.0.9-42.el5.src.rpm"/><source-package last-modified="1251450181" id="rhn-source-package-51377" source-rpm="libibcm-1.0.4-3.el5.src.rpm"/><source-package last-modified="1251450182" id="rhn-source-package-51378" source-rpm="ofed-docs-1.4.1-2.el5.src.rpm"/><source-package last-modified="1251450185" id="rhn-source-package-51379" source-rpm="strace-4.5.18-5.el5.src.rpm"/><source-package last-modified="1251450193" id="rhn-source-package-51380" source-rpm="systemtap-0.9.7-5.el5.src.rpm"/><source-package last-modified="1251450197" id="rhn-source-package-51382" source-rpm="dmidecode-2.9-1.el5.src.rpm"/><source-package last-modified="1251450199" id="rhn-source-package-51383" source-rpm="libpciaccess-0.10.5-2.el5.src.rpm"/><source-package last-modified="1251450200" id="rhn-source-package-51384" source-rpm="watchdog-5.6-1.el5.src.rpm"/><source-package last-modified="1251450201" id="rhn-source-package-51385" source-rpm="rhnlib-2.2.7-2.el5.src.rpm"/><source-package last-modified="1251450205" id="rhn-source-package-51387" source-rpm="mpi-selector-1.0.2-1.el5.src.rpm"/><source-package last-modified="1251450215" id="rhn-source-package-51388" source-rpm="cups-1.3.7-11.el5.src.rpm"/><source-package last-modified="1251450345" id="rhn-source-package-51389" source-rpm="gcc44-4.4.0-6.el5.src.rpm"/><source-package last-modified="1251450347" id="rhn-source-package-51390" source-rpm="qperf-0.4.4-3.el5.src.rpm"/><source-package last-modified="1251450351" id="rhn-source-package-51391" source-rpm="lftp-3.7.11-4.el5.src.rpm"/><source-package last-modified="1251450432" id="rhn-source-package-51392" source-rpm="gcc-4.1.2-46.el5.src.rpm"/><source-package last-modified="1251450436" id="rhn-source-package-51394" source-rpm="libselinux-1.33.4-5.5.el5.src.rpm"/><source-package last-modified="1251450438" id="rhn-source-package-51395" source-rpm="libmthca-1.0.5-4.el5.src.rpm"/><source-package last-modified="1251450439" id="rhn-source-package-51396" source-rpm="ibsim-0.5-1.el5.src.rpm"/><source-package last-modified="1251450443" id="rhn-source-package-51397" source-rpm="xorg-x11-drv-i810-1.6.5-9.25.el5.src.rpm"/><source-package last-modified="1251450459" id="rhn-source-package-51398" source-rpm="tog-pegasus-2.7.2-1.el5.src.rpm"/><source-package last-modified="1251450463" id="rhn-source-package-51399" source-rpm="audit-1.7.13-2.el5.src.rpm"/><source-package last-modified="1251450467" id="rhn-source-package-51400" source-rpm="mysql-connector-odbc-3.51.26r1127-1.el5.src.rpm"/><source-package last-modified="1251450540" id="rhn-source-package-51404" source-rpm="ghostscript-8.15.2-9.11.el5.src.rpm"/><source-package last-modified="1251899746" id="rhn-source-package-51422" source-rpm="ktune-0.2-4.el5_4.3.src.rpm"/><source-package last-modified="1252421014" id="rhn-source-package-51439" source-rpm="fetchmail-6.3.6-1.1.el5_3.1.src.rpm"/><source-package last-modified="1252423508" id="rhn-source-package-51440" source-rpm="xmlsec1-1.2.9-8.1.1.src.rpm"/><source-package last-modified="1252537523" id="rhn-source-package-51552" source-rpm="nspr-4.7.5-1.el5_4.src.rpm"/><source-package last-modified="1252537523" id="rhn-source-package-51553" source-rpm="firefox-3.0.14-1.el5_4.src.rpm"/><source-package last-modified="1252537523" id="rhn-source-package-51554" source-rpm="xulrunner-1.9.0.14-1.el5_4.src.rpm"/><source-package last-modified="1252608416" id="rhn-source-package-51603" source-rpm="cman-2.0.115-1.el5_4.2.src.rpm"/><source-package last-modified="1252657160" id="rhn-source-package-51605" source-rpm="net-snmp-5.3.2.2-7.el5_4.2.src.rpm"/><source-package last-modified="1253198035" id="rhn-source-package-51629" source-rpm="freeradius-1.1.3-1.5.el5_4.src.rpm"/><source-package last-modified="1253545119" id="rhn-source-package-51633" source-rpm="neon-0.25.5-10.el5_4.1.src.rpm"/><source-package last-modified="1253610673" id="rhn-source-package-51640" source-rpm="dmidecode-2.10-2.el5.src.rpm"/><source-package last-modified="1253716552" id="rhn-source-package-51648" source-rpm="cyrus-imapd-2.3.7-7.el5_4.3.src.rpm"/><source-package last-modified="1253818201" id="rhn-source-package-51657" source-rpm="newt-0.52.2-12.el5_4.1.src.rpm"/><source-package last-modified="1254210412" id="rhn-source-package-51668" source-rpm="kdelibs-3.5.4-22.el5_4.1.src.rpm"/><source-package last-modified="1254252004" id="rhn-source-package-51670" source-rpm="kernel-2.6.18-164.2.1.el5.src.rpm"/><source-package last-modified="1254298538" id="rhn-source-package-51672" source-rpm="tzdata-2009m-1.el5.src.rpm"/><source-package last-modified="1254299200" id="rhn-source-package-51674" source-rpm="autofs-5.0.1-0.rc2.131.el5_4.1.src.rpm"/><source-package last-modified="1254323011" id="rhn-source-package-51676" source-rpm="openssh-4.3p2-36.el5_4.2.src.rpm"/><source-package last-modified="1254416076" id="rhn-source-package-51678" source-rpm="elinks-0.11.1-6.el5_4.1.src.rpm"/><source-package last-modified="1254419558" id="rhn-source-package-51679" source-rpm="xen-3.0.3-94.el5_4.1.src.rpm"/><source-package last-modified="1254490262" id="rhn-source-package-51751" source-rpm="openais-0.80.6-8.el5_4.1.src.rpm"/><source-package last-modified="1254726884" id="rhn-source-package-51754" source-rpm="lvm2-2.02.46-8.el5_4.1.src.rpm"/><source-package last-modified="1254928154" id="rhn-source-package-51764" source-rpm="postgresql-8.1.18-2.el5_4.1.src.rpm"/><source-package last-modified="1254997670" id="rhn-source-package-51767" source-rpm="OpenIPMI-2.0.16-5.el5_4.1.src.rpm"/><source-package last-modified="1255031432" id="rhn-source-package-51775" source-rpm="squirrelmail-1.4.8-5.el5_4.10.src.rpm"/><source-package last-modified="1255418970" id="rhn-source-package-51785" source-rpm="tcsh-6.14-14.el5_4.2.src.rpm"/><source-package last-modified="1255421490" id="rhn-source-package-51786" source-rpm="selinux-policy-2.4.6-255.el5_4.1.src.rpm"/><source-package last-modified="1255591926" id="rhn-source-package-51815" source-rpm="coreutils-5.97-23.el5_4.1.src.rpm"/><source-package last-modified="1255596254" id="rhn-source-package-51820" source-rpm="poppler-0.5.4-4.4.el5_4.11.src.rpm"/><source-package last-modified="1255596858" id="rhn-source-package-51822" source-rpm="cups-1.3.7-11.el5_4.3.src.rpm"/><source-package last-modified="1255609237" id="rhn-source-package-51823" source-rpm="xen-3.0.3-94.el5_4.2.src.rpm"/></source-packages><rhn-channel-errata><erratum last-modified="1173884075" id="rhn-erratum-5388" advisory-name="RHSA-2007:0075"/><erratum last-modified="1173884812" id="rhn-erratum-5390" advisory-name="RHSA-2007:0107"/><erratum last-modified="1173884788" id="rhn-erratum-5392" advisory-name="RHEA-2007:0105"/><erratum last-modified="1173885139" id="rhn-erratum-5393" advisory-name="RHBA-2007:0109"/><erratum last-modified="1173884466" id="rhn-erratum-5394" advisory-name="RHBA-2007:0098"/><erratum last-modified="1173884228" id="rhn-erratum-5396" advisory-name="RHSA-2007:0082"/><erratum last-modified="1173884120" id="rhn-erratum-5397" advisory-name="RHSA-2007:0057"/><erratum last-modified="1173884286" id="rhn-erratum-5398" advisory-name="RHSA-2007:0061"/><erratum last-modified="1173884494" id="rhn-erratum-5399" advisory-name="RHSA-2007:0097"/><erratum last-modified="1173885169" id="rhn-erratum-5400" advisory-name="RHBA-2007:0113"/><erratum last-modified="1173885206" id="rhn-erratum-5401" advisory-name="RHSA-2007:0114"/><erratum last-modified="1173884509" id="rhn-erratum-5402" advisory-name="RHSA-2007:0068"/><erratum last-modified="1173884663" id="rhn-erratum-5403" advisory-name="RHBA-2007:0103"/><erratum last-modified="1173885044" id="rhn-erratum-5404" advisory-name="RHBA-2007:0100"/><erratum last-modified="1173884681" id="rhn-erratum-5405" advisory-name="RHSA-2007:0099"/><erratum last-modified="1173885203" id="rhn-erratum-5406" advisory-name="RHEA-2007:0115"/><erratum last-modified="1173885075" id="rhn-erratum-5407" advisory-name="RHBA-2007:0110"/><erratum last-modified="1173887436" id="rhn-erratum-5411" advisory-name="RHEA-2007:0121"/><erratum last-modified="1173889743" id="rhn-erratum-5412" advisory-name="RHSA-2007:0066"/><erratum last-modified="1174644491" id="rhn-erratum-5427" advisory-name="RHSA-2007:0124"/><erratum last-modified="1174688135" id="rhn-erratum-5428" advisory-name="RHEA-2007:0128"/><erratum last-modified="1175179674" id="rhn-erratum-5431" advisory-name="RHBA-2007:0129"/><erratum last-modified="1175624424" id="rhn-erratum-5443" advisory-name="RHSA-2007:0095"/><erratum last-modified="1175625002" id="rhn-erratum-5444" advisory-name="RHSA-2007:0132"/><erratum last-modified="1175625829" id="rhn-erratum-5445" advisory-name="RHSA-2007:0127"/><erratum last-modified="1175626420" id="rhn-erratum-5447" advisory-name="RHSA-2007:0131"/><erratum last-modified="1176723344" id="rhn-erratum-5465" advisory-name="RHSA-2007:0150"/><erratum last-modified="1176724173" id="rhn-erratum-5466" advisory-name="RHSA-2007:0123"/><erratum last-modified="1176738127" id="rhn-erratum-5470" advisory-name="RHSA-2007:0157"/><erratum last-modified="1177062426" id="rhn-erratum-5475" advisory-name="RHSA-2007:0153"/><erratum last-modified="1177951006" id="rhn-erratum-5619" advisory-name="RHSA-2007:0169"/><erratum last-modified="1199735207" id="rhn-erratum-5645" advisory-name="RHSA-2007:0336"/><erratum last-modified="1178639124" id="rhn-erratum-5646" advisory-name="RHSA-2007:0348"/><erratum last-modified="1178716315" id="rhn-erratum-5647" advisory-name="RHSA-2007:0346"/><erratum last-modified="1179496330" id="rhn-erratum-5655" advisory-name="RHBA-2007:0161"/><erratum last-modified="1199735373" id="rhn-erratum-5656" advisory-name="RHSA-2007:0338"/><erratum last-modified="1199906533" id="rhn-erratum-5676" advisory-name="RHSA-2007:0354"/><erratum last-modified="1179161981" id="rhn-erratum-5677" advisory-name="RHSA-2007:0327"/><erratum last-modified="1179338483" id="rhn-erratum-5689" advisory-name="RHBA-2007:0352"/><erratum last-modified="1179340366" id="rhn-erratum-5690" advisory-name="RHSA-2007:0347"/><erratum last-modified="1179411433" id="rhn-erratum-5694" advisory-name="RHSA-2007:0342"/><erratum last-modified="1199735437" id="rhn-erratum-5695" advisory-name="RHSA-2007:0345"/><erratum last-modified="1199742173" id="rhn-erratum-5697" advisory-name="RHSA-2007:0358"/><erratum last-modified="1199743831" id="rhn-erratum-5698" advisory-name="RHSA-2007:0356"/><erratum last-modified="1199735668" id="rhn-erratum-5707" advisory-name="RHSA-2007:0343"/><erratum last-modified="1180011522" id="rhn-erratum-5710" advisory-name="RHBA-2007:0365"/><erratum last-modified="1180516364" id="rhn-erratum-5718" advisory-name="RHSA-2007:0344"/><erratum last-modified="1199742671" id="rhn-erratum-5720" advisory-name="RHSA-2007:0389"/><erratum last-modified="1199742298" id="rhn-erratum-5721" advisory-name="RHSA-2007:0391"/><erratum last-modified="1199897038" id="rhn-erratum-5724" advisory-name="RHSA-2007:0400"/><erratum last-modified="1199743349" id="rhn-erratum-5728" advisory-name="RHSA-2007:0386"/><erratum last-modified="1199743812" id="rhn-erratum-5730" advisory-name="RHSA-2007:0385"/><erratum last-modified="1199893698" id="rhn-erratum-5800" advisory-name="RHSA-2007:0403"/><erratum last-modified="1199900997" id="rhn-erratum-5806" advisory-name="RHSA-2007:0494"/><erratum last-modified="1199891884" id="rhn-erratum-5807" advisory-name="RHSA-2007:0492"/><erratum last-modified="1181815032" id="rhn-erratum-5809" advisory-name="RHSA-2007:0497"/><erratum last-modified="1199729488" id="rhn-erratum-5812" advisory-name="RHSA-2007:0395"/><erratum last-modified="1181832884" id="rhn-erratum-5816" advisory-name="RHSA-2007:0376"/><erratum last-modified="1199744532" id="rhn-erratum-5817" advisory-name="RHSA-2007:0501"/><erratum last-modified="1182155439" id="rhn-erratum-5820" advisory-name="RHBA-2007:0504"/><erratum last-modified="1182778752" id="rhn-erratum-5825" advisory-name="RHSA-2007:0510"/><erratum last-modified="1182871332" id="rhn-erratum-5833" advisory-name="RHSA-2007:0556"/><erratum last-modified="1199744251" id="rhn-erratum-5835" advisory-name="RHSA-2007:0562"/><erratum last-modified="1211378384" id="rhn-erratum-5836" advisory-name="RHBA-2007:0373"/><erratum last-modified="1211378384" id="rhn-erratum-5837" advisory-name="RHBA-2007:0370"/><erratum last-modified="1211378431" id="rhn-erratum-5838" advisory-name="RHBA-2007:0357"/><erratum last-modified="1211378384" id="rhn-erratum-5839" advisory-name="RHBA-2007:0339"/><erratum last-modified="1211378384" id="rhn-erratum-5840" advisory-name="RHBA-2007:0333"/><erratum last-modified="1211378384" id="rhn-erratum-5842" advisory-name="RHBA-2007:0496"/><erratum last-modified="1211378384" id="rhn-erratum-5843" advisory-name="RHBA-2007:0407"/><erratum last-modified="1211378384" id="rhn-erratum-5844" advisory-name="RHEA-2007:0399"/><erratum last-modified="1211378384" id="rhn-erratum-5845" advisory-name="RHBA-2007:0382"/><erratum last-modified="1183016029" id="rhn-erratum-5854" advisory-name="RHSA-2007:0559"/><erratum last-modified="1211378384" id="rhn-erratum-5859" advisory-name="RHEA-2007:0629"/><erratum last-modified="1211378384" id="rhn-erratum-5860" advisory-name="RHBA-2007:0622"/><erratum last-modified="1211378384" id="rhn-erratum-5861" advisory-name="RHBA-2007:0585"/><erratum last-modified="1211378431" id="rhn-erratum-5862" advisory-name="RHBA-2007:0517"/><erratum last-modified="1211378431" id="rhn-erratum-5863" advisory-name="RHBA-2007:0515"/><erratum last-modified="1184040025" id="rhn-erratum-5865" advisory-name="RHSA-2007:0595"/><erratum last-modified="1184231207" id="rhn-erratum-5870" advisory-name="RHSA-2007:0674"/><erratum last-modified="1184231932" id="rhn-erratum-5871" advisory-name="RHSA-2007:0520"/><erratum last-modified="1184668567" id="rhn-erratum-5877" advisory-name="RHSA-2007:0569"/><erratum last-modified="1211378384" id="rhn-erratum-5879" advisory-name="RHBA-2007:0529"/><erratum last-modified="1211378384" id="rhn-erratum-5880" advisory-name="RHBA-2007:0527"/><erratum last-modified="1211378431" id="rhn-erratum-5881" advisory-name="RHBA-2007:0495"/><erratum last-modified="1211378384" id="rhn-erratum-5887" advisory-name="RHBA-2007:0693"/><erratum last-modified="1199899221" id="rhn-erratum-5890" advisory-name="RHSA-2007:0724"/><erratum last-modified="1184852000" id="rhn-erratum-5891" advisory-name="RHEA-2007:0689"/><erratum last-modified="1199898988" id="rhn-erratum-5892" advisory-name="RHSA-2007:0740"/><erratum last-modified="1199746499" id="rhn-erratum-5915" advisory-name="RHSA-2007:0720"/><erratum last-modified="1185821923" id="rhn-erratum-5916" advisory-name="RHSA-2007:0732"/><erratum last-modified="1199746097" id="rhn-erratum-5919" advisory-name="RHSA-2007:0721"/><erratum last-modified="1199734585" id="rhn-erratum-5920" advisory-name="RHSA-2007:0731"/><erratum last-modified="1186514400" id="rhn-erratum-5928" advisory-name="RHSA-2007:0777"/><erratum last-modified="1199753089" id="rhn-erratum-5960" advisory-name="RHSA-2007:0860"/><erratum last-modified="1199753000" id="rhn-erratum-5969" advisory-name="RHSA-2007:0875"/><erratum last-modified="1188914573" id="rhn-erratum-5970" advisory-name="RHSA-2007:0539"/><erratum last-modified="1199750666" id="rhn-erratum-5973" advisory-name="RHSA-2007:0873"/><erratum last-modified="1188929617" id="rhn-erratum-5975" advisory-name="RHSA-2007:0858"/><erratum last-modified="1189167282" id="rhn-erratum-5982" advisory-name="RHSA-2007:0892"/><erratum last-modified="1189674787" id="rhn-erratum-5984" advisory-name="RHSA-2007:0705"/><erratum last-modified="1199750631" id="rhn-erratum-5985" advisory-name="RHSA-2007:0883"/><erratum last-modified="1199753060" id="rhn-erratum-5992" advisory-name="RHSA-2007:0845"/><erratum last-modified="1199749936" id="rhn-erratum-5993" advisory-name="RHSA-2007:0890"/><erratum last-modified="1199733043" id="rhn-erratum-5998" advisory-name="RHSA-2007:0513"/><erratum last-modified="1190795252" id="rhn-erratum-5999" advisory-name="RHSA-2007:0871"/><erratum last-modified="1190924497" id="rhn-erratum-6027" advisory-name="RHSA-2007:0936"/><erratum last-modified="1191358414" id="rhn-erratum-6038" advisory-name="RHSA-2007:0323"/><erratum last-modified="1191358509" id="rhn-erratum-6039" advisory-name="RHSA-2007:0951"/><erratum last-modified="1199814823" id="rhn-erratum-6040" advisory-name="RHSA-2007:0933"/><erratum last-modified="1191510370" id="rhn-erratum-6043" advisory-name="RHEA-2007:0928"/><erratum last-modified="1199814624" id="rhn-erratum-6045" advisory-name="RHSA-2007:0905"/><erratum last-modified="1199841433" id="rhn-erratum-6048" advisory-name="RHSA-2007:0909"/><erratum last-modified="1192127161" id="rhn-erratum-6052" advisory-name="RHSA-2007:0960"/><erratum last-modified="1192198966" id="rhn-erratum-6054" advisory-name="RHSA-2007:0964"/><erratum last-modified="1199839438" id="rhn-erratum-6056" advisory-name="RHSA-2007:0979"/><erratum last-modified="1193050357" id="rhn-erratum-6060" advisory-name="RHSA-2007:0940"/><erratum last-modified="1199814764" id="rhn-erratum-6061" advisory-name="RHSA-2007:0975"/><erratum last-modified="1199840209" id="rhn-erratum-6065" advisory-name="RHSA-2007:0992"/><erratum last-modified="1194449155" id="rhn-erratum-6071" advisory-name="RHBA-2007:0383"/><erratum last-modified="1194449155" id="rhn-erratum-6072" advisory-name="RHBA-2007:0499"/><erratum last-modified="1194449155" id="rhn-erratum-6073" advisory-name="RHEA-2007:0374"/><erratum last-modified="1194449155" id="rhn-erratum-6074" advisory-name="RHBA-2007:0500"/><erratum last-modified="1194449155" id="rhn-erratum-6075" advisory-name="RHBA-2007:0498"/><erratum last-modified="1194449155" id="rhn-erratum-6076" advisory-name="RHBA-2007:0381"/><erratum last-modified="1194449155" id="rhn-erratum-6078" advisory-name="RHBA-2007:0325"/><erratum last-modified="1194449155" id="rhn-erratum-6079" advisory-name="RHEA-2007:0900"/><erratum last-modified="1194449155" id="rhn-erratum-6080" advisory-name="RHEA-2007:0899"/><erratum last-modified="1194449155" id="rhn-erratum-6081" advisory-name="RHEA-2007:0901"/><erratum last-modified="1194449155" id="rhn-erratum-6082" advisory-name="RHEA-2007:0874"/><erratum last-modified="1194449155" id="rhn-erratum-6083" advisory-name="RHEA-2007:0882"/><erratum last-modified="1194449155" id="rhn-erratum-6084" advisory-name="RHEA-2007:0855"/><erratum last-modified="1194449155" id="rhn-erratum-6085" advisory-name="RHEA-2007:0854"/><erratum last-modified="1194449155" id="rhn-erratum-6086" advisory-name="RHBA-2007:0887"/><erratum last-modified="1194449155" id="rhn-erratum-6087" advisory-name="RHBA-2007:0659"/><erratum last-modified="1194531234" id="rhn-erratum-6088" advisory-name="RHBA-2007:0826"/><erratum last-modified="1194449155" id="rhn-erratum-6090" advisory-name="RHBA-2007:0821"/><erratum last-modified="1194449155" id="rhn-erratum-6091" advisory-name="RHBA-2007:0692"/><erratum last-modified="1194449155" id="rhn-erratum-6092" advisory-name="RHEA-2007:0852"/><erratum last-modified="1194449155" id="rhn-erratum-6094" advisory-name="RHBA-2007:0676"/><erratum last-modified="1194449155" id="rhn-erratum-6095" advisory-name="RHBA-2007:0719"/><erratum last-modified="1194446118" id="rhn-erratum-6096" advisory-name="RHBA-2007:0836"/><erratum last-modified="1194449155" id="rhn-erratum-6097" advisory-name="RHBA-2007:0760"/><erratum last-modified="1194449155" id="rhn-erratum-6099" advisory-name="RHBA-2007:0718"/><erratum last-modified="1194449155" id="rhn-erratum-6101" advisory-name="RHBA-2007:0712"/><erratum last-modified="1194449155" id="rhn-erratum-6102" advisory-name="RHBA-2007:0663"/><erratum last-modified="1194449155" id="rhn-erratum-6103" advisory-name="RHEA-2007:0678"/><erratum last-modified="1194449155" id="rhn-erratum-6104" advisory-name="RHEA-2007:0893"/><erratum last-modified="1194449155" id="rhn-erratum-6105" advisory-name="RHBA-2007:0561"/><erratum last-modified="1194449155" id="rhn-erratum-6106" advisory-name="RHBA-2007:0560"/><erratum last-modified="1194449155" id="rhn-erratum-6107" advisory-name="RHBA-2007:0554"/><erratum last-modified="1194449155" id="rhn-erratum-6108" advisory-name="RHEA-2007:0568"/><erratum last-modified="1194449155" id="rhn-erratum-6109" advisory-name="RHBA-2007:0553"/><erratum last-modified="1194476961" id="rhn-erratum-6110" advisory-name="RHBA-2007:0563"/><erratum last-modified="1194449155" id="rhn-erratum-6111" advisory-name="RHEA-2007:0567"/><erratum last-modified="1194531182" id="rhn-erratum-6112" advisory-name="RHBA-2007:0579"/><erratum last-modified="1194449155" id="rhn-erratum-6113" advisory-name="RHBA-2007:0575"/><erratum last-modified="1194449155" id="rhn-erratum-6114" advisory-name="RHBA-2007:0599"/><erratum last-modified="1194482853" id="rhn-erratum-6115" advisory-name="RHBA-2007:0959"/><erratum last-modified="1194449155" id="rhn-erratum-6116" advisory-name="RHBA-2007:0397"/><erratum last-modified="1194446118" id="rhn-erratum-6117" advisory-name="RHEA-2007:0601"/><erratum last-modified="1194449155" id="rhn-erratum-6119" advisory-name="RHBA-2007:0603"/><erratum last-modified="1194449155" id="rhn-erratum-6120" advisory-name="RHBA-2007:0602"/><erratum last-modified="1194449155" id="rhn-erratum-6124" advisory-name="RHEA-2007:0551"/><erratum last-modified="1194449155" id="rhn-erratum-6126" advisory-name="RHEA-2007:0641"/><erratum last-modified="1194449155" id="rhn-erratum-6129" advisory-name="RHEA-2007:0645"/><erratum last-modified="1194449155" id="rhn-erratum-6130" advisory-name="RHBA-2007:0656"/><erratum last-modified="1194449155" id="rhn-erratum-6132" advisory-name="RHBA-2007:0511"/><erratum last-modified="1194449155" id="rhn-erratum-6136" advisory-name="RHEA-2007:0630"/><erratum last-modified="1194446125" id="rhn-erratum-6137" advisory-name="RHEA-2007:0635"/><erratum last-modified="1194449155" id="rhn-erratum-6138" advisory-name="RHEA-2007:0607"/><erratum last-modified="1194449155" id="rhn-erratum-6139" advisory-name="RHEA-2007:0524"/><erratum last-modified="1194446118" id="rhn-erratum-6140" advisory-name="RHEA-2007:0587"/><erratum last-modified="1194449155" id="rhn-erratum-6142" advisory-name="RHEA-2007:0583"/><erratum last-modified="1194449155" id="rhn-erratum-6144" advisory-name="RHBA-2007:0598"/><erratum last-modified="1194449155" id="rhn-erratum-6146" advisory-name="RHEA-2007:0531"/><erratum last-modified="1194449155" id="rhn-erratum-6148" advisory-name="RHBA-2007:0620"/><erratum last-modified="1194449155" id="rhn-erratum-6149" advisory-name="RHBA-2007:0548"/><erratum last-modified="1194449155" id="rhn-erratum-6150" advisory-name="RHEA-2007:0521"/><erratum last-modified="1194449155" id="rhn-erratum-6151" advisory-name="RHBA-2007:0549"/><erratum last-modified="1194449155" id="rhn-erratum-6152" advisory-name="RHBA-2007:0541"/><erratum last-modified="1194449155" id="rhn-erratum-6153" advisory-name="RHBA-2007:0651"/><erratum last-modified="1194531406" id="rhn-erratum-6154" advisory-name="RHBA-2007:0544"/><erratum last-modified="1194449155" id="rhn-erratum-6156" advisory-name="RHBA-2007:0834"/><erratum last-modified="1194449155" id="rhn-erratum-6157" advisory-name="RHBA-2007:0632"/><erratum last-modified="1194449155" id="rhn-erratum-6158" advisory-name="RHBA-2007:0523"/><erratum last-modified="1194449155" id="rhn-erratum-6159" advisory-name="RHBA-2007:0610"/><erratum last-modified="1194449155" id="rhn-erratum-6160" advisory-name="RHBA-2007:0545"/><erratum last-modified="1194449155" id="rhn-erratum-6161" advisory-name="RHBA-2007:0538"/><erratum last-modified="1194449155" id="rhn-erratum-6162" advisory-name="RHBA-2007:0621"/><erratum last-modified="1194449155" id="rhn-erratum-6163" advisory-name="RHBA-2007:0536"/><erratum last-modified="1194449155" id="rhn-erratum-6164" advisory-name="RHBA-2007:0550"/><erratum last-modified="1194449155" id="rhn-erratum-6166" advisory-name="RHBA-2007:0522"/><erratum last-modified="1194449155" id="rhn-erratum-6168" advisory-name="RHBA-2007:0516"/><erratum last-modified="1194449155" id="rhn-erratum-6169" advisory-name="RHBA-2007:0614"/><erratum last-modified="1194449155" id="rhn-erratum-6170" advisory-name="RHBA-2007:0618"/><erratum last-modified="1194449155" id="rhn-erratum-6171" advisory-name="RHEA-2007:0617"/><erratum last-modified="1194449155" id="rhn-erratum-6172" advisory-name="RHBA-2007:0626"/><erratum last-modified="1194449155" id="rhn-erratum-6173" advisory-name="RHBA-2007:0594"/><erratum last-modified="1194449155" id="rhn-erratum-6174" advisory-name="RHBA-2007:0590"/><erratum last-modified="1194452816" id="rhn-erratum-6175" advisory-name="RHSA-2007:0710"/><erratum last-modified="1194452863" id="rhn-erratum-6176" advisory-name="RHSA-2007:0746"/><erratum last-modified="1194452580" id="rhn-erratum-6177" advisory-name="RHSA-2007:0631"/><erratum last-modified="1194452300" id="rhn-erratum-6178" advisory-name="RHSA-2007:0368"/><erratum last-modified="1194453594" id="rhn-erratum-6179" advisory-name="RHSA-2007:0542"/><erratum last-modified="1194449155" id="rhn-erratum-6181" advisory-name="RHBA-2007:0573"/><erratum last-modified="1194449155" id="rhn-erratum-6182" advisory-name="RHEA-2007:0653"/><erratum last-modified="1194449155" id="rhn-erratum-6183" advisory-name="RHBA-2007:0748"/><erratum last-modified="1194452355" id="rhn-erratum-6184" advisory-name="RHSA-2007:0540"/><erratum last-modified="1194531242" id="rhn-erratum-6185" advisory-name="RHEA-2007:0658"/><erratum last-modified="1194449155" id="rhn-erratum-6186" advisory-name="RHEA-2007:0609"/><erratum last-modified="1194444943" id="rhn-erratum-6187" advisory-name="RHEA-2007:0646"/><erratum last-modified="1194449155" id="rhn-erratum-6189" advisory-name="RHBA-2007:0591"/><erratum last-modified="1194449155" id="rhn-erratum-6191" advisory-name="RHBA-2007:0537"/><erratum last-modified="1194449155" id="rhn-erratum-6192" advisory-name="RHBA-2007:0572"/><erratum last-modified="1194449155" id="rhn-erratum-6193" advisory-name="RHEA-2007:0715"/><erratum last-modified="1194449155" id="rhn-erratum-6195" advisory-name="RHEA-2007:0649"/><erratum last-modified="1194449155" id="rhn-erratum-6196" advisory-name="RHEA-2007:0648"/><erratum last-modified="1194449155" id="rhn-erratum-6197" advisory-name="RHBA-2007:0596"/><erratum last-modified="1194449155" id="rhn-erratum-6198" advisory-name="RHBA-2007:0597"/><erratum last-modified="1194449155" id="rhn-erratum-6199" advisory-name="RHBA-2007:0634"/><erratum last-modified="1194446118" id="rhn-erratum-6201" advisory-name="RHEA-2007:0592"/><erratum last-modified="1194531426" id="rhn-erratum-6202" advisory-name="RHBA-2007:0574"/><erratum last-modified="1194449155" id="rhn-erratum-6206" advisory-name="RHBA-2007:0644"/><erratum last-modified="1194446118" id="rhn-erratum-6208" advisory-name="RHEA-2007:0657"/><erratum last-modified="1194449155" id="rhn-erratum-6209" advisory-name="RHEA-2007:0528"/><erratum last-modified="1194449155" id="rhn-erratum-6210" advisory-name="RHBA-2007:0628"/><erratum last-modified="1194449155" id="rhn-erratum-6211" advisory-name="RHBA-2007:0514"/><erratum last-modified="1194449155" id="rhn-erratum-6212" advisory-name="RHBA-2007:0543"/><erratum last-modified="1194449155" id="rhn-erratum-6213" advisory-name="RHBA-2007:0744"/><erratum last-modified="1194449155" id="rhn-erratum-6214" advisory-name="RHBA-2007:0581"/><erratum last-modified="1194449155" id="rhn-erratum-6215" advisory-name="RHBA-2007:0661"/><erratum last-modified="1194449155" id="rhn-erratum-6216" advisory-name="RHBA-2007:0480"/><erratum last-modified="1194449155" id="rhn-erratum-6217" advisory-name="RHBA-2007:0633"/><erratum last-modified="1194449155" id="rhn-erratum-6218" advisory-name="RHBA-2007:0404"/><erratum last-modified="1194449155" id="rhn-erratum-6219" advisory-name="RHBA-2007:0619"/><erratum last-modified="1194449155" id="rhn-erratum-6220" advisory-name="RHBA-2007:0565"/><erratum last-modified="1194449155" id="rhn-erratum-6221" advisory-name="RHBA-2007:0564"/><erratum last-modified="1194449155" id="rhn-erratum-6222" advisory-name="RHBA-2007:0571"/><erratum last-modified="1194449155" id="rhn-erratum-6223" advisory-name="RHEA-2007:0638"/><erratum last-modified="1194449155" id="rhn-erratum-6224" advisory-name="RHEA-2007:0558"/><erratum last-modified="1194449155" id="rhn-erratum-6225" advisory-name="RHBA-2007:0616"/><erratum last-modified="1194449155" id="rhn-erratum-6226" advisory-name="RHBA-2007:0627"/><erratum last-modified="1194452539" id="rhn-erratum-6227" advisory-name="RHSA-2007:0555"/><erratum last-modified="1193838510" id="rhn-erratum-6228" advisory-name="RHSA-2007:1020"/><erratum last-modified="1194281157" id="rhn-erratum-6236" advisory-name="RHSA-2007:0967"/><erratum last-modified="1199815247" id="rhn-erratum-6238" advisory-name="RHSA-2007:0966"/><erratum last-modified="1194453985" id="rhn-erratum-6240" advisory-name="RHBA-2007:0989"/><erratum last-modified="1194454329" id="rhn-erratum-6241" advisory-name="RHBA-2007:0974"/><erratum last-modified="1194454418" id="rhn-erratum-6242" advisory-name="RHBA-2007:0987"/><erratum last-modified="1194454517" id="rhn-erratum-6243" advisory-name="RHBA-2007:0985"/><erratum last-modified="1194454641" id="rhn-erratum-6244" advisory-name="RHBA-2007:0976"/><erratum last-modified="1194457548" id="rhn-erratum-6245" advisory-name="RHSA-2007:1021"/><erratum last-modified="1194459002" id="rhn-erratum-6249" advisory-name="RHSA-2007:1026"/><erratum last-modified="1194529544" id="rhn-erratum-6254" advisory-name="RHSA-2007:1027"/><erratum last-modified="1194540840" id="rhn-erratum-6255" advisory-name="RHSA-2007:1037"/><erratum last-modified="1195129236" id="rhn-erratum-6256" advisory-name="RHSA-2007:1052"/><erratum last-modified="1194946761" id="rhn-erratum-6263" advisory-name="RHSA-2007:0965"/><erratum last-modified="1195133259" id="rhn-erratum-6383" advisory-name="RHBA-2007:0972"/><erratum last-modified="1195134535" id="rhn-erratum-6389" advisory-name="RHBA-2007:0984"/><erratum last-modified="1195135655" id="rhn-erratum-6390" advisory-name="RHBA-2007:1002"/><erratum last-modified="1195136724" id="rhn-erratum-6392" advisory-name="RHBA-2007:1010"/><erratum last-modified="1195137230" id="rhn-erratum-6393" advisory-name="RHBA-2007:1012"/><erratum last-modified="1195142859" id="rhn-erratum-6396" advisory-name="RHSA-2007:0969"/><erratum last-modified="1195144149" id="rhn-erratum-6398" advisory-name="RHSA-2007:1017"/><erratum last-modified="1195146693" id="rhn-erratum-6400" advisory-name="RHSA-2007:1045"/><erratum last-modified="1195582547" id="rhn-erratum-6404" advisory-name="RHBA-2007:1073"/><erratum last-modified="1211378431" id="rhn-erratum-6405" advisory-name="RHBA-2007:0958"/><erratum last-modified="1211378384" id="rhn-erratum-6406" advisory-name="RHBA-2007:1009"/><erratum last-modified="1211378431" id="rhn-erratum-6407" advisory-name="RHBA-2007:1033"/><erratum last-modified="1211378384" id="rhn-erratum-6408" advisory-name="RHBA-2007:1039"/><erratum last-modified="1211378384" id="rhn-erratum-6412" advisory-name="RHBA-2007:0971"/><erratum last-modified="1195653093" id="rhn-erratum-6413" advisory-name="RHBA-2007:1067"/><erratum last-modified="1196119399" id="rhn-erratum-6435" advisory-name="RHSA-2007:1082"/><erratum last-modified="1211378384" id="rhn-erratum-6436" advisory-name="RHBA-2007:1057"/><erratum last-modified="1211378384" id="rhn-erratum-6437" advisory-name="RHBA-2007:1046"/><erratum last-modified="1196347593" id="rhn-erratum-6439" advisory-name="RHSA-2007:0993"/><erratum last-modified="1196347858" id="rhn-erratum-6440" advisory-name="RHSA-2007:1059"/><erratum last-modified="1196350728" id="rhn-erratum-6444" advisory-name="RHSA-2007:1078"/><erratum last-modified="1196696817" id="rhn-erratum-6448" advisory-name="RHSA-2007:1095"/><erratum last-modified="1211378384" id="rhn-erratum-6452" advisory-name="RHBA-2007:1072"/><erratum last-modified="1211378431" id="rhn-erratum-6453" advisory-name="RHBA-2007:1066"/><erratum last-modified="1211378431" id="rhn-erratum-6454" advisory-name="RHBA-2007:1075"/><erratum last-modified="1211378384" id="rhn-erratum-6455" advisory-name="RHBA-2007:1089"/><erratum last-modified="1197050972" id="rhn-erratum-6464" advisory-name="RHEA-2007:1132"/><erratum last-modified="1197305586" id="rhn-erratum-6466" advisory-name="RHSA-2007:1114"/><erratum last-modified="1197463014" id="rhn-erratum-6473" advisory-name="RHSA-2007:1128"/><erratum last-modified="1211378384" id="rhn-erratum-6476" advisory-name="RHBA-2007:1047"/><erratum last-modified="1211378431" id="rhn-erratum-6477" advisory-name="RHBA-2007:1064"/><erratum last-modified="1211378431" id="rhn-erratum-6478" advisory-name="RHBA-2007:1102"/><erratum last-modified="1211378384" id="rhn-erratum-6479" advisory-name="RHBA-2007:1103"/><erratum last-modified="1211378384" id="rhn-erratum-6480" advisory-name="RHBA-2007:1110"/><erratum last-modified="1197476377" id="rhn-erratum-6481" advisory-name="RHBA-2007:1131"/><erratum last-modified="1197577209" id="rhn-erratum-6482" advisory-name="RHBA-2007:1133"/><erratum last-modified="1197662892" id="rhn-erratum-6483" advisory-name="RHBA-2007:1127"/><erratum last-modified="1197994745" id="rhn-erratum-6485" advisory-name="RHSA-2007:1130"/><erratum last-modified="1197995854" id="rhn-erratum-6486" advisory-name="RHSA-2007:1155"/><erratum last-modified="1198078495" id="rhn-erratum-6488" advisory-name="RHSA-2007:1165"/><erratum last-modified="1211378384" id="rhn-erratum-6494" advisory-name="RHBA-2007:1146"/><erratum last-modified="1211378384" id="rhn-erratum-6495" advisory-name="RHBA-2007:1145"/><erratum last-modified="1211378384" id="rhn-erratum-6497" advisory-name="RHEA-2007:1125"/><erratum last-modified="1211378384" id="rhn-erratum-6498" advisory-name="RHBA-2007:1115"/><erratum last-modified="1211378384" id="rhn-erratum-6499" advisory-name="RHBA-2007:1109"/><erratum last-modified="1198178650" id="rhn-erratum-6500" advisory-name="RHSA-2007:1176"/><erratum last-modified="1211378384" id="rhn-erratum-6516" advisory-name="RHBA-2008:0015"/><erratum last-modified="1211378431" id="rhn-erratum-6517" advisory-name="RHBA-2008:0014"/><erratum last-modified="1211378384" id="rhn-erratum-6518" advisory-name="RHBA-2008:0012"/><erratum last-modified="1211378431" id="rhn-erratum-6519" advisory-name="RHEA-2008:0011"/><erratum last-modified="1199387416" id="rhn-erratum-6520" advisory-name="RHEA-2008:0028"/><erratum last-modified="1199473380" id="rhn-erratum-6522" advisory-name="RHEA-2008:0001"/><erratum last-modified="1199731010" id="rhn-erratum-6524" advisory-name="RHSA-2008:0002"/><erratum last-modified="1199732110" id="rhn-erratum-6525" advisory-name="RHSA-2008:0003"/><erratum last-modified="1211378384" id="rhn-erratum-6527" advisory-name="RHBA-2008:0020"/><erratum last-modified="1211378384" id="rhn-erratum-6528" advisory-name="RHBA-2008:0017"/><erratum last-modified="1200054423" id="rhn-erratum-6537" advisory-name="RHSA-2008:0032"/><erratum last-modified="1200055042" id="rhn-erratum-6538" advisory-name="RHSA-2008:0038"/><erratum last-modified="1200389908" id="rhn-erratum-6544" advisory-name="RHSA-2008:0008"/><erratum last-modified="1211378431" id="rhn-erratum-6550" advisory-name="RHBA-2008:0021"/><erratum last-modified="1211378384" id="rhn-erratum-6551" advisory-name="RHBA-2008:0010"/><erratum last-modified="1211378384" id="rhn-erratum-6552" advisory-name="RHBA-2008:0016"/><erratum last-modified="1211378431" id="rhn-erratum-6553" advisory-name="RHBA-2008:0019"/><erratum last-modified="1211378431" id="rhn-erratum-6554" advisory-name="RHBA-2008:0044"/><erratum last-modified="1211378384" id="rhn-erratum-6555" advisory-name="RHBA-2008:0041"/><erratum last-modified="1211378431" id="rhn-erratum-6556" advisory-name="RHBA-2008:0047"/><erratum last-modified="1211378384" id="rhn-erratum-6557" advisory-name="RHBA-2008:0056"/><erratum last-modified="1211378384" id="rhn-erratum-6558" advisory-name="RHBA-2008:0043"/><erratum last-modified="1200600032" id="rhn-erratum-6560" advisory-name="RHSA-2008:0064"/><erratum last-modified="1200706116" id="rhn-erratum-6561" advisory-name="RHSA-2008:0031"/><erratum last-modified="1200904274" id="rhn-erratum-6564" advisory-name="RHSA-2008:0058"/><erratum last-modified="1201078075" id="rhn-erratum-6568" advisory-name="RHBA-2008:0057"/><erratum last-modified="1211378384" id="rhn-erratum-6569" advisory-name="RHBA-2008:0085"/><erratum last-modified="1211378431" id="rhn-erratum-6570" advisory-name="RHBA-2008:0079"/><erratum last-modified="1211378384" id="rhn-erratum-6571" advisory-name="RHBA-2008:0077"/><erratum last-modified="1211378384" id="rhn-erratum-6572" advisory-name="RHBA-2008:0073"/><erratum last-modified="1211378384" id="rhn-erratum-6573" advisory-name="RHBA-2008:0072"/><erratum last-modified="1211378384" id="rhn-erratum-6574" advisory-name="RHBA-2008:0068"/><erratum last-modified="1211378384" id="rhn-erratum-6575" advisory-name="RHBA-2008:0067"/><erratum last-modified="1211378384" id="rhn-erratum-6576" advisory-name="RHBA-2008:0046"/><erratum last-modified="1211378431" id="rhn-erratum-6577" advisory-name="RHBA-2008:0045"/><erratum last-modified="1211378384" id="rhn-erratum-6578" advisory-name="RHBA-2008:0013"/><erratum last-modified="1201100825" id="rhn-erratum-6579" advisory-name="RHSA-2008:0089"/><erratum last-modified="1201267716" id="rhn-erratum-6580" advisory-name="RHSA-2008:0090"/><erratum last-modified="1211378384" id="rhn-erratum-6596" advisory-name="RHBA-2008:0078"/><erratum last-modified="1211378384" id="rhn-erratum-6597" advisory-name="RHBA-2008:0065"/><erratum last-modified="1211378384" id="rhn-erratum-6598" advisory-name="RHBA-2008:0063"/><erratum last-modified="1201707073" id="rhn-erratum-6601" advisory-name="RHBA-2008:0050"/><erratum last-modified="1201868901" id="rhn-erratum-6603" advisory-name="RHBA-2008:0099"/><erratum last-modified="1211378384" id="rhn-erratum-6618" advisory-name="RHBA-2008:0071"/><erratum last-modified="1211378384" id="rhn-erratum-6619" advisory-name="RHBA-2008:0108"/><erratum last-modified="1211378431" id="rhn-erratum-6620" advisory-name="RHBA-2008:0109"/><erratum last-modified="1202409708" id="rhn-erratum-6622" advisory-name="RHBA-2008:0102"/><erratum last-modified="1202438303" id="rhn-erratum-6625" advisory-name="RHSA-2008:0103"/><erratum last-modified="1202835190" id="rhn-erratum-6628" advisory-name="RHSA-2008:0129"/><erratum last-modified="1211378431" id="rhn-erratum-6631" advisory-name="RHBA-2008:0101"/><erratum last-modified="1203077128" id="rhn-erratum-6638" advisory-name="RHBA-2008:0143"/><erratum last-modified="1203135547" id="rhn-erratum-6642" advisory-name="RHBA-2008:0147"/><erratum last-modified="1211378431" id="rhn-erratum-6659" advisory-name="RHBA-2008:0087"/><erratum last-modified="1203628528" id="rhn-erratum-6662" advisory-name="RHSA-2008:0110"/><erratum last-modified="1203628947" id="rhn-erratum-6664" advisory-name="RHSA-2008:0136"/><erratum last-modified="1203629444" id="rhn-erratum-6665" advisory-name="RHSA-2008:0157"/><erratum last-modified="1211378384" id="rhn-erratum-6680" advisory-name="RHBA-2008:0106"/><erratum last-modified="1204147755" id="rhn-erratum-6681" advisory-name="RHSA-2008:0159"/><erratum last-modified="1204150462" id="rhn-erratum-6682" advisory-name="RHSA-2008:0155"/><erratum last-modified="1204192756" id="rhn-erratum-6683" advisory-name="RHSA-2008:0146"/><erratum last-modified="1204725396" id="rhn-erratum-6697" advisory-name="RHSA-2008:0154"/><erratum last-modified="1205160912" id="rhn-erratum-6717" advisory-name="RHEA-2008:0185"/><erratum last-modified="1205166351" id="rhn-erratum-6718" advisory-name="RHBA-2008:0128"/><erratum last-modified="1205232700" id="rhn-erratum-6719" advisory-name="RHSA-2008:0042"/><erratum last-modified="1205868372" id="rhn-erratum-6739" advisory-name="RHSA-2008:0164"/><erratum last-modified="1206398670" id="rhn-erratum-6747" advisory-name="RHBA-2008:0188"/><erratum last-modified="1206580098" id="rhn-erratum-6748" advisory-name="RHSA-2008:0207"/><erratum last-modified="1207059008" id="rhn-erratum-6752" advisory-name="RHSA-2008:0192"/><erratum last-modified="1207136024" id="rhn-erratum-6756" advisory-name="RHSA-2008:0197"/><erratum last-modified="1211378384" id="rhn-erratum-6764" advisory-name="RHSA-2008:0218"/><erratum last-modified="1207670266" id="rhn-erratum-6777" advisory-name="RHBA-2008:8237"/><erratum last-modified="1207698438" id="rhn-erratum-6779" advisory-name="RHSA-2008:0214"/><erratum last-modified="1208390558" id="rhn-erratum-6795" advisory-name="RHSA-2008:0235"/><erratum last-modified="1208396243" id="rhn-erratum-6797" advisory-name="RHSA-2008:0222"/><erratum last-modified="1208395929" id="rhn-erratum-6798" advisory-name="RHSA-2008:0145"/><erratum last-modified="1208453661" id="rhn-erratum-6803" advisory-name="RHSA-2008:0239"/><erratum last-modified="1210145958" id="rhn-erratum-6860" advisory-name="RHSA-2008:0233"/><erratum last-modified="1210341648" id="rhn-erratum-6868" advisory-name="RHBA-2008:0258"/><erratum last-modified="1210681682" id="rhn-erratum-6898" advisory-name="RHSA-2008:0194"/><erratum last-modified="1210751665" id="rhn-erratum-6902" advisory-name="RHSA-2008:0270"/><erratum last-modified="1210934227" id="rhn-erratum-6903" advisory-name="RHBA-2008:0219"/><erratum last-modified="1211378688" id="rhn-erratum-6919" advisory-name="RHBA-2008:0455"/><erratum last-modified="1211378688" id="rhn-erratum-6920" advisory-name="RHBA-2008:0437"/><erratum last-modified="1211378688" id="rhn-erratum-6921" advisory-name="RHBA-2008:0442"/><erratum last-modified="1211378688" id="rhn-erratum-6922" advisory-name="RHBA-2008:0484"/><erratum last-modified="1211378688" id="rhn-erratum-6923" advisory-name="RHBA-2008:0457"/><erratum last-modified="1211378688" id="rhn-erratum-6924" advisory-name="RHBA-2008:0453"/><erratum last-modified="1211378688" id="rhn-erratum-6925" advisory-name="RHBA-2008:0450"/><erratum last-modified="1211378688" id="rhn-erratum-6926" advisory-name="RHBA-2008:0459"/><erratum last-modified="1211378688" id="rhn-erratum-6928" advisory-name="RHBA-2008:0458"/><erratum last-modified="1211378688" id="rhn-erratum-6929" advisory-name="RHEA-2008:0454"/><erratum last-modified="1211378688" id="rhn-erratum-6930" advisory-name="RHEA-2008:0451"/><erratum last-modified="1211378688" id="rhn-erratum-6931" advisory-name="RHBA-2008:0462"/><erratum last-modified="1211392488" id="rhn-erratum-6932" advisory-name="RHEA-2008:0436"/><erratum last-modified="1211378688" id="rhn-erratum-6934" advisory-name="RHBA-2008:0434"/><erratum last-modified="1211378688" id="rhn-erratum-6935" advisory-name="RHBA-2008:0481"/><erratum last-modified="1211378688" id="rhn-erratum-6936" advisory-name="RHBA-2008:0424"/><erratum last-modified="1211378688" id="rhn-erratum-6937" advisory-name="RHBA-2008:0431"/><erratum last-modified="1211378688" id="rhn-erratum-6939" advisory-name="RHEA-2008:0427"/><erratum last-modified="1211378688" id="rhn-erratum-6940" advisory-name="RHEA-2008:0430"/><erratum last-modified="1211378688" id="rhn-erratum-6941" advisory-name="RHEA-2008:0418"/><erratum last-modified="1211378688" id="rhn-erratum-6942" advisory-name="RHBA-2008:0404"/><erratum last-modified="1211378688" id="rhn-erratum-6943" advisory-name="RHBA-2008:0412"/><erratum last-modified="1211378688" id="rhn-erratum-6944" advisory-name="RHEA-2008:0422"/><erratum last-modified="1211378688" id="rhn-erratum-6945" advisory-name="RHBA-2008:0419"/><erratum last-modified="1211378688" id="rhn-erratum-6946" advisory-name="RHEA-2008:0413"/><erratum last-modified="1211378688" id="rhn-erratum-6947" advisory-name="RHBA-2008:0403"/><erratum last-modified="1211378688" id="rhn-erratum-6949" advisory-name="RHBA-2008:0416"/><erratum last-modified="1211378688" id="rhn-erratum-6950" advisory-name="RHBA-2008:0414"/><erratum last-modified="1211378688" id="rhn-erratum-6951" advisory-name="RHBA-2008:0411"/><erratum last-modified="1211378688" id="rhn-erratum-6952" advisory-name="RHEA-2008:0420"/><erratum last-modified="1211378688" id="rhn-erratum-6954" advisory-name="RHBA-2008:0408"/><erratum last-modified="1211378688" id="rhn-erratum-6956" advisory-name="RHBA-2008:0470"/><erratum last-modified="1211378688" id="rhn-erratum-6957" advisory-name="RHBA-2008:0398"/><erratum last-modified="1211378688" id="rhn-erratum-6958" advisory-name="RHBA-2008:0396"/><erratum last-modified="1211378688" id="rhn-erratum-6959" advisory-name="RHBA-2008:0395"/><erratum last-modified="1211378688" id="rhn-erratum-6960" advisory-name="RHBA-2008:0397"/><erratum last-modified="1211378688" id="rhn-erratum-6961" advisory-name="RHBA-2008:0394"/><erratum last-modified="1211378688" id="rhn-erratum-6962" advisory-name="RHBA-2008:0393"/><erratum last-modified="1211378688" id="rhn-erratum-6963" advisory-name="RHEA-2008:0399"/><erratum last-modified="1211378688" id="rhn-erratum-6964" advisory-name="RHBA-2008:0386"/><erratum last-modified="1211378688" id="rhn-erratum-6965" advisory-name="RHEA-2008:0392"/><erratum last-modified="1211271165" id="rhn-erratum-6967" advisory-name="RHBA-2008:0280"/><erratum last-modified="1211277450" id="rhn-erratum-6968" advisory-name="RHSA-2008:0275"/><erratum last-modified="1211378688" id="rhn-erratum-6969" advisory-name="RHEA-2008:0387"/><erratum last-modified="1211378688" id="rhn-erratum-6970" advisory-name="RHEA-2008:0384"/><erratum last-modified="1211378688" id="rhn-erratum-6971" advisory-name="RHBA-2008:0446"/><erratum last-modified="1211378688" id="rhn-erratum-6972" advisory-name="RHBA-2008:0377"/><erratum last-modified="1211378688" id="rhn-erratum-6973" advisory-name="RHBA-2008:0381"/><erratum last-modified="1211378688" id="rhn-erratum-6974" advisory-name="RHBA-2008:0362"/><erratum last-modified="1211378688" id="rhn-erratum-6975" advisory-name="RHBA-2008:0382"/><erratum last-modified="1211378688" id="rhn-erratum-6976" advisory-name="RHEA-2008:0390"/><erratum last-modified="1211378688" id="rhn-erratum-6977" advisory-name="RHBA-2008:0461"/><erratum last-modified="1211378688" id="rhn-erratum-6978" advisory-name="RHBA-2008:0385"/><erratum last-modified="1211378688" id="rhn-erratum-6979" advisory-name="RHBA-2008:0347"/><erratum last-modified="1211378688" id="rhn-erratum-6980" advisory-name="RHBA-2008:0343"/><erratum last-modified="1211378688" id="rhn-erratum-6981" advisory-name="RHEA-2008:0356"/><erratum last-modified="1211379958" id="rhn-erratum-6983" advisory-name="RHSA-2008:0364"/><erratum last-modified="1211378688" id="rhn-erratum-6984" advisory-name="RHBA-2008:0350"/><erratum last-modified="1211378688" id="rhn-erratum-6985" advisory-name="RHBA-2008:0360"/><erratum last-modified="1211378688" id="rhn-erratum-6986" advisory-name="RHBA-2008:0346"/><erratum last-modified="1211378688" id="rhn-erratum-6987" advisory-name="RHBA-2008:0340"/><erratum last-modified="1211378688" id="rhn-erratum-6989" advisory-name="RHEA-2008:0358"/><erratum last-modified="1211378688" id="rhn-erratum-6990" advisory-name="RHBA-2008:0363"/><erratum last-modified="1211378688" id="rhn-erratum-6993" advisory-name="RHBA-2008:0357"/><erratum last-modified="1211378688" id="rhn-erratum-6995" advisory-name="RHBA-2008:0351"/><erratum last-modified="1211378688" id="rhn-erratum-6996" advisory-name="RHEA-2008:0468"/><erratum last-modified="1211378688" id="rhn-erratum-6998" advisory-name="RHBA-2008:0354"/><erratum last-modified="1211378688" id="rhn-erratum-7000" advisory-name="RHBA-2008:0333"/><erratum last-modified="1211378688" id="rhn-erratum-7001" advisory-name="RHBA-2008:0341"/><erratum last-modified="1211378688" id="rhn-erratum-7002" advisory-name="RHBA-2008:0083"/><erratum last-modified="1211378688" id="rhn-erratum-7003" advisory-name="RHEA-2008:0084"/><erratum last-modified="1211378688" id="rhn-erratum-7004" advisory-name="RHBA-2008:0376"/><erratum last-modified="1211378688" id="rhn-erratum-7005" advisory-name="RHBA-2008:0322"/><erratum last-modified="1211378688" id="rhn-erratum-7006" advisory-name="RHBA-2008:0334"/><erratum last-modified="1211378688" id="rhn-erratum-7007" advisory-name="RHBA-2008:0323"/><erratum last-modified="1211379958" id="rhn-erratum-7008" advisory-name="RHSA-2008:0061"/><erratum last-modified="1211378688" id="rhn-erratum-7009" advisory-name="RHBA-2008:0335"/><erratum last-modified="1211378688" id="rhn-erratum-7010" advisory-name="RHEA-2008:0331"/><erratum last-modified="1211378688" id="rhn-erratum-7011" advisory-name="RHBA-2008:0374"/><erratum last-modified="1211378688" id="rhn-erratum-7012" advisory-name="RHBA-2008:0336"/><erratum last-modified="1211378688" id="rhn-erratum-7014" advisory-name="RHBA-2008:0329"/><erratum last-modified="1211378688" id="rhn-erratum-7015" advisory-name="RHBA-2008:0324"/><erratum last-modified="1211378688" id="rhn-erratum-7016" advisory-name="RHBA-2008:0327"/><erratum last-modified="1211378688" id="rhn-erratum-7017" advisory-name="RHBA-2008:0337"/><erratum last-modified="1211378688" id="rhn-erratum-7018" advisory-name="RHBA-2008:0325"/><erratum last-modified="1211378688" id="rhn-erratum-7019" advisory-name="RHEA-2008:0477"/><erratum last-modified="1211378688" id="rhn-erratum-7020" advisory-name="RHBA-2008:0054"/><erratum last-modified="1211378688" id="rhn-erratum-7021" advisory-name="RHEA-2008:0338"/><erratum last-modified="1211378688" id="rhn-erratum-7022" advisory-name="RHBA-2008:0328"/><erratum last-modified="1214319667" id="rhn-erratum-7023" advisory-name="RHEA-2008:0479"/><erratum last-modified="1211378688" id="rhn-erratum-7026" advisory-name="RHBA-2008:0372"/><erratum last-modified="1211378688" id="rhn-erratum-7027" advisory-name="RHBA-2008:0375"/><erratum last-modified="1211378688" id="rhn-erratum-7028" advisory-name="RHBA-2008:0369"/><erratum last-modified="1211379302" id="rhn-erratum-7034" advisory-name="RHSA-2008:0389"/><erratum last-modified="1211378688" id="rhn-erratum-7035" advisory-name="RHBA-2008:0366"/><erratum last-modified="1211378688" id="rhn-erratum-7036" advisory-name="RHBA-2008:0367"/><erratum last-modified="1211378688" id="rhn-erratum-7037" advisory-name="RHBA-2008:0460"/><erratum last-modified="1211378688" id="rhn-erratum-7039" advisory-name="RHBA-2008:0368"/><erratum last-modified="1211378688" id="rhn-erratum-7040" advisory-name="RHBA-2008:0476"/><erratum last-modified="1211378688" id="rhn-erratum-7041" advisory-name="RHEA-2008:0474"/><erratum last-modified="1211378688" id="rhn-erratum-7042" advisory-name="RHBA-2008:0482"/><erratum last-modified="1211378688" id="rhn-erratum-7044" advisory-name="RHBA-2008:0326"/><erratum last-modified="1211378688" id="rhn-erratum-7045" advisory-name="RHEA-2008:0370"/><erratum last-modified="1211378688" id="rhn-erratum-7046" advisory-name="RHBA-2008:0383"/><erratum last-modified="1211378688" id="rhn-erratum-7047" advisory-name="RHBA-2008:0321"/><erratum last-modified="1211379607" id="rhn-erratum-7048" advisory-name="RHSA-2008:0297"/><erratum last-modified="1211378688" id="rhn-erratum-7049" advisory-name="RHBA-2008:0456"/><erratum last-modified="1211378688" id="rhn-erratum-7050" advisory-name="RHBA-2008:0312"/><erratum last-modified="1211379437" id="rhn-erratum-7051" advisory-name="RHSA-2008:0300"/><erratum last-modified="1211378688" id="rhn-erratum-7052" advisory-name="RHBA-2008:0465"/><erratum last-modified="1211378688" id="rhn-erratum-7053" advisory-name="RHBA-2008:0373"/><erratum last-modified="1211378688" id="rhn-erratum-7054" advisory-name="RHBA-2008:0307"/><erratum last-modified="1211378688" id="rhn-erratum-7055" advisory-name="RHBA-2008:0472"/><erratum last-modified="1211378688" id="rhn-erratum-7056" advisory-name="RHBA-2008:0296"/><erratum last-modified="1211294907" id="rhn-erratum-7058" advisory-name="RHSA-2008:0489"/><erratum last-modified="1211378688" id="rhn-erratum-7059" advisory-name="RHBA-2008:0314"/><erratum last-modified="1211378688" id="rhn-erratum-7061" advisory-name="RHBA-2008:0445"/><erratum last-modified="1211378688" id="rhn-erratum-7062" advisory-name="RHBA-2008:0444"/><erratum last-modified="1211378688" id="rhn-erratum-7063" advisory-name="RHBA-2008:0440"/><erratum last-modified="1211378688" id="rhn-erratum-7064" advisory-name="RHBA-2008:0309"/><erratum last-modified="1211378688" id="rhn-erratum-7065" advisory-name="RHBA-2008:0316"/><erratum last-modified="1211378688" id="rhn-erratum-7066" advisory-name="RHBA-2008:0306"/><erratum last-modified="1211378688" id="rhn-erratum-7067" advisory-name="RHBA-2008:0313"/><erratum last-modified="1211378688" id="rhn-erratum-7068" advisory-name="RHBA-2008:0311"/><erratum last-modified="1211378688" id="rhn-erratum-7069" advisory-name="RHBA-2008:0319"/><erratum last-modified="1211378688" id="rhn-erratum-7070" advisory-name="RHBA-2008:0308"/><erratum last-modified="1211378688" id="rhn-erratum-7071" advisory-name="RHBA-2008:0220"/><erratum last-modified="1211378688" id="rhn-erratum-7073" advisory-name="RHBA-2008:0388"/><erratum last-modified="1211378688" id="rhn-erratum-7074" advisory-name="RHBA-2008:0428"/><erratum last-modified="1211378688" id="rhn-erratum-7075" advisory-name="RHBA-2008:0449"/><erratum last-modified="1211378688" id="rhn-erratum-7076" advisory-name="RHEA-2008:0438"/><erratum last-modified="1211378688" id="rhn-erratum-7077" advisory-name="RHBA-2008:0475"/><erratum last-modified="1211378688" id="rhn-erratum-7078" advisory-name="RHBA-2008:0447"/><erratum last-modified="1211378688" id="rhn-erratum-7079" advisory-name="RHBA-2008:0405"/><erratum last-modified="1211378688" id="rhn-erratum-7080" advisory-name="RHBA-2008:0443"/><erratum last-modified="1211378688" id="rhn-erratum-7081" advisory-name="RHBA-2008:0432"/><erratum last-modified="1211378688" id="rhn-erratum-7082" advisory-name="RHBA-2008:0410"/><erratum last-modified="1211378688" id="rhn-erratum-7083" advisory-name="RHEA-2008:0402"/><erratum last-modified="1211378688" id="rhn-erratum-7084" advisory-name="RHBA-2008:0380"/><erratum last-modified="1211378688" id="rhn-erratum-7085" advisory-name="RHEA-2008:0429"/><erratum last-modified="1211378688" id="rhn-erratum-7087" advisory-name="RHEA-2008:0435"/><erratum last-modified="1211378688" id="rhn-erratum-7088" advisory-name="RHEA-2008:0439"/><erratum last-modified="1211378688" id="rhn-erratum-7089" advisory-name="RHEA-2008:0391"/><erratum last-modified="1211378688" id="rhn-erratum-7091" advisory-name="RHEA-2008:0417"/><erratum last-modified="1211378688" id="rhn-erratum-7092" advisory-name="RHBA-2008:0441"/><erratum last-modified="1211378688" id="rhn-erratum-7093" advisory-name="RHEA-2008:0400"/><erratum last-modified="1211378688" id="rhn-erratum-7095" advisory-name="RHBA-2008:0339"/><erratum last-modified="1211378688" id="rhn-erratum-7096" advisory-name="RHBA-2008:0345"/><erratum last-modified="1211378688" id="rhn-erratum-7098" advisory-name="RHBA-2008:0303"/><erratum last-modified="1211378688" id="rhn-erratum-7099" advisory-name="RHBA-2008:0332"/><erratum last-modified="1211465127" id="rhn-erratum-7100" advisory-name="RHBA-2008:0361"/><erratum last-modified="1211378711" id="rhn-erratum-7101" advisory-name="RHBA-2008:0305"/><erratum last-modified="1211378688" id="rhn-erratum-7102" advisory-name="RHBA-2008:0302"/><erratum last-modified="1211378688" id="rhn-erratum-7103" advisory-name="RHEA-2008:0304"/><erratum last-modified="1211378688" id="rhn-erratum-7104" advisory-name="RHEA-2008:0452"/><erratum last-modified="1211378688" id="rhn-erratum-7106" advisory-name="RHBA-2008:0478"/><erratum last-modified="1211378688" id="rhn-erratum-7107" advisory-name="RHBA-2008:0344"/><erratum last-modified="1211378688" id="rhn-erratum-7108" advisory-name="RHBA-2008:0081"/><erratum last-modified="1211378688" id="rhn-erratum-7109" advisory-name="RHBA-2008:0330"/><erratum last-modified="1211378688" id="rhn-erratum-7110" advisory-name="RHBA-2008:0301"/><erratum last-modified="1211378688" id="rhn-erratum-7112" advisory-name="RHBA-2008:0469"/><erratum last-modified="1211378688" id="rhn-erratum-7114" advisory-name="RHBA-2008:0466"/><erratum last-modified="1211378688" id="rhn-erratum-7115" advisory-name="RHBA-2008:0473"/><erratum last-modified="1211378688" id="rhn-erratum-7116" advisory-name="RHEA-2008:0317"/><erratum last-modified="1211378688" id="rhn-erratum-7117" advisory-name="RHBA-2008:0298"/><erratum last-modified="1211378688" id="rhn-erratum-7118" advisory-name="RHBA-2008:0294"/><erratum last-modified="1211378688" id="rhn-erratum-7119" advisory-name="RHBA-2008:0292"/><erratum last-modified="1211378688" id="rhn-erratum-7120" advisory-name="RHBA-2008:0293"/><erratum last-modified="1211378688" id="rhn-erratum-7121" advisory-name="RHBA-2008:0299"/><erratum last-modified="1211378688" id="rhn-erratum-7122" advisory-name="RHBA-2008:0310"/><erratum last-modified="1211378688" id="rhn-erratum-7123" advisory-name="RHBA-2008:0401"/><erratum last-modified="1211378688" id="rhn-erratum-7124" advisory-name="RHBA-2008:0378"/><erratum last-modified="1211355036" id="rhn-erratum-7126" advisory-name="RHSA-2008:0287"/><erratum last-modified="1211392804" id="rhn-erratum-7127" advisory-name="RHBA-2008:0464"/><erratum last-modified="1211378688" id="rhn-erratum-7128" advisory-name="RHBA-2008:0365"/><erratum last-modified="1211379396" id="rhn-erratum-7130" advisory-name="RHSA-2008:0295"/><erratum last-modified="1211386894" id="rhn-erratum-7131" advisory-name="RHBA-2008:0283"/><erratum last-modified="1211385551" id="rhn-erratum-7133" advisory-name="RHBA-2008:0279"/><erratum last-modified="1211386850" id="rhn-erratum-7134" advisory-name="RHBA-2008:0278"/><erratum last-modified="1211386980" id="rhn-erratum-7135" advisory-name="RHBA-2008:0488"/><erratum last-modified="1211387731" id="rhn-erratum-7136" advisory-name="RHBA-2008:0487"/><erratum last-modified="1211966851" id="rhn-erratum-7144" advisory-name="RHEA-2008:0506"/><erratum last-modified="1211973628" id="rhn-erratum-7147" advisory-name="RHSA-2008:0290"/><erratum last-modified="1232480208" id="rhn-erratum-7178" advisory-name="RHBA-2008:0286"/><erratum last-modified="1232480208" id="rhn-erratum-7179" advisory-name="RHBA-2008:0490"/><erratum last-modified="1232480208" id="rhn-erratum-7180" advisory-name="RHBA-2008:0491"/><erratum last-modified="1212652858" id="rhn-erratum-7185" advisory-name="RHSA-2008:0498"/><erratum last-modified="1212659953" id="rhn-erratum-7186" advisory-name="RHBA-2008:0499"/><erratum last-modified="1212670283" id="rhn-erratum-7188" advisory-name="RHBA-2008:0513"/><erratum last-modified="1213012998" id="rhn-erratum-7189" advisory-name="RHBA-2008:0526"/><erratum last-modified="1213106876" id="rhn-erratum-7191" advisory-name="RHSA-2008:0529"/><erratum last-modified="1213169531" id="rhn-erratum-7192" advisory-name="RHBA-2008:0536"/><erratum last-modified="1213211574" id="rhn-erratum-7194" advisory-name="RHSA-2008:0522"/><erratum last-modified="1213212894" id="rhn-erratum-7196" advisory-name="RHSA-2008:0504"/><erratum last-modified="1232480208" id="rhn-erratum-7198" advisory-name="RHBA-2008:0534"/><erratum last-modified="1232480208" id="rhn-erratum-7199" advisory-name="RHBA-2008:0531"/><erratum last-modified="1232480208" id="rhn-erratum-7200" advisory-name="RHBA-2008:0530"/><erratum last-modified="1213266274" id="rhn-erratum-7201" advisory-name="RHBA-2008:0527"/><erratum last-modified="1214393985" id="rhn-erratum-7219" advisory-name="RHSA-2008:0556"/><erratum last-modified="1214299895" id="rhn-erratum-7223" advisory-name="RHSA-2008:0497"/><erratum last-modified="1232480208" id="rhn-erratum-7225" advisory-name="RHBA-2008:0567"/><erratum last-modified="1214402999" id="rhn-erratum-7226" advisory-name="RHBA-2008:0551"/><erratum last-modified="1214408624" id="rhn-erratum-7228" advisory-name="RHSA-2008:0519"/><erratum last-modified="1214589842" id="rhn-erratum-7237" advisory-name="RHBA-2008:0573"/><erratum last-modified="1215002227" id="rhn-erratum-7259" advisory-name="RHSA-2008:0569"/><erratum last-modified="1215022795" id="rhn-erratum-7265" advisory-name="RHBA-2008:0557"/><erratum last-modified="1215719579" id="rhn-erratum-7269" advisory-name="RHSA-2008:0533"/><erratum last-modified="1232480208" id="rhn-erratum-7271" advisory-name="RHBA-2008:0559"/><erratum last-modified="1215614648" id="rhn-erratum-7272" advisory-name="RHSA-2008:0583"/><erratum last-modified="1215766327" id="rhn-erratum-7273" advisory-name="RHBA-2008:0565"/><erratum last-modified="1216041981" id="rhn-erratum-7275" advisory-name="RHSA-2008:0561"/><erratum last-modified="1216043746" id="rhn-erratum-7277" advisory-name="RHSA-2008:0581"/><erratum last-modified="1216200981" id="rhn-erratum-7280" advisory-name="RHSA-2008:0544"/><erratum last-modified="1216250824" id="rhn-erratum-7284" advisory-name="RHSA-2008:0597"/><erratum last-modified="1232480208" id="rhn-erratum-7287" advisory-name="RHBA-2008:0587"/><erratum last-modified="1232470477" id="rhn-erratum-7292" advisory-name="RHBA-2008:0613"/><erratum last-modified="1232469848" id="rhn-erratum-7293" advisory-name="RHBA-2008:0610"/><erratum last-modified="1232480208" id="rhn-erratum-7294" advisory-name="RHBA-2008:0600"/><erratum last-modified="1232471900" id="rhn-erratum-7295" advisory-name="RHBA-2008:0589"/><erratum last-modified="1232471827" id="rhn-erratum-7296" advisory-name="RHBA-2008:0586"/><erratum last-modified="1216919718" id="rhn-erratum-7435" advisory-name="RHSA-2008:0575"/><erratum last-modified="1217260961" id="rhn-erratum-7459" advisory-name="RHBA-2008:0611"/><erratum last-modified="1232480208" id="rhn-erratum-7479" advisory-name="RHBA-2008:0535"/><erratum last-modified="1232480208" id="rhn-erratum-7480" advisory-name="RHBA-2008:0593"/><erratum last-modified="1232480208" id="rhn-erratum-7481" advisory-name="RHBA-2008:0609"/><erratum last-modified="1232480208" id="rhn-erratum-7482" advisory-name="RHBA-2008:0626"/><erratum last-modified="1232471506" id="rhn-erratum-7483" advisory-name="RHBA-2008:0637"/><erratum last-modified="1218054405" id="rhn-erratum-7487" advisory-name="RHSA-2008:0649"/><erratum last-modified="1217518732" id="rhn-erratum-7488" advisory-name="RHSA-2008:0486"/><erratum last-modified="1218051005" id="rhn-erratum-7498" advisory-name="RHSA-2008:0612"/><erratum last-modified="1218016403" id="rhn-erratum-7511" advisory-name="RHBA-2008:0824"/><erratum last-modified="1232480208" id="rhn-erratum-7512" advisory-name="RHBA-2008:0786"/><erratum last-modified="1232471750" id="rhn-erratum-7513" advisory-name="RHBA-2008:0652"/><erratum last-modified="1232480208" id="rhn-erratum-7515" advisory-name="RHBA-2008:0644"/><erratum last-modified="1232480208" id="rhn-erratum-7516" advisory-name="RHBA-2008:0614"/><erratum last-modified="1218439900" id="rhn-erratum-7517" advisory-name="RHBA-2008:0829"/><erratum last-modified="1218474123" id="rhn-erratum-7518" advisory-name="RHSA-2008:0789"/><erratum last-modified="1218573097" id="rhn-erratum-7521" advisory-name="RHSA-2008:0818"/><erratum last-modified="1232480208" id="rhn-erratum-7527" advisory-name="RHBA-2008:0830"/><erratum last-modified="1232471959" id="rhn-erratum-7530" advisory-name="RHBA-2008:0809"/><erratum last-modified="1232480208" id="rhn-erratum-7531" advisory-name="RHBA-2008:0574"/><erratum last-modified="1218721404" id="rhn-erratum-7532" advisory-name="RHSA-2008:0815"/><erratum last-modified="1218742318" id="rhn-erratum-7533" advisory-name="RHSA-2008:0839"/><erratum last-modified="1219739888" id="rhn-erratum-7538" advisory-name="RHSA-2008:0836"/><erratum last-modified="1219407017" id="rhn-erratum-7539" advisory-name="RHSA-2008:0855"/><erratum last-modified="1219778653" id="rhn-erratum-7560" advisory-name="RHSA-2008:0849"/><erratum last-modified="1232469934" id="rhn-erratum-7562" advisory-name="RHBA-2008:0840"/><erratum last-modified="1232480208" id="rhn-erratum-7563" advisory-name="RHEA-2008:0838"/><erratum last-modified="1232480208" id="rhn-erratum-7564" advisory-name="RHBA-2008:0811"/><erratum last-modified="1232471170" id="rhn-erratum-7565" advisory-name="RHBA-2008:0631"/><erratum last-modified="1219857228" id="rhn-erratum-7568" advisory-name="RHSA-2008:0648"/><erratum last-modified="1219961566" id="rhn-erratum-7574" advisory-name="RHSA-2008:0847"/><erratum last-modified="1220439894" id="rhn-erratum-7578" advisory-name="RHEA-2008:0875"/><erratum last-modified="1220342177" id="rhn-erratum-7590" advisory-name="RHBA-2008:0639"/><erratum last-modified="1220380576" id="rhn-erratum-7591" advisory-name="RHBA-2008:0878"/><erratum last-modified="1232480208" id="rhn-erratum-7592" advisory-name="RHBA-2008:0266"/><erratum last-modified="1232471669" id="rhn-erratum-7593" advisory-name="RHBA-2008:0646"/><erratum last-modified="1232480208" id="rhn-erratum-7594" advisory-name="RHBA-2008:0844"/><erratum last-modified="1232480208" id="rhn-erratum-7595" advisory-name="RHBA-2008:0853"/><erratum last-modified="1232471607" id="rhn-erratum-7596" advisory-name="RHBA-2008:0866"/><erratum last-modified="1221141028" id="rhn-erratum-7607" advisory-name="RHSA-2008:0884"/><erratum last-modified="1221569125" id="rhn-erratum-7618" advisory-name="RHSA-2008:0893"/><erratum last-modified="1221666679" id="rhn-erratum-7619" advisory-name="RHBA-2008:0876"/><erratum last-modified="1232480208" id="rhn-erratum-7620" advisory-name="RHBA-2008:0881"/><erratum last-modified="1232480208" id="rhn-erratum-7621" advisory-name="RHBA-2008:0889"/><erratum last-modified="1222220548" id="rhn-erratum-7638" advisory-name="RHSA-2008:0879"/><erratum last-modified="1232472306" id="rhn-erratum-7640" advisory-name="RHBA-2008:0913"/><erratum last-modified="1232480208" id="rhn-erratum-7641" advisory-name="RHBA-2008:0931"/><erratum last-modified="1232480208" id="rhn-erratum-7642" advisory-name="RHBA-2008:0894"/><erratum last-modified="1222281827" id="rhn-erratum-7643" advisory-name="RHSA-2008:0885"/><erratum last-modified="1222371933" id="rhn-erratum-7646" advisory-name="RHBA-2008:0898"/><erratum last-modified="1222771548" id="rhn-erratum-7658" advisory-name="RHBA-2008:0933"/><erratum last-modified="1222875066" id="rhn-erratum-7659" advisory-name="RHSA-2008:0890"/><erratum last-modified="1222874832" id="rhn-erratum-7660" advisory-name="RHSA-2008:0892"/><erratum last-modified="1232480208" id="rhn-erratum-7662" advisory-name="RHBA-2008:0914"/><erratum last-modified="1222944761" id="rhn-erratum-7663" advisory-name="RHBA-2008:0647"/><erratum last-modified="1222951493" id="rhn-erratum-7664" advisory-name="RHBA-2008:0902"/><erratum last-modified="1222955994" id="rhn-erratum-7665" advisory-name="RHSA-2008:0907"/><erratum last-modified="1232480208" id="rhn-erratum-7704" advisory-name="RHBA-2008:0920"/><erratum last-modified="1232472272" id="rhn-erratum-7705" advisory-name="RHBA-2008:0912"/><erratum last-modified="1232472188" id="rhn-erratum-7707" advisory-name="RHBA-2008:0905"/><erratum last-modified="1232480208" id="rhn-erratum-7708" advisory-name="RHBA-2008:0899"/><erratum last-modified="1223471927" id="rhn-erratum-7710" advisory-name="RHEA-2008:0941"/><erratum last-modified="1223624846" id="rhn-erratum-7717" advisory-name="RHSA-2008:0937"/><erratum last-modified="1223912487" id="rhn-erratum-7719" advisory-name="RHBA-2008:0850"/><erratum last-modified="1224058340" id="rhn-erratum-7721" advisory-name="RHBA-2008:0909"/><erratum last-modified="1232480208" id="rhn-erratum-7725" advisory-name="RHBA-2008:0921"/><erratum last-modified="1232480208" id="rhn-erratum-7726" advisory-name="RHBA-2008:0917"/><erratum last-modified="1232480208" id="rhn-erratum-7727" advisory-name="RHBA-2008:0900"/><erratum last-modified="1232480208" id="rhn-erratum-7728" advisory-name="RHBA-2008:0845"/><erratum last-modified="1232472902" id="rhn-erratum-7738" advisory-name="RHBA-2008:0918"/><erratum last-modified="1224600759" id="rhn-erratum-7739" advisory-name="RHSA-2008:0897"/><erratum last-modified="1224602762" id="rhn-erratum-7742" advisory-name="RHSA-2008:0946"/><erratum last-modified="1225127389" id="rhn-erratum-7778" advisory-name="RHSA-2008:0965"/><erratum last-modified="1225723995" id="rhn-erratum-7799" advisory-name="RHSA-2008:0971"/><erratum last-modified="1226482482" id="rhn-erratum-7800" advisory-name="RHSA-2008:0957"/><erratum last-modified="1225826819" id="rhn-erratum-7801" advisory-name="RHBA-2008:0923"/><erratum last-modified="1225897383" id="rhn-erratum-7803" advisory-name="RHEA-2008:0969"/><erratum last-modified="1225907418" id="rhn-erratum-7805" advisory-name="RHBA-2008:0947"/><erratum last-modified="1225910118" id="rhn-erratum-7806" advisory-name="RHBA-2008:0956"/><erratum last-modified="1226428000" id="rhn-erratum-7820" advisory-name="RHSA-2008:0967"/><erratum last-modified="1226427998" id="rhn-erratum-7821" advisory-name="RHSA-2008:0982"/><erratum last-modified="1226542692" id="rhn-erratum-7828" advisory-name="RHSA-2008:0978"/><erratum last-modified="1226938556" id="rhn-erratum-7830" advisory-name="RHSA-2008:0988"/><erratum last-modified="1227602466" id="rhn-erratum-7863" advisory-name="RHSA-2008:0580"/><erratum last-modified="1227603932" id="rhn-erratum-7866" advisory-name="RHSA-2008:1001"/><erratum last-modified="1227605180" id="rhn-erratum-7867" advisory-name="RHBA-2008:0992"/><erratum last-modified="1227646521" id="rhn-erratum-7870" advisory-name="RHBA-2008:1009"/><erratum last-modified="1228132653" id="rhn-erratum-7879" advisory-name="RHBA-2008:0996"/><erratum last-modified="1228237181" id="rhn-erratum-7880" advisory-name="RHBA-2008:0962"/><erratum last-modified="1229103319" id="rhn-erratum-7901" advisory-name="RHSA-2008:0981"/><erratum last-modified="1228942168" id="rhn-erratum-7906" advisory-name="RHBA-2008:1030"/><erratum last-modified="1228992998" id="rhn-erratum-7918" advisory-name="RHBA-2008:0999"/><erratum last-modified="1229345508" id="rhn-erratum-7919" advisory-name="RHSA-2008:1016"/><erratum last-modified="1229347540" id="rhn-erratum-7922" advisory-name="RHSA-2008:1029"/><erratum last-modified="1229481511" id="rhn-erratum-7924" advisory-name="RHSA-2008:1017"/><erratum last-modified="1229477477" id="rhn-erratum-7926" advisory-name="RHSA-2008:1036"/><erratum last-modified="1231324405" id="rhn-erratum-7959" advisory-name="RHSA-2009:0003"/><erratum last-modified="1231326579" id="rhn-erratum-7961" advisory-name="RHSA-2009:0018"/><erratum last-modified="1231334838" id="rhn-erratum-7962" advisory-name="RHSA-2009:0004"/><erratum last-modified="1231335043" id="rhn-erratum-7963" advisory-name="RHSA-2009:0008"/><erratum last-modified="1231335537" id="rhn-erratum-7964" advisory-name="RHSA-2009:0011"/><erratum last-modified="1231439171" id="rhn-erratum-7979" advisory-name="RHSA-2009:0020"/><erratum last-modified="1231750715" id="rhn-erratum-7980" advisory-name="RHBA-2008:1034"/><erratum last-modified="1231769347" id="rhn-erratum-7981" advisory-name="RHSA-2009:0013"/><erratum last-modified="1231770400" id="rhn-erratum-7982" advisory-name="RHSA-2009:0010"/><erratum last-modified="1232399801" id="rhn-erratum-8007" advisory-name="RHSA-2009:0057"/><erratum last-modified="1232459797" id="rhn-erratum-8008" advisory-name="RHBA-2009:0056"/><erratum last-modified="1232480208" id="rhn-erratum-8009" advisory-name="RHBA-2009:0058"/><erratum last-modified="1232480208" id="rhn-erratum-8011" advisory-name="RHBA-2009:0060"/><erratum last-modified="1232480208" id="rhn-erratum-8012" advisory-name="RHBA-2009:0062"/><erratum last-modified="1232480208" id="rhn-erratum-8013" advisory-name="RHEA-2009:0063"/><erratum last-modified="1232480208" id="rhn-erratum-8016" advisory-name="RHBA-2009:0066"/><erratum last-modified="1232480208" id="rhn-erratum-8017" advisory-name="RHBA-2009:0067"/><erratum last-modified="1232480208" id="rhn-erratum-8018" advisory-name="RHBA-2009:0068"/><erratum last-modified="1232480208" id="rhn-erratum-8019" advisory-name="RHBA-2009:0069"/><erratum last-modified="1232480208" id="rhn-erratum-8020" advisory-name="RHBA-2009:0070"/><erratum last-modified="1232480208" id="rhn-erratum-8021" advisory-name="RHBA-2009:0071"/><erratum last-modified="1232480208" id="rhn-erratum-8022" advisory-name="RHBA-2009:0072"/><erratum last-modified="1232480208" id="rhn-erratum-8023" advisory-name="RHBA-2009:0073"/><erratum last-modified="1232480208" id="rhn-erratum-8024" advisory-name="RHBA-2009:0074"/><erratum last-modified="1232480208" id="rhn-erratum-8025" advisory-name="RHEA-2009:0075"/><erratum last-modified="1232480208" id="rhn-erratum-8026" advisory-name="RHBA-2009:0076"/><erratum last-modified="1232480208" id="rhn-erratum-8027" advisory-name="RHEA-2009:0077"/><erratum last-modified="1232480208" id="rhn-erratum-8028" advisory-name="RHEA-2009:0078"/><erratum last-modified="1232480208" id="rhn-erratum-8029" advisory-name="RHBA-2009:0079"/><erratum last-modified="1232480208" id="rhn-erratum-8030" advisory-name="RHBA-2009:0080"/><erratum last-modified="1232480208" id="rhn-erratum-8031" advisory-name="RHBA-2009:0082"/><erratum last-modified="1232480208" id="rhn-erratum-8032" advisory-name="RHEA-2009:0083"/><erratum last-modified="1232480208" id="rhn-erratum-8033" advisory-name="RHBA-2009:0084"/><erratum last-modified="1232480208" id="rhn-erratum-8034" advisory-name="RHBA-2009:0085"/><erratum last-modified="1232480208" id="rhn-erratum-8036" advisory-name="RHBA-2009:0087"/><erratum last-modified="1232480208" id="rhn-erratum-8037" advisory-name="RHBA-2009:0088"/><erratum last-modified="1232480208" id="rhn-erratum-8038" advisory-name="RHEA-2009:0089"/><erratum last-modified="1232480208" id="rhn-erratum-8039" advisory-name="RHBA-2009:0090"/><erratum last-modified="1232480208" id="rhn-erratum-8040" advisory-name="RHBA-2009:0091"/><erratum last-modified="1232480208" id="rhn-erratum-8041" advisory-name="RHEA-2009:0092"/><erratum last-modified="1232480208" id="rhn-erratum-8042" advisory-name="RHBA-2009:0093"/><erratum last-modified="1232480208" id="rhn-erratum-8043" advisory-name="RHBA-2009:0094"/><erratum last-modified="1232480208" id="rhn-erratum-8045" advisory-name="RHEA-2009:0096"/><erratum last-modified="1232480208" id="rhn-erratum-8046" advisory-name="RHEA-2009:0097"/><erratum last-modified="1232480208" id="rhn-erratum-8047" advisory-name="RHEA-2009:0098"/><erratum last-modified="1232480208" id="rhn-erratum-8052" advisory-name="RHBA-2009:0103"/><erratum last-modified="1232480208" id="rhn-erratum-8054" advisory-name="RHBA-2009:0105"/><erratum last-modified="1232480208" id="rhn-erratum-8055" advisory-name="RHEA-2009:0106"/><erratum last-modified="1232480208" id="rhn-erratum-8056" advisory-name="RHBA-2009:0107"/><erratum last-modified="1232480208" id="rhn-erratum-8057" advisory-name="RHEA-2009:0108"/><erratum last-modified="1232480208" id="rhn-erratum-8058" advisory-name="RHBA-2009:0109"/><erratum last-modified="1232480208" id="rhn-erratum-8059" advisory-name="RHBA-2009:0110"/><erratum last-modified="1232480208" id="rhn-erratum-8060" advisory-name="RHBA-2009:0111"/><erratum last-modified="1232480208" id="rhn-erratum-8061" advisory-name="RHBA-2009:0112"/><erratum last-modified="1232480208" id="rhn-erratum-8062" advisory-name="RHBA-2009:0113"/><erratum last-modified="1232480208" id="rhn-erratum-8063" advisory-name="RHBA-2009:0114"/><erratum last-modified="1232480208" id="rhn-erratum-8064" advisory-name="RHBA-2009:0115"/><erratum last-modified="1232480208" id="rhn-erratum-8065" advisory-name="RHBA-2009:0116"/><erratum last-modified="1232480208" id="rhn-erratum-8066" advisory-name="RHBA-2009:0117"/><erratum last-modified="1232480224" id="rhn-erratum-8067" advisory-name="RHBA-2009:0118"/><erratum last-modified="1232480208" id="rhn-erratum-8068" advisory-name="RHBA-2009:0119"/><erratum last-modified="1232480208" id="rhn-erratum-8069" advisory-name="RHBA-2009:0120"/><erratum last-modified="1232480208" id="rhn-erratum-8070" advisory-name="RHEA-2009:0123"/><erratum last-modified="1232480208" id="rhn-erratum-8072" advisory-name="RHEA-2009:0124"/><erratum last-modified="1232480208" id="rhn-erratum-8073" advisory-name="RHBA-2009:0125"/><erratum last-modified="1232480208" id="rhn-erratum-8074" advisory-name="RHBA-2009:0126"/><erratum last-modified="1232480208" id="rhn-erratum-8075" advisory-name="RHBA-2009:0127"/><erratum last-modified="1232480208" id="rhn-erratum-8076" advisory-name="RHBA-2009:0128"/><erratum last-modified="1232480208" id="rhn-erratum-8077" advisory-name="RHBA-2009:0130"/><erratum last-modified="1232480208" id="rhn-erratum-8078" advisory-name="RHBA-2009:0131"/><erratum last-modified="1232480208" id="rhn-erratum-8080" advisory-name="RHEA-2009:0133"/><erratum last-modified="1232480208" id="rhn-erratum-8081" advisory-name="RHBA-2009:0134"/><erratum last-modified="1232480208" id="rhn-erratum-8082" advisory-name="RHBA-2009:0135"/><erratum last-modified="1232480208" id="rhn-erratum-8083" advisory-name="RHBA-2009:0136"/><erratum last-modified="1232480208" id="rhn-erratum-8085" advisory-name="RHBA-2009:0138"/><erratum last-modified="1232480208" id="rhn-erratum-8086" advisory-name="RHBA-2009:0139"/><erratum last-modified="1232480208" id="rhn-erratum-8090" advisory-name="RHBA-2009:0143"/><erratum last-modified="1232480208" id="rhn-erratum-8091" advisory-name="RHBA-2009:0144"/><erratum last-modified="1232480208" id="rhn-erratum-8092" advisory-name="RHBA-2009:0145"/><erratum last-modified="1232480208" id="rhn-erratum-8093" advisory-name="RHBA-2009:0146"/><erratum last-modified="1232480208" id="rhn-erratum-8094" advisory-name="RHBA-2009:0147"/><erratum last-modified="1232480208" id="rhn-erratum-8095" advisory-name="RHBA-2009:0148"/><erratum last-modified="1232480208" id="rhn-erratum-8096" advisory-name="RHBA-2009:0149"/><erratum last-modified="1232480208" id="rhn-erratum-8098" advisory-name="RHEA-2009:0151"/><erratum last-modified="1232480208" id="rhn-erratum-8099" advisory-name="RHEA-2009:0152"/><erratum last-modified="1232480208" id="rhn-erratum-8100" advisory-name="RHEA-2009:0153"/><erratum last-modified="1232480208" id="rhn-erratum-8101" advisory-name="RHEA-2009:0154"/><erratum last-modified="1232480208" id="rhn-erratum-8103" advisory-name="RHBA-2009:0156"/><erratum last-modified="1232480208" id="rhn-erratum-8104" advisory-name="RHBA-2009:0157"/><erratum last-modified="1232480208" id="rhn-erratum-8107" advisory-name="RHEA-2009:0160"/><erratum last-modified="1232480208" id="rhn-erratum-8108" advisory-name="RHEA-2009:0161"/><erratum last-modified="1232480208" id="rhn-erratum-8109" advisory-name="RHBA-2009:0162"/><erratum last-modified="1232480208" id="rhn-erratum-8110" advisory-name="RHBA-2009:0163"/><erratum last-modified="1232480208" id="rhn-erratum-8111" advisory-name="RHBA-2009:0164"/><erratum last-modified="1232480208" id="rhn-erratum-8112" advisory-name="RHBA-2009:0165"/><erratum last-modified="1232480208" id="rhn-erratum-8113" advisory-name="RHEA-2009:0166"/><erratum last-modified="1232480208" id="rhn-erratum-8114" advisory-name="RHBA-2009:0167"/><erratum last-modified="1232480208" id="rhn-erratum-8115" advisory-name="RHBA-2009:0168"/><erratum last-modified="1232480208" id="rhn-erratum-8116" advisory-name="RHBA-2009:0170"/><erratum last-modified="1232480208" id="rhn-erratum-8117" advisory-name="RHBA-2009:0171"/><erratum last-modified="1232480208" id="rhn-erratum-8118" advisory-name="RHBA-2009:0172"/><erratum last-modified="1232480208" id="rhn-erratum-8119" advisory-name="RHBA-2009:0173"/><erratum last-modified="1232480208" id="rhn-erratum-8120" advisory-name="RHEA-2009:0174"/><erratum last-modified="1232480208" id="rhn-erratum-8121" advisory-name="RHBA-2009:0175"/><erratum last-modified="1232480208" id="rhn-erratum-8122" advisory-name="RHBA-2009:0176"/><erratum last-modified="1232480208" id="rhn-erratum-8124" advisory-name="RHBA-2009:0178"/><erratum last-modified="1232480208" id="rhn-erratum-8125" advisory-name="RHBA-2009:0179"/><erratum last-modified="1232480208" id="rhn-erratum-8126" advisory-name="RHBA-2009:0180"/><erratum last-modified="1232480208" id="rhn-erratum-8127" advisory-name="RHBA-2009:0181"/><erratum last-modified="1232480208" id="rhn-erratum-8128" advisory-name="RHBA-2009:0182"/><erratum last-modified="1232480208" id="rhn-erratum-8129" advisory-name="RHEA-2009:0183"/><erratum last-modified="1232480208" id="rhn-erratum-8130" advisory-name="RHEA-2009:0184"/><erratum last-modified="1232480208" id="rhn-erratum-8131" advisory-name="RHBA-2009:0186"/><erratum last-modified="1232480208" id="rhn-erratum-8132" advisory-name="RHEA-2009:0187"/><erratum last-modified="1232480208" id="rhn-erratum-8134" advisory-name="RHBA-2009:0189"/><erratum last-modified="1232480208" id="rhn-erratum-8135" advisory-name="RHEA-2009:0190"/><erratum last-modified="1232480208" id="rhn-erratum-8136" advisory-name="RHEA-2009:0191"/><erratum last-modified="1232480208" id="rhn-erratum-8137" advisory-name="RHEA-2009:0192"/><erratum last-modified="1232480208" id="rhn-erratum-8138" advisory-name="RHBA-2009:0193"/><erratum last-modified="1232480208" id="rhn-erratum-8139" advisory-name="RHEA-2009:0194"/><erratum last-modified="1232480208" id="rhn-erratum-8140" advisory-name="RHBA-2009:0195"/><erratum last-modified="1232480208" id="rhn-erratum-8142" advisory-name="RHEA-2009:0197"/><erratum last-modified="1232480208" id="rhn-erratum-8143" advisory-name="RHBA-2009:0198"/><erratum last-modified="1232480208" id="rhn-erratum-8144" advisory-name="RHEA-2009:0199"/><erratum last-modified="1232480208" id="rhn-erratum-8145" advisory-name="RHBA-2009:0200"/><erratum last-modified="1232480208" id="rhn-erratum-8146" advisory-name="RHEA-2009:0201"/><erratum last-modified="1232480208" id="rhn-erratum-8147" advisory-name="RHBA-2009:0202"/><erratum last-modified="1232480208" id="rhn-erratum-8148" advisory-name="RHBA-2009:0203"/><erratum last-modified="1232480208" id="rhn-erratum-8149" advisory-name="RHBA-2009:0204"/><erratum last-modified="1232479510" id="rhn-erratum-8150" advisory-name="RHSA-2009:0205"/><erratum last-modified="1232480208" id="rhn-erratum-8151" advisory-name="RHBA-2009:0206"/><erratum last-modified="1232480208" id="rhn-erratum-8152" advisory-name="RHBA-2009:0207"/><erratum last-modified="1232480208" id="rhn-erratum-8153" advisory-name="RHBA-2009:0208"/><erratum last-modified="1232480208" id="rhn-erratum-8154" advisory-name="RHBA-2009:0209"/><erratum last-modified="1232480208" id="rhn-erratum-8155" advisory-name="RHBA-2009:0210"/><erratum last-modified="1232480208" id="rhn-erratum-8156" advisory-name="RHEA-2009:0211"/><erratum last-modified="1232480208" id="rhn-erratum-8157" advisory-name="RHEA-2009:0212"/><erratum last-modified="1232480208" id="rhn-erratum-8158" advisory-name="RHBA-2009:0213"/><erratum last-modified="1232480208" id="rhn-erratum-8159" advisory-name="RHBA-2009:0214"/><erratum last-modified="1232480208" id="rhn-erratum-8162" advisory-name="RHEA-2009:0217"/><erratum last-modified="1232480208" id="rhn-erratum-8163" advisory-name="RHEA-2009:0218"/><erratum last-modified="1232480208" id="rhn-erratum-8164" advisory-name="RHBA-2009:0220"/><erratum last-modified="1232480208" id="rhn-erratum-8165" advisory-name="RHBA-2009:0221"/><erratum last-modified="1232480208" id="rhn-erratum-8166" advisory-name="RHBA-2009:0222"/><erratum last-modified="1232480208" id="rhn-erratum-8167" advisory-name="RHBA-2009:0224"/><erratum last-modified="1232659228" id="rhn-erratum-8168" advisory-name="RHSA-2009:0225"/><erratum last-modified="1232480208" id="rhn-erratum-8169" advisory-name="RHBA-2009:0226"/><erratum last-modified="1232480208" id="rhn-erratum-8170" advisory-name="RHBA-2009:0227"/><erratum last-modified="1232480208" id="rhn-erratum-8171" advisory-name="RHBA-2009:0228"/><erratum last-modified="1232480208" id="rhn-erratum-8172" advisory-name="RHBA-2009:0229"/><erratum last-modified="1232480208" id="rhn-erratum-8173" advisory-name="RHBA-2009:0230"/><erratum last-modified="1232480208" id="rhn-erratum-8174" advisory-name="RHBA-2009:0231"/><erratum last-modified="1232480208" id="rhn-erratum-8175" advisory-name="RHEA-2009:0232"/><erratum last-modified="1232480208" id="rhn-erratum-8176" advisory-name="RHBA-2009:0233"/><erratum last-modified="1232480208" id="rhn-erratum-8177" advisory-name="RHBA-2009:0234"/><erratum last-modified="1232480208" id="rhn-erratum-8178" advisory-name="RHEA-2009:0235"/><erratum last-modified="1232480208" id="rhn-erratum-8179" advisory-name="RHEA-2009:0236"/><erratum last-modified="1232480208" id="rhn-erratum-8180" advisory-name="RHBA-2009:0237"/><erratum last-modified="1232480208" id="rhn-erratum-8182" advisory-name="RHBA-2009:0239"/><erratum last-modified="1232480208" id="rhn-erratum-8183" advisory-name="RHBA-2009:0240"/><erratum last-modified="1232480208" id="rhn-erratum-8184" advisory-name="RHBA-2009:0241"/><erratum last-modified="1232480208" id="rhn-erratum-8185" advisory-name="RHBA-2009:0242"/><erratum last-modified="1232480208" id="rhn-erratum-8187" advisory-name="RHBA-2009:0245"/><erratum last-modified="1232480208" id="rhn-erratum-8188" advisory-name="RHBA-2009:0246"/><erratum last-modified="1232480208" id="rhn-erratum-8189" advisory-name="RHBA-2009:0247"/><erratum last-modified="1232480208" id="rhn-erratum-8190" advisory-name="RHBA-2009:0248"/><erratum last-modified="1232480208" id="rhn-erratum-8191" advisory-name="RHBA-2009:0249"/><erratum last-modified="1232480208" id="rhn-erratum-8192" advisory-name="RHBA-2009:0250"/><erratum last-modified="1232470005" id="rhn-erratum-8193" advisory-name="RHBA-2009:0252"/><erratum last-modified="1232480208" id="rhn-erratum-8194" advisory-name="RHBA-2009:0185"/><erratum last-modified="1232495455" id="rhn-erratum-8195" advisory-name="RHBA-2009:0169"/><erratum last-modified="1232497996" id="rhn-erratum-8203" advisory-name="RHBA-2009:0017"/><erratum last-modified="1232503970" id="rhn-erratum-8204" advisory-name="RHBA-2009:0048"/><erratum last-modified="1232495619" id="rhn-erratum-8205" advisory-name="RHBA-2009:0049"/><erratum last-modified="1233222316" id="rhn-erratum-8243" advisory-name="RHSA-2009:0046"/><erratum last-modified="1233737974" id="rhn-erratum-8266" advisory-name="RHSA-2009:0256"/><erratum last-modified="1233849544" id="rhn-erratum-8276" advisory-name="RHSA-2009:0267"/><erratum last-modified="1233925487" id="rhn-erratum-8279" advisory-name="RHSA-2009:0271"/><erratum last-modified="1234281035" id="rhn-erratum-8283" advisory-name="RHSA-2009:0264"/><erratum last-modified="1251890453" id="rhn-erratum-8284" advisory-name="RHBA-2009:0276"/><erratum last-modified="1251890602" id="rhn-erratum-8285" advisory-name="RHBA-2009:0277"/><erratum last-modified="1251890770" id="rhn-erratum-8286" advisory-name="RHBA-2009:0279"/><erratum last-modified="1234371093" id="rhn-erratum-8288" advisory-name="RHSA-2009:0012"/><erratum last-modified="1234371489" id="rhn-erratum-8289" advisory-name="RHSA-2009:0259"/><erratum last-modified="1234374733" id="rhn-erratum-8291" advisory-name="RHSA-2009:0261"/><erratum last-modified="1251891421" id="rhn-erratum-8301" advisory-name="RHBA-2009:0294"/><erratum last-modified="1234975480" id="rhn-erratum-8304" advisory-name="RHBA-2009:0309"/><erratum last-modified="1235513125" id="rhn-erratum-8319" advisory-name="RHBA-2009:0280"/><erratum last-modified="1235749692" id="rhn-erratum-8325" advisory-name="RHBA-2009:0283"/><erratum last-modified="1236194593" id="rhn-erratum-8327" advisory-name="RHSA-2009:0313"/><erratum last-modified="1236196706" id="rhn-erratum-8328" advisory-name="RHSA-2009:0333"/><erratum last-modified="1236211859" id="rhn-erratum-8330" advisory-name="RHSA-2009:0315"/><erratum last-modified="1251891574" id="rhn-erratum-8338" advisory-name="RHBA-2009:0305"/><erratum last-modified="1251891276" id="rhn-erratum-8339" advisory-name="RHBA-2009:0291"/><erratum last-modified="1236867191" id="rhn-erratum-8358" advisory-name="RHSA-2009:0296"/><erratum last-modified="1237211621" id="rhn-erratum-8362" advisory-name="RHSA-2009:0344"/><erratum last-modified="1237212400" id="rhn-erratum-8363" advisory-name="RHSA-2009:0354"/><erratum last-modified="1251892651" id="rhn-erratum-8378" advisory-name="RHBA-2009:0378"/><erratum last-modified="1251901881" id="rhn-erratum-8379" advisory-name="RHBA-2009:0379"/><erratum last-modified="1251892890" id="rhn-erratum-8380" advisory-name="RHBA-2009:0380"/><erratum last-modified="1237475158" id="rhn-erratum-8382" advisory-name="RHSA-2009:0339"/><erratum last-modified="1237476611" id="rhn-erratum-8383" advisory-name="RHSA-2009:0341"/><erratum last-modified="1237478023" id="rhn-erratum-8384" advisory-name="RHSA-2009:0345"/><erratum last-modified="1237896260" id="rhn-erratum-8399" advisory-name="RHSA-2009:0336"/><erratum last-modified="1251892784" id="rhn-erratum-8400" advisory-name="RHBA-2009:0389"/><erratum last-modified="1251891869" id="rhn-erratum-8401" advisory-name="RHBA-2009:0390"/><erratum last-modified="1237989484" id="rhn-erratum-8403" advisory-name="RHSA-2009:0361"/><erratum last-modified="1238083248" id="rhn-erratum-8409" advisory-name="RHSA-2009:0373"/><erratum last-modified="1238196859" id="rhn-erratum-8423" advisory-name="RHSA-2009:0397"/><erratum last-modified="1238423623" id="rhn-erratum-8424" advisory-name="RHBA-2009:0401"/><erratum last-modified="1238431951" id="rhn-erratum-8425" advisory-name="RHSA-2009:0402"/><erratum last-modified="1238488903" id="rhn-erratum-8426" advisory-name="RHEA-2009:0403"/><erratum last-modified="1238574216" id="rhn-erratum-8427" advisory-name="RHSA-2009:0326"/><erratum last-modified="1251893018" id="rhn-erratum-8428" advisory-name="RHBA-2009:0404"/><erratum last-modified="1251901555" id="rhn-erratum-8429" advisory-name="RHBA-2009:0405"/><erratum last-modified="1238684368" id="rhn-erratum-8431" advisory-name="RHBA-2009:0406"/><erratum last-modified="1239035514" id="rhn-erratum-8437" advisory-name="RHSA-2009:0352"/><erratum last-modified="1239035685" id="rhn-erratum-8438" advisory-name="RHSA-2009:0338"/><erratum last-modified="1239129395" id="rhn-erratum-8440" advisory-name="RHSA-2009:0377"/><erratum last-modified="1239129589" id="rhn-erratum-8441" advisory-name="RHSA-2009:0408"/><erratum last-modified="1239131002" id="rhn-erratum-8444" advisory-name="RHSA-2009:0411"/><erratum last-modified="1251893998" id="rhn-erratum-8445" advisory-name="RHBA-2009:0412"/><erratum last-modified="1251893770" id="rhn-erratum-8446" advisory-name="RHBA-2009:0413"/><erratum last-modified="1251893573" id="rhn-erratum-8447" advisory-name="RHBA-2009:0414"/><erratum last-modified="1239307344" id="rhn-erratum-8449" advisory-name="RHBA-2009:0416"/><erratum last-modified="1239307510" id="rhn-erratum-8450" advisory-name="RHBA-2009:0417"/><erratum last-modified="1239307689" id="rhn-erratum-8451" advisory-name="RHBA-2009:0418"/><erratum last-modified="1239731641" id="rhn-erratum-8461" advisory-name="RHSA-2009:0421"/><erratum last-modified="1239788525" id="rhn-erratum-8462" advisory-name="RHEA-2009:0422"/><erratum last-modified="1251894185" id="rhn-erratum-8463" advisory-name="RHBA-2009:0423"/><erratum last-modified="1251893153" id="rhn-erratum-8464" advisory-name="RHBA-2009:0424"/><erratum last-modified="1251892498" id="rhn-erratum-8465" advisory-name="RHBA-2009:0425"/><erratum last-modified="1251892034" id="rhn-erratum-8466" advisory-name="RHBA-2009:0426"/><erratum last-modified="1239910537" id="rhn-erratum-8467" advisory-name="RHSA-2009:0427"/><erratum last-modified="1239919907" id="rhn-erratum-8469" advisory-name="RHSA-2009:0429"/><erratum last-modified="1239975414" id="rhn-erratum-8472" advisory-name="RHBA-2009:0432"/><erratum last-modified="1240364412" id="rhn-erratum-8476" advisory-name="RHSA-2009:0436"/><erratum last-modified="1251895891" id="rhn-erratum-8477" advisory-name="RHBA-2009:0438"/><erratum last-modified="1251895717" id="rhn-erratum-8478" advisory-name="RHBA-2009:0439"/><erratum last-modified="1251895285" id="rhn-erratum-8479" advisory-name="RHBA-2009:0440"/><erratum last-modified="1251894684" id="rhn-erratum-8480" advisory-name="RHBA-2009:0441"/><erratum last-modified="1251894498" id="rhn-erratum-8481" advisory-name="RHBA-2009:0442"/><erratum last-modified="1240405100" id="rhn-erratum-8482" advisory-name="RHBA-2009:0443"/><erratum last-modified="1240421850" id="rhn-erratum-8483" advisory-name="RHSA-2009:0444"/><erratum last-modified="1240866192" id="rhn-erratum-8521" advisory-name="RHSA-2009:0449"/><erratum last-modified="1251897739" id="rhn-erratum-8524" advisory-name="RHBA-2009:0452"/><erratum last-modified="1251895441" id="rhn-erratum-8525" advisory-name="RHBA-2009:0453"/><erratum last-modified="1241095601" id="rhn-erratum-8528" advisory-name="RHBA-2009:0456"/><erratum last-modified="1241124168" id="rhn-erratum-8529" advisory-name="RHSA-2009:0457"/><erratum last-modified="1241606946" id="rhn-erratum-8538" advisory-name="RHBA-2009:0461"/><erratum last-modified="1251896232" id="rhn-erratum-8539" advisory-name="RHBA-2009:0462"/><erratum last-modified="1251896081" id="rhn-erratum-8540" advisory-name="RHBA-2009:0463"/><erratum last-modified="1251895131" id="rhn-erratum-8542" advisory-name="RHBA-2009:0465"/><erratum last-modified="1241689947" id="rhn-erratum-8543" advisory-name="RHBA-2009:0467"/><erratum last-modified="1241693590" id="rhn-erratum-8549" advisory-name="RHSA-2009:0473"/><erratum last-modified="1241697393" id="rhn-erratum-8551" advisory-name="RHSA-2009:0474"/><erratum last-modified="1241698624" id="rhn-erratum-8552" advisory-name="RHBA-2009:0475"/><erratum last-modified="1241774754" id="rhn-erratum-8558" advisory-name="RHSA-2009:0476"/><erratum last-modified="1241804814" id="rhn-erratum-8559" advisory-name="RHBA-2009:0477"/><erratum last-modified="1242224830" id="rhn-erratum-8561" advisory-name="RHSA-2009:0479"/><erratum last-modified="1242225153" id="rhn-erratum-8562" advisory-name="RHSA-2009:0480"/><erratum last-modified="1251902269" id="rhn-erratum-8563" advisory-name="RHBA-2009:0481"/><erratum last-modified="1251896851" id="rhn-erratum-8564" advisory-name="RHBA-2009:0482"/><erratum last-modified="1251896558" id="rhn-erratum-8565" advisory-name="RHBA-2009:0483"/><erratum last-modified="1251894347" id="rhn-erratum-8566" advisory-name="RHBA-2009:0484"/><erratum last-modified="1242677390" id="rhn-erratum-8671" advisory-name="RHSA-2009:1036"/><erratum last-modified="1242678906" id="rhn-erratum-8673" advisory-name="RHSA-2009:1039"/><erratum last-modified="1251898985" id="rhn-erratum-8690" advisory-name="RHBA-2009:1056"/><erratum last-modified="1242993962" id="rhn-erratum-8703" advisory-name="RHSA-2009:1061"/><erratum last-modified="1243358818" id="rhn-erratum-8724" advisory-name="RHSA-2009:1066"/><erratum last-modified="1243411642" id="rhn-erratum-8725" advisory-name="RHBA-2009:1068"/><erratum last-modified="1243412316" id="rhn-erratum-8726" advisory-name="RHBA-2009:1069"/><erratum last-modified="1251902639" id="rhn-erratum-8727" advisory-name="RHBA-2009:1070"/><erratum last-modified="1251902447" id="rhn-erratum-8728" advisory-name="RHBA-2009:1071"/><erratum last-modified="1251899735" id="rhn-erratum-8729" advisory-name="RHBA-2009:1072"/><erratum last-modified="1251898792" id="rhn-erratum-8730" advisory-name="RHEA-2009:1073"/><erratum last-modified="1251898432" id="rhn-erratum-8731" advisory-name="RHBA-2009:1074"/><erratum last-modified="1243433945" id="rhn-erratum-8732" advisory-name="RHSA-2009:1075"/><erratum last-modified="1251899215" id="rhn-erratum-8742" advisory-name="RHBA-2009:1078"/><erratum last-modified="1251896388" id="rhn-erratum-8743" advisory-name="RHBA-2009:1079"/><erratum last-modified="1251894855" id="rhn-erratum-8744" advisory-name="RHBA-2009:1080"/><erratum last-modified="1244043269" id="rhn-erratum-8745" advisory-name="RHSA-2009:1082"/><erratum last-modified="1251902372" id="rhn-erratum-8765" advisory-name="RHBA-2009:1089"/><erratum last-modified="1251898633" id="rhn-erratum-8766" advisory-name="RHBA-2009:1090"/><erratum last-modified="1244712708" id="rhn-erratum-8769" advisory-name="RHBA-2009:1092"/><erratum last-modified="1244760082" id="rhn-erratum-8772" advisory-name="RHSA-2009:1095"/><erratum last-modified="1245049997" id="rhn-erratum-8776" advisory-name="RHBA-2009:1099"/><erratum last-modified="1245098247" id="rhn-erratum-8777" advisory-name="RHSA-2009:1100"/><erratum last-modified="1245099386" id="rhn-erratum-8778" advisory-name="RHBA-2009:1088"/><erratum last-modified="1245100252" id="rhn-erratum-8780" advisory-name="RHSA-2009:1102"/><erratum last-modified="1245137587" id="rhn-erratum-8781" advisory-name="RHBA-2009:1103"/><erratum last-modified="1245157126" id="rhn-erratum-8782" advisory-name="RHBA-2009:1104"/><erratum last-modified="1245169236" id="rhn-erratum-8783" advisory-name="RHEA-2009:1105"/><erratum last-modified="1245191652" id="rhn-erratum-8784" advisory-name="RHSA-2009:1106"/><erratum last-modified="1245188970" id="rhn-erratum-8785" advisory-name="RHSA-2009:1107"/><erratum last-modified="1251898283" id="rhn-erratum-8788" advisory-name="RHBA-2009:1110"/><erratum last-modified="1251898086" id="rhn-erratum-8789" advisory-name="RHBA-2009:1111"/><erratum last-modified="1251897375" id="rhn-erratum-8790" advisory-name="RHBA-2009:1112"/><erratum last-modified="1251893281" id="rhn-erratum-8791" advisory-name="RHBA-2009:1113"/><erratum last-modified="1245345978" id="rhn-erratum-8794" advisory-name="RHSA-2009:1116"/><erratum last-modified="1251903394" id="rhn-erratum-8796" advisory-name="RHBA-2009:1117"/><erratum last-modified="1251904193" id="rhn-erratum-8797" advisory-name="RHBA-2009:1118"/><erratum last-modified="1251901978" id="rhn-erratum-8798" advisory-name="RHBA-2009:1119"/><erratum last-modified="1251897187" id="rhn-erratum-8799" advisory-name="RHBA-2009:1120"/><erratum last-modified="1251896704" id="rhn-erratum-8800" advisory-name="RHEA-2009:1121"/><erratum last-modified="1245938790" id="rhn-erratum-8816" advisory-name="RHSA-2009:1122"/><erratum last-modified="1245939212" id="rhn-erratum-8817" advisory-name="RHSA-2009:1123"/><erratum last-modified="1245948118" id="rhn-erratum-8821" advisory-name="RHSA-2009:1127"/><erratum last-modified="1246018455" id="rhn-erratum-8836" advisory-name="RHBA-2009:1131"/><erratum last-modified="1246351025" id="rhn-erratum-8838" advisory-name="RHBA-2009:1133"/><erratum last-modified="1246531095" id="rhn-erratum-8856" advisory-name="RHBA-2009:1137"/><erratum last-modified="1246546970" id="rhn-erratum-8857" advisory-name="RHSA-2009:1138"/><erratum last-modified="1246554217" id="rhn-erratum-8859" advisory-name="RHSA-2009:1140"/><erratum last-modified="1246606281" id="rhn-erratum-8861" advisory-name="RHBA-2009:1142"/><erratum last-modified="1247155814" id="rhn-erratum-8883" advisory-name="RHSA-2009:1148"/><erratum last-modified="1247238297" id="rhn-erratum-8885" advisory-name="RHBA-2009:1150"/><erratum last-modified="1247562642" id="rhn-erratum-8886" advisory-name="RHBA-2009:1151"/><erratum last-modified="1247772613" id="rhn-erratum-8895" advisory-name="RHSA-2009:1159"/><erratum last-modified="1248075024" id="rhn-erratum-8897" advisory-name="RHBA-2009:1161"/><erratum last-modified="1248209788" id="rhn-erratum-8898" advisory-name="RHSA-2009:1164"/><erratum last-modified="1248225956" id="rhn-erratum-8899" advisory-name="RHSA-2009:1162"/><erratum last-modified="1248247063" id="rhn-erratum-8901" advisory-name="RHBA-2009:1165"/><erratum last-modified="1248686569" id="rhn-erratum-8912" advisory-name="RHSA-2009:1176"/><erratum last-modified="1248908176" id="rhn-erratum-8915" advisory-name="RHSA-2009:1179"/><erratum last-modified="1248992401" id="rhn-erratum-8923" advisory-name="RHSA-2009:1186"/><erratum last-modified="1249284929" id="rhn-erratum-8927" advisory-name="RHBA-2009:1191"/><erratum last-modified="1249285235" id="rhn-erratum-8928" advisory-name="RHBA-2009:1192"/><erratum last-modified="1249391447" id="rhn-erratum-8929" advisory-name="RHSA-2009:1193"/><erratum last-modified="1249593283" id="rhn-erratum-8936" advisory-name="RHSA-2009:1201"/><erratum last-modified="1249635208" id="rhn-erratum-8938" advisory-name="RHBA-2009:1202"/><erratum last-modified="1249923570" id="rhn-erratum-8939" advisory-name="RHSA-2009:1203"/><erratum last-modified="1249924960" id="rhn-erratum-8940" advisory-name="RHSA-2009:1204"/><erratum last-modified="1249928065" id="rhn-erratum-8942" advisory-name="RHSA-2009:1206"/><erratum last-modified="1250174015" id="rhn-erratum-8946" advisory-name="RHSA-2009:1209"/><erratum last-modified="1250515305" id="rhn-erratum-8960" advisory-name="RHEA-2009:1214"/><erratum last-modified="1250587186" id="rhn-erratum-8961" advisory-name="RHBA-2009:1215"/><erratum last-modified="1250619786" id="rhn-erratum-8965" advisory-name="RHSA-2009:1219"/><erratum last-modified="1251112218" id="rhn-erratum-8968" advisory-name="RHSA-2009:1222"/><erratum last-modified="1251298026" id="rhn-erratum-8978" advisory-name="RHSA-2009:1232"/><erratum last-modified="1251764323" id="rhn-erratum-8985" advisory-name="RHSA-2009:1238"/><erratum last-modified="1251874953" id="rhn-erratum-8988" advisory-name="RHBA-2009:1240"/><erratum last-modified="1251899232" id="rhn-erratum-8989" advisory-name="RHBA-2009:1241"/><erratum last-modified="1251874953" id="rhn-erratum-8990" advisory-name="RHBA-2009:1242"/><erratum last-modified="1252518575" id="rhn-erratum-8991" advisory-name="RHSA-2009:1243"/><erratum last-modified="1251874953" id="rhn-erratum-8992" advisory-name="RHBA-2009:1244"/><erratum last-modified="1251874953" id="rhn-erratum-8993" advisory-name="RHEA-2009:1245"/><erratum last-modified="1251874953" id="rhn-erratum-8996" advisory-name="RHBA-2009:1249"/><erratum last-modified="1251899232" id="rhn-erratum-8997" advisory-name="RHBA-2009:1250"/><erratum last-modified="1251874953" id="rhn-erratum-8998" advisory-name="RHBA-2009:1251"/><erratum last-modified="1251899232" id="rhn-erratum-8999" advisory-name="RHBA-2009:1256"/><erratum last-modified="1251899232" id="rhn-erratum-9000" advisory-name="RHBA-2009:1257"/><erratum last-modified="1251874953" id="rhn-erratum-9001" advisory-name="RHBA-2009:1258"/><erratum last-modified="1251899232" id="rhn-erratum-9002" advisory-name="RHBA-2009:1259"/><erratum last-modified="1251874953" id="rhn-erratum-9004" advisory-name="RHBA-2009:1262"/><erratum last-modified="1251899232" id="rhn-erratum-9006" advisory-name="RHEA-2009:1264"/><erratum last-modified="1251874953" id="rhn-erratum-9007" advisory-name="RHBA-2009:1265"/><erratum last-modified="1251899232" id="rhn-erratum-9008" advisory-name="RHEA-2009:1266"/><erratum last-modified="1251899232" id="rhn-erratum-9009" advisory-name="RHBA-2009:1267"/><erratum last-modified="1251899232" id="rhn-erratum-9010" advisory-name="RHBA-2009:1268"/><erratum last-modified="1251899232" id="rhn-erratum-9013" advisory-name="RHBA-2009:1273"/><erratum last-modified="1251899232" id="rhn-erratum-9014" advisory-name="RHEA-2009:1274"/><erratum last-modified="1251899232" id="rhn-erratum-9017" advisory-name="RHBA-2009:1277"/><erratum last-modified="1251874953" id="rhn-erratum-9018" advisory-name="RHSA-2009:1278"/><erratum last-modified="1251899232" id="rhn-erratum-9019" advisory-name="RHEA-2009:1279"/><erratum last-modified="1251874953" id="rhn-erratum-9020" advisory-name="RHBA-2009:1280"/><erratum last-modified="1251874953" id="rhn-erratum-9021" advisory-name="RHEA-2009:1281"/><erratum last-modified="1251899232" id="rhn-erratum-9022" advisory-name="RHBA-2009:1282"/><erratum last-modified="1251899232" id="rhn-erratum-9023" advisory-name="RHBA-2009:1283"/><erratum last-modified="1251899232" id="rhn-erratum-9024" advisory-name="RHEA-2009:1284"/><erratum last-modified="1251899232" id="rhn-erratum-9026" advisory-name="RHBA-2009:1286"/><erratum last-modified="1251874953" id="rhn-erratum-9027" advisory-name="RHSA-2009:1287"/><erratum last-modified="1251899232" id="rhn-erratum-9028" advisory-name="RHBA-2009:1288"/><erratum last-modified="1251874953" id="rhn-erratum-9029" advisory-name="RHBA-2009:1290"/><erratum last-modified="1251899232" id="rhn-erratum-9030" advisory-name="RHBA-2009:1291"/><erratum last-modified="1251874953" id="rhn-erratum-9031" advisory-name="RHBA-2009:1292"/><erratum last-modified="1251874953" id="rhn-erratum-9032" advisory-name="RHEA-2009:1293"/><erratum last-modified="1251899232" id="rhn-erratum-9033" advisory-name="RHEA-2009:1294"/><erratum last-modified="1251899232" id="rhn-erratum-9034" advisory-name="RHEA-2009:1295"/><erratum last-modified="1251899232" id="rhn-erratum-9035" advisory-name="RHEA-2009:1296"/><erratum last-modified="1251874953" id="rhn-erratum-9036" advisory-name="RHEA-2009:1297"/><erratum last-modified="1251899232" id="rhn-erratum-9037" advisory-name="RHBA-2009:1298"/><erratum last-modified="1251899232" id="rhn-erratum-9039" advisory-name="RHBA-2009:1300"/><erratum last-modified="1251899232" id="rhn-erratum-9040" advisory-name="RHBA-2009:1301"/><erratum last-modified="1251899232" id="rhn-erratum-9042" advisory-name="RHEA-2009:1303"/><erratum last-modified="1251899232" id="rhn-erratum-9043" advisory-name="RHBA-2009:1304"/><erratum last-modified="1251874953" id="rhn-erratum-9045" advisory-name="RHBA-2009:1306"/><erratum last-modified="1251899232" id="rhn-erratum-9046" advisory-name="RHSA-2009:1307"/><erratum last-modified="1251874953" id="rhn-erratum-9047" advisory-name="RHEA-2009:1308"/><erratum last-modified="1251874953" id="rhn-erratum-9049" advisory-name="RHBA-2009:1310"/><erratum last-modified="1251899232" id="rhn-erratum-9051" advisory-name="RHEA-2009:1312"/><erratum last-modified="1251899232" id="rhn-erratum-9052" advisory-name="RHBA-2009:1313"/><erratum last-modified="1251899232" id="rhn-erratum-9053" advisory-name="RHEA-2009:1314"/><erratum last-modified="1251899232" id="rhn-erratum-9054" advisory-name="RHEA-2009:1315"/><erratum last-modified="1251874953" id="rhn-erratum-9055" advisory-name="RHEA-2009:1316"/><erratum last-modified="1251874953" id="rhn-erratum-9056" advisory-name="RHBA-2009:1317"/><erratum last-modified="1251874953" id="rhn-erratum-9057" advisory-name="RHEA-2009:1318"/><erratum last-modified="1251874953" id="rhn-erratum-9058" advisory-name="RHBA-2009:1319"/><erratum last-modified="1251899232" id="rhn-erratum-9059" advisory-name="RHEA-2009:1320"/><erratum last-modified="1251874953" id="rhn-erratum-9060" advisory-name="RHSA-2009:1321"/><erratum last-modified="1251899232" id="rhn-erratum-9061" advisory-name="RHBA-2009:1322"/><erratum last-modified="1251874953" id="rhn-erratum-9063" advisory-name="RHBA-2009:1324"/><erratum last-modified="1251874953" id="rhn-erratum-9066" advisory-name="RHEA-2009:1327"/><erratum last-modified="1251899263" id="rhn-erratum-9067" advisory-name="RHBA-2009:1328"/><erratum last-modified="1251874953" id="rhn-erratum-9068" advisory-name="RHBA-2009:1329"/><erratum last-modified="1251899232" id="rhn-erratum-9069" advisory-name="RHBA-2009:1330"/><erratum last-modified="1251899232" id="rhn-erratum-9070" advisory-name="RHBA-2009:1331"/><erratum last-modified="1251899232" id="rhn-erratum-9071" advisory-name="RHEA-2009:1332"/><erratum last-modified="1251899232" id="rhn-erratum-9072" advisory-name="RHBA-2009:1333"/><erratum last-modified="1251899232" id="rhn-erratum-9074" advisory-name="RHSA-2009:1335"/><erratum last-modified="1251874953" id="rhn-erratum-9076" advisory-name="RHSA-2009:1337"/><erratum last-modified="1251899232" id="rhn-erratum-9080" advisory-name="RHSA-2009:1341"/><erratum last-modified="1251874953" id="rhn-erratum-9081" advisory-name="RHEA-2009:1342"/><erratum last-modified="1251874953" id="rhn-erratum-9082" advisory-name="RHBA-2009:1343"/><erratum last-modified="1251874953" id="rhn-erratum-9083" advisory-name="RHBA-2009:1344"/><erratum last-modified="1251899232" id="rhn-erratum-9084" advisory-name="RHBA-2009:1345"/><erratum last-modified="1251899232" id="rhn-erratum-9085" advisory-name="RHBA-2009:1346"/><erratum last-modified="1251899232" id="rhn-erratum-9086" advisory-name="RHBA-2009:1347"/><erratum last-modified="1251874953" id="rhn-erratum-9087" advisory-name="RHEA-2009:1348"/><erratum last-modified="1251899232" id="rhn-erratum-9088" advisory-name="RHBA-2009:1349"/><erratum last-modified="1251874953" id="rhn-erratum-9089" advisory-name="RHEA-2009:1350"/><erratum last-modified="1251874953" id="rhn-erratum-9090" advisory-name="RHBA-2009:1351"/><erratum last-modified="1251874953" id="rhn-erratum-9091" advisory-name="RHBA-2009:1352"/><erratum last-modified="1251874953" id="rhn-erratum-9092" advisory-name="RHBA-2009:1353"/><erratum last-modified="1251874953" id="rhn-erratum-9093" advisory-name="RHBA-2009:1354"/><erratum last-modified="1251874953" id="rhn-erratum-9094" advisory-name="RHBA-2009:1355"/><erratum last-modified="1251874953" id="rhn-erratum-9095" advisory-name="RHBA-2009:1356"/><erratum last-modified="1254425146" id="rhn-erratum-9096" advisory-name="RHBA-2009:1357"/><erratum last-modified="1251899232" id="rhn-erratum-9097" advisory-name="RHBA-2009:1358"/><erratum last-modified="1251899232" id="rhn-erratum-9098" advisory-name="RHBA-2009:1359"/><erratum last-modified="1251899232" id="rhn-erratum-9099" advisory-name="RHBA-2009:1360"/><erratum last-modified="1251874953" id="rhn-erratum-9100" advisory-name="RHBA-2009:1361"/><erratum last-modified="1251874953" id="rhn-erratum-9101" advisory-name="RHBA-2009:1362"/><erratum last-modified="1251874953" id="rhn-erratum-9102" advisory-name="RHEA-2009:1363"/><erratum last-modified="1251874953" id="rhn-erratum-9103" advisory-name="RHSA-2009:1364"/><erratum last-modified="1251874953" id="rhn-erratum-9104" advisory-name="RHBA-2009:1365"/><erratum last-modified="1251899232" id="rhn-erratum-9105" advisory-name="RHBA-2009:1366"/><erratum last-modified="1251874953" id="rhn-erratum-9107" advisory-name="RHBA-2009:1368"/><erratum last-modified="1251874953" id="rhn-erratum-9108" advisory-name="RHEA-2009:1369"/><erratum last-modified="1251874953" id="rhn-erratum-9109" advisory-name="RHBA-2009:1370"/><erratum last-modified="1251899232" id="rhn-erratum-9110" advisory-name="RHBA-2009:1371"/><erratum last-modified="1251899232" id="rhn-erratum-9111" advisory-name="RHBA-2009:1372"/><erratum last-modified="1251899232" id="rhn-erratum-9112" advisory-name="RHBA-2009:1373"/><erratum last-modified="1251899232" id="rhn-erratum-9114" advisory-name="RHBA-2009:1375"/><erratum last-modified="1251899232" id="rhn-erratum-9115" advisory-name="RHBA-2009:1376"/><erratum last-modified="1251899232" id="rhn-erratum-9116" advisory-name="RHBA-2009:1378"/><erratum last-modified="1251874953" id="rhn-erratum-9117" advisory-name="RHBA-2009:1379"/><erratum last-modified="1251899232" id="rhn-erratum-9118" advisory-name="RHBA-2009:1380"/><erratum last-modified="1251874953" id="rhn-erratum-9120" advisory-name="RHBA-2009:1382"/><erratum last-modified="1251899232" id="rhn-erratum-9121" advisory-name="RHEA-2009:1384"/><erratum last-modified="1251874953" id="rhn-erratum-9122" advisory-name="RHEA-2009:1385"/><erratum last-modified="1251874953" id="rhn-erratum-9124" advisory-name="RHBA-2009:1387"/><erratum last-modified="1251874953" id="rhn-erratum-9125" advisory-name="RHBA-2009:1388"/><erratum last-modified="1251899232" id="rhn-erratum-9126" advisory-name="RHBA-2009:1389"/><erratum last-modified="1251874953" id="rhn-erratum-9127" advisory-name="RHBA-2009:1390"/><erratum last-modified="1251899232" id="rhn-erratum-9128" advisory-name="RHBA-2009:1391"/><erratum last-modified="1251874953" id="rhn-erratum-9129" advisory-name="RHBA-2009:1392"/><erratum last-modified="1251874953" id="rhn-erratum-9130" advisory-name="RHBA-2009:1393"/><erratum last-modified="1251899232" id="rhn-erratum-9132" advisory-name="RHBA-2009:1395"/><erratum last-modified="1251874953" id="rhn-erratum-9134" advisory-name="RHBA-2009:1397"/><erratum last-modified="1251874953" id="rhn-erratum-9136" advisory-name="RHEA-2009:1400"/><erratum last-modified="1251899232" id="rhn-erratum-9138" advisory-name="RHBA-2009:1402"/><erratum last-modified="1251874953" id="rhn-erratum-9139" advisory-name="RHBA-2009:1403"/><erratum last-modified="1251874953" id="rhn-erratum-9140" advisory-name="RHBA-2009:1404"/><erratum last-modified="1251874953" id="rhn-erratum-9141" advisory-name="RHBA-2009:1405"/><erratum last-modified="1251874953" id="rhn-erratum-9142" advisory-name="RHEA-2009:1406"/><erratum last-modified="1251874953" id="rhn-erratum-9143" advisory-name="RHEA-2009:1407"/><erratum last-modified="1251874953" id="rhn-erratum-9144" advisory-name="RHEA-2009:1408"/><erratum last-modified="1251899232" id="rhn-erratum-9145" advisory-name="RHBA-2009:1409"/><erratum last-modified="1251874953" id="rhn-erratum-9146" advisory-name="RHEA-2009:1410"/><erratum last-modified="1251899232" id="rhn-erratum-9147" advisory-name="RHEA-2009:1411"/><erratum last-modified="1251874953" id="rhn-erratum-9150" advisory-name="RHEA-2009:1377"/><erratum last-modified="1251899232" id="rhn-erratum-9157" advisory-name="RHSA-2009:1289"/><erratum last-modified="1251874953" id="rhn-erratum-9158" advisory-name="RHBA-2009:1413"/><erratum last-modified="1251899232" id="rhn-erratum-9159" advisory-name="RHBA-2009:1414"/><erratum last-modified="1251874953" id="rhn-erratum-9162" advisory-name="RHBA-2009:1415"/><erratum last-modified="1251874953" id="rhn-erratum-9163" advisory-name="RHBA-2009:1416"/><erratum last-modified="1251874953" id="rhn-erratum-9164" advisory-name="RHEA-2009:1417"/><erratum last-modified="1251876580" id="rhn-erratum-9166" advisory-name="RHBA-2009:1418"/><erratum last-modified="1251876776" id="rhn-erratum-9167" advisory-name="RHBA-2009:1419"/><erratum last-modified="1251876999" id="rhn-erratum-9168" advisory-name="RHBA-2009:1420"/><erratum last-modified="1251899854" id="rhn-erratum-9170" advisory-name="RHBA-2009:1422"/><erratum last-modified="1252422602" id="rhn-erratum-9175" advisory-name="RHSA-2009:1427"/><erratum last-modified="1252424580" id="rhn-erratum-9176" advisory-name="RHSA-2009:1428"/><erratum last-modified="1252538566" id="rhn-erratum-9179" advisory-name="RHSA-2009:1430"/><erratum last-modified="1252608717" id="rhn-erratum-9184" advisory-name="RHEA-2009:1435"/><erratum last-modified="1252657598" id="rhn-erratum-9185" advisory-name="RHBA-2009:1437"/><erratum last-modified="1253294999" id="rhn-erratum-9199" advisory-name="RHBA-2009:1435"/><erratum last-modified="1253198298" id="rhn-erratum-9200" advisory-name="RHSA-2009:1451"/><erratum last-modified="1253546063" id="rhn-erratum-9203" advisory-name="RHSA-2009:1452"/><erratum last-modified="1253610836" id="rhn-erratum-9206" advisory-name="RHEA-2009:1456"/><erratum last-modified="1253719476" id="rhn-erratum-9211" advisory-name="RHSA-2009:1459"/><erratum last-modified="1253820091" id="rhn-erratum-9215" advisory-name="RHSA-2009:1463"/><erratum last-modified="1254210796" id="rhn-erratum-9216" advisory-name="RHBA-2009:1464"/><erratum last-modified="1254252620" id="rhn-erratum-9219" advisory-name="RHSA-2009:1455"/><erratum last-modified="1254300291" id="rhn-erratum-9220" advisory-name="RHEA-2009:1467"/><erratum last-modified="1254306914" id="rhn-erratum-9221" advisory-name="RHBA-2009:1468"/><erratum last-modified="1254323283" id="rhn-erratum-9223" advisory-name="RHSA-2009:1470"/><erratum last-modified="1254417983" id="rhn-erratum-9224" advisory-name="RHSA-2009:1471"/><erratum last-modified="1254419726" id="rhn-erratum-9225" advisory-name="RHSA-2009:1472"/><erratum last-modified="1254490488" id="rhn-erratum-9227" advisory-name="RHBA-2009:1474"/><erratum last-modified="1254727120" id="rhn-erratum-9229" advisory-name="RHBA-2009:1476"/><erratum last-modified="1254932561" id="rhn-erratum-9237" advisory-name="RHSA-2009:1484"/><erratum last-modified="1254931779" id="rhn-erratum-9240" advisory-name="RHBA-2009:1417"/><erratum last-modified="1254997927" id="rhn-erratum-9241" advisory-name="RHBA-2009:1487"/><erratum last-modified="1255033032" id="rhn-erratum-9244" advisory-name="RHSA-2009:1490"/><erratum last-modified="1255419221" id="rhn-erratum-9248" advisory-name="RHBA-2009:1494"/><erratum last-modified="1255421818" id="rhn-erratum-9249" advisory-name="RHBA-2009:1495"/><erratum last-modified="1255592166" id="rhn-erratum-9260" advisory-name="RHBA-2009:1511"/><erratum last-modified="1255596673" id="rhn-erratum-9265" advisory-name="RHSA-2009:1504"/><erratum last-modified="1255597236" id="rhn-erratum-9266" advisory-name="RHSA-2009:1513"/><erratum last-modified="1255609387" id="rhn-erratum-9268" advisory-name="RHBA-2009:1514"/></rhn-channel-errata><rhn-release/></rhn-channel><rhn-channel channel-arch="channel-x86_64" has-comps="True" channel-errata="rhn-erratum-5388 rhn-erratum-5390 rhn-erratum-5392 rhn-erratum-5393 rhn-erratum-5394 rhn-erratum-5396 rhn-erratum-5397 rhn-erratum-5398 rhn-erratum-5399 rhn-erratum-5400 rhn-erratum-5401 rhn-erratum-5402 rhn-erratum-5403 rhn-erratum-5404 rhn-erratum-5405 rhn-erratum-5406 rhn-erratum-5407 rhn-erratum-5411 rhn-erratum-5412 rhn-erratum-5427 rhn-erratum-5428 rhn-erratum-5431 rhn-erratum-5443 rhn-erratum-5444 rhn-erratum-5445 rhn-erratum-5447 rhn-erratum-5465 rhn-erratum-5466 rhn-erratum-5470 rhn-erratum-5475 rhn-erratum-5619 rhn-erratum-5645 rhn-erratum-5646 rhn-erratum-5647 rhn-erratum-5655 rhn-erratum-5656 rhn-erratum-5676 rhn-erratum-5677 rhn-erratum-5689 rhn-erratum-5690 rhn-erratum-5694 rhn-erratum-5695 rhn-erratum-5697 rhn-erratum-5698 rhn-erratum-5707 rhn-erratum-5710 rhn-erratum-5718 rhn-erratum-5720 rhn-erratum-5721 rhn-erratum-5724 rhn-erratum-5728 rhn-erratum-5730 rhn-erratum-5800 rhn-erratum-5806 rhn-erratum-5807 rhn-erratum-5809 rhn-erratum-5812 rhn-erratum-5816 rhn-erratum-5817 rhn-erratum-5820 rhn-erratum-5825 rhn-erratum-5833 rhn-erratum-5835 rhn-erratum-5836 rhn-erratum-5837 rhn-erratum-5838 rhn-erratum-5839 rhn-erratum-5840 rhn-erratum-5842 rhn-erratum-5843 rhn-erratum-5844 rhn-erratum-5845 rhn-erratum-5854 rhn-erratum-5859 rhn-erratum-5860 rhn-erratum-5861 rhn-erratum-5862 rhn-erratum-5863 rhn-erratum-5865 rhn-erratum-5870 rhn-erratum-5871 rhn-erratum-5877 rhn-erratum-5879 rhn-erratum-5880 rhn-erratum-5881 rhn-erratum-5887 rhn-erratum-5890 rhn-erratum-5891 rhn-erratum-5892 rhn-erratum-5915 rhn-erratum-5916 rhn-erratum-5919 rhn-erratum-5920 rhn-erratum-5928 rhn-erratum-5960 rhn-erratum-5969 rhn-erratum-5970 rhn-erratum-5973 rhn-erratum-5975 rhn-erratum-5982 rhn-erratum-5984 rhn-erratum-5985 rhn-erratum-5992 rhn-erratum-5993 rhn-erratum-5998 rhn-erratum-5999 rhn-erratum-6027 rhn-erratum-6038 rhn-erratum-6039 rhn-erratum-6040 rhn-erratum-6043 rhn-erratum-6045 rhn-erratum-6048 rhn-erratum-6052 rhn-erratum-6054 rhn-erratum-6056 rhn-erratum-6060 rhn-erratum-6061 rhn-erratum-6065 rhn-erratum-6071 rhn-erratum-6072 rhn-erratum-6073 rhn-erratum-6074 rhn-erratum-6075 rhn-erratum-6076 rhn-erratum-6078 rhn-erratum-6079 rhn-erratum-6080 rhn-erratum-6081 rhn-erratum-6082 rhn-erratum-6083 rhn-erratum-6084 rhn-erratum-6085 rhn-erratum-6086 rhn-erratum-6087 rhn-erratum-6088 rhn-erratum-6090 rhn-erratum-6091 rhn-erratum-6092 rhn-erratum-6094 rhn-erratum-6095 rhn-erratum-6096 rhn-erratum-6097 rhn-erratum-6099 rhn-erratum-6101 rhn-erratum-6102 rhn-erratum-6103 rhn-erratum-6104 rhn-erratum-6105 rhn-erratum-6106 rhn-erratum-6107 rhn-erratum-6108 rhn-erratum-6109 rhn-erratum-6110 rhn-erratum-6111 rhn-erratum-6112 rhn-erratum-6113 rhn-erratum-6114 rhn-erratum-6115 rhn-erratum-6116 rhn-erratum-6117 rhn-erratum-6119 rhn-erratum-6120 rhn-erratum-6124 rhn-erratum-6126 rhn-erratum-6129 rhn-erratum-6130 rhn-erratum-6132 rhn-erratum-6136 rhn-erratum-6137 rhn-erratum-6138 rhn-erratum-6139 rhn-erratum-6140 rhn-erratum-6142 rhn-erratum-6144 rhn-erratum-6146 rhn-erratum-6148 rhn-erratum-6149 rhn-erratum-6150 rhn-erratum-6151 rhn-erratum-6152 rhn-erratum-6153 rhn-erratum-6154 rhn-erratum-6156 rhn-erratum-6157 rhn-erratum-6158 rhn-erratum-6159 rhn-erratum-6160 rhn-erratum-6161 rhn-erratum-6162 rhn-erratum-6163 rhn-erratum-6164 rhn-erratum-6166 rhn-erratum-6168 rhn-erratum-6169 rhn-erratum-6170 rhn-erratum-6171 rhn-erratum-6172 rhn-erratum-6173 rhn-erratum-6174 rhn-erratum-6175 rhn-erratum-6176 rhn-erratum-6177 rhn-erratum-6178 rhn-erratum-6179 rhn-erratum-6181 rhn-erratum-6182 rhn-erratum-6183 rhn-erratum-6184 rhn-erratum-6185 rhn-erratum-6186 rhn-erratum-6189 rhn-erratum-6191 rhn-erratum-6192 rhn-erratum-6193 rhn-erratum-6195 rhn-erratum-6196 rhn-erratum-6197 rhn-erratum-6198 rhn-erratum-6199 rhn-erratum-6201 rhn-erratum-6202 rhn-erratum-6206 rhn-erratum-6208 rhn-erratum-6209 rhn-erratum-6210 rhn-erratum-6211 rhn-erratum-6212 rhn-erratum-6213 rhn-erratum-6214 rhn-erratum-6215 rhn-erratum-6216 rhn-erratum-6217 rhn-erratum-6218 rhn-erratum-6219 rhn-erratum-6220 rhn-erratum-6221 rhn-erratum-6222 rhn-erratum-6223 rhn-erratum-6224 rhn-erratum-6225 rhn-erratum-6226 rhn-erratum-6227 rhn-erratum-6228 rhn-erratum-6236 rhn-erratum-6238 rhn-erratum-6240 rhn-erratum-6241 rhn-erratum-6242 rhn-erratum-6243 rhn-erratum-6244 rhn-erratum-6245 rhn-erratum-6249 rhn-erratum-6254 rhn-erratum-6255 rhn-erratum-6256 rhn-erratum-6263 rhn-erratum-6383 rhn-erratum-6389 rhn-erratum-6390 rhn-erratum-6392 rhn-erratum-6393 rhn-erratum-6396 rhn-erratum-6398 rhn-erratum-6400 rhn-erratum-6404 rhn-erratum-6405 rhn-erratum-6406 rhn-erratum-6407 rhn-erratum-6408 rhn-erratum-6412 rhn-erratum-6413 rhn-erratum-6435 rhn-erratum-6436 rhn-erratum-6437 rhn-erratum-6439 rhn-erratum-6440 rhn-erratum-6444 rhn-erratum-6448 rhn-erratum-6452 rhn-erratum-6453 rhn-erratum-6454 rhn-erratum-6455 rhn-erratum-6464 rhn-erratum-6466 rhn-erratum-6473 rhn-erratum-6476 rhn-erratum-6477 rhn-erratum-6478 rhn-erratum-6479 rhn-erratum-6480 rhn-erratum-6481 rhn-erratum-6482 rhn-erratum-6483 rhn-erratum-6485 rhn-erratum-6486 rhn-erratum-6488 rhn-erratum-6494 rhn-erratum-6495 rhn-erratum-6497 rhn-erratum-6498 rhn-erratum-6499 rhn-erratum-6500 rhn-erratum-6516 rhn-erratum-6517 rhn-erratum-6518 rhn-erratum-6519 rhn-erratum-6520 rhn-erratum-6522 rhn-erratum-6524 rhn-erratum-6525 rhn-erratum-6527 rhn-erratum-6528 rhn-erratum-6537 rhn-erratum-6538 rhn-erratum-6544 rhn-erratum-6550 rhn-erratum-6551 rhn-erratum-6552 rhn-erratum-6553 rhn-erratum-6554 rhn-erratum-6555 rhn-erratum-6556 rhn-erratum-6557 rhn-erratum-6558 rhn-erratum-6560 rhn-erratum-6561 rhn-erratum-6564 rhn-erratum-6568 rhn-erratum-6569 rhn-erratum-6570 rhn-erratum-6571 rhn-erratum-6572 rhn-erratum-6573 rhn-erratum-6574 rhn-erratum-6575 rhn-erratum-6576 rhn-erratum-6577 rhn-erratum-6578 rhn-erratum-6579 rhn-erratum-6580 rhn-erratum-6596 rhn-erratum-6597 rhn-erratum-6598 rhn-erratum-6601 rhn-erratum-6603 rhn-erratum-6618 rhn-erratum-6619 rhn-erratum-6620 rhn-erratum-6622 rhn-erratum-6625 rhn-erratum-6628 rhn-erratum-6631 rhn-erratum-6638 rhn-erratum-6642 rhn-erratum-6659 rhn-erratum-6662 rhn-erratum-6664 rhn-erratum-6665 rhn-erratum-6680 rhn-erratum-6681 rhn-erratum-6682 rhn-erratum-6683 rhn-erratum-6697 rhn-erratum-6717 rhn-erratum-6718 rhn-erratum-6719 rhn-erratum-6739 rhn-erratum-6747 rhn-erratum-6748 rhn-erratum-6752 rhn-erratum-6756 rhn-erratum-6764 rhn-erratum-6777 rhn-erratum-6779 rhn-erratum-6795 rhn-erratum-6797 rhn-erratum-6798 rhn-erratum-6803 rhn-erratum-6860 rhn-erratum-6868 rhn-erratum-6898 rhn-erratum-6902 rhn-erratum-6903 rhn-erratum-6919 rhn-erratum-6920 rhn-erratum-6921 rhn-erratum-6922 rhn-erratum-6923 rhn-erratum-6924 rhn-erratum-6925 rhn-erratum-6926 rhn-erratum-6928 rhn-erratum-6929 rhn-erratum-6930 rhn-erratum-6931 rhn-erratum-6932 rhn-erratum-6934 rhn-erratum-6935 rhn-erratum-6936 rhn-erratum-6937 rhn-erratum-6939 rhn-erratum-6940 rhn-erratum-6941 rhn-erratum-6942 rhn-erratum-6943 rhn-erratum-6944 rhn-erratum-6945 rhn-erratum-6946 rhn-erratum-6947 rhn-erratum-6949 rhn-erratum-6950 rhn-erratum-6951 rhn-erratum-6952 rhn-erratum-6954 rhn-erratum-6956 rhn-erratum-6957 rhn-erratum-6958 rhn-erratum-6959 rhn-erratum-6960 rhn-erratum-6961 rhn-erratum-6962 rhn-erratum-6963 rhn-erratum-6964 rhn-erratum-6965 rhn-erratum-6967 rhn-erratum-6968 rhn-erratum-6969 rhn-erratum-6970 rhn-erratum-6971 rhn-erratum-6972 rhn-erratum-6973 rhn-erratum-6974 rhn-erratum-6975 rhn-erratum-6976 rhn-erratum-6977 rhn-erratum-6978 rhn-erratum-6979 rhn-erratum-6980 rhn-erratum-6981 rhn-erratum-6983 rhn-erratum-6984 rhn-erratum-6985 rhn-erratum-6986 rhn-erratum-6987 rhn-erratum-6989 rhn-erratum-6990 rhn-erratum-6993 rhn-erratum-6995 rhn-erratum-6996 rhn-erratum-6998 rhn-erratum-7000 rhn-erratum-7001 rhn-erratum-7002 rhn-erratum-7003 rhn-erratum-7004 rhn-erratum-7005 rhn-erratum-7006 rhn-erratum-7007 rhn-erratum-7008 rhn-erratum-7009 rhn-erratum-7010 rhn-erratum-7011 rhn-erratum-7012 rhn-erratum-7014 rhn-erratum-7015 rhn-erratum-7016 rhn-erratum-7017 rhn-erratum-7018 rhn-erratum-7019 rhn-erratum-7020 rhn-erratum-7021 rhn-erratum-7022 rhn-erratum-7023 rhn-erratum-7026 rhn-erratum-7027 rhn-erratum-7028 rhn-erratum-7034 rhn-erratum-7035 rhn-erratum-7036 rhn-erratum-7037 rhn-erratum-7039 rhn-erratum-7040 rhn-erratum-7041 rhn-erratum-7042 rhn-erratum-7044 rhn-erratum-7045 rhn-erratum-7046 rhn-erratum-7047 rhn-erratum-7048 rhn-erratum-7049 rhn-erratum-7050 rhn-erratum-7051 rhn-erratum-7052 rhn-erratum-7053 rhn-erratum-7054 rhn-erratum-7055 rhn-erratum-7056 rhn-erratum-7058 rhn-erratum-7059 rhn-erratum-7061 rhn-erratum-7062 rhn-erratum-7063 rhn-erratum-7064 rhn-erratum-7065 rhn-erratum-7066 rhn-erratum-7067 rhn-erratum-7068 rhn-erratum-7069 rhn-erratum-7070 rhn-erratum-7071 rhn-erratum-7073 rhn-erratum-7074 rhn-erratum-7075 rhn-erratum-7076 rhn-erratum-7077 rhn-erratum-7078 rhn-erratum-7079 rhn-erratum-7080 rhn-erratum-7081 rhn-erratum-7082 rhn-erratum-7083 rhn-erratum-7084 rhn-erratum-7085 rhn-erratum-7087 rhn-erratum-7088 rhn-erratum-7089 rhn-erratum-7091 rhn-erratum-7092 rhn-erratum-7093 rhn-erratum-7095 rhn-erratum-7096 rhn-erratum-7098 rhn-erratum-7099 rhn-erratum-7100 rhn-erratum-7101 rhn-erratum-7102 rhn-erratum-7103 rhn-erratum-7104 rhn-erratum-7106 rhn-erratum-7107 rhn-erratum-7108 rhn-erratum-7109 rhn-erratum-7110 rhn-erratum-7112 rhn-erratum-7114 rhn-erratum-7115 rhn-erratum-7116 rhn-erratum-7117 rhn-erratum-7118 rhn-erratum-7119 rhn-erratum-7120 rhn-erratum-7121 rhn-erratum-7122 rhn-erratum-7123 rhn-erratum-7124 rhn-erratum-7126 rhn-erratum-7127 rhn-erratum-7128 rhn-erratum-7130 rhn-erratum-7131 rhn-erratum-7133 rhn-erratum-7134 rhn-erratum-7135 rhn-erratum-7136 rhn-erratum-7144 rhn-erratum-7147 rhn-erratum-7178 rhn-erratum-7179 rhn-erratum-7180 rhn-erratum-7185 rhn-erratum-7186 rhn-erratum-7188 rhn-erratum-7189 rhn-erratum-7191 rhn-erratum-7192 rhn-erratum-7194 rhn-erratum-7196 rhn-erratum-7198 rhn-erratum-7199 rhn-erratum-7200 rhn-erratum-7201 rhn-erratum-7219 rhn-erratum-7223 rhn-erratum-7225 rhn-erratum-7226 rhn-erratum-7228 rhn-erratum-7237 rhn-erratum-7259 rhn-erratum-7265 rhn-erratum-7269 rhn-erratum-7271 rhn-erratum-7272 rhn-erratum-7273 rhn-erratum-7275 rhn-erratum-7277 rhn-erratum-7280 rhn-erratum-7284 rhn-erratum-7287 rhn-erratum-7292 rhn-erratum-7293 rhn-erratum-7294 rhn-erratum-7295 rhn-erratum-7296 rhn-erratum-7435 rhn-erratum-7459 rhn-erratum-7479 rhn-erratum-7480 rhn-erratum-7481 rhn-erratum-7482 rhn-erratum-7483 rhn-erratum-7487 rhn-erratum-7488 rhn-erratum-7498 rhn-erratum-7511 rhn-erratum-7512 rhn-erratum-7513 rhn-erratum-7515 rhn-erratum-7516 rhn-erratum-7517 rhn-erratum-7518 rhn-erratum-7521 rhn-erratum-7527 rhn-erratum-7530 rhn-erratum-7531 rhn-erratum-7532 rhn-erratum-7533 rhn-erratum-7538 rhn-erratum-7539 rhn-erratum-7560 rhn-erratum-7562 rhn-erratum-7563 rhn-erratum-7564 rhn-erratum-7565 rhn-erratum-7568 rhn-erratum-7574 rhn-erratum-7578 rhn-erratum-7590 rhn-erratum-7591 rhn-erratum-7592 rhn-erratum-7593 rhn-erratum-7594 rhn-erratum-7595 rhn-erratum-7596 rhn-erratum-7607 rhn-erratum-7618 rhn-erratum-7619 rhn-erratum-7620 rhn-erratum-7621 rhn-erratum-7638 rhn-erratum-7640 rhn-erratum-7641 rhn-erratum-7642 rhn-erratum-7643 rhn-erratum-7646 rhn-erratum-7658 rhn-erratum-7659 rhn-erratum-7660 rhn-erratum-7662 rhn-erratum-7663 rhn-erratum-7664 rhn-erratum-7665 rhn-erratum-7704 rhn-erratum-7705 rhn-erratum-7707 rhn-erratum-7708 rhn-erratum-7710 rhn-erratum-7717 rhn-erratum-7719 rhn-erratum-7721 rhn-erratum-7725 rhn-erratum-7726 rhn-erratum-7727 rhn-erratum-7728 rhn-erratum-7738 rhn-erratum-7739 rhn-erratum-7742 rhn-erratum-7778 rhn-erratum-7799 rhn-erratum-7800 rhn-erratum-7801 rhn-erratum-7803 rhn-erratum-7805 rhn-erratum-7806 rhn-erratum-7820 rhn-erratum-7821 rhn-erratum-7828 rhn-erratum-7830 rhn-erratum-7863 rhn-erratum-7866 rhn-erratum-7867 rhn-erratum-7870 rhn-erratum-7879 rhn-erratum-7880 rhn-erratum-7901 rhn-erratum-7906 rhn-erratum-7918 rhn-erratum-7919 rhn-erratum-7922 rhn-erratum-7924 rhn-erratum-7926 rhn-erratum-7959 rhn-erratum-7961 rhn-erratum-7962 rhn-erratum-7963 rhn-erratum-7964 rhn-erratum-7979 rhn-erratum-7980 rhn-erratum-7981 rhn-erratum-7982 rhn-erratum-8007 rhn-erratum-8008 rhn-erratum-8009 rhn-erratum-8011 rhn-erratum-8012 rhn-erratum-8013 rhn-erratum-8016 rhn-erratum-8017 rhn-erratum-8018 rhn-erratum-8019 rhn-erratum-8020 rhn-erratum-8021 rhn-erratum-8022 rhn-erratum-8023 rhn-erratum-8024 rhn-erratum-8025 rhn-erratum-8026 rhn-erratum-8027 rhn-erratum-8028 rhn-erratum-8029 rhn-erratum-8030 rhn-erratum-8031 rhn-erratum-8032 rhn-erratum-8033 rhn-erratum-8034 rhn-erratum-8036 rhn-erratum-8037 rhn-erratum-8038 rhn-erratum-8039 rhn-erratum-8040 rhn-erratum-8041 rhn-erratum-8042 rhn-erratum-8043 rhn-erratum-8045 rhn-erratum-8046 rhn-erratum-8047 rhn-erratum-8052 rhn-erratum-8054 rhn-erratum-8055 rhn-erratum-8056 rhn-erratum-8057 rhn-erratum-8058 rhn-erratum-8059 rhn-erratum-8060 rhn-erratum-8061 rhn-erratum-8062 rhn-erratum-8063 rhn-erratum-8064 rhn-erratum-8065 rhn-erratum-8066 rhn-erratum-8067 rhn-erratum-8068 rhn-erratum-8069 rhn-erratum-8070 rhn-erratum-8072 rhn-erratum-8073 rhn-erratum-8074 rhn-erratum-8075 rhn-erratum-8076 rhn-erratum-8077 rhn-erratum-8078 rhn-erratum-8080 rhn-erratum-8081 rhn-erratum-8082 rhn-erratum-8083 rhn-erratum-8085 rhn-erratum-8086 rhn-erratum-8090 rhn-erratum-8091 rhn-erratum-8092 rhn-erratum-8093 rhn-erratum-8094 rhn-erratum-8095 rhn-erratum-8096 rhn-erratum-8098 rhn-erratum-8099 rhn-erratum-8100 rhn-erratum-8101 rhn-erratum-8103 rhn-erratum-8104 rhn-erratum-8107 rhn-erratum-8108 rhn-erratum-8109 rhn-erratum-8110 rhn-erratum-8111 rhn-erratum-8112 rhn-erratum-8113 rhn-erratum-8114 rhn-erratum-8115 rhn-erratum-8116 rhn-erratum-8117 rhn-erratum-8118 rhn-erratum-8119 rhn-erratum-8120 rhn-erratum-8121 rhn-erratum-8122 rhn-erratum-8124 rhn-erratum-8125 rhn-erratum-8126 rhn-erratum-8127 rhn-erratum-8128 rhn-erratum-8129 rhn-erratum-8130 rhn-erratum-8131 rhn-erratum-8132 rhn-erratum-8134 rhn-erratum-8135 rhn-erratum-8136 rhn-erratum-8137 rhn-erratum-8138 rhn-erratum-8139 rhn-erratum-8140 rhn-erratum-8142 rhn-erratum-8143 rhn-erratum-8144 rhn-erratum-8145 rhn-erratum-8146 rhn-erratum-8147 rhn-erratum-8148 rhn-erratum-8149 rhn-erratum-8150 rhn-erratum-8151 rhn-erratum-8152 rhn-erratum-8153 rhn-erratum-8154 rhn-erratum-8155 rhn-erratum-8156 rhn-erratum-8157 rhn-erratum-8158 rhn-erratum-8159 rhn-erratum-8162 rhn-erratum-8163 rhn-erratum-8164 rhn-erratum-8165 rhn-erratum-8166 rhn-erratum-8167 rhn-erratum-8168 rhn-erratum-8169 rhn-erratum-8170 rhn-erratum-8171 rhn-erratum-8172 rhn-erratum-8173 rhn-erratum-8174 rhn-erratum-8175 rhn-erratum-8176 rhn-erratum-8177 rhn-erratum-8178 rhn-erratum-8179 rhn-erratum-8180 rhn-erratum-8182 rhn-erratum-8183 rhn-erratum-8184 rhn-erratum-8185 rhn-erratum-8187 rhn-erratum-8188 rhn-erratum-8189 rhn-erratum-8190 rhn-erratum-8191 rhn-erratum-8192 rhn-erratum-8193 rhn-erratum-8194 rhn-erratum-8195 rhn-erratum-8203 rhn-erratum-8204 rhn-erratum-8205 rhn-erratum-8243 rhn-erratum-8266 rhn-erratum-8276 rhn-erratum-8279 rhn-erratum-8283 rhn-erratum-8284 rhn-erratum-8285 rhn-erratum-8286 rhn-erratum-8288 rhn-erratum-8289 rhn-erratum-8291 rhn-erratum-8301 rhn-erratum-8304 rhn-erratum-8319 rhn-erratum-8325 rhn-erratum-8327 rhn-erratum-8328 rhn-erratum-8330 rhn-erratum-8338 rhn-erratum-8339 rhn-erratum-8358 rhn-erratum-8362 rhn-erratum-8363 rhn-erratum-8378 rhn-erratum-8379 rhn-erratum-8380 rhn-erratum-8382 rhn-erratum-8383 rhn-erratum-8384 rhn-erratum-8399 rhn-erratum-8400 rhn-erratum-8401 rhn-erratum-8403 rhn-erratum-8409 rhn-erratum-8423 rhn-erratum-8424 rhn-erratum-8425 rhn-erratum-8426 rhn-erratum-8427 rhn-erratum-8428 rhn-erratum-8429 rhn-erratum-8431 rhn-erratum-8437 rhn-erratum-8438 rhn-erratum-8440 rhn-erratum-8441 rhn-erratum-8444 rhn-erratum-8445 rhn-erratum-8446 rhn-erratum-8447 rhn-erratum-8449 rhn-erratum-8450 rhn-erratum-8451 rhn-erratum-8461 rhn-erratum-8462 rhn-erratum-8463 rhn-erratum-8464 rhn-erratum-8465 rhn-erratum-8466 rhn-erratum-8467 rhn-erratum-8469 rhn-erratum-8472 rhn-erratum-8476 rhn-erratum-8477 rhn-erratum-8478 rhn-erratum-8479 rhn-erratum-8480 rhn-erratum-8481 rhn-erratum-8482 rhn-erratum-8483 rhn-erratum-8521 rhn-erratum-8524 rhn-erratum-8525 rhn-erratum-8528 rhn-erratum-8529 rhn-erratum-8538 rhn-erratum-8539 rhn-erratum-8540 rhn-erratum-8542 rhn-erratum-8543 rhn-erratum-8549 rhn-erratum-8551 rhn-erratum-8552 rhn-erratum-8558 rhn-erratum-8559 rhn-erratum-8561 rhn-erratum-8562 rhn-erratum-8563 rhn-erratum-8564 rhn-erratum-8565 rhn-erratum-8566 rhn-erratum-8671 rhn-erratum-8673 rhn-erratum-8690 rhn-erratum-8703 rhn-erratum-8724 rhn-erratum-8725 rhn-erratum-8726 rhn-erratum-8727 rhn-erratum-8728 rhn-erratum-8729 rhn-erratum-8730 rhn-erratum-8731 rhn-erratum-8732 rhn-erratum-8742 rhn-erratum-8743 rhn-erratum-8744 rhn-erratum-8745 rhn-erratum-8765 rhn-erratum-8766 rhn-erratum-8769 rhn-erratum-8772 rhn-erratum-8776 rhn-erratum-8777 rhn-erratum-8778 rhn-erratum-8780 rhn-erratum-8781 rhn-erratum-8782 rhn-erratum-8783 rhn-erratum-8784 rhn-erratum-8785 rhn-erratum-8788 rhn-erratum-8789 rhn-erratum-8790 rhn-erratum-8791 rhn-erratum-8794 rhn-erratum-8796 rhn-erratum-8797 rhn-erratum-8798 rhn-erratum-8799 rhn-erratum-8800 rhn-erratum-8816 rhn-erratum-8817 rhn-erratum-8821 rhn-erratum-8836 rhn-erratum-8838 rhn-erratum-8856 rhn-erratum-8857 rhn-erratum-8859 rhn-erratum-8861 rhn-erratum-8883 rhn-erratum-8885 rhn-erratum-8886 rhn-erratum-8895 rhn-erratum-8897 rhn-erratum-8898 rhn-erratum-8899 rhn-erratum-8901 rhn-erratum-8912 rhn-erratum-8915 rhn-erratum-8923 rhn-erratum-8927 rhn-erratum-8928 rhn-erratum-8929 rhn-erratum-8936 rhn-erratum-8938 rhn-erratum-8939 rhn-erratum-8940 rhn-erratum-8942 rhn-erratum-8946 rhn-erratum-8960 rhn-erratum-8961 rhn-erratum-8965 rhn-erratum-8968 rhn-erratum-8978 rhn-erratum-8985 rhn-erratum-8988 rhn-erratum-8989 rhn-erratum-8990 rhn-erratum-8991 rhn-erratum-8992 rhn-erratum-8993 rhn-erratum-8996 rhn-erratum-8997 rhn-erratum-8998 rhn-erratum-8999 rhn-erratum-9000 rhn-erratum-9001 rhn-erratum-9002 rhn-erratum-9004 rhn-erratum-9006 rhn-erratum-9007 rhn-erratum-9008 rhn-erratum-9009 rhn-erratum-9010 rhn-erratum-9013 rhn-erratum-9014 rhn-erratum-9017 rhn-erratum-9018 rhn-erratum-9019 rhn-erratum-9020 rhn-erratum-9021 rhn-erratum-9022 rhn-erratum-9023 rhn-erratum-9024 rhn-erratum-9026 rhn-erratum-9027 rhn-erratum-9028 rhn-erratum-9029 rhn-erratum-9030 rhn-erratum-9031 rhn-erratum-9032 rhn-erratum-9033 rhn-erratum-9034 rhn-erratum-9035 rhn-erratum-9036 rhn-erratum-9037 rhn-erratum-9039 rhn-erratum-9040 rhn-erratum-9042 rhn-erratum-9043 rhn-erratum-9045 rhn-erratum-9046 rhn-erratum-9047 rhn-erratum-9049 rhn-erratum-9051 rhn-erratum-9052 rhn-erratum-9053 rhn-erratum-9054 rhn-erratum-9055 rhn-erratum-9056 rhn-erratum-9057 rhn-erratum-9058 rhn-erratum-9059 rhn-erratum-9060 rhn-erratum-9061 rhn-erratum-9063 rhn-erratum-9066 rhn-erratum-9067 rhn-erratum-9068 rhn-erratum-9069 rhn-erratum-9070 rhn-erratum-9071 rhn-erratum-9072 rhn-erratum-9074 rhn-erratum-9076 rhn-erratum-9080 rhn-erratum-9081 rhn-erratum-9082 rhn-erratum-9083 rhn-erratum-9084 rhn-erratum-9085 rhn-erratum-9086 rhn-erratum-9087 rhn-erratum-9088 rhn-erratum-9089 rhn-erratum-9090 rhn-erratum-9091 rhn-erratum-9092 rhn-erratum-9093 rhn-erratum-9094 rhn-erratum-9095 rhn-erratum-9096 rhn-erratum-9097 rhn-erratum-9098 rhn-erratum-9099 rhn-erratum-9100 rhn-erratum-9101 rhn-erratum-9102 rhn-erratum-9103 rhn-erratum-9104 rhn-erratum-9105 rhn-erratum-9107 rhn-erratum-9108 rhn-erratum-9109 rhn-erratum-9110 rhn-erratum-9111 rhn-erratum-9112 rhn-erratum-9113 rhn-erratum-9114 rhn-erratum-9115 rhn-erratum-9116 rhn-erratum-9117 rhn-erratum-9118 rhn-erratum-9120 rhn-erratum-9121 rhn-erratum-9122 rhn-erratum-9124 rhn-erratum-9125 rhn-erratum-9126 rhn-erratum-9127 rhn-erratum-9128 rhn-erratum-9129 rhn-erratum-9130 rhn-erratum-9132 rhn-erratum-9134 rhn-erratum-9136 rhn-erratum-9138 rhn-erratum-9139 rhn-erratum-9140 rhn-erratum-9141 rhn-erratum-9142 rhn-erratum-9143 rhn-erratum-9144 rhn-erratum-9145 rhn-erratum-9146 rhn-erratum-9147 rhn-erratum-9150 rhn-erratum-9157 rhn-erratum-9158 rhn-erratum-9159 rhn-erratum-9162 rhn-erratum-9163 rhn-erratum-9164 rhn-erratum-9166 rhn-erratum-9167 rhn-erratum-9168 rhn-erratum-9170 rhn-erratum-9175 rhn-erratum-9176 rhn-erratum-9179 rhn-erratum-9184 rhn-erratum-9185 rhn-erratum-9199 rhn-erratum-9200 rhn-erratum-9203 rhn-erratum-9206 rhn-erratum-9211 rhn-erratum-9215 rhn-erratum-9216 rhn-erratum-9219 rhn-erratum-9220 rhn-erratum-9221 rhn-erratum-9223 rhn-erratum-9224 rhn-erratum-9225 rhn-erratum-9227 rhn-erratum-9229 rhn-erratum-9237 rhn-erratum-9240 rhn-erratum-9241 rhn-erratum-9244 rhn-erratum-9248 rhn-erratum-9249 rhn-erratum-9260 rhn-erratum-9265 rhn-erratum-9266 rhn-erratum-9268" kickstartable-trees="ks-rhel-x86_64-server-5 ks-rhel-x86_64-server-5-u1 ks-rhel-x86_64-server-5-u2 ks-rhel-x86_64-server-5-u3 ks-rhel-x86_64-server-5-u4" label="rhel-x86_64-server-5" packages="rhn-package-386982 rhn-package-386983 rhn-package-386987 rhn-package-386988 rhn-package-386990 rhn-package-386994 rhn-package-386995 rhn-package-386996 rhn-package-386997 rhn-package-387001 rhn-package-387003 rhn-package-387004 rhn-package-387007 rhn-package-387008 rhn-package-387009 rhn-package-387010 rhn-package-387011 rhn-package-387013 rhn-package-387014 rhn-package-387017 rhn-package-387019 rhn-package-387020 rhn-package-387021 rhn-package-387023 rhn-package-387025 rhn-package-387029 rhn-package-387032 rhn-package-387034 rhn-package-387035 rhn-package-387038 rhn-package-387039 rhn-package-387040 rhn-package-387041 rhn-package-387042 rhn-package-387043 rhn-package-387046 rhn-package-387048 rhn-package-387050 rhn-package-387051 rhn-package-387052 rhn-package-387054 rhn-package-387055 rhn-package-387057 rhn-package-387064 rhn-package-387065 rhn-package-387070 rhn-package-387074 rhn-package-387075 rhn-package-387076 rhn-package-387082 rhn-package-387084 rhn-package-387085 rhn-package-387087 rhn-package-387092 rhn-package-387096 rhn-package-387107 rhn-package-387110 rhn-package-387114 rhn-package-387116 rhn-package-387122 rhn-package-387124 rhn-package-387127 rhn-package-387132 rhn-package-387135 rhn-package-387143 rhn-package-387144 rhn-package-387145 rhn-package-387149 rhn-package-387150 rhn-package-387151 rhn-package-387152 rhn-package-387153 rhn-package-387155 rhn-package-387157 rhn-package-387159 rhn-package-387162 rhn-package-387164 rhn-package-387168 rhn-package-387170 rhn-package-387172 rhn-package-387176 rhn-package-387183 rhn-package-387184 rhn-package-387189 rhn-package-387191 rhn-package-387192 rhn-package-387199 rhn-package-387201 rhn-package-387207 rhn-package-387216 rhn-package-387223 rhn-package-387224 rhn-package-387229 rhn-package-387232 rhn-package-387234 rhn-package-387235 rhn-package-387237 rhn-package-387239 rhn-package-387243 rhn-package-387245 rhn-package-387246 rhn-package-387249 rhn-package-387251 rhn-package-387252 rhn-package-387254 rhn-package-387257 rhn-package-387264 rhn-package-387265 rhn-package-387266 rhn-package-387271 rhn-package-387272 rhn-package-387274 rhn-package-387278 rhn-package-387280 rhn-package-387282 rhn-package-387285 rhn-package-387286 rhn-package-387288 rhn-package-387289 rhn-package-387290 rhn-package-387298 rhn-package-387300 rhn-package-387301 rhn-package-387302 rhn-package-387304 rhn-package-387306 rhn-package-387307 rhn-package-387310 rhn-package-387312 rhn-package-387313 rhn-package-387314 rhn-package-387317 rhn-package-387318 rhn-package-387322 rhn-package-387323 rhn-package-387327 rhn-package-387330 rhn-package-387332 rhn-package-387337 rhn-package-387340 rhn-package-387343 rhn-package-387346 rhn-package-387347 rhn-package-387356 rhn-package-387357 rhn-package-387360 rhn-package-387369 rhn-package-387370 rhn-package-387376 rhn-package-387379 rhn-package-387381 rhn-package-387382 rhn-package-387383 rhn-package-387384 rhn-package-387389 rhn-package-387393 rhn-package-387394 rhn-package-387395 rhn-package-387397 rhn-package-387402 rhn-package-387405 rhn-package-387407 rhn-package-387408 rhn-package-387410 rhn-package-387416 rhn-package-387427 rhn-package-387428 rhn-package-387429 rhn-package-387431 rhn-package-387432 rhn-package-387434 rhn-package-387435 rhn-package-387439 rhn-package-387444 rhn-package-387445 rhn-package-387446 rhn-package-387451 rhn-package-387452 rhn-package-387453 rhn-package-387454 rhn-package-387458 rhn-package-387459 rhn-package-387460 rhn-package-387461 rhn-package-387462 rhn-package-387470 rhn-package-387471 rhn-package-387473 rhn-package-387477 rhn-package-387481 rhn-package-387491 rhn-package-387493 rhn-package-387494 rhn-package-387497 rhn-package-387499 rhn-package-387502 rhn-package-387504 rhn-package-387505 rhn-package-387510 rhn-package-387512 rhn-package-387513 rhn-package-387516 rhn-package-387517 rhn-package-387525 rhn-package-387527 rhn-package-387530 rhn-package-387532 rhn-package-387533 rhn-package-387536 rhn-package-387539 rhn-package-387542 rhn-package-387547 rhn-package-387554 rhn-package-387556 rhn-package-387557 rhn-package-387564 rhn-package-387569 rhn-package-387571 rhn-package-387572 rhn-package-387576 rhn-package-387579 rhn-package-387583 rhn-package-387585 rhn-package-387586 rhn-package-387588 rhn-package-387591 rhn-package-387603 rhn-package-387605 rhn-package-387606 rhn-package-387607 rhn-package-387610 rhn-package-387611 rhn-package-387612 rhn-package-387621 rhn-package-387623 rhn-package-387624 rhn-package-387626 rhn-package-387634 rhn-package-387636 rhn-package-387641 rhn-package-387644 rhn-package-387646 rhn-package-387648 rhn-package-387651 rhn-package-387652 rhn-package-387653 rhn-package-387655 rhn-package-387656 rhn-package-387657 rhn-package-387660 rhn-package-387662 rhn-package-387663 rhn-package-387664 rhn-package-387669 rhn-package-387671 rhn-package-387673 rhn-package-387675 rhn-package-387676 rhn-package-387678 rhn-package-387681 rhn-package-387682 rhn-package-387683 rhn-package-387689 rhn-package-387690 rhn-package-387691 rhn-package-387692 rhn-package-387694 rhn-package-387695 rhn-package-387699 rhn-package-387709 rhn-package-387716 rhn-package-387721 rhn-package-387723 rhn-package-387724 rhn-package-387725 rhn-package-387726 rhn-package-387727 rhn-package-387731 rhn-package-387736 rhn-package-387742 rhn-package-387744 rhn-package-387748 rhn-package-387752 rhn-package-387753 rhn-package-387760 rhn-package-387761 rhn-package-387765 rhn-package-387768 rhn-package-387771 rhn-package-387774 rhn-package-387775 rhn-package-387776 rhn-package-387778 rhn-package-387779 rhn-package-387781 rhn-package-387784 rhn-package-387786 rhn-package-387787 rhn-package-387796 rhn-package-387798 rhn-package-387803 rhn-package-387804 rhn-package-387807 rhn-package-387808 rhn-package-387812 rhn-package-387813 rhn-package-387822 rhn-package-387828 rhn-package-387829 rhn-package-387831 rhn-package-387832 rhn-package-387833 rhn-package-387834 rhn-package-387836 rhn-package-387837 rhn-package-387838 rhn-package-387839 rhn-package-387840 rhn-package-387842 rhn-package-387844 rhn-package-387852 rhn-package-387853 rhn-package-387855 rhn-package-387856 rhn-package-387858 rhn-package-387860 rhn-package-387864 rhn-package-387866 rhn-package-387867 rhn-package-387871 rhn-package-387873 rhn-package-387876 rhn-package-387880 rhn-package-387884 rhn-package-387885 rhn-package-387887 rhn-package-387890 rhn-package-387893 rhn-package-387895 rhn-package-387896 rhn-package-387912 rhn-package-387915 rhn-package-387916 rhn-package-387917 rhn-package-387918 rhn-package-387920 rhn-package-387921 rhn-package-387922 rhn-package-387924 rhn-package-387926 rhn-package-387927 rhn-package-387929 rhn-package-387931 rhn-package-387932 rhn-package-387933 rhn-package-387935 rhn-package-387936 rhn-package-387937 rhn-package-387938 rhn-package-387942 rhn-package-387944 rhn-package-387946 rhn-package-387948 rhn-package-387952 rhn-package-387953 rhn-package-387954 rhn-package-387958 rhn-package-387959 rhn-package-387962 rhn-package-387964 rhn-package-387966 rhn-package-387967 rhn-package-387968 rhn-package-387972 rhn-package-387974 rhn-package-387977 rhn-package-387979 rhn-package-387981 rhn-package-387982 rhn-package-387983 rhn-package-387984 rhn-package-387986 rhn-package-387988 rhn-package-387989 rhn-package-387991 rhn-package-387992 rhn-package-387994 rhn-package-387996 rhn-package-387997 rhn-package-387998 rhn-package-388000 rhn-package-388001 rhn-package-388002 rhn-package-388004 rhn-package-388005 rhn-package-388006 rhn-package-388007 rhn-package-388008 rhn-package-388009 rhn-package-388012 rhn-package-388013 rhn-package-388015 rhn-package-388019 rhn-package-388021 rhn-package-388023 rhn-package-388024 rhn-package-388025 rhn-package-388026 rhn-package-388029 rhn-package-388030 rhn-package-388032 rhn-package-388035 rhn-package-388036 rhn-package-388037 rhn-package-388038 rhn-package-388039 rhn-package-388040 rhn-package-388042 rhn-package-388045 rhn-package-388048 rhn-package-388049 rhn-package-388050 rhn-package-388051 rhn-package-388052 rhn-package-388053 rhn-package-388054 rhn-package-388057 rhn-package-388058 rhn-package-388059 rhn-package-388060 rhn-package-388069 rhn-package-388071 rhn-package-388072 rhn-package-388073 rhn-package-388077 rhn-package-388081 rhn-package-388082 rhn-package-388083 rhn-package-388084 rhn-package-388085 rhn-package-388086 rhn-package-388087 rhn-package-388088 rhn-package-388089 rhn-package-388091 rhn-package-388092 rhn-package-388094 rhn-package-388096 rhn-package-388097 rhn-package-388099 rhn-package-388101 rhn-package-388103 rhn-package-388105 rhn-package-388106 rhn-package-388109 rhn-package-388110 rhn-package-388111 rhn-package-388113 rhn-package-388114 rhn-package-388115 rhn-package-388117 rhn-package-388118 rhn-package-388119 rhn-package-388120 rhn-package-388122 rhn-package-388123 rhn-package-388125 rhn-package-388126 rhn-package-388130 rhn-package-388131 rhn-package-388132 rhn-package-388137 rhn-package-388140 rhn-package-388142 rhn-package-388143 rhn-package-388145 rhn-package-388146 rhn-package-388147 rhn-package-388148 rhn-package-388149 rhn-package-388150 rhn-package-388153 rhn-package-388154 rhn-package-388155 rhn-package-388157 rhn-package-388158 rhn-package-388159 rhn-package-388161 rhn-package-388162 rhn-package-388165 rhn-package-388166 rhn-package-388167 rhn-package-388170 rhn-package-388171 rhn-package-388174 rhn-package-388175 rhn-package-388176 rhn-package-388177 rhn-package-388181 rhn-package-388182 rhn-package-388184 rhn-package-388185 rhn-package-388186 rhn-package-388189 rhn-package-388190 rhn-package-388191 rhn-package-388193 rhn-package-388195 rhn-package-388197 rhn-package-388198 rhn-package-388200 rhn-package-388202 rhn-package-388205 rhn-package-388206 rhn-package-388207 rhn-package-388209 rhn-package-388210 rhn-package-388211 rhn-package-388212 rhn-package-388214 rhn-package-388215 rhn-package-388217 rhn-package-388220 rhn-package-388222 rhn-package-388223 rhn-package-388225 rhn-package-388227 rhn-package-388229 rhn-package-388231 rhn-package-388233 rhn-package-388235 rhn-package-388237 rhn-package-388240 rhn-package-388245 rhn-package-388246 rhn-package-388247 rhn-package-388248 rhn-package-388249 rhn-package-388250 rhn-package-388251 rhn-package-388252 rhn-package-388254 rhn-package-388255 rhn-package-388256 rhn-package-388257 rhn-package-388259 rhn-package-388260 rhn-package-388261 rhn-package-388263 rhn-package-388265 rhn-package-388268 rhn-package-388270 rhn-package-388271 rhn-package-388273 rhn-package-388274 rhn-package-388276 rhn-package-388277 rhn-package-388282 rhn-package-388283 rhn-package-388284 rhn-package-388285 rhn-package-388287 rhn-package-388289 rhn-package-388290 rhn-package-388291 rhn-package-388292 rhn-package-388293 rhn-package-388296 rhn-package-388301 rhn-package-388302 rhn-package-388303 rhn-package-388305 rhn-package-388307 rhn-package-388308 rhn-package-388310 rhn-package-388311 rhn-package-388313 rhn-package-388314 rhn-package-388315 rhn-package-388316 rhn-package-388318 rhn-package-388319 rhn-package-388322 rhn-package-388323 rhn-package-388324 rhn-package-388325 rhn-package-388327 rhn-package-388328 rhn-package-388340 rhn-package-388342 rhn-package-388349 rhn-package-388350 rhn-package-388353 rhn-package-388355 rhn-package-388357 rhn-package-388358 rhn-package-388367 rhn-package-388377 rhn-package-388378 rhn-package-388385 rhn-package-388392 rhn-package-388401 rhn-package-388406 rhn-package-388416 rhn-package-388418 rhn-package-388419 rhn-package-388430 rhn-package-388442 rhn-package-388450 rhn-package-388462 rhn-package-388468 rhn-package-388520 rhn-package-388523 rhn-package-388525 rhn-package-388527 rhn-package-388528 rhn-package-388534 rhn-package-388536 rhn-package-388537 rhn-package-388538 rhn-package-388539 rhn-package-388541 rhn-package-388542 rhn-package-388543 rhn-package-388544 rhn-package-388545 rhn-package-388547 rhn-package-388549 rhn-package-388552 rhn-package-388554 rhn-package-388555 rhn-package-388556 rhn-package-388557 rhn-package-388563 rhn-package-388565 rhn-package-388567 rhn-package-388568 rhn-package-388569 rhn-package-388572 rhn-package-388578 rhn-package-388580 rhn-package-388586 rhn-package-388587 rhn-package-388588 rhn-package-388589 rhn-package-388590 rhn-package-388593 rhn-package-388594 rhn-package-388595 rhn-package-388596 rhn-package-388597 rhn-package-388598 rhn-package-388599 rhn-package-388600 rhn-package-388603 rhn-package-388605 rhn-package-388606 rhn-package-388608 rhn-package-388609 rhn-package-388613 rhn-package-388615 rhn-package-388620 rhn-package-388621 rhn-package-388627 rhn-package-388628 rhn-package-388629 rhn-package-388630 rhn-package-388631 rhn-package-388632 rhn-package-388633 rhn-package-388634 rhn-package-388635 rhn-package-388637 rhn-package-388639 rhn-package-388641 rhn-package-388642 rhn-package-388644 rhn-package-388645 rhn-package-388647 rhn-package-388650 rhn-package-388652 rhn-package-388657 rhn-package-388658 rhn-package-388659 rhn-package-388666 rhn-package-388667 rhn-package-388669 rhn-package-388672 rhn-package-388674 rhn-package-388676 rhn-package-388677 rhn-package-388679 rhn-package-388680 rhn-package-388681 rhn-package-388682 rhn-package-388683 rhn-package-388684 rhn-package-388685 rhn-package-388688 rhn-package-388689 rhn-package-388690 rhn-package-388691 rhn-package-388694 rhn-package-388696 rhn-package-388697 rhn-package-388698 rhn-package-388699 rhn-package-388701 rhn-package-388702 rhn-package-388704 rhn-package-388705 rhn-package-388706 rhn-package-388708 rhn-package-388711 rhn-package-388712 rhn-package-388713 rhn-package-388714 rhn-package-388722 rhn-package-388723 rhn-package-388724 rhn-package-388726 rhn-package-388727 rhn-package-388729 rhn-package-388730 rhn-package-388732 rhn-package-388733 rhn-package-388734 rhn-package-388736 rhn-package-388738 rhn-package-388739 rhn-package-388740 rhn-package-388741 rhn-package-388742 rhn-package-388743 rhn-package-388748 rhn-package-388752 rhn-package-388755 rhn-package-388759 rhn-package-388760 rhn-package-388761 rhn-package-388763 rhn-package-388766 rhn-package-388768 rhn-package-388771 rhn-package-388772 rhn-package-388773 rhn-package-388774 rhn-package-388776 rhn-package-388777 rhn-package-388778 rhn-package-388782 rhn-package-388783 rhn-package-388785 rhn-package-388786 rhn-package-388788 rhn-package-388790 rhn-package-388791 rhn-package-388792 rhn-package-388793 rhn-package-388794 rhn-package-388798 rhn-package-388799 rhn-package-388800 rhn-package-388802 rhn-package-388804 rhn-package-388805 rhn-package-388806 rhn-package-388807 rhn-package-388808 rhn-package-388809 rhn-package-388810 rhn-package-388811 rhn-package-388815 rhn-package-388818 rhn-package-388823 rhn-package-388824 rhn-package-388825 rhn-package-388826 rhn-package-388827 rhn-package-388828 rhn-package-388829 rhn-package-388830 rhn-package-388832 rhn-package-388833 rhn-package-388834 rhn-package-388836 rhn-package-388838 rhn-package-388840 rhn-package-388841 rhn-package-388844 rhn-package-388845 rhn-package-388846 rhn-package-388851 rhn-package-388852 rhn-package-388854 rhn-package-388858 rhn-package-388860 rhn-package-388861 rhn-package-388862 rhn-package-388863 rhn-package-388865 rhn-package-388866 rhn-package-388868 rhn-package-388872 rhn-package-388873 rhn-package-388874 rhn-package-388878 rhn-package-388879 rhn-package-388884 rhn-package-388887 rhn-package-388888 rhn-package-388889 rhn-package-388891 rhn-package-388892 rhn-package-388894 rhn-package-388896 rhn-package-388897 rhn-package-388898 rhn-package-388899 rhn-package-388901 rhn-package-388904 rhn-package-388905 rhn-package-388906 rhn-package-388907 rhn-package-388908 rhn-package-388909 rhn-package-388911 rhn-package-388914 rhn-package-388918 rhn-package-388920 rhn-package-388921 rhn-package-388922 rhn-package-388923 rhn-package-388927 rhn-package-388928 rhn-package-388929 rhn-package-388931 rhn-package-388933 rhn-package-388936 rhn-package-388937 rhn-package-388938 rhn-package-388940 rhn-package-388942 rhn-package-388945 rhn-package-388946 rhn-package-388950 rhn-package-388954 rhn-package-388960 rhn-package-388963 rhn-package-388966 rhn-package-388968 rhn-package-388970 rhn-package-388971 rhn-package-388977 rhn-package-388980 rhn-package-388981 rhn-package-388983 rhn-package-388984 rhn-package-388986 rhn-package-388987 rhn-package-388988 rhn-package-388989 rhn-package-388993 rhn-package-388994 rhn-package-388995 rhn-package-388997 rhn-package-388998 rhn-package-389000 rhn-package-389001 rhn-package-389004 rhn-package-389005 rhn-package-389009 rhn-package-389012 rhn-package-389015 rhn-package-389018 rhn-package-389019 rhn-package-389020 rhn-package-389021 rhn-package-389022 rhn-package-389026 rhn-package-389028 rhn-package-389031 rhn-package-389032 rhn-package-389034 rhn-package-389035 rhn-package-389036 rhn-package-389037 rhn-package-389040 rhn-package-389041 rhn-package-389044 rhn-package-389046 rhn-package-389047 rhn-package-389048 rhn-package-389049 rhn-package-389050 rhn-package-389052 rhn-package-389054 rhn-package-389055 rhn-package-389056 rhn-package-389057 rhn-package-389058 rhn-package-389061 rhn-package-389062 rhn-package-389064 rhn-package-389065 rhn-package-389066 rhn-package-389069 rhn-package-389073 rhn-package-389074 rhn-package-389083 rhn-package-389088 rhn-package-389090 rhn-package-389091 rhn-package-389092 rhn-package-389093 rhn-package-389095 rhn-package-389096 rhn-package-389097 rhn-package-389098 rhn-package-389099 rhn-package-389101 rhn-package-389102 rhn-package-389104 rhn-package-389105 rhn-package-389107 rhn-package-389111 rhn-package-389112 rhn-package-389113 rhn-package-389114 rhn-package-389117 rhn-package-389118 rhn-package-389121 rhn-package-389125 rhn-package-389128 rhn-package-389129 rhn-package-389132 rhn-package-389133 rhn-package-389134 rhn-package-389136 rhn-package-389138 rhn-package-389139 rhn-package-389140 rhn-package-389141 rhn-package-389146 rhn-package-389148 rhn-package-389149 rhn-package-389156 rhn-package-389159 rhn-package-389161 rhn-package-389162 rhn-package-389164 rhn-package-389167 rhn-package-389169 rhn-package-389171 rhn-package-389172 rhn-package-389173 rhn-package-389174 rhn-package-389176 rhn-package-389179 rhn-package-389183 rhn-package-389184 rhn-package-389185 rhn-package-389187 rhn-package-389188 rhn-package-389190 rhn-package-389192 rhn-package-389193 rhn-package-389197 rhn-package-389198 rhn-package-389200 rhn-package-389201 rhn-package-389202 rhn-package-389207 rhn-package-389209 rhn-package-389210 rhn-package-389211 rhn-package-389212 rhn-package-389213 rhn-package-389214 rhn-package-389215 rhn-package-389216 rhn-package-389218 rhn-package-389220 rhn-package-389221 rhn-package-389222 rhn-package-389225 rhn-package-389226 rhn-package-389227 rhn-package-389228 rhn-package-389229 rhn-package-389230 rhn-package-389231 rhn-package-389232 rhn-package-389235 rhn-package-389237 rhn-package-389238 rhn-package-389239 rhn-package-389240 rhn-package-389241 rhn-package-389243 rhn-package-389244 rhn-package-389249 rhn-package-389251 rhn-package-389252 rhn-package-389253 rhn-package-389256 rhn-package-389257 rhn-package-389258 rhn-package-389259 rhn-package-389260 rhn-package-389261 rhn-package-389262 rhn-package-389264 rhn-package-389265 rhn-package-389266 rhn-package-389267 rhn-package-389268 rhn-package-389269 rhn-package-389270 rhn-package-389272 rhn-package-389273 rhn-package-389274 rhn-package-389275 rhn-package-389276 rhn-package-389277 rhn-package-389278 rhn-package-389279 rhn-package-389280 rhn-package-389282 rhn-package-389283 rhn-package-389284 rhn-package-389285 rhn-package-389286 rhn-package-389287 rhn-package-389288 rhn-package-389289 rhn-package-389290 rhn-package-389291 rhn-package-389292 rhn-package-389293 rhn-package-389295 rhn-package-389296 rhn-package-389298 rhn-package-389299 rhn-package-389300 rhn-package-389301 rhn-package-389303 rhn-package-389304 rhn-package-389305 rhn-package-389306 rhn-package-389307 rhn-package-389308 rhn-package-389309 rhn-package-389310 rhn-package-389311 rhn-package-389312 rhn-package-389314 rhn-package-389315 rhn-package-389317 rhn-package-389318 rhn-package-389319 rhn-package-389320 rhn-package-389321 rhn-package-389323 rhn-package-389324 rhn-package-389325 rhn-package-389326 rhn-package-389327 rhn-package-389328 rhn-package-389329 rhn-package-389330 rhn-package-389331 rhn-package-389333 rhn-package-389334 rhn-package-389335 rhn-package-389336 rhn-package-389337 rhn-package-389338 rhn-package-389339 rhn-package-389340 rhn-package-389341 rhn-package-389342 rhn-package-389343 rhn-package-389344 rhn-package-389345 rhn-package-389346 rhn-package-389347 rhn-package-389349 rhn-package-389350 rhn-package-389352 rhn-package-389353 rhn-package-389356 rhn-package-389357 rhn-package-389358 rhn-package-389359 rhn-package-389361 rhn-package-389362 rhn-package-389363 rhn-package-389364 rhn-package-389365 rhn-package-389367 rhn-package-389368 rhn-package-389369 rhn-package-389370 rhn-package-389371 rhn-package-389372 rhn-package-389373 rhn-package-389374 rhn-package-389375 rhn-package-389376 rhn-package-389377 rhn-package-389378 rhn-package-389379 rhn-package-389380 rhn-package-389381 rhn-package-389382 rhn-package-389383 rhn-package-389384 rhn-package-389385 rhn-package-389387 rhn-package-389388 rhn-package-389389 rhn-package-389390 rhn-package-389391 rhn-package-389393 rhn-package-389394 rhn-package-389395 rhn-package-389399 rhn-package-389402 rhn-package-389403 rhn-package-389404 rhn-package-389405 rhn-package-389406 rhn-package-389407 rhn-package-389408 rhn-package-389410 rhn-package-389412 rhn-package-389413 rhn-package-389414 rhn-package-389415 rhn-package-389417 rhn-package-389418 rhn-package-389419 rhn-package-389420 rhn-package-389421 rhn-package-389422 rhn-package-389423 rhn-package-389424 rhn-package-389425 rhn-package-389427 rhn-package-389428 rhn-package-389430 rhn-package-389432 rhn-package-389433 rhn-package-389434 rhn-package-389435 rhn-package-389436 rhn-package-389437 rhn-package-389438 rhn-package-389439 rhn-package-389441 rhn-package-389442 rhn-package-389443 rhn-package-389445 rhn-package-389446 rhn-package-389447 rhn-package-389449 rhn-package-389457 rhn-package-389458 rhn-package-389459 rhn-package-389460 rhn-package-389461 rhn-package-389462 rhn-package-389463 rhn-package-389464 rhn-package-389465 rhn-package-389466 rhn-package-389467 rhn-package-389468 rhn-package-389469 rhn-package-389470 rhn-package-389471 rhn-package-389472 rhn-package-389473 rhn-package-389474 rhn-package-389475 rhn-package-389476 rhn-package-389477 rhn-package-389478 rhn-package-389479 rhn-package-389480 rhn-package-389481 rhn-package-389482 rhn-package-389483 rhn-package-389484 rhn-package-389485 rhn-package-389486 rhn-package-389487 rhn-package-389488 rhn-package-389489 rhn-package-389490 rhn-package-389491 rhn-package-389492 rhn-package-389493 rhn-package-389494 rhn-package-389495 rhn-package-389496 rhn-package-389497 rhn-package-389498 rhn-package-389499 rhn-package-389500 rhn-package-389501 rhn-package-389502 rhn-package-389503 rhn-package-389504 rhn-package-389505 rhn-package-389506 rhn-package-389507 rhn-package-389508 rhn-package-389509 rhn-package-389510 rhn-package-389511 rhn-package-389512 rhn-package-389513 rhn-package-389514 rhn-package-389516 rhn-package-389517 rhn-package-389518 rhn-package-389519 rhn-package-389520 rhn-package-389521 rhn-package-389522 rhn-package-389524 rhn-package-389525 rhn-package-389526 rhn-package-389527 rhn-package-389528 rhn-package-389529 rhn-package-389530 rhn-package-389531 rhn-package-389532 rhn-package-389533 rhn-package-389534 rhn-package-389535 rhn-package-389536 rhn-package-389537 rhn-package-389538 rhn-package-389539 rhn-package-389540 rhn-package-389541 rhn-package-389542 rhn-package-389543 rhn-package-389544 rhn-package-389545 rhn-package-389546 rhn-package-389547 rhn-package-389548 rhn-package-389549 rhn-package-389550 rhn-package-389551 rhn-package-389552 rhn-package-389553 rhn-package-389554 rhn-package-389556 rhn-package-389557 rhn-package-389558 rhn-package-389559 rhn-package-389560 rhn-package-389561 rhn-package-389562 rhn-package-389563 rhn-package-389564 rhn-package-389565 rhn-package-389566 rhn-package-389568 rhn-package-389569 rhn-package-389570 rhn-package-389571 rhn-package-389572 rhn-package-389573 rhn-package-389574 rhn-package-389575 rhn-package-389576 rhn-package-389577 rhn-package-389578 rhn-package-389579 rhn-package-389580 rhn-package-389581 rhn-package-389582 rhn-package-389583 rhn-package-389584 rhn-package-389585 rhn-package-389586 rhn-package-389587 rhn-package-389588 rhn-package-389589 rhn-package-389590 rhn-package-389591 rhn-package-389592 rhn-package-389593 rhn-package-389594 rhn-package-389595 rhn-package-389596 rhn-package-389597 rhn-package-389598 rhn-package-389599 rhn-package-389600 rhn-package-389601 rhn-package-389602 rhn-package-389604 rhn-package-389605 rhn-package-389606 rhn-package-389607 rhn-package-389608 rhn-package-389609 rhn-package-389610 rhn-package-389611 rhn-package-389612 rhn-package-389613 rhn-package-389614 rhn-package-389615 rhn-package-389616 rhn-package-389617 rhn-package-389618 rhn-package-389619 rhn-package-389620 rhn-package-389621 rhn-package-389622 rhn-package-389623 rhn-package-389624 rhn-package-389625 rhn-package-389626 rhn-package-389627 rhn-package-389628 rhn-package-389629 rhn-package-389630 rhn-package-389631 rhn-package-389632 rhn-package-389633 rhn-package-389634 rhn-package-389635 rhn-package-389636 rhn-package-389637 rhn-package-389638 rhn-package-389639 rhn-package-389640 rhn-package-389641 rhn-package-389642 rhn-package-389643 rhn-package-389644 rhn-package-389645 rhn-package-389646 rhn-package-389647 rhn-package-389648 rhn-package-389649 rhn-package-389650 rhn-package-389651 rhn-package-389652 rhn-package-389653 rhn-package-389654 rhn-package-389655 rhn-package-389656 rhn-package-389658 rhn-package-389659 rhn-package-389660 rhn-package-389661 rhn-package-389662 rhn-package-389663 rhn-package-389664 rhn-package-389665 rhn-package-389667 rhn-package-389668 rhn-package-389669 rhn-package-389670 rhn-package-389671 rhn-package-389672 rhn-package-389673 rhn-package-389674 rhn-package-389675 rhn-package-389676 rhn-package-389677 rhn-package-389678 rhn-package-389679 rhn-package-389680 rhn-package-389681 rhn-package-389682 rhn-package-389683 rhn-package-389684 rhn-package-389685 rhn-package-389686 rhn-package-389687 rhn-package-389688 rhn-package-389689 rhn-package-389690 rhn-package-389691 rhn-package-389692 rhn-package-389693 rhn-package-389694 rhn-package-389695 rhn-package-389697 rhn-package-389698 rhn-package-389699 rhn-package-389700 rhn-package-389701 rhn-package-389702 rhn-package-389703 rhn-package-389704 rhn-package-389705 rhn-package-389706 rhn-package-389707 rhn-package-389708 rhn-package-389709 rhn-package-389710 rhn-package-389711 rhn-package-389712 rhn-package-389713 rhn-package-389714 rhn-package-389715 rhn-package-389716 rhn-package-389717 rhn-package-389718 rhn-package-389719 rhn-package-389720 rhn-package-389721 rhn-package-389722 rhn-package-389723 rhn-package-389724 rhn-package-389725 rhn-package-389726 rhn-package-389727 rhn-package-389728 rhn-package-389729 rhn-package-389730 rhn-package-389731 rhn-package-389732 rhn-package-389733 rhn-package-389734 rhn-package-389735 rhn-package-389736 rhn-package-389737 rhn-package-389738 rhn-package-389739 rhn-package-389740 rhn-package-389741 rhn-package-389742 rhn-package-389743 rhn-package-389744 rhn-package-389745 rhn-package-389746 rhn-package-389747 rhn-package-389748 rhn-package-389749 rhn-package-389750 rhn-package-389752 rhn-package-389753 rhn-package-389754 rhn-package-389755 rhn-package-389756 rhn-package-389757 rhn-package-389758 rhn-package-389759 rhn-package-389760 rhn-package-389761 rhn-package-389762 rhn-package-389763 rhn-package-389764 rhn-package-389765 rhn-package-389766 rhn-package-389767 rhn-package-389768 rhn-package-389769 rhn-package-389771 rhn-package-389772 rhn-package-389773 rhn-package-389774 rhn-package-389775 rhn-package-389776 rhn-package-389777 rhn-package-389778 rhn-package-389779 rhn-package-389780 rhn-package-389781 rhn-package-389782 rhn-package-389783 rhn-package-389784 rhn-package-389785 rhn-package-390348 rhn-package-390349 rhn-package-390350 rhn-package-390351 rhn-package-390352 rhn-package-390353 rhn-package-390354 rhn-package-390355 rhn-package-390356 rhn-package-390357 rhn-package-390358 rhn-package-390359 rhn-package-390360 rhn-package-390361 rhn-package-390362 rhn-package-390363 rhn-package-390364 rhn-package-390365 rhn-package-390366 rhn-package-390367 rhn-package-390368 rhn-package-390369 rhn-package-390370 rhn-package-390371 rhn-package-390372 rhn-package-390373 rhn-package-390374 rhn-package-390375 rhn-package-390376 rhn-package-390377 rhn-package-390378 rhn-package-390379 rhn-package-390380 rhn-package-390381 rhn-package-390382 rhn-package-390383 rhn-package-390384 rhn-package-390385 rhn-package-390386 rhn-package-390387 rhn-package-390388 rhn-package-390389 rhn-package-390390 rhn-package-390391 rhn-package-390392 rhn-package-390393 rhn-package-390394 rhn-package-390395 rhn-package-390396 rhn-package-390397 rhn-package-390398 rhn-package-390399 rhn-package-390400 rhn-package-390401 rhn-package-390402 rhn-package-390403 rhn-package-390404 rhn-package-390405 rhn-package-390406 rhn-package-390407 rhn-package-390408 rhn-package-390409 rhn-package-390410 rhn-package-390411 rhn-package-390412 rhn-package-390413 rhn-package-390414 rhn-package-390415 rhn-package-390416 rhn-package-390417 rhn-package-390418 rhn-package-390419 rhn-package-390420 rhn-package-390421 rhn-package-390422 rhn-package-390423 rhn-package-390424 rhn-package-390425 rhn-package-390426 rhn-package-390427 rhn-package-390428 rhn-package-390429 rhn-package-390430 rhn-package-390431 rhn-package-390432 rhn-package-390433 rhn-package-390434 rhn-package-390435 rhn-package-390436 rhn-package-390437 rhn-package-390438 rhn-package-390439 rhn-package-390440 rhn-package-390441 rhn-package-390442 rhn-package-390443 rhn-package-390444 rhn-package-390445 rhn-package-390446 rhn-package-390447 rhn-package-390448 rhn-package-390449 rhn-package-390450 rhn-package-390451 rhn-package-390452 rhn-package-390453 rhn-package-390454 rhn-package-390455 rhn-package-390456 rhn-package-390457 rhn-package-390458 rhn-package-390459 rhn-package-390461 rhn-package-390462 rhn-package-390463 rhn-package-390464 rhn-package-390465 rhn-package-390466 rhn-package-390467 rhn-package-390468 rhn-package-390469 rhn-package-390470 rhn-package-390471 rhn-package-390472 rhn-package-390473 rhn-package-390474 rhn-package-390475 rhn-package-390476 rhn-package-390477 rhn-package-390478 rhn-package-390479 rhn-package-390480 rhn-package-390481 rhn-package-390488 rhn-package-390489 rhn-package-390490 rhn-package-390495 rhn-package-390498 rhn-package-390500 rhn-package-390502 rhn-package-390503 rhn-package-390504 rhn-package-390505 rhn-package-390506 rhn-package-390507 rhn-package-390509 rhn-package-390511 rhn-package-390513 rhn-package-390514 rhn-package-390517 rhn-package-390519 rhn-package-390522 rhn-package-390524 rhn-package-390525 rhn-package-390526 rhn-package-390527 rhn-package-390528 rhn-package-390530 rhn-package-390531 rhn-package-390532 rhn-package-390533 rhn-package-390534 rhn-package-390535 rhn-package-390536 rhn-package-390537 rhn-package-390538 rhn-package-390539 rhn-package-390540 rhn-package-390541 rhn-package-390542 rhn-package-390543 rhn-package-390544 rhn-package-390545 rhn-package-390546 rhn-package-390547 rhn-package-390548 rhn-package-390550 rhn-package-390551 rhn-package-390552 rhn-package-390558 rhn-package-390559 rhn-package-390560 rhn-package-390561 rhn-package-390562 rhn-package-390563 rhn-package-390564 rhn-package-390565 rhn-package-390566 rhn-package-390567 rhn-package-390568 rhn-package-390569 rhn-package-390570 rhn-package-390571 rhn-package-390572 rhn-package-390573 rhn-package-390574 rhn-package-390576 rhn-package-390586 rhn-package-390587 rhn-package-390588 rhn-package-390589 rhn-package-390590 rhn-package-390591 rhn-package-390593 rhn-package-390594 rhn-package-390595 rhn-package-390596 rhn-package-390597 rhn-package-390599 rhn-package-390600 rhn-package-390601 rhn-package-390602 rhn-package-390604 rhn-package-390606 rhn-package-390608 rhn-package-390609 rhn-package-390610 rhn-package-390611 rhn-package-390613 rhn-package-390614 rhn-package-390615 rhn-package-390616 rhn-package-390617 rhn-package-390618 rhn-package-390620 rhn-package-390621 rhn-package-390623 rhn-package-390624 rhn-package-390627 rhn-package-390628 rhn-package-390629 rhn-package-390630 rhn-package-390631 rhn-package-390632 rhn-package-390633 rhn-package-390634 rhn-package-390635 rhn-package-390636 rhn-package-390637 rhn-package-390639 rhn-package-390640 rhn-package-390641 rhn-package-390642 rhn-package-390651 rhn-package-390652 rhn-package-390653 rhn-package-390654 rhn-package-390655 rhn-package-390656 rhn-package-390658 rhn-package-390661 rhn-package-390662 rhn-package-390663 rhn-package-390664 rhn-package-390665 rhn-package-390666 rhn-package-390667 rhn-package-390668 rhn-package-390670 rhn-package-390671 rhn-package-390672 rhn-package-390674 rhn-package-390675 rhn-package-390676 rhn-package-390677 rhn-package-390678 rhn-package-390686 rhn-package-390688 rhn-package-390693 rhn-package-390694 rhn-package-390699 rhn-package-390700 rhn-package-390702 rhn-package-390703 rhn-package-390705 rhn-package-390706 rhn-package-390707 rhn-package-390708 rhn-package-390710 rhn-package-390711 rhn-package-390712 rhn-package-390713 rhn-package-390714 rhn-package-390715 rhn-package-390716 rhn-package-390717 rhn-package-390721 rhn-package-390724 rhn-package-390727 rhn-package-390729 rhn-package-390731 rhn-package-390732 rhn-package-390733 rhn-package-390734 rhn-package-390735 rhn-package-390736 rhn-package-390737 rhn-package-390738 rhn-package-390739 rhn-package-390740 rhn-package-390741 rhn-package-390743 rhn-package-390744 rhn-package-390745 rhn-package-390746 rhn-package-390747 rhn-package-390748 rhn-package-390749 rhn-package-390750 rhn-package-390751 rhn-package-390752 rhn-package-390753 rhn-package-390754 rhn-package-390756 rhn-package-390758 rhn-package-390760 rhn-package-390762 rhn-package-390763 rhn-package-390768 rhn-package-390769 rhn-package-390770 rhn-package-390773 rhn-package-390774 rhn-package-390778 rhn-package-390779 rhn-package-390780 rhn-package-390781 rhn-package-390782 rhn-package-390783 rhn-package-390784 rhn-package-390786 rhn-package-390790 rhn-package-390791 rhn-package-390792 rhn-package-390793 rhn-package-390794 rhn-package-390795 rhn-package-390796 rhn-package-390798 rhn-package-390800 rhn-package-390804 rhn-package-390805 rhn-package-390806 rhn-package-390807 rhn-package-390809 rhn-package-390810 rhn-package-390813 rhn-package-390814 rhn-package-390815 rhn-package-390816 rhn-package-390818 rhn-package-390836 rhn-package-390837 rhn-package-390839 rhn-package-390841 rhn-package-390842 rhn-package-390843 rhn-package-390845 rhn-package-390846 rhn-package-390850 rhn-package-390854 rhn-package-390855 rhn-package-390857 rhn-package-390859 rhn-package-390860 rhn-package-390862 rhn-package-390864 rhn-package-390870 rhn-package-390871 rhn-package-390872 rhn-package-390886 rhn-package-390892 rhn-package-390894 rhn-package-390895 rhn-package-390896 rhn-package-390897 rhn-package-390898 rhn-package-396712 rhn-package-396713 rhn-package-396714 rhn-package-396715 rhn-package-396716 rhn-package-396717 rhn-package-396718 rhn-package-396719 rhn-package-396720 rhn-package-396721 rhn-package-396722 rhn-package-396723 rhn-package-396724 rhn-package-396725 rhn-package-396726 rhn-package-396727 rhn-package-396728 rhn-package-396729 rhn-package-396730 rhn-package-396731 rhn-package-396732 rhn-package-396733 rhn-package-396734 rhn-package-396735 rhn-package-396736 rhn-package-396737 rhn-package-396738 rhn-package-396739 rhn-package-396740 rhn-package-396741 rhn-package-396742 rhn-package-396743 rhn-package-396744 rhn-package-396745 rhn-package-396746 rhn-package-396747 rhn-package-396748 rhn-package-396749 rhn-package-396750 rhn-package-396751 rhn-package-396752 rhn-package-396753 rhn-package-396754 rhn-package-396755 rhn-package-396756 rhn-package-396757 rhn-package-396758 rhn-package-396759 rhn-package-396760 rhn-package-396761 rhn-package-396762 rhn-package-396763 rhn-package-396764 rhn-package-396765 rhn-package-396766 rhn-package-396767 rhn-package-396768 rhn-package-396769 rhn-package-396770 rhn-package-396771 rhn-package-396772 rhn-package-396773 rhn-package-396774 rhn-package-396775 rhn-package-396776 rhn-package-396777 rhn-package-396778 rhn-package-396779 rhn-package-396780 rhn-package-396781 rhn-package-396782 rhn-package-396783 rhn-package-396784 rhn-package-396785 rhn-package-396786 rhn-package-396787 rhn-package-396788 rhn-package-396789 rhn-package-396790 rhn-package-396791 rhn-package-396792 rhn-package-396793 rhn-package-396794 rhn-package-396795 rhn-package-396796 rhn-package-396797 rhn-package-396798 rhn-package-396799 rhn-package-396800 rhn-package-396801 rhn-package-396802 rhn-package-396803 rhn-package-396804 rhn-package-396805 rhn-package-396806 rhn-package-396807 rhn-package-396808 rhn-package-396809 rhn-package-396810 rhn-package-396811 rhn-package-396812 rhn-package-396813 rhn-package-396814 rhn-package-396815 rhn-package-396816 rhn-package-396817 rhn-package-396818 rhn-package-396819 rhn-package-396820 rhn-package-396821 rhn-package-396822 rhn-package-396823 rhn-package-396824 rhn-package-396825 rhn-package-396826 rhn-package-396827 rhn-package-396828 rhn-package-396829 rhn-package-396830 rhn-package-396831 rhn-package-396832 rhn-package-396833 rhn-package-396834 rhn-package-396835 rhn-package-396836 rhn-package-396837 rhn-package-396838 rhn-package-396839 rhn-package-396840 rhn-package-396841 rhn-package-396842 rhn-package-396843 rhn-package-396844 rhn-package-396845 rhn-package-396846 rhn-package-396847 rhn-package-396848 rhn-package-396849 rhn-package-396850 rhn-package-396851 rhn-package-396852 rhn-package-396853 rhn-package-396854 rhn-package-396855 rhn-package-396856 rhn-package-396857 rhn-package-396858 rhn-package-396859 rhn-package-396860 rhn-package-396861 rhn-package-396862 rhn-package-396863 rhn-package-396864 rhn-package-396865 rhn-package-396866 rhn-package-396867 rhn-package-396868 rhn-package-396869 rhn-package-396870 rhn-package-396871 rhn-package-396872 rhn-package-396873 rhn-package-396874 rhn-package-396875 rhn-package-396876 rhn-package-396877 rhn-package-396878 rhn-package-396879 rhn-package-396880 rhn-package-396881 rhn-package-396882 rhn-package-396883 rhn-package-396884 rhn-package-396885 rhn-package-396886 rhn-package-396887 rhn-package-396888 rhn-package-396889 rhn-package-396890 rhn-package-396891 rhn-package-396892 rhn-package-396893 rhn-package-396894 rhn-package-396895 rhn-package-396896 rhn-package-396897 rhn-package-396898 rhn-package-396899 rhn-package-396900 rhn-package-396901 rhn-package-396902 rhn-package-396903 rhn-package-396904 rhn-package-396905 rhn-package-396906 rhn-package-396907 rhn-package-396908 rhn-package-396909 rhn-package-396910 rhn-package-396911 rhn-package-396912 rhn-package-396913 rhn-package-396914 rhn-package-396915 rhn-package-396916 rhn-package-396917 rhn-package-396918 rhn-package-396919 rhn-package-396920 rhn-package-396921 rhn-package-396922 rhn-package-396923 rhn-package-396924 rhn-package-396925 rhn-package-396926 rhn-package-396927 rhn-package-396928 rhn-package-396929 rhn-package-396930 rhn-package-396931 rhn-package-396932 rhn-package-396933 rhn-package-396934 rhn-package-396935 rhn-package-396936 rhn-package-396937 rhn-package-396938 rhn-package-396939 rhn-package-396940 rhn-package-396941 rhn-package-396942 rhn-package-396943 rhn-package-396944 rhn-package-396945 rhn-package-396946 rhn-package-396947 rhn-package-396948 rhn-package-396949 rhn-package-396950 rhn-package-396951 rhn-package-396952 rhn-package-396953 rhn-package-396954 rhn-package-396955 rhn-package-396956 rhn-package-396957 rhn-package-396958 rhn-package-396959 rhn-package-396960 rhn-package-396961 rhn-package-396962 rhn-package-396963 rhn-package-396964 rhn-package-396965 rhn-package-396966 rhn-package-396967 rhn-package-396968 rhn-package-396969 rhn-package-396970 rhn-package-396971 rhn-package-396972 rhn-package-396973 rhn-package-396974 rhn-package-396975 rhn-package-396976 rhn-package-396977 rhn-package-396978 rhn-package-396979 rhn-package-396980 rhn-package-396981 rhn-package-396982 rhn-package-396983 rhn-package-396984 rhn-package-396985 rhn-package-396986 rhn-package-396987 rhn-package-396988 rhn-package-396989 rhn-package-396990 rhn-package-396991 rhn-package-396992 rhn-package-396993 rhn-package-396994 rhn-package-396995 rhn-package-396996 rhn-package-396997 rhn-package-396998 rhn-package-396999 rhn-package-397000 rhn-package-397001 rhn-package-397002 rhn-package-397003 rhn-package-397004 rhn-package-397005 rhn-package-397006 rhn-package-397007 rhn-package-397008 rhn-package-397009 rhn-package-397010 rhn-package-397011 rhn-package-397012 rhn-package-397013 rhn-package-397014 rhn-package-397015 rhn-package-397016 rhn-package-397017 rhn-package-397018 rhn-package-397019 rhn-package-397020 rhn-package-397021 rhn-package-397022 rhn-package-397023 rhn-package-397024 rhn-package-397025 rhn-package-397026 rhn-package-397027 rhn-package-397028 rhn-package-397029 rhn-package-397030 rhn-package-397031 rhn-package-397032 rhn-package-397033 rhn-package-397034 rhn-package-397035 rhn-package-397036 rhn-package-397037 rhn-package-397038 rhn-package-397039 rhn-package-397040 rhn-package-397041 rhn-package-397042 rhn-package-397043 rhn-package-397044 rhn-package-397045 rhn-package-397046 rhn-package-397047 rhn-package-397048 rhn-package-397049 rhn-package-397050 rhn-package-397051 rhn-package-397052 rhn-package-397053 rhn-package-397054 rhn-package-397055 rhn-package-397056 rhn-package-397057 rhn-package-397058 rhn-package-397059 rhn-package-397060 rhn-package-397061 rhn-package-397062 rhn-package-397063 rhn-package-397064 rhn-package-397065 rhn-package-397066 rhn-package-397067 rhn-package-397068 rhn-package-397069 rhn-package-397070 rhn-package-397071 rhn-package-397072 rhn-package-397073 rhn-package-397074 rhn-package-397075 rhn-package-397076 rhn-package-397077 rhn-package-397078 rhn-package-397079 rhn-package-397080 rhn-package-397081 rhn-package-397082 rhn-package-397083 rhn-package-397084 rhn-package-397085 rhn-package-397086 rhn-package-397087 rhn-package-397088 rhn-package-397089 rhn-package-397090 rhn-package-397091 rhn-package-397092 rhn-package-397093 rhn-package-397094 rhn-package-397095 rhn-package-397096 rhn-package-397097 rhn-package-397098 rhn-package-397099 rhn-package-397100 rhn-package-397101 rhn-package-397102 rhn-package-397103 rhn-package-397104 rhn-package-397105 rhn-package-397106 rhn-package-397107 rhn-package-397108 rhn-package-397109 rhn-package-397110 rhn-package-397111 rhn-package-397112 rhn-package-397113 rhn-package-397114 rhn-package-397115 rhn-package-397116 rhn-package-397117 rhn-package-397118 rhn-package-397119 rhn-package-397120 rhn-package-397121 rhn-package-397122 rhn-package-397123 rhn-package-397124 rhn-package-397125 rhn-package-397126 rhn-package-397127 rhn-package-397128 rhn-package-397129 rhn-package-397130 rhn-package-397131 rhn-package-397132 rhn-package-397133 rhn-package-397134 rhn-package-397135 rhn-package-397136 rhn-package-397137 rhn-package-397138 rhn-package-397139 rhn-package-397140 rhn-package-397141 rhn-package-397142 rhn-package-397143 rhn-package-397144 rhn-package-397145 rhn-package-397146 rhn-package-397147 rhn-package-397148 rhn-package-397149 rhn-package-397150 rhn-package-397151 rhn-package-397152 rhn-package-397153 rhn-package-397154 rhn-package-397155 rhn-package-397156 rhn-package-397157 rhn-package-397158 rhn-package-397159 rhn-package-397160 rhn-package-397161 rhn-package-397162 rhn-package-397163 rhn-package-397164 rhn-package-397165 rhn-package-397166 rhn-package-397167 rhn-package-397168 rhn-package-397169 rhn-package-397170 rhn-package-397171 rhn-package-397172 rhn-package-397173 rhn-package-397174 rhn-package-397175 rhn-package-397176 rhn-package-397177 rhn-package-397178 rhn-package-397179 rhn-package-397180 rhn-package-397181 rhn-package-397182 rhn-package-397183 rhn-package-397184 rhn-package-397185 rhn-package-397186 rhn-package-397187 rhn-package-397188 rhn-package-397189 rhn-package-397190 rhn-package-397191 rhn-package-397192 rhn-package-397193 rhn-package-397194 rhn-package-397195 rhn-package-397196 rhn-package-397197 rhn-package-397198 rhn-package-397199 rhn-package-397200 rhn-package-397201 rhn-package-397202 rhn-package-397203 rhn-package-397204 rhn-package-397205 rhn-package-397206 rhn-package-397207 rhn-package-397208 rhn-package-397209 rhn-package-397210 rhn-package-397211 rhn-package-397212 rhn-package-397213 rhn-package-397214 rhn-package-397215 rhn-package-397216 rhn-package-397217 rhn-package-397218 rhn-package-397219 rhn-package-397220 rhn-package-397221 rhn-package-397222 rhn-package-397223 rhn-package-397224 rhn-package-397225 rhn-package-397226 rhn-package-397227 rhn-package-397228 rhn-package-397229 rhn-package-397230 rhn-package-397231 rhn-package-397232 rhn-package-397233 rhn-package-397234 rhn-package-397235 rhn-package-397236 rhn-package-397237 rhn-package-397238 rhn-package-397239 rhn-package-397240 rhn-package-397241 rhn-package-397242 rhn-package-397243 rhn-package-397244 rhn-package-397245 rhn-package-397246 rhn-package-397247 rhn-package-397248 rhn-package-397249 rhn-package-397250 rhn-package-397251 rhn-package-397252 rhn-package-397253 rhn-package-397254 rhn-package-397255 rhn-package-397256 rhn-package-397257 rhn-package-397258 rhn-package-397259 rhn-package-397260 rhn-package-397261 rhn-package-397262 rhn-package-397263 rhn-package-397264 rhn-package-397265 rhn-package-397266 rhn-package-397267 rhn-package-397268 rhn-package-397269 rhn-package-397270 rhn-package-397271 rhn-package-397272 rhn-package-397273 rhn-package-397274 rhn-package-397275 rhn-package-397276 rhn-package-397277 rhn-package-397278 rhn-package-397279 rhn-package-397280 rhn-package-397281 rhn-package-397282 rhn-package-397283 rhn-package-397284 rhn-package-397285 rhn-package-397286 rhn-package-397287 rhn-package-397288 rhn-package-397289 rhn-package-397290 rhn-package-397291 rhn-package-397292 rhn-package-397293 rhn-package-397294 rhn-package-397295 rhn-package-397296 rhn-package-397297 rhn-package-397298 rhn-package-397299 rhn-package-397300 rhn-package-397301 rhn-package-397302 rhn-package-397303 rhn-package-397304 rhn-package-397305 rhn-package-397306 rhn-package-397307 rhn-package-397308 rhn-package-397309 rhn-package-397310 rhn-package-397311 rhn-package-397312 rhn-package-397313 rhn-package-397314 rhn-package-397315 rhn-package-397316 rhn-package-397317 rhn-package-397318 rhn-package-397319 rhn-package-397320 rhn-package-397321 rhn-package-397322 rhn-package-397323 rhn-package-397324 rhn-package-397325 rhn-package-397326 rhn-package-397327 rhn-package-397328 rhn-package-397329 rhn-package-397330 rhn-package-397331 rhn-package-397332 rhn-package-397333 rhn-package-397334 rhn-package-397335 rhn-package-397336 rhn-package-397337 rhn-package-397338 rhn-package-397339 rhn-package-397340 rhn-package-397341 rhn-package-397342 rhn-package-397343 rhn-package-397344 rhn-package-397345 rhn-package-397346 rhn-package-397347 rhn-package-397348 rhn-package-397349 rhn-package-397350 rhn-package-397351 rhn-package-397352 rhn-package-397353 rhn-package-397354 rhn-package-397355 rhn-package-397356 rhn-package-397357 rhn-package-397358 rhn-package-397359 rhn-package-397360 rhn-package-397361 rhn-package-397362 rhn-package-397363 rhn-package-397364 rhn-package-397365 rhn-package-397366 rhn-package-397367 rhn-package-397368 rhn-package-397369 rhn-package-397370 rhn-package-397371 rhn-package-397372 rhn-package-397373 rhn-package-397374 rhn-package-397375 rhn-package-397376 rhn-package-397377 rhn-package-397378 rhn-package-397379 rhn-package-397380 rhn-package-397381 rhn-package-397382 rhn-package-397383 rhn-package-397384 rhn-package-397385 rhn-package-397386 rhn-package-397387 rhn-package-397388 rhn-package-397389 rhn-package-397390 rhn-package-397391 rhn-package-397392 rhn-package-397393 rhn-package-397394 rhn-package-397395 rhn-package-397396 rhn-package-397397 rhn-package-397398 rhn-package-397399 rhn-package-397400 rhn-package-397401 rhn-package-397402 rhn-package-397403 rhn-package-397404 rhn-package-397405 rhn-package-397406 rhn-package-397407 rhn-package-397408 rhn-package-397409 rhn-package-397410 rhn-package-397411 rhn-package-397412 rhn-package-397413 rhn-package-397414 rhn-package-397415 rhn-package-397416 rhn-package-397417 rhn-package-397418 rhn-package-397419 rhn-package-397420 rhn-package-397421 rhn-package-397422 rhn-package-397423 rhn-package-397424 rhn-package-397425 rhn-package-397426 rhn-package-397427 rhn-package-397428 rhn-package-397429 rhn-package-397430 rhn-package-397431 rhn-package-397432 rhn-package-397433 rhn-package-397434 rhn-package-397435 rhn-package-397436 rhn-package-397437 rhn-package-397438 rhn-package-397439 rhn-package-397440 rhn-package-397441 rhn-package-397442 rhn-package-397443 rhn-package-397444 rhn-package-397445 rhn-package-397446 rhn-package-397447 rhn-package-397448 rhn-package-397449 rhn-package-397450 rhn-package-397451 rhn-package-397452 rhn-package-397453 rhn-package-397454 rhn-package-397455 rhn-package-397456 rhn-package-397457 rhn-package-397458 rhn-package-397459 rhn-package-397460 rhn-package-397461 rhn-package-397462 rhn-package-397463 rhn-package-397464 rhn-package-397465 rhn-package-397466 rhn-package-397467 rhn-package-397468 rhn-package-397469 rhn-package-397470 rhn-package-397471 rhn-package-397472 rhn-package-397473 rhn-package-397474 rhn-package-397475 rhn-package-397476 rhn-package-397477 rhn-package-397478 rhn-package-397479 rhn-package-397480 rhn-package-397481 rhn-package-397482 rhn-package-397483 rhn-package-397484 rhn-package-397485 rhn-package-397486 rhn-package-397487 rhn-package-397488 rhn-package-397489 rhn-package-397490 rhn-package-397491 rhn-package-397492 rhn-package-397493 rhn-package-397494 rhn-package-397495 rhn-package-397496 rhn-package-397497 rhn-package-397498 rhn-package-397499 rhn-package-397500 rhn-package-397501 rhn-package-397502 rhn-package-397503 rhn-package-397504 rhn-package-397505 rhn-package-397506 rhn-package-397507 rhn-package-397508 rhn-package-397509 rhn-package-397510 rhn-package-397511 rhn-package-397512 rhn-package-397513 rhn-package-397514 rhn-package-397515 rhn-package-397516 rhn-package-397517 rhn-package-397518 rhn-package-397519 rhn-package-397520 rhn-package-397521 rhn-package-397522 rhn-package-397523 rhn-package-397524 rhn-package-397525 rhn-package-397526 rhn-package-397527 rhn-package-397528 rhn-package-397529 rhn-package-397530 rhn-package-397531 rhn-package-397532 rhn-package-397533 rhn-package-397534 rhn-package-397535 rhn-package-397536 rhn-package-397537 rhn-package-397538 rhn-package-397539 rhn-package-397540 rhn-package-397541 rhn-package-397542 rhn-package-397543 rhn-package-397544 rhn-package-397545 rhn-package-397546 rhn-package-397547 rhn-package-397548 rhn-package-397549 rhn-package-397550 rhn-package-397551 rhn-package-397552 rhn-package-397553 rhn-package-397554 rhn-package-397555 rhn-package-397556 rhn-package-397557 rhn-package-397558 rhn-package-397559 rhn-package-397560 rhn-package-397561 rhn-package-397562 rhn-package-397563 rhn-package-397564 rhn-package-397565 rhn-package-397566 rhn-package-397567 rhn-package-397568 rhn-package-397569 rhn-package-397570 rhn-package-397571 rhn-package-397572 rhn-package-397573 rhn-package-397574 rhn-package-397575 rhn-package-397576 rhn-package-397577 rhn-package-397578 rhn-package-397579 rhn-package-397580 rhn-package-397581 rhn-package-397582 rhn-package-397583 rhn-package-397584 rhn-package-397585 rhn-package-397586 rhn-package-397587 rhn-package-397588 rhn-package-397589 rhn-package-397590 rhn-package-397591 rhn-package-397592 rhn-package-397593 rhn-package-397594 rhn-package-397595 rhn-package-397596 rhn-package-397597 rhn-package-397598 rhn-package-397599 rhn-package-397600 rhn-package-397601 rhn-package-397602 rhn-package-397603 rhn-package-397604 rhn-package-397605 rhn-package-397606 rhn-package-397607 rhn-package-397608 rhn-package-397609 rhn-package-397610 rhn-package-397611 rhn-package-397612 rhn-package-397613 rhn-package-397614 rhn-package-397615 rhn-package-397616 rhn-package-397617 rhn-package-397618 rhn-package-397619 rhn-package-397620 rhn-package-397621 rhn-package-397622 rhn-package-397623 rhn-package-397624 rhn-package-397625 rhn-package-397626 rhn-package-397627 rhn-package-397628 rhn-package-397629 rhn-package-397630 rhn-package-397631 rhn-package-397632 rhn-package-397633 rhn-package-397634 rhn-package-397635 rhn-package-397636 rhn-package-397637 rhn-package-397638 rhn-package-397639 rhn-package-397640 rhn-package-397641 rhn-package-397642 rhn-package-397643 rhn-package-397644 rhn-package-397645 rhn-package-397646 rhn-package-397818 rhn-package-398167 rhn-package-398175 rhn-package-398181 rhn-package-398187 rhn-package-398188 rhn-package-398189 rhn-package-398190 rhn-package-398191 rhn-package-398208 rhn-package-398233 rhn-package-398234 rhn-package-398235 rhn-package-398236 rhn-package-398237 rhn-package-398238 rhn-package-398239 rhn-package-398240 rhn-package-398241 rhn-package-398242 rhn-package-398243 rhn-package-398244 rhn-package-398245 rhn-package-398246 rhn-package-398247 rhn-package-398248 rhn-package-398249 rhn-package-398250 rhn-package-398251 rhn-package-398311 rhn-package-398312 rhn-package-398313 rhn-package-398317 rhn-package-398318 rhn-package-398326 rhn-package-398327 rhn-package-398330 rhn-package-398332 rhn-package-398339 rhn-package-398341 rhn-package-398355 rhn-package-398359 rhn-package-398361 rhn-package-398363 rhn-package-398365 rhn-package-398377 rhn-package-398379 rhn-package-398380 rhn-package-398385 rhn-package-398388 rhn-package-398389 rhn-package-398391 rhn-package-398393 rhn-package-398397 rhn-package-398408 rhn-package-398409 rhn-package-398411 rhn-package-398413 rhn-package-398415 rhn-package-398421 rhn-package-398429 rhn-package-398435 rhn-package-398437 rhn-package-398443 rhn-package-398444 rhn-package-398445 rhn-package-398447 rhn-package-398449 rhn-package-398455 rhn-package-398458 rhn-package-398461 rhn-package-398462 rhn-package-398468 rhn-package-398478 rhn-package-398484 rhn-package-398499 rhn-package-398500 rhn-package-398501 rhn-package-398505 rhn-package-398512 rhn-package-398513 rhn-package-398514 rhn-package-398515 rhn-package-398518 rhn-package-398520 rhn-package-398521 rhn-package-398525 rhn-package-398528 rhn-package-398535 rhn-package-398538 rhn-package-398540 rhn-package-398542 rhn-package-398543 rhn-package-398546 rhn-package-398549 rhn-package-398555 rhn-package-398556 rhn-package-398558 rhn-package-398559 rhn-package-398563 rhn-package-398566 rhn-package-398567 rhn-package-398571 rhn-package-398573 rhn-package-398579 rhn-package-398585 rhn-package-398593 rhn-package-398597 rhn-package-398600 rhn-package-398602 rhn-package-398608 rhn-package-398619 rhn-package-398628 rhn-package-398637 rhn-package-398644 rhn-package-398646 rhn-package-398649 rhn-package-398650 rhn-package-398659 rhn-package-398663 rhn-package-398671 rhn-package-398673 rhn-package-398674 rhn-package-398676 rhn-package-398702 rhn-package-398711 rhn-package-398712 rhn-package-398881 rhn-package-398882 rhn-package-398883 rhn-package-398884 rhn-package-398885 rhn-package-398886 rhn-package-398887 rhn-package-398888 rhn-package-398889 rhn-package-398890 rhn-package-398891 rhn-package-398892 rhn-package-398893 rhn-package-398894 rhn-package-398895 rhn-package-398896 rhn-package-398897 rhn-package-398898 rhn-package-398899 rhn-package-398900 rhn-package-398901 rhn-package-398902 rhn-package-398903 rhn-package-398927 rhn-package-398929 rhn-package-399133 rhn-package-399134 rhn-package-399459 rhn-package-399500 rhn-package-399613 rhn-package-399614 rhn-package-399618 rhn-package-399621 rhn-package-399622 rhn-package-399623 rhn-package-399625 rhn-package-399843 rhn-package-399844 rhn-package-399850 rhn-package-399851 rhn-package-399879 rhn-package-399902 rhn-package-399925 rhn-package-399927 rhn-package-399933 rhn-package-399934 rhn-package-399947 rhn-package-399948 rhn-package-399950 rhn-package-399956 rhn-package-399962 rhn-package-399971 rhn-package-400075 rhn-package-400681 rhn-package-400685 rhn-package-400688 rhn-package-400690 rhn-package-400711 rhn-package-400742 rhn-package-400745 rhn-package-400755 rhn-package-400765 rhn-package-400769 rhn-package-400780 rhn-package-400945 rhn-package-400946 rhn-package-400951 rhn-package-400954 rhn-package-400959 rhn-package-401072 rhn-package-401075 rhn-package-401080 rhn-package-401082 rhn-package-401085 rhn-package-401088 rhn-package-401092 rhn-package-401094 rhn-package-401100 rhn-package-401102 rhn-package-401103 rhn-package-401105 rhn-package-401107 rhn-package-401110 rhn-package-401112 rhn-package-401121 rhn-package-401143 rhn-package-401146 rhn-package-401157 rhn-package-404177 rhn-package-404179 rhn-package-404182 rhn-package-404183 rhn-package-404194 rhn-package-404197 rhn-package-404880 rhn-package-404895 rhn-package-404898 rhn-package-404899 rhn-package-404927 rhn-package-404940 rhn-package-404955 rhn-package-404979 rhn-package-404980 rhn-package-404987 rhn-package-405009 rhn-package-405010 rhn-package-405060 rhn-package-405061 rhn-package-405063 rhn-package-405071 rhn-package-405076 rhn-package-405080 rhn-package-405085 rhn-package-405090 rhn-package-405095 rhn-package-405098 rhn-package-405101 rhn-package-405105 rhn-package-405108 rhn-package-405111 rhn-package-405118 rhn-package-405122 rhn-package-405125 rhn-package-405135 rhn-package-405137 rhn-package-405207 rhn-package-405215 rhn-package-405220 rhn-package-405223 rhn-package-405435 rhn-package-405436 rhn-package-405440 rhn-package-405474 rhn-package-405498 rhn-package-405499 rhn-package-405512 rhn-package-405724 rhn-package-405743 rhn-package-405756 rhn-package-405765 rhn-package-405768 rhn-package-405807 rhn-package-405810 rhn-package-405812 rhn-package-405819 rhn-package-405820 rhn-package-405825 rhn-package-405826 rhn-package-405828 rhn-package-405831 rhn-package-405841 rhn-package-405843 rhn-package-405846 rhn-package-405860 rhn-package-405934 rhn-package-405937 rhn-package-405938 rhn-package-405942 rhn-package-405945 rhn-package-405949 rhn-package-405950 rhn-package-406008 rhn-package-406021 rhn-package-406053 rhn-package-406060 rhn-package-406070 rhn-package-406096 rhn-package-406113 rhn-package-406159 rhn-package-406164 rhn-package-406165 rhn-package-406251 rhn-package-406273 rhn-package-406279 rhn-package-406292 rhn-package-406297 rhn-package-406472 rhn-package-406540 rhn-package-406541 rhn-package-406547 rhn-package-406548 rhn-package-406572 rhn-package-406580 rhn-package-406592 rhn-package-406600 rhn-package-406608 rhn-package-406645 rhn-package-406647 rhn-package-406650 rhn-package-406651 rhn-package-406654 rhn-package-406660 rhn-package-406661 rhn-package-406667 rhn-package-406668 rhn-package-406932 rhn-package-407002 rhn-package-407864 rhn-package-407869 rhn-package-407874 rhn-package-407897 rhn-package-407902 rhn-package-408228 rhn-package-408232 rhn-package-408233 rhn-package-408245 rhn-package-408272 rhn-package-408556 rhn-package-408568 rhn-package-408571 rhn-package-408574 rhn-package-408657 rhn-package-408658 rhn-package-408659 rhn-package-408661 rhn-package-408671 rhn-package-408672 rhn-package-408715 rhn-package-408719 rhn-package-408728 rhn-package-408730 rhn-package-408835 rhn-package-408837 rhn-package-408839 rhn-package-408845 rhn-package-408978 rhn-package-408979 rhn-package-408982 rhn-package-408987 rhn-package-409180 rhn-package-409183 rhn-package-409185 rhn-package-409188 rhn-package-409193 rhn-package-409239 rhn-package-409240 rhn-package-409256 rhn-package-409258 rhn-package-409281 rhn-package-409286 rhn-package-409305 rhn-package-409306 rhn-package-409313 rhn-package-409317 rhn-package-409321 rhn-package-409328 rhn-package-409333 rhn-package-409334 rhn-package-409337 rhn-package-409342 rhn-package-409346 rhn-package-409500 rhn-package-409501 rhn-package-409503 rhn-package-409690 rhn-package-409691 rhn-package-409695 rhn-package-409703 rhn-package-409708 rhn-package-409755 rhn-package-409757 rhn-package-409762 rhn-package-409763 rhn-package-409764 rhn-package-409768 rhn-package-409864 rhn-package-409868 rhn-package-409870 rhn-package-410187 rhn-package-410190 rhn-package-410194 rhn-package-410197 rhn-package-410200 rhn-package-410201 rhn-package-410206 rhn-package-410207 rhn-package-410212 rhn-package-410215 rhn-package-410238 rhn-package-410285 rhn-package-410286 rhn-package-410287 rhn-package-410320 rhn-package-410473 rhn-package-410476 rhn-package-410479 rhn-package-410483 rhn-package-410502 rhn-package-410570 rhn-package-410572 rhn-package-410574 rhn-package-410580 rhn-package-410583 rhn-package-410591 rhn-package-410595 rhn-package-410599 rhn-package-410607 rhn-package-410630 rhn-package-410653 rhn-package-410722 rhn-package-410723 rhn-package-410771 rhn-package-410822 rhn-package-410826 rhn-package-410832 rhn-package-410837 rhn-package-410862 rhn-package-410864 rhn-package-410867 rhn-package-410874 rhn-package-410954 rhn-package-410965 rhn-package-411002 rhn-package-411074 rhn-package-411076 rhn-package-411131 rhn-package-411151 rhn-package-411156 rhn-package-411165 rhn-package-412490 rhn-package-412492 rhn-package-412493 rhn-package-412511 rhn-package-412512 rhn-package-412513 rhn-package-412514 rhn-package-412515 rhn-package-412536 rhn-package-412561 rhn-package-412562 rhn-package-412591 rhn-package-412593 rhn-package-412595 rhn-package-412596 rhn-package-412603 rhn-package-412604 rhn-package-412684 rhn-package-412723 rhn-package-412724 rhn-package-412731 rhn-package-412758 rhn-package-412760 rhn-package-412814 rhn-package-412836 rhn-package-412841 rhn-package-412850 rhn-package-412851 rhn-package-412852 rhn-package-413075 rhn-package-413098 rhn-package-413099 rhn-package-413103 rhn-package-413105 rhn-package-413118 rhn-package-413128 rhn-package-413130 rhn-package-413131 rhn-package-413133 rhn-package-413139 rhn-package-413245 rhn-package-413269 rhn-package-413273 rhn-package-413274 rhn-package-413276 rhn-package-413297 rhn-package-413308 rhn-package-413309 rhn-package-413310 rhn-package-413337 rhn-package-413414 rhn-package-413428 rhn-package-413439 rhn-package-413440 rhn-package-413475 rhn-package-413492 rhn-package-413499 rhn-package-413748 rhn-package-414339 rhn-package-416550 rhn-package-416559 rhn-package-416562 rhn-package-416566 rhn-package-416574 rhn-package-416577 rhn-package-416587 rhn-package-416630 rhn-package-416724 rhn-package-416768 rhn-package-416769 rhn-package-416772 rhn-package-416774 rhn-package-416781 rhn-package-416786 rhn-package-416969 rhn-package-416970 rhn-package-416973 rhn-package-416974 rhn-package-416976 rhn-package-416985 rhn-package-417158 rhn-package-417162 rhn-package-417163 rhn-package-417169 rhn-package-417171 rhn-package-417179 rhn-package-417213 rhn-package-417218 rhn-package-417238 rhn-package-417250 rhn-package-417269 rhn-package-417270 rhn-package-417291 rhn-package-417297 rhn-package-417303 rhn-package-417310 rhn-package-418138 rhn-package-418141 rhn-package-418155 rhn-package-418158 rhn-package-418195 rhn-package-418201 rhn-package-418202 rhn-package-418204 rhn-package-418213 rhn-package-418225 rhn-package-418231 rhn-package-418241 rhn-package-418244 rhn-package-418245 rhn-package-418282 rhn-package-418288 rhn-package-418289 rhn-package-418295 rhn-package-418323 rhn-package-418330 rhn-package-418332 rhn-package-418333 rhn-package-418347 rhn-package-418486 rhn-package-418495 rhn-package-418502 rhn-package-418505 rhn-package-418506 rhn-package-418535 rhn-package-418539 rhn-package-418542 rhn-package-418545 rhn-package-418548 rhn-package-418555 rhn-package-418564 rhn-package-418568 rhn-package-418574 rhn-package-418577 rhn-package-418579 rhn-package-418790 rhn-package-418793 rhn-package-418795 rhn-package-418804 rhn-package-418805 rhn-package-418806 rhn-package-419032 rhn-package-419033 rhn-package-419041 rhn-package-419042 rhn-package-419043 rhn-package-419044 rhn-package-419067 rhn-package-419113 rhn-package-419260 rhn-package-419261 rhn-package-419262 rhn-package-419282 rhn-package-419291 rhn-package-419292 rhn-package-419295 rhn-package-419297 rhn-package-419305 rhn-package-419542 rhn-package-419546 rhn-package-419547 rhn-package-419581 rhn-package-419586 rhn-package-419587 rhn-package-419588 rhn-package-419590 rhn-package-419841 rhn-package-419847 rhn-package-419852 rhn-package-419854 rhn-package-420045 rhn-package-420050 rhn-package-420054 rhn-package-420057 rhn-package-420059 rhn-package-420062 rhn-package-420075 rhn-package-420082 rhn-package-420084 rhn-package-420099 rhn-package-420228 rhn-package-420233 rhn-package-420246 rhn-package-420259 rhn-package-420581 rhn-package-420584 rhn-package-420587 rhn-package-420589 rhn-package-420590 rhn-package-420592 rhn-package-420597 rhn-package-420599 rhn-package-420602 rhn-package-420603 rhn-package-420604 rhn-package-420607 rhn-package-420609 rhn-package-420631 rhn-package-420634 rhn-package-420642 rhn-package-420647 rhn-package-420648 rhn-package-420650 rhn-package-420660 rhn-package-420673 rhn-package-420675 rhn-package-420676 rhn-package-420679 rhn-package-420684 rhn-package-420690 rhn-package-420691 rhn-package-420698 rhn-package-420699 rhn-package-420707 rhn-package-420710 rhn-package-420711 rhn-package-420720 rhn-package-420722 rhn-package-420729 rhn-package-420731 rhn-package-420732 rhn-package-420739 rhn-package-420745 rhn-package-420746 rhn-package-420751 rhn-package-420758 rhn-package-420761 rhn-package-420764 rhn-package-420765 rhn-package-420766 rhn-package-420774 rhn-package-420783 rhn-package-420788 rhn-package-420790 rhn-package-420799 rhn-package-420805 rhn-package-420808 rhn-package-420812 rhn-package-420814 rhn-package-420817 rhn-package-420819 rhn-package-420833 rhn-package-420837 rhn-package-420840 rhn-package-420842 rhn-package-420847 rhn-package-420848 rhn-package-420850 rhn-package-420852 rhn-package-420864 rhn-package-420867 rhn-package-420868 rhn-package-420869 rhn-package-420872 rhn-package-420886 rhn-package-420891 rhn-package-420892 rhn-package-420900 rhn-package-420904 rhn-package-420908 rhn-package-420914 rhn-package-420915 rhn-package-420918 rhn-package-420919 rhn-package-420923 rhn-package-420927 rhn-package-420929 rhn-package-420930 rhn-package-420936 rhn-package-420944 rhn-package-420945 rhn-package-420946 rhn-package-420947 rhn-package-420951 rhn-package-420955 rhn-package-420956 rhn-package-420964 rhn-package-420965 rhn-package-420966 rhn-package-420968 rhn-package-420981 rhn-package-420999 rhn-package-421000 rhn-package-421002 rhn-package-421019 rhn-package-421021 rhn-package-421029 rhn-package-421030 rhn-package-421031 rhn-package-421032 rhn-package-421035 rhn-package-421036 rhn-package-421041 rhn-package-421042 rhn-package-421053 rhn-package-421054 rhn-package-421057 rhn-package-421058 rhn-package-421064 rhn-package-421070 rhn-package-421099 rhn-package-421100 rhn-package-421103 rhn-package-421108 rhn-package-421109 rhn-package-421111 rhn-package-421113 rhn-package-421114 rhn-package-421115 rhn-package-421117 rhn-package-421118 rhn-package-421121 rhn-package-421122 rhn-package-421124 rhn-package-421126 rhn-package-421128 rhn-package-421129 rhn-package-421131 rhn-package-421132 rhn-package-421135 rhn-package-421139 rhn-package-421141 rhn-package-421142 rhn-package-421149 rhn-package-421150 rhn-package-421151 rhn-package-421153 rhn-package-421154 rhn-package-421156 rhn-package-421159 rhn-package-421160 rhn-package-421161 rhn-package-421162 rhn-package-421165 rhn-package-421166 rhn-package-421169 rhn-package-421179 rhn-package-421180 rhn-package-421183 rhn-package-421186 rhn-package-421187 rhn-package-421194 rhn-package-421196 rhn-package-421197 rhn-package-421198 rhn-package-421200 rhn-package-421201 rhn-package-421203 rhn-package-421210 rhn-package-421212 rhn-package-421219 rhn-package-421220 rhn-package-421233 rhn-package-421253 rhn-package-421255 rhn-package-421259 rhn-package-421263 rhn-package-421268 rhn-package-421275 rhn-package-421276 rhn-package-421278 rhn-package-421280 rhn-package-421288 rhn-package-421297 rhn-package-421300 rhn-package-421304 rhn-package-421306 rhn-package-421321 rhn-package-421323 rhn-package-421329 rhn-package-421352 rhn-package-421353 rhn-package-421354 rhn-package-421355 rhn-package-421356 rhn-package-421358 rhn-package-421359 rhn-package-421360 rhn-package-421361 rhn-package-421461 rhn-package-421462 rhn-package-421464 rhn-package-421475 rhn-package-421515 rhn-package-421518 rhn-package-421519 rhn-package-421520 rhn-package-421547 rhn-package-421548 rhn-package-421556 rhn-package-421558 rhn-package-421565 rhn-package-421568 rhn-package-421569 rhn-package-421575 rhn-package-421578 rhn-package-421588 rhn-package-421592 rhn-package-421598 rhn-package-421599 rhn-package-421602 rhn-package-421611 rhn-package-421612 rhn-package-421615 rhn-package-421623 rhn-package-421626 rhn-package-421631 rhn-package-421632 rhn-package-421633 rhn-package-421634 rhn-package-421635 rhn-package-421639 rhn-package-421640 rhn-package-421648 rhn-package-421653 rhn-package-421655 rhn-package-421656 rhn-package-421658 rhn-package-421659 rhn-package-421661 rhn-package-421663 rhn-package-421664 rhn-package-421668 rhn-package-421670 rhn-package-421671 rhn-package-421676 rhn-package-421679 rhn-package-421681 rhn-package-421682 rhn-package-421686 rhn-package-421687 rhn-package-421691 rhn-package-421693 rhn-package-421694 rhn-package-421696 rhn-package-421697 rhn-package-421701 rhn-package-421704 rhn-package-421705 rhn-package-421706 rhn-package-421708 rhn-package-421710 rhn-package-421712 rhn-package-421713 rhn-package-421717 rhn-package-421718 rhn-package-421721 rhn-package-421729 rhn-package-421731 rhn-package-421734 rhn-package-421742 rhn-package-421743 rhn-package-421745 rhn-package-421747 rhn-package-421755 rhn-package-421756 rhn-package-421760 rhn-package-421764 rhn-package-421773 rhn-package-421776 rhn-package-421778 rhn-package-421784 rhn-package-421790 rhn-package-421796 rhn-package-421805 rhn-package-421820 rhn-package-421822 rhn-package-421853 rhn-package-421872 rhn-package-421873 rhn-package-421874 rhn-package-421875 rhn-package-421876 rhn-package-421877 rhn-package-421878 rhn-package-421879 rhn-package-421880 rhn-package-421881 rhn-package-421882 rhn-package-421883 rhn-package-421884 rhn-package-421885 rhn-package-421886 rhn-package-421887 rhn-package-421888 rhn-package-421889 rhn-package-421890 rhn-package-421891 rhn-package-421892 rhn-package-421893 rhn-package-421894 rhn-package-421899 rhn-package-421902 rhn-package-421905 rhn-package-421912 rhn-package-421916 rhn-package-421917 rhn-package-421924 rhn-package-421939 rhn-package-421955 rhn-package-421956 rhn-package-421959 rhn-package-421989 rhn-package-421997 rhn-package-422005 rhn-package-422007 rhn-package-422009 rhn-package-422017 rhn-package-422018 rhn-package-422022 rhn-package-422024 rhn-package-422030 rhn-package-422032 rhn-package-422039 rhn-package-422040 rhn-package-422045 rhn-package-422047 rhn-package-422053 rhn-package-422060 rhn-package-422064 rhn-package-422065 rhn-package-422067 rhn-package-422071 rhn-package-422076 rhn-package-422077 rhn-package-422080 rhn-package-422084 rhn-package-422096 rhn-package-422105 rhn-package-422111 rhn-package-422114 rhn-package-422117 rhn-package-422120 rhn-package-422121 rhn-package-422130 rhn-package-422136 rhn-package-422137 rhn-package-422138 rhn-package-422143 rhn-package-422151 rhn-package-422153 rhn-package-422155 rhn-package-422161 rhn-package-422162 rhn-package-422163 rhn-package-422164 rhn-package-422169 rhn-package-422173 rhn-package-422180 rhn-package-422182 rhn-package-422186 rhn-package-422187 rhn-package-422188 rhn-package-422198 rhn-package-422204 rhn-package-422212 rhn-package-422215 rhn-package-422216 rhn-package-422218 rhn-package-422221 rhn-package-422223 rhn-package-422229 rhn-package-422234 rhn-package-422235 rhn-package-422236 rhn-package-422237 rhn-package-422243 rhn-package-422249 rhn-package-422250 rhn-package-422251 rhn-package-422259 rhn-package-422260 rhn-package-422261 rhn-package-422264 rhn-package-422265 rhn-package-422267 rhn-package-422271 rhn-package-422273 rhn-package-422289 rhn-package-422292 rhn-package-422293 rhn-package-422294 rhn-package-422297 rhn-package-422300 rhn-package-422303 rhn-package-422304 rhn-package-422305 rhn-package-422321 rhn-package-422326 rhn-package-422331 rhn-package-422336 rhn-package-422340 rhn-package-422343 rhn-package-422346 rhn-package-422347 rhn-package-422353 rhn-package-422354 rhn-package-422361 rhn-package-422363 rhn-package-422374 rhn-package-422376 rhn-package-422378 rhn-package-422385 rhn-package-422387 rhn-package-422389 rhn-package-422395 rhn-package-422396 rhn-package-422401 rhn-package-422406 rhn-package-422411 rhn-package-422421 rhn-package-422423 rhn-package-422425 rhn-package-422431 rhn-package-422433 rhn-package-422434 rhn-package-422435 rhn-package-422439 rhn-package-422440 rhn-package-422441 rhn-package-422445 rhn-package-422454 rhn-package-422460 rhn-package-422463 rhn-package-422466 rhn-package-422470 rhn-package-422472 rhn-package-422480 rhn-package-422482 rhn-package-422487 rhn-package-422490 rhn-package-422491 rhn-package-422492 rhn-package-422502 rhn-package-422503 rhn-package-422514 rhn-package-422516 rhn-package-422522 rhn-package-422525 rhn-package-422527 rhn-package-422528 rhn-package-422531 rhn-package-422532 rhn-package-422545 rhn-package-422549 rhn-package-422553 rhn-package-422555 rhn-package-422560 rhn-package-422566 rhn-package-422567 rhn-package-422571 rhn-package-422572 rhn-package-422580 rhn-package-422583 rhn-package-422586 rhn-package-422588 rhn-package-422589 rhn-package-422590 rhn-package-422592 rhn-package-422595 rhn-package-422597 rhn-package-422599 rhn-package-422605 rhn-package-422606 rhn-package-422613 rhn-package-422617 rhn-package-422620 rhn-package-422624 rhn-package-422628 rhn-package-422635 rhn-package-422642 rhn-package-422644 rhn-package-422648 rhn-package-422649 rhn-package-422650 rhn-package-422651 rhn-package-422655 rhn-package-422657 rhn-package-422662 rhn-package-422666 rhn-package-422670 rhn-package-422678 rhn-package-422689 rhn-package-422701 rhn-package-422703 rhn-package-422706 rhn-package-422709 rhn-package-422714 rhn-package-422715 rhn-package-422719 rhn-package-422747 rhn-package-422748 rhn-package-422749 rhn-package-422750 rhn-package-422755 rhn-package-422759 rhn-package-422951 rhn-package-422955 rhn-package-422959 rhn-package-422960 rhn-package-422983 rhn-package-422990 rhn-package-423117 rhn-package-423118 rhn-package-423120 rhn-package-423121 rhn-package-423123 rhn-package-423126 rhn-package-423127 rhn-package-423134 rhn-package-423152 rhn-package-423153 rhn-package-423155 rhn-package-423156 rhn-package-423159 rhn-package-423162 rhn-package-423164 rhn-package-423165 rhn-package-423166 rhn-package-423167 rhn-package-423168 rhn-package-423170 rhn-package-423172 rhn-package-423177 rhn-package-423180 rhn-package-423182 rhn-package-423183 rhn-package-423184 rhn-package-423186 rhn-package-423187 rhn-package-423188 rhn-package-423191 rhn-package-423193 rhn-package-423194 rhn-package-423195 rhn-package-423197 rhn-package-423199 rhn-package-423200 rhn-package-423201 rhn-package-423203 rhn-package-423204 rhn-package-423206 rhn-package-423212 rhn-package-423213 rhn-package-423214 rhn-package-423215 rhn-package-423217 rhn-package-423219 rhn-package-423220 rhn-package-423230 rhn-package-423232 rhn-package-423234 rhn-package-423242 rhn-package-423244 rhn-package-423246 rhn-package-423252 rhn-package-423260 rhn-package-423262 rhn-package-423263 rhn-package-423264 rhn-package-423266 rhn-package-423273 rhn-package-423274 rhn-package-423310 rhn-package-423311 rhn-package-423314 rhn-package-423320 rhn-package-423321 rhn-package-423322 rhn-package-423323 rhn-package-423324 rhn-package-423326 rhn-package-423329 rhn-package-423333 rhn-package-423336 rhn-package-423339 rhn-package-423345 rhn-package-423346 rhn-package-423349 rhn-package-423351 rhn-package-423353 rhn-package-423357 rhn-package-423413 rhn-package-423414 rhn-package-423420 rhn-package-423426 rhn-package-423428 rhn-package-423527 rhn-package-423539 rhn-package-423550 rhn-package-423553 rhn-package-423561 rhn-package-423572 rhn-package-423584 rhn-package-423607 rhn-package-423611 rhn-package-423613 rhn-package-423615 rhn-package-423619 rhn-package-423622 rhn-package-423625 rhn-package-423633 rhn-package-423636 rhn-package-423684 rhn-package-423685 rhn-package-423697 rhn-package-423702 rhn-package-424953 rhn-package-424954 rhn-package-424957 rhn-package-424959 rhn-package-424962 rhn-package-424965 rhn-package-424967 rhn-package-424973 rhn-package-424974 rhn-package-424979 rhn-package-424987 rhn-package-425821 rhn-package-425828 rhn-package-425831 rhn-package-425835 rhn-package-425838 rhn-package-425840 rhn-package-425844 rhn-package-425851 rhn-package-425853 rhn-package-425860 rhn-package-425949 rhn-package-425982 rhn-package-425985 rhn-package-425991 rhn-package-425999 rhn-package-426002 rhn-package-426054 rhn-package-426067 rhn-package-426071 rhn-package-426077 rhn-package-426078 rhn-package-426118 rhn-package-426120 rhn-package-426276 rhn-package-426279 rhn-package-426280 rhn-package-426283 rhn-package-426285 rhn-package-426287 rhn-package-426296 rhn-package-426311 rhn-package-426315 rhn-package-426322 rhn-package-426325 rhn-package-426326 rhn-package-426328 rhn-package-426329 rhn-package-426340 rhn-package-426367 rhn-package-426370 rhn-package-426371 rhn-package-426372 rhn-package-426373 rhn-package-426897 rhn-package-426898 rhn-package-426903 rhn-package-426907 rhn-package-426993 rhn-package-427000 rhn-package-427038 rhn-package-427040 rhn-package-427047 rhn-package-427049 rhn-package-427055 rhn-package-427061 rhn-package-427062 rhn-package-427076 rhn-package-427092 rhn-package-427093 rhn-package-427098 rhn-package-427099 rhn-package-427145 rhn-package-427146 rhn-package-427147 rhn-package-427149 rhn-package-427644 rhn-package-427648 rhn-package-428032 rhn-package-428033 rhn-package-428034 rhn-package-428036 rhn-package-428038 rhn-package-428044 rhn-package-428050 rhn-package-428051 rhn-package-428470 rhn-package-428546 rhn-package-428563 rhn-package-428571 rhn-package-428581 rhn-package-428600 rhn-package-428759 rhn-package-428778 rhn-package-428780 rhn-package-428783 rhn-package-428789 rhn-package-428791 rhn-package-428793 rhn-package-428795 rhn-package-428796 rhn-package-428804 rhn-package-428805 rhn-package-428810 rhn-package-428811 rhn-package-428818 rhn-package-428823 rhn-package-428826 rhn-package-428827 rhn-package-428830 rhn-package-428832 rhn-package-428840 rhn-package-428841 rhn-package-428850 rhn-package-428868 rhn-package-428890 rhn-package-428893 rhn-package-428895 rhn-package-428899 rhn-package-428969 rhn-package-428992 rhn-package-428994 rhn-package-429001 rhn-package-429006 rhn-package-429010 rhn-package-429024 rhn-package-429029 rhn-package-429112 rhn-package-429114 rhn-package-429116 rhn-package-429120 rhn-package-429239 rhn-package-429241 rhn-package-429246 rhn-package-429247 rhn-package-429333 rhn-package-429336 rhn-package-429339 rhn-package-429341 rhn-package-429349 rhn-package-429504 rhn-package-429513 rhn-package-429516 rhn-package-429517 rhn-package-429520 rhn-package-429522 rhn-package-429529 rhn-package-429531 rhn-package-429533 rhn-package-429539 rhn-package-429546 rhn-package-429552 rhn-package-429554 rhn-package-429555 rhn-package-429556 rhn-package-429557 rhn-package-429569 rhn-package-429606 rhn-package-429611 rhn-package-429612 rhn-package-429613 rhn-package-429656 rhn-package-429661 rhn-package-429669 rhn-package-429680 rhn-package-429705 rhn-package-429709 rhn-package-429716 rhn-package-429719 rhn-package-429721 rhn-package-429918 rhn-package-429919 rhn-package-430000 rhn-package-430007 rhn-package-430008 rhn-package-430022 rhn-package-430039 rhn-package-430070 rhn-package-430080 rhn-package-430084 rhn-package-430090 rhn-package-430091 rhn-package-430093 rhn-package-430102 rhn-package-430115 rhn-package-430116 rhn-package-430117 rhn-package-430133 rhn-package-430146 rhn-package-430409 rhn-package-430410 rhn-package-430412 rhn-package-430424 rhn-package-430428 rhn-package-430524 rhn-package-430525 rhn-package-430527 rhn-package-430529 rhn-package-430531 rhn-package-430532 rhn-package-430533 rhn-package-430534 rhn-package-430535 rhn-package-430536 rhn-package-430537 rhn-package-430538 rhn-package-430539 rhn-package-430540 rhn-package-430541 rhn-package-430542 rhn-package-430543 rhn-package-430544 rhn-package-430545 rhn-package-430546 rhn-package-430547 rhn-package-430548 rhn-package-430549 rhn-package-430550 rhn-package-430551 rhn-package-430552 rhn-package-430553 rhn-package-430554 rhn-package-430555 rhn-package-430556 rhn-package-430557 rhn-package-430558 rhn-package-430559 rhn-package-430560 rhn-package-430561 rhn-package-430562 rhn-package-430563 rhn-package-430564 rhn-package-430565 rhn-package-430566 rhn-package-430567 rhn-package-430568 rhn-package-430569 rhn-package-430570 rhn-package-430571 rhn-package-430572 rhn-package-430573 rhn-package-430574 rhn-package-430576 rhn-package-430580 rhn-package-430585 rhn-package-430586 rhn-package-430592 rhn-package-430594 rhn-package-430599 rhn-package-430600 rhn-package-430608 rhn-package-430614 rhn-package-430616 rhn-package-430617 rhn-package-430619 rhn-package-430627 rhn-package-430630 rhn-package-430637 rhn-package-430661 rhn-package-430663 rhn-package-430664 rhn-package-430665 rhn-package-430682 rhn-package-430688 rhn-package-430691 rhn-package-430692 rhn-package-430694 rhn-package-430698 rhn-package-431072 rhn-package-431074 rhn-package-431075 rhn-package-431081 rhn-package-431084 rhn-package-431087 rhn-package-431475 rhn-package-431482 rhn-package-431486 rhn-package-431493 rhn-package-431494 rhn-package-431503 rhn-package-431604 rhn-package-431609 rhn-package-431615 rhn-package-431616 rhn-package-431617 rhn-package-431619 rhn-package-431629 rhn-package-431632 rhn-package-431638 rhn-package-431643 rhn-package-431648 rhn-package-431654 rhn-package-431658 rhn-package-431662 rhn-package-431664 rhn-package-431665 rhn-package-431667 rhn-package-431677 rhn-package-431686 rhn-package-431688 rhn-package-431697 rhn-package-431702 rhn-package-431705 rhn-package-431710 rhn-package-431711 rhn-package-431718 rhn-package-431745 rhn-package-431748 rhn-package-431753 rhn-package-431754 rhn-package-431755 rhn-package-431758 rhn-package-431873 rhn-package-431874 rhn-package-431875 rhn-package-431878 rhn-package-431879 rhn-package-431888 rhn-package-431889 rhn-package-431891 rhn-package-431897 rhn-package-431907 rhn-package-431910 rhn-package-431912 rhn-package-431934 rhn-package-431937 rhn-package-431940 rhn-package-431954 rhn-package-431956 rhn-package-431962 rhn-package-431963 rhn-package-431966 rhn-package-431986 rhn-package-431988 rhn-package-432222 rhn-package-432469 rhn-package-432471 rhn-package-432478 rhn-package-432480 rhn-package-432481 rhn-package-432483 rhn-package-432508 rhn-package-432668 rhn-package-432674 rhn-package-432676 rhn-package-432679 rhn-package-432805 rhn-package-432813 rhn-package-432818 rhn-package-432819 rhn-package-432825 rhn-package-432835 rhn-package-432837 rhn-package-432839 rhn-package-432909 rhn-package-432912 rhn-package-432915 rhn-package-432916 rhn-package-433072 rhn-package-433076 rhn-package-433077 rhn-package-433081 rhn-package-433085 rhn-package-433091 rhn-package-433093 rhn-package-433157 rhn-package-433158 rhn-package-433161 rhn-package-433162 rhn-package-433239 rhn-package-433241 rhn-package-433243 rhn-package-433249 rhn-package-433253 rhn-package-433383 rhn-package-433385 rhn-package-433409 rhn-package-433410 rhn-package-433414 rhn-package-433429 rhn-package-433432 rhn-package-433440 rhn-package-433450 rhn-package-433468 rhn-package-433469 rhn-package-433471 rhn-package-433474 rhn-package-433481 rhn-package-433482 rhn-package-433484 rhn-package-433485 rhn-package-433495 rhn-package-433497 rhn-package-433703 rhn-package-433706 rhn-package-433713 rhn-package-433716 rhn-package-433721 rhn-package-433730 rhn-package-433732 rhn-package-433733 rhn-package-433734 rhn-package-433739 rhn-package-433755 rhn-package-433762 rhn-package-433766 rhn-package-433767 rhn-package-433773 rhn-package-433828 rhn-package-433829 rhn-package-433834 rhn-package-433835 rhn-package-433840 rhn-package-434251 rhn-package-434258 rhn-package-434261 rhn-package-434267 rhn-package-434268 rhn-package-434269 rhn-package-434271 rhn-package-434283 rhn-package-434400 rhn-package-434406 rhn-package-434412 rhn-package-437307 rhn-package-437308 rhn-package-437309 rhn-package-437310 rhn-package-437311 rhn-package-437312 rhn-package-437318 rhn-package-437323 rhn-package-437340 rhn-package-437346 rhn-package-437355 rhn-package-437833 rhn-package-437837 rhn-package-437839 rhn-package-437840 rhn-package-437842 rhn-package-437845 rhn-package-437960 rhn-package-437961 rhn-package-437964 rhn-package-438018 rhn-package-438025 rhn-package-438026 rhn-package-438032 rhn-package-438216 rhn-package-438217 rhn-package-438219 rhn-package-438223 rhn-package-438224 rhn-package-438230 rhn-package-438282 rhn-package-438503 rhn-package-438606 rhn-package-438624 rhn-package-438996 rhn-package-439002 rhn-package-439009 rhn-package-439013 rhn-package-439162 rhn-package-439164 rhn-package-439170 rhn-package-439174 rhn-package-439181 rhn-package-439182 rhn-package-439185 rhn-package-439186 rhn-package-439196 rhn-package-439211 rhn-package-439240 rhn-package-439244 rhn-package-439254 rhn-package-439612 rhn-package-439616 rhn-package-439618 rhn-package-439619 rhn-package-439621 rhn-package-440233 rhn-package-440234 rhn-package-440237 rhn-package-440239 rhn-package-440241 rhn-package-440246 rhn-package-440250 rhn-package-440255 rhn-package-440322 rhn-package-440560 rhn-package-440563 rhn-package-440590 rhn-package-440591 rhn-package-440593 rhn-package-440594 rhn-package-440667 rhn-package-440668 rhn-package-440811 rhn-package-440813 rhn-package-440814 rhn-package-440817 rhn-package-440818 rhn-package-440820 rhn-package-440826 rhn-package-440837 rhn-package-440838 rhn-package-440839 rhn-package-440846 rhn-package-440848 rhn-package-440850 rhn-package-440851 rhn-package-440859 rhn-package-440860 rhn-package-440865 rhn-package-440867 rhn-package-440874 rhn-package-440878 rhn-package-440882 rhn-package-440886 rhn-package-440894 rhn-package-440895 rhn-package-440900 rhn-package-440902 rhn-package-440907 rhn-package-440908 rhn-package-440909 rhn-package-440921 rhn-package-440924 rhn-package-440931 rhn-package-440932 rhn-package-440937 rhn-package-440944 rhn-package-440953 rhn-package-440954 rhn-package-440955 rhn-package-440960 rhn-package-440962 rhn-package-440971 rhn-package-441004 rhn-package-441005 rhn-package-441006 rhn-package-441007 rhn-package-441008 rhn-package-441009 rhn-package-441010 rhn-package-441011 rhn-package-441012 rhn-package-441013 rhn-package-441014 rhn-package-441015 rhn-package-441016 rhn-package-441017 rhn-package-441018 rhn-package-441019 rhn-package-441020 rhn-package-441021 rhn-package-441022 rhn-package-441023 rhn-package-441024 rhn-package-441025 rhn-package-441026 rhn-package-441030 rhn-package-441034 rhn-package-441036 rhn-package-441038 rhn-package-441039 rhn-package-441040 rhn-package-441041 rhn-package-441044 rhn-package-441049 rhn-package-441050 rhn-package-441051 rhn-package-441052 rhn-package-441053 rhn-package-441067 rhn-package-441070 rhn-package-441071 rhn-package-441075 rhn-package-441080 rhn-package-441083 rhn-package-441089 rhn-package-441090 rhn-package-441095 rhn-package-441096 rhn-package-441105 rhn-package-441115 rhn-package-441130 rhn-package-441131 rhn-package-441133 rhn-package-441136 rhn-package-441137 rhn-package-441138 rhn-package-441140 rhn-package-441155 rhn-package-441156 rhn-package-441158 rhn-package-441159 rhn-package-441218 rhn-package-441221 rhn-package-441224 rhn-package-441226 rhn-package-441227 rhn-package-441231 rhn-package-441241 rhn-package-441245 rhn-package-441247 rhn-package-441253 rhn-package-441254 rhn-package-441255 rhn-package-441264 rhn-package-441268 rhn-package-441270 rhn-package-441271 rhn-package-441272 rhn-package-441274 rhn-package-441276 rhn-package-441280 rhn-package-441295 rhn-package-441299 rhn-package-441304 rhn-package-441307 rhn-package-441314 rhn-package-441316 rhn-package-441317 rhn-package-441319 rhn-package-441320 rhn-package-441325 rhn-package-441331 rhn-package-441333 rhn-package-441337 rhn-package-441339 rhn-package-441343 rhn-package-441350 rhn-package-441355 rhn-package-441358 rhn-package-441359 rhn-package-441362 rhn-package-441364 rhn-package-441365 rhn-package-441373 rhn-package-441374 rhn-package-441380 rhn-package-441391 rhn-package-441394 rhn-package-441399 rhn-package-441402 rhn-package-441409 rhn-package-441414 rhn-package-441415 rhn-package-441419 rhn-package-441422 rhn-package-441429 rhn-package-441431 rhn-package-441433 rhn-package-441436 rhn-package-441440 rhn-package-441441 rhn-package-441442 rhn-package-441443 rhn-package-441444 rhn-package-441445 rhn-package-441446 rhn-package-441452 rhn-package-441453 rhn-package-441454 rhn-package-441456 rhn-package-441458 rhn-package-441468 rhn-package-441469 rhn-package-441471 rhn-package-441472 rhn-package-441473 rhn-package-441474 rhn-package-441477 rhn-package-441483 rhn-package-441484 rhn-package-441486 rhn-package-441493 rhn-package-441499 rhn-package-441502 rhn-package-441504 rhn-package-441505 rhn-package-441506 rhn-package-441507 rhn-package-441508 rhn-package-441509 rhn-package-441510 rhn-package-441511 rhn-package-441512 rhn-package-441513 rhn-package-441515 rhn-package-441516 rhn-package-441522 rhn-package-441526 rhn-package-441528 rhn-package-441529 rhn-package-441533 rhn-package-441534 rhn-package-441535 rhn-package-441537 rhn-package-441617 rhn-package-441621 rhn-package-441625 rhn-package-441626 rhn-package-441631 rhn-package-441634 rhn-package-441635 rhn-package-441638 rhn-package-441639 rhn-package-441640 rhn-package-441641 rhn-package-441644 rhn-package-441651 rhn-package-441652 rhn-package-441653 rhn-package-441657 rhn-package-441660 rhn-package-441661 rhn-package-441662 rhn-package-441665 rhn-package-441666 rhn-package-441667 rhn-package-441668 rhn-package-441669 rhn-package-441670 rhn-package-441671 rhn-package-441673 rhn-package-441679 rhn-package-441680 rhn-package-441681 rhn-package-441688 rhn-package-441689 rhn-package-441690 rhn-package-441691 rhn-package-441693 rhn-package-441706 rhn-package-441712 rhn-package-441719 rhn-package-441721 rhn-package-441722 rhn-package-441723 rhn-package-441724 rhn-package-441725 rhn-package-441726 rhn-package-441727 rhn-package-441728 rhn-package-441730 rhn-package-441731 rhn-package-441732 rhn-package-441733 rhn-package-441734 rhn-package-441735 rhn-package-441736 rhn-package-441737 rhn-package-441738 rhn-package-441747 rhn-package-441748 rhn-package-441749 rhn-package-441751 rhn-package-441752 rhn-package-441754 rhn-package-441755 rhn-package-441756 rhn-package-441759 rhn-package-441760 rhn-package-441761 rhn-package-441763 rhn-package-441764 rhn-package-441765 rhn-package-441766 rhn-package-441767 rhn-package-441768 rhn-package-441771 rhn-package-441773 rhn-package-441777 rhn-package-441789 rhn-package-441791 rhn-package-441798 rhn-package-441799 rhn-package-441800 rhn-package-441801 rhn-package-441804 rhn-package-441805 rhn-package-441808 rhn-package-441810 rhn-package-441811 rhn-package-441812 rhn-package-441815 rhn-package-441816 rhn-package-441817 rhn-package-441819 rhn-package-441820 rhn-package-441821 rhn-package-441822 rhn-package-441824 rhn-package-441825 rhn-package-441826 rhn-package-441827 rhn-package-441828 rhn-package-441830 rhn-package-441831 rhn-package-441833 rhn-package-441834 rhn-package-441836 rhn-package-441837 rhn-package-441839 rhn-package-441840 rhn-package-441843 rhn-package-441845 rhn-package-441847 rhn-package-441848 rhn-package-441850 rhn-package-441851 rhn-package-441854 rhn-package-441855 rhn-package-441856 rhn-package-441857 rhn-package-441858 rhn-package-441859 rhn-package-441860 rhn-package-441861 rhn-package-441862 rhn-package-441863 rhn-package-441866 rhn-package-441867 rhn-package-441869 rhn-package-441870 rhn-package-441871 rhn-package-441872 rhn-package-441873 rhn-package-441874 rhn-package-441875 rhn-package-441899 rhn-package-441900 rhn-package-441901 rhn-package-441902 rhn-package-441903 rhn-package-441907 rhn-package-441908 rhn-package-441910 rhn-package-441911 rhn-package-441914 rhn-package-441915 rhn-package-441920 rhn-package-441924 rhn-package-441927 rhn-package-441928 rhn-package-441929 rhn-package-441931 rhn-package-441932 rhn-package-441933 rhn-package-441934 rhn-package-441935 rhn-package-441936 rhn-package-441941 rhn-package-441944 rhn-package-441945 rhn-package-441946 rhn-package-441947 rhn-package-441948 rhn-package-441949 rhn-package-441950 rhn-package-441951 rhn-package-441952 rhn-package-441953 rhn-package-441954 rhn-package-441955 rhn-package-441956 rhn-package-441957 rhn-package-441958 rhn-package-441959 rhn-package-441960 rhn-package-441961 rhn-package-441962 rhn-package-441963 rhn-package-441964 rhn-package-441965 rhn-package-441966 rhn-package-441967 rhn-package-441968 rhn-package-441969 rhn-package-441970 rhn-package-441971 rhn-package-441972 rhn-package-441973 rhn-package-441974 rhn-package-441975 rhn-package-441976 rhn-package-441977 rhn-package-441978 rhn-package-441979 rhn-package-441980 rhn-package-441981 rhn-package-441982 rhn-package-441983 rhn-package-441984 rhn-package-441985 rhn-package-441986 rhn-package-441987 rhn-package-441988 rhn-package-441989 rhn-package-441991 rhn-package-441992 rhn-package-441994 rhn-package-441995 rhn-package-441996 rhn-package-441997 rhn-package-441998 rhn-package-441999 rhn-package-442000 rhn-package-442001 rhn-package-442002 rhn-package-442003 rhn-package-442004 rhn-package-442005 rhn-package-442006 rhn-package-442007 rhn-package-442008 rhn-package-442009 rhn-package-442010 rhn-package-442011 rhn-package-442012 rhn-package-442013 rhn-package-442014 rhn-package-442015 rhn-package-442016 rhn-package-442017 rhn-package-442018 rhn-package-442019 rhn-package-442020 rhn-package-442021 rhn-package-442022 rhn-package-442023 rhn-package-442024 rhn-package-442025 rhn-package-442026 rhn-package-442027 rhn-package-442028 rhn-package-442029 rhn-package-442030 rhn-package-442031 rhn-package-442032 rhn-package-442033 rhn-package-442034 rhn-package-442035 rhn-package-442036 rhn-package-442037 rhn-package-442038 rhn-package-442039 rhn-package-442040 rhn-package-442041 rhn-package-442042 rhn-package-442043 rhn-package-442044 rhn-package-442045 rhn-package-442046 rhn-package-442047 rhn-package-442048 rhn-package-442049 rhn-package-442050 rhn-package-442051 rhn-package-442052 rhn-package-442053 rhn-package-442054 rhn-package-442055 rhn-package-442056 rhn-package-442057 rhn-package-442058 rhn-package-442059 rhn-package-442060 rhn-package-442061 rhn-package-442062 rhn-package-442063 rhn-package-442064 rhn-package-442065 rhn-package-442066 rhn-package-442067 rhn-package-442068 rhn-package-442069 rhn-package-442144 rhn-package-442145 rhn-package-442146 rhn-package-442147 rhn-package-442148 rhn-package-442149 rhn-package-442150 rhn-package-442151 rhn-package-442152 rhn-package-442153 rhn-package-442154 rhn-package-442155 rhn-package-442156 rhn-package-442157 rhn-package-442158 rhn-package-442159 rhn-package-442160 rhn-package-442161 rhn-package-442162 rhn-package-442163 rhn-package-442164 rhn-package-442165 rhn-package-442166 rhn-package-442169 rhn-package-442170 rhn-package-442171 rhn-package-442172 rhn-package-442173 rhn-package-442174 rhn-package-442175 rhn-package-442176 rhn-package-442177 rhn-package-442178 rhn-package-442179 rhn-package-442180 rhn-package-442181 rhn-package-442182 rhn-package-442183 rhn-package-442184 rhn-package-442185 rhn-package-442186 rhn-package-442187 rhn-package-442188 rhn-package-442189 rhn-package-442190 rhn-package-442191 rhn-package-442192 rhn-package-442193 rhn-package-442194 rhn-package-442195 rhn-package-442196 rhn-package-442197 rhn-package-442198 rhn-package-442199 rhn-package-442200 rhn-package-442201 rhn-package-442202 rhn-package-442203 rhn-package-442204 rhn-package-442205 rhn-package-442206 rhn-package-442207 rhn-package-442208 rhn-package-442209 rhn-package-442211 rhn-package-442212 rhn-package-442213 rhn-package-442214 rhn-package-442215 rhn-package-442216 rhn-package-442217 rhn-package-442218 rhn-package-442219 rhn-package-442220 rhn-package-442221 rhn-package-442222 rhn-package-442223 rhn-package-442224 rhn-package-442225 rhn-package-442226 rhn-package-442227 rhn-package-442228 rhn-package-442229 rhn-package-442230 rhn-package-442231 rhn-package-442232 rhn-package-442233 rhn-package-442234 rhn-package-442235 rhn-package-442236 rhn-package-442237 rhn-package-442245 rhn-package-442246 rhn-package-442247 rhn-package-442248 rhn-package-442249 rhn-package-442250 rhn-package-442251 rhn-package-442252 rhn-package-442253 rhn-package-442254 rhn-package-442255 rhn-package-442256 rhn-package-442257 rhn-package-442258 rhn-package-442259 rhn-package-442260 rhn-package-442261 rhn-package-442262 rhn-package-442263 rhn-package-442264 rhn-package-442265 rhn-package-442266 rhn-package-442267 rhn-package-442268 rhn-package-442269 rhn-package-442270 rhn-package-442271 rhn-package-442272 rhn-package-442273 rhn-package-442274 rhn-package-442275 rhn-package-442276 rhn-package-442277 rhn-package-442278 rhn-package-442279 rhn-package-442280 rhn-package-442281 rhn-package-442282 rhn-package-442283 rhn-package-442284 rhn-package-442285 rhn-package-442287 rhn-package-442288 rhn-package-442289 rhn-package-442290 rhn-package-442291 rhn-package-442292 rhn-package-442293 rhn-package-442294 rhn-package-442295 rhn-package-442296 rhn-package-442297 rhn-package-442298 rhn-package-442299 rhn-package-442300 rhn-package-442301 rhn-package-442302 rhn-package-442303 rhn-package-442304 rhn-package-442305 rhn-package-442306 rhn-package-442307 rhn-package-442308 rhn-package-442309 rhn-package-442311 rhn-package-442312 rhn-package-442313 rhn-package-442314 rhn-package-442315 rhn-package-442316 rhn-package-442317 rhn-package-442318 rhn-package-442319 rhn-package-442320 rhn-package-442321 rhn-package-442322 rhn-package-442323 rhn-package-442324 rhn-package-442325 rhn-package-442326 rhn-package-442327 rhn-package-442328 rhn-package-442329 rhn-package-442330 rhn-package-442331 rhn-package-442332 rhn-package-442333 rhn-package-442334 rhn-package-442335 rhn-package-442336 rhn-package-442337 rhn-package-442338 rhn-package-442339 rhn-package-442340 rhn-package-442341 rhn-package-442342 rhn-package-442343 rhn-package-442344 rhn-package-442345 rhn-package-442346 rhn-package-442347 rhn-package-442348 rhn-package-442349 rhn-package-442350 rhn-package-442351 rhn-package-442352 rhn-package-442353 rhn-package-442355 rhn-package-442356 rhn-package-442357 rhn-package-442358 rhn-package-442359 rhn-package-442360 rhn-package-442361 rhn-package-442362 rhn-package-442363 rhn-package-442364 rhn-package-442365 rhn-package-442366 rhn-package-442367 rhn-package-442368 rhn-package-442369 rhn-package-442370 rhn-package-442371 rhn-package-442372 rhn-package-442373 rhn-package-442374 rhn-package-442377 rhn-package-442378 rhn-package-442379 rhn-package-442380 rhn-package-442381 rhn-package-442383 rhn-package-442384 rhn-package-442386 rhn-package-442387 rhn-package-442388 rhn-package-442389 rhn-package-442390 rhn-package-442391 rhn-package-442392 rhn-package-442393 rhn-package-442394 rhn-package-442395 rhn-package-442396 rhn-package-442397 rhn-package-442398 rhn-package-442399 rhn-package-442400 rhn-package-442401 rhn-package-442402 rhn-package-442403 rhn-package-442404 rhn-package-442405 rhn-package-442406 rhn-package-442408 rhn-package-442409 rhn-package-442410 rhn-package-442411 rhn-package-442412 rhn-package-442413 rhn-package-442414 rhn-package-442415 rhn-package-442416 rhn-package-442417 rhn-package-442418 rhn-package-442419 rhn-package-442420 rhn-package-442421 rhn-package-442422 rhn-package-442423 rhn-package-442424 rhn-package-442425 rhn-package-442426 rhn-package-442427 rhn-package-442428 rhn-package-442429 rhn-package-442430 rhn-package-442431 rhn-package-442432 rhn-package-442433 rhn-package-442434 rhn-package-442435 rhn-package-442436 rhn-package-442438 rhn-package-442439 rhn-package-442440 rhn-package-442456 rhn-package-442504 rhn-package-442514 rhn-package-442517 rhn-package-442522 rhn-package-442527 rhn-package-442528 rhn-package-442530 rhn-package-442531 rhn-package-442538 rhn-package-442545 rhn-package-442548 rhn-package-443196 rhn-package-443385 rhn-package-443389 rhn-package-443392 rhn-package-443395 rhn-package-443398 rhn-package-444061 rhn-package-444062 rhn-package-444063 rhn-package-444065 rhn-package-444136 rhn-package-444143 rhn-package-444146 rhn-package-444149 rhn-package-444161 rhn-package-444210 rhn-package-444218 rhn-package-444219 rhn-package-444227 rhn-package-444232 rhn-package-444239 rhn-package-444343 rhn-package-444437 rhn-package-444440 rhn-package-444443 rhn-package-444444 rhn-package-444445 rhn-package-446646 rhn-package-446650 rhn-package-446651 rhn-package-446654 rhn-package-446656 rhn-package-446657 rhn-package-446666 rhn-package-446674 rhn-package-446676 rhn-package-446679 rhn-package-446765 rhn-package-446768 rhn-package-446769 rhn-package-446777 rhn-package-446782 rhn-package-446783 rhn-package-446845 rhn-package-446846 rhn-package-446848 rhn-package-446850 rhn-package-446853 rhn-package-446855 rhn-package-446864 rhn-package-446874 rhn-package-446889 rhn-package-446901 rhn-package-446903 rhn-package-446904 rhn-package-446907 rhn-package-446913 rhn-package-446914 rhn-package-447099 rhn-package-447104 rhn-package-447118 rhn-package-447131 rhn-package-447132 rhn-package-447144 rhn-package-447146 rhn-package-447263 rhn-package-447268 rhn-package-447422 rhn-package-447441 rhn-package-447633 rhn-package-447636 rhn-package-447642 rhn-package-447645 rhn-package-447647 rhn-package-447654 rhn-package-447659 rhn-package-447792 rhn-package-447795 rhn-package-447796 rhn-package-447799 rhn-package-447801 rhn-package-447803 rhn-package-447814 rhn-package-447819 rhn-package-448450 rhn-package-448461 rhn-package-448465 rhn-package-448470 rhn-package-448476 rhn-package-448501 rhn-package-448503 rhn-package-448505 rhn-package-448507 rhn-package-448509 rhn-package-448513 rhn-package-448526 rhn-package-448531 rhn-package-448537 rhn-package-448539 rhn-package-448542 rhn-package-448549 rhn-package-448550 rhn-package-448553 rhn-package-448556 rhn-package-448558 rhn-package-448568 rhn-package-448573 rhn-package-448581 rhn-package-448582 rhn-package-448584 rhn-package-448585 rhn-package-448587 rhn-package-448590 rhn-package-448596 rhn-package-448599 rhn-package-448602 rhn-package-448606 rhn-package-448610 rhn-package-448617 rhn-package-448625 rhn-package-448626 rhn-package-448627 rhn-package-448630 rhn-package-448663 rhn-package-448665 rhn-package-448666 rhn-package-448672 rhn-package-448688 rhn-package-448691 rhn-package-448694 rhn-package-448697 rhn-package-448699 rhn-package-448713 rhn-package-448733 rhn-package-448745 rhn-package-448748 rhn-package-448749 rhn-package-448756 rhn-package-448765 rhn-package-448771 rhn-package-448783 rhn-package-448835 rhn-package-449054 rhn-package-449057 rhn-package-449058 rhn-package-449061 rhn-package-449068 rhn-package-449069 rhn-package-449070 rhn-package-449071 rhn-package-449072 rhn-package-449073 rhn-package-449074 rhn-package-449075 rhn-package-449076 rhn-package-449077 rhn-package-449078 rhn-package-449079 rhn-package-449080 rhn-package-449081 rhn-package-449082 rhn-package-449083 rhn-package-449084 rhn-package-449085 rhn-package-449086 rhn-package-449087 rhn-package-449088 rhn-package-449089 rhn-package-449090 rhn-package-449132 rhn-package-449133 rhn-package-449134 rhn-package-449136 rhn-package-449137 rhn-package-449143 rhn-package-449144 rhn-package-449154 rhn-package-449354 rhn-package-449705 rhn-package-449709 rhn-package-449712 rhn-package-449713 rhn-package-449714 rhn-package-449718 rhn-package-449720 rhn-package-449728 rhn-package-449729 rhn-package-449733 rhn-package-449738 rhn-package-449742 rhn-package-449945 rhn-package-449947 rhn-package-449950 rhn-package-449952 rhn-package-449956 rhn-package-449958 rhn-package-449959 rhn-package-449960 rhn-package-449961 rhn-package-449967 rhn-package-449972 rhn-package-450117 rhn-package-450120 rhn-package-450122 rhn-package-450130 rhn-package-450131 rhn-package-450132 rhn-package-450133 rhn-package-450134 rhn-package-450135 rhn-package-450145 rhn-package-450161 rhn-package-450164 rhn-package-450168 rhn-package-450207 rhn-package-450208 rhn-package-450220 rhn-package-450263 rhn-package-450264 rhn-package-450265 rhn-package-450275 rhn-package-450284 rhn-package-450286 rhn-package-450302 rhn-package-450306 rhn-package-450321 rhn-package-450327 rhn-package-450329 rhn-package-450333 rhn-package-450395 rhn-package-450397 rhn-package-450401 rhn-package-450404 rhn-package-450405 rhn-package-450409 rhn-package-450411 rhn-package-450417 rhn-package-450420 rhn-package-450421 rhn-package-450424 rhn-package-450496 rhn-package-450500 rhn-package-450502 rhn-package-450505 rhn-package-450509 rhn-package-450849 rhn-package-450851 rhn-package-450854 rhn-package-450858 rhn-package-450860 rhn-package-450862 rhn-package-450865 rhn-package-450866 rhn-package-450867 rhn-package-450868 rhn-package-450869 rhn-package-450991 rhn-package-450995 rhn-package-450997 rhn-package-450999 rhn-package-451001 rhn-package-451002 rhn-package-451116 rhn-package-451122 rhn-package-451137 rhn-package-451138 rhn-package-451144 rhn-package-451145 rhn-package-451153 rhn-package-451160 rhn-package-451162 rhn-package-451166 rhn-package-451175 rhn-package-451180 rhn-package-451181 rhn-package-451185 rhn-package-451186 rhn-package-451190 rhn-package-451193 rhn-package-451196 rhn-package-451199 rhn-package-451487 rhn-package-451490 rhn-package-451493 rhn-package-451495 rhn-package-451499 rhn-package-451502 rhn-package-451505 rhn-package-451510 rhn-package-451511 rhn-package-451518 rhn-package-451524 rhn-package-451526 rhn-package-451531 rhn-package-451546 rhn-package-451548 rhn-package-453866 rhn-package-453871 rhn-package-453875 rhn-package-453881 rhn-package-453884 rhn-package-454062 rhn-package-454321 rhn-package-454325 rhn-package-454452 rhn-package-454454 rhn-package-454455 rhn-package-454459 rhn-package-454460 rhn-package-454472 rhn-package-454474 rhn-package-454483 rhn-package-454487 rhn-package-454492 rhn-package-454497 rhn-package-454593 rhn-package-454595 rhn-package-454596 rhn-package-454600 rhn-package-454603 rhn-package-454634 rhn-package-454769 rhn-package-454772 rhn-package-454775 rhn-package-454780 rhn-package-454784 rhn-package-454786 rhn-package-454798 rhn-package-454803 rhn-package-454950 rhn-package-454955 rhn-package-454956 rhn-package-454958 rhn-package-454963 rhn-package-454964 rhn-package-454975 rhn-package-454976 rhn-package-454980 rhn-package-454982 rhn-package-454989 rhn-package-454990 rhn-package-455150 rhn-package-455172 rhn-package-455222 rhn-package-455227 rhn-package-455229 rhn-package-455304 rhn-package-455315 rhn-package-455339 rhn-package-455353 rhn-package-455354 rhn-package-455602 rhn-package-455604 rhn-package-455607 rhn-package-455611 rhn-package-455615 rhn-package-455700 rhn-package-455703 rhn-package-455704 rhn-package-455705 rhn-package-455772 rhn-package-455773 rhn-package-455774 rhn-package-455777 rhn-package-455786 rhn-package-455965 rhn-package-456000 rhn-package-456005 rhn-package-456008 rhn-package-456009 rhn-package-456014 rhn-package-456017 rhn-package-456021 rhn-package-456029 rhn-package-456228 rhn-package-456232 rhn-package-456236 rhn-package-456237 rhn-package-456242 rhn-package-456248 rhn-package-456257 rhn-package-456261 rhn-package-456267 rhn-package-456268 rhn-package-456272 rhn-package-456342 rhn-package-456344 rhn-package-456347 rhn-package-456349 rhn-package-456412 rhn-package-456432 rhn-package-456449 rhn-package-456452 rhn-package-456455 rhn-package-456460 rhn-package-456461 rhn-package-456533 rhn-package-456534 rhn-package-456539 rhn-package-456543 rhn-package-456544 rhn-package-456547 rhn-package-456552 rhn-package-456559 rhn-package-457416 rhn-package-457417 rhn-package-457419 rhn-package-457427 rhn-package-457428 rhn-package-458030 rhn-package-458031 rhn-package-458032 rhn-package-458034 rhn-package-458036 rhn-package-458159 rhn-package-458160 rhn-package-458177 rhn-package-458184 rhn-package-458185 rhn-package-458381 rhn-package-458383 rhn-package-458384 rhn-package-458388 rhn-package-458390 rhn-package-458393 rhn-package-458394 rhn-package-458398 rhn-package-458401 rhn-package-458402 rhn-package-458406 rhn-package-458409 rhn-package-458411 rhn-package-458416 rhn-package-458419 rhn-package-458423 rhn-package-458427 rhn-package-458430 rhn-package-458439 rhn-package-458586 rhn-package-458588 rhn-package-458589 rhn-package-458590 rhn-package-458595 rhn-package-458597 rhn-package-458598 rhn-package-458603 rhn-package-458607 rhn-package-458613 rhn-package-458616 rhn-package-458619 rhn-package-458621 rhn-package-458626 rhn-package-458631 rhn-package-458632 rhn-package-458678 rhn-package-458679 rhn-package-458684 rhn-package-458797 rhn-package-458871 rhn-package-458877 rhn-package-458882 rhn-package-458896 rhn-package-458921 rhn-package-458938 rhn-package-458940 rhn-package-458941 rhn-package-458942 rhn-package-458949 rhn-package-458954 rhn-package-458961 rhn-package-458963 rhn-package-458965 rhn-package-458966 rhn-package-458969 rhn-package-458977 rhn-package-458990 rhn-package-458991 rhn-package-459230 rhn-package-459235 rhn-package-459236 rhn-package-459237 rhn-package-459242 rhn-package-459255 rhn-package-459256 rhn-package-459257 rhn-package-459258 rhn-package-459259 rhn-package-459260 rhn-package-459261 rhn-package-459262 rhn-package-459263 rhn-package-459265 rhn-package-459304 rhn-package-459412 rhn-package-459413 rhn-package-459421 rhn-package-459428 rhn-package-459443 rhn-package-459445 rhn-package-459490 rhn-package-459492 rhn-package-459493 rhn-package-459496 rhn-package-459807 rhn-package-459811 rhn-package-459814 rhn-package-459815 rhn-package-459817 rhn-package-459818 rhn-package-459825 rhn-package-459837 rhn-package-459877 rhn-package-459883 rhn-package-459892 rhn-package-459893 rhn-package-459896 rhn-package-459902 rhn-package-459903 rhn-package-459909 rhn-package-459911 rhn-package-459913 rhn-package-459915 rhn-package-459929 rhn-package-459933 rhn-package-459935 rhn-package-459941 rhn-package-459942 rhn-package-460232 rhn-package-460241 rhn-package-460242 rhn-package-460252 rhn-package-460253 rhn-package-460254 rhn-package-460268 rhn-package-460269 rhn-package-460278 rhn-package-460293 rhn-package-460302 rhn-package-460303 rhn-package-460307 rhn-package-460322 rhn-package-460424 rhn-package-460767 rhn-package-463500 rhn-package-463507 rhn-package-463513 rhn-package-463520 rhn-package-463525 rhn-package-463532 rhn-package-463537 rhn-package-463595 rhn-package-463596 rhn-package-463605 rhn-package-463615 rhn-package-463617 rhn-package-463621 rhn-package-463629 rhn-package-463633 rhn-package-463641 rhn-package-463642 rhn-package-463644 rhn-package-464556 rhn-package-464583 rhn-package-464594 rhn-package-464598 rhn-package-464737 rhn-package-464752 rhn-package-464757 rhn-package-464767 rhn-package-464807 rhn-package-464808 rhn-package-464810 rhn-package-464817 rhn-package-464818 rhn-package-464820 rhn-package-464853 rhn-package-464855 rhn-package-464858 rhn-package-464859 rhn-package-464860 rhn-package-464872 rhn-package-464874 rhn-package-464885 rhn-package-465046 rhn-package-465047 rhn-package-465050 rhn-package-465052 rhn-package-465054 rhn-package-465056 rhn-package-465063 rhn-package-465078 rhn-package-465091 rhn-package-465093 rhn-package-465095 rhn-package-465098 rhn-package-465099 rhn-package-465101 rhn-package-465104 rhn-package-465108 rhn-package-465110 rhn-package-465114 rhn-package-465121 rhn-package-465175 rhn-package-465197 rhn-package-465199 rhn-package-465204 rhn-package-465221 rhn-package-465413 rhn-package-465416 rhn-package-465418 rhn-package-465419 rhn-package-465490 rhn-package-465491 rhn-package-465492 rhn-package-465493 rhn-package-465501 rhn-package-465502 rhn-package-465615 rhn-package-465620 rhn-package-465622 rhn-package-465896 rhn-package-465900 rhn-package-465905 rhn-package-465908 rhn-package-465909 rhn-package-465928 rhn-package-465931 rhn-package-465933 rhn-package-465940 rhn-package-465941 rhn-package-465950 rhn-package-465951 rhn-package-465958 rhn-package-466116 rhn-package-466117 rhn-package-466118 rhn-package-466121 rhn-package-466122 rhn-package-466136 rhn-package-466150 rhn-package-466160 rhn-package-466161 rhn-package-466162 rhn-package-466184 rhn-package-466483 rhn-package-466485 rhn-package-466488 rhn-package-466514 rhn-package-466584 rhn-package-466659 rhn-package-466661 rhn-package-466662 rhn-package-466665 rhn-package-466667 rhn-package-466673 rhn-package-466705 rhn-package-466706 rhn-package-466709 rhn-package-466710 rhn-package-466711 rhn-package-466721 rhn-package-466726 rhn-package-466727 rhn-package-466866 rhn-package-466875 rhn-package-466876 rhn-package-466877 rhn-package-466879 rhn-package-466891 rhn-package-466898 rhn-package-466900 rhn-package-466901 rhn-package-466902 rhn-package-466910 rhn-package-466915 rhn-package-466916 rhn-package-466922 rhn-package-466930 rhn-package-466935 rhn-package-466940 rhn-package-466948 rhn-package-467190 rhn-package-467191 rhn-package-467236 rhn-package-467249 rhn-package-467254 rhn-package-467268 rhn-package-467272 rhn-package-467273 rhn-package-467312 rhn-package-467316 rhn-package-467335 rhn-package-467342 rhn-package-467344 rhn-package-467345 rhn-package-467349 rhn-package-467355 rhn-package-467359 rhn-package-467360 rhn-package-467362 rhn-package-467363 rhn-package-467417 rhn-package-467428 rhn-package-467442 rhn-package-467445 rhn-package-467451 rhn-package-467463 rhn-package-467473 rhn-package-467489 rhn-package-467492 rhn-package-467498 rhn-package-467510 rhn-package-467568 rhn-package-467571 rhn-package-467573 rhn-package-467576 rhn-package-467581 rhn-package-467590 rhn-package-467592 rhn-package-467597 rhn-package-467599 rhn-package-467600 rhn-package-467602 rhn-package-467603 rhn-package-467609 rhn-package-467614 rhn-package-467615 rhn-package-467619 rhn-package-467621 rhn-package-467625 rhn-package-467626 rhn-package-467627 rhn-package-467628 rhn-package-467630 rhn-package-467631 rhn-package-467632 rhn-package-467642 rhn-package-467655 rhn-package-467656 rhn-package-467665 rhn-package-467935 rhn-package-467971 rhn-package-467981 rhn-package-467983 rhn-package-467984 rhn-package-467985 rhn-package-467988 rhn-package-467992 rhn-package-467993 rhn-package-467994 rhn-package-467995 rhn-package-467998 rhn-package-468005 rhn-package-468008 rhn-package-468011 rhn-package-468014 rhn-package-468016 rhn-package-468024 rhn-package-468027 rhn-package-468030 rhn-package-468031 rhn-package-468037 rhn-package-468041 rhn-package-468043 rhn-package-468048 rhn-package-468049 rhn-package-468051 rhn-package-468052 rhn-package-468054 rhn-package-468075 rhn-package-468078 rhn-package-468079 rhn-package-468080 rhn-package-468085 rhn-package-468086 rhn-package-468096 rhn-package-468107 rhn-package-468115 rhn-package-468116 rhn-package-468118 rhn-package-468119 rhn-package-468124 rhn-package-468125 rhn-package-468127 rhn-package-468129 rhn-package-468133 rhn-package-468143 rhn-package-468144 rhn-package-468145 rhn-package-468147 rhn-package-468150 rhn-package-468151 rhn-package-468152 rhn-package-468160 rhn-package-468162 rhn-package-468163 rhn-package-468171 rhn-package-468173 rhn-package-468178 rhn-package-468179 rhn-package-468180 rhn-package-468181 rhn-package-468186 rhn-package-468190 rhn-package-468198 rhn-package-468204 rhn-package-468208 rhn-package-468218 rhn-package-468222 rhn-package-468224 rhn-package-468226 rhn-package-468227 rhn-package-468236 rhn-package-468239 rhn-package-468240 rhn-package-468248 rhn-package-468256 rhn-package-468261 rhn-package-468263 rhn-package-468264 rhn-package-468265 rhn-package-468274 rhn-package-468279 rhn-package-468281 rhn-package-468283 rhn-package-468286 rhn-package-468287 rhn-package-468288 rhn-package-468297 rhn-package-468304 rhn-package-468306 rhn-package-468307 rhn-package-468323 rhn-package-468324 rhn-package-468329 rhn-package-468332 rhn-package-468334 rhn-package-468336 rhn-package-468340 rhn-package-468343 rhn-package-468350 rhn-package-468353 rhn-package-468361 rhn-package-468362 rhn-package-468364 rhn-package-468365 rhn-package-468378 rhn-package-468383 rhn-package-468384 rhn-package-468385 rhn-package-468397 rhn-package-468404 rhn-package-468405 rhn-package-468406 rhn-package-468414 rhn-package-468418 rhn-package-468419 rhn-package-468420 rhn-package-468421 rhn-package-468422 rhn-package-468425 rhn-package-468428 rhn-package-468431 rhn-package-468432 rhn-package-468433 rhn-package-468435 rhn-package-468444 rhn-package-468446 rhn-package-468454 rhn-package-468458 rhn-package-468460 rhn-package-468466 rhn-package-468467 rhn-package-468479 rhn-package-468492 rhn-package-468494 rhn-package-468498 rhn-package-468502 rhn-package-468503 rhn-package-468505 rhn-package-468509 rhn-package-468510 rhn-package-468511 rhn-package-468515 rhn-package-468517 rhn-package-468521 rhn-package-468528 rhn-package-468533 rhn-package-468541 rhn-package-468543 rhn-package-468545 rhn-package-468558 rhn-package-468563 rhn-package-468565 rhn-package-468566 rhn-package-468568 rhn-package-468569 rhn-package-468570 rhn-package-468571 rhn-package-468573 rhn-package-468578 rhn-package-468587 rhn-package-468589 rhn-package-468594 rhn-package-468607 rhn-package-468610 rhn-package-468616 rhn-package-468617 rhn-package-468620 rhn-package-468621 rhn-package-468622 rhn-package-468624 rhn-package-468627 rhn-package-468631 rhn-package-468637 rhn-package-468638 rhn-package-468652 rhn-package-468654 rhn-package-468656 rhn-package-468658 rhn-package-468667 rhn-package-468669 rhn-package-468677 rhn-package-468678 rhn-package-468688 rhn-package-468693 rhn-package-468705 rhn-package-468706 rhn-package-468711 rhn-package-468712 rhn-package-468716 rhn-package-468722 rhn-package-468723 rhn-package-468724 rhn-package-468725 rhn-package-468728 rhn-package-468743 rhn-package-468750 rhn-package-468766 rhn-package-468767 rhn-package-468771 rhn-package-468779 rhn-package-468782 rhn-package-468793 rhn-package-468798 rhn-package-468800 rhn-package-468801 rhn-package-468808 rhn-package-468809 rhn-package-468813 rhn-package-468819 rhn-package-468820 rhn-package-468824 rhn-package-468827 rhn-package-468829 rhn-package-468832 rhn-package-468833 rhn-package-468838 rhn-package-468846 rhn-package-468849 rhn-package-468851 rhn-package-468856 rhn-package-468862 rhn-package-468867 rhn-package-468868 rhn-package-468883 rhn-package-468884 rhn-package-468886 rhn-package-468888 rhn-package-468893 rhn-package-468894 rhn-package-468895 rhn-package-468902 rhn-package-468904 rhn-package-468910 rhn-package-468923 rhn-package-468936 rhn-package-468937 rhn-package-468938 rhn-package-468945 rhn-package-468947 rhn-package-468949 rhn-package-468953 rhn-package-468957 rhn-package-468960 rhn-package-468961 rhn-package-468963 rhn-package-468965 rhn-package-468969 rhn-package-468971 rhn-package-468973 rhn-package-468978 rhn-package-468982 rhn-package-468983 rhn-package-468988 rhn-package-469002 rhn-package-469008 rhn-package-469016 rhn-package-469019 rhn-package-469026 rhn-package-469031 rhn-package-469032 rhn-package-469033 rhn-package-469041 rhn-package-469047 rhn-package-469048 rhn-package-469049 rhn-package-469051 rhn-package-469064 rhn-package-469070 rhn-package-469071 rhn-package-469073 rhn-package-469075 rhn-package-469076 rhn-package-469078 rhn-package-469079 rhn-package-469080 rhn-package-469084 rhn-package-469086 rhn-package-469087 rhn-package-469089 rhn-package-469092 rhn-package-469095 rhn-package-469097 rhn-package-469100 rhn-package-469101 rhn-package-469104 rhn-package-469106 rhn-package-469109 rhn-package-469114 rhn-package-469115 rhn-package-469117 rhn-package-469126 rhn-package-469127 rhn-package-469144 rhn-package-469145 rhn-package-469146 rhn-package-469150 rhn-package-469152 rhn-package-469172 rhn-package-469177 rhn-package-469178 rhn-package-469179 rhn-package-469180 rhn-package-469184 rhn-package-469188 rhn-package-469190 rhn-package-469195 rhn-package-469197 rhn-package-469203 rhn-package-469205 rhn-package-469221 rhn-package-469226 rhn-package-469228 rhn-package-469230 rhn-package-469232 rhn-package-469233 rhn-package-469237 rhn-package-469238 rhn-package-469244 rhn-package-469246 rhn-package-469264 rhn-package-469270 rhn-package-469277 rhn-package-469283 rhn-package-469284 rhn-package-469286 rhn-package-469289 rhn-package-469292 rhn-package-469293 rhn-package-469297 rhn-package-469306 rhn-package-469316 rhn-package-469317 rhn-package-469320 rhn-package-469322 rhn-package-469326 rhn-package-469327 rhn-package-469329 rhn-package-469331 rhn-package-469335 rhn-package-469336 rhn-package-469343 rhn-package-469344 rhn-package-469345 rhn-package-469349 rhn-package-469350 rhn-package-469366 rhn-package-469372 rhn-package-469375 rhn-package-469377 rhn-package-469378 rhn-package-469380 rhn-package-469381 rhn-package-469382 rhn-package-469385 rhn-package-469388 rhn-package-469391 rhn-package-469397 rhn-package-469405 rhn-package-469411 rhn-package-469412 rhn-package-469417 rhn-package-469421 rhn-package-469426 rhn-package-469427 rhn-package-469431 rhn-package-469432 rhn-package-469434 rhn-package-469436 rhn-package-469441 rhn-package-469442 rhn-package-469444 rhn-package-469450 rhn-package-469453 rhn-package-469459 rhn-package-469460 rhn-package-469470 rhn-package-469472 rhn-package-469474 rhn-package-469477 rhn-package-469478 rhn-package-469482 rhn-package-469487 rhn-package-469490 rhn-package-469492 rhn-package-469493 rhn-package-469495 rhn-package-469506 rhn-package-469509 rhn-package-469511 rhn-package-469518 rhn-package-469525 rhn-package-469526 rhn-package-469527 rhn-package-469530 rhn-package-469531 rhn-package-469533 rhn-package-469537 rhn-package-469544 rhn-package-469547 rhn-package-469551 rhn-package-469555 rhn-package-469556 rhn-package-469558 rhn-package-469560 rhn-package-469562 rhn-package-469575 rhn-package-469581 rhn-package-469587 rhn-package-469590 rhn-package-469591 rhn-package-469603 rhn-package-469609 rhn-package-469613 rhn-package-469620 rhn-package-469623 rhn-package-469625 rhn-package-469626 rhn-package-469628 rhn-package-469629 rhn-package-469633 rhn-package-469637 rhn-package-469638 rhn-package-469640 rhn-package-469644 rhn-package-469645 rhn-package-469646 rhn-package-469652 rhn-package-469659 rhn-package-469662 rhn-package-469668 rhn-package-469670 rhn-package-469672 rhn-package-469676 rhn-package-469679 rhn-package-469681 rhn-package-469687 rhn-package-469690 rhn-package-469700 rhn-package-469703 rhn-package-469704 rhn-package-469707 rhn-package-469709 rhn-package-469712 rhn-package-469719 rhn-package-469725 rhn-package-469741 rhn-package-469747 rhn-package-469749 rhn-package-469752 rhn-package-469755 rhn-package-469756 rhn-package-469761 rhn-package-469762 rhn-package-469769 rhn-package-469771 rhn-package-469772 rhn-package-469776 rhn-package-469777 rhn-package-469785 rhn-package-469790 rhn-package-469791 rhn-package-469795 rhn-package-469796 rhn-package-469797 rhn-package-469801 rhn-package-469803 rhn-package-469804 rhn-package-469805 rhn-package-469811 rhn-package-469814 rhn-package-469817 rhn-package-469824 rhn-package-469834 rhn-package-469836 rhn-package-469840 rhn-package-469844 rhn-package-469845 rhn-package-469856 rhn-package-469857 rhn-package-469870 rhn-package-469872 rhn-package-469878 rhn-package-469884 rhn-package-469886 rhn-package-469890 rhn-package-469897 rhn-package-469911 rhn-package-469912 rhn-package-469916 rhn-package-469918 rhn-package-469920 rhn-package-469924 rhn-package-469925 rhn-package-469926 rhn-package-469929 rhn-package-469944 rhn-package-469950 rhn-package-469960 rhn-package-469962 rhn-package-469963 rhn-package-469965 rhn-package-469969 rhn-package-469972 rhn-package-469975 rhn-package-469977 rhn-package-469980 rhn-package-469981 rhn-package-469984 rhn-package-469985 rhn-package-469989 rhn-package-469991 rhn-package-469994 rhn-package-469995 rhn-package-470001 rhn-package-470002 rhn-package-470016 rhn-package-470017 rhn-package-470019 rhn-package-470022 rhn-package-470027 rhn-package-470028 rhn-package-470029 rhn-package-470031 rhn-package-470036 rhn-package-470038 rhn-package-470042 rhn-package-470043 rhn-package-470045 rhn-package-470053 rhn-package-470067 rhn-package-470072 rhn-package-470076 rhn-package-470082 rhn-package-470088 rhn-package-470090 rhn-package-470091 rhn-package-470094 rhn-package-470099 rhn-package-470118 rhn-package-470123 rhn-package-470124 rhn-package-470130 rhn-package-470133 rhn-package-470134 rhn-package-470140 rhn-package-470148 rhn-package-470160 rhn-package-470162 rhn-package-470163 rhn-package-470168 rhn-package-470171 rhn-package-470174 rhn-package-470176 rhn-package-470182 rhn-package-470183 rhn-package-470191 rhn-package-470195 rhn-package-470196 rhn-package-470197 rhn-package-470201 rhn-package-470203 rhn-package-470205 rhn-package-470206 rhn-package-470208 rhn-package-470209 rhn-package-470214 rhn-package-470217 rhn-package-470221 rhn-package-470223 rhn-package-470228 rhn-package-470231 rhn-package-470235 rhn-package-470237 rhn-package-470239 rhn-package-470240 rhn-package-470241 rhn-package-470242 rhn-package-470245 rhn-package-470246 rhn-package-470251 rhn-package-470253 rhn-package-470259 rhn-package-470262 rhn-package-470272 rhn-package-470285 rhn-package-470286 rhn-package-470292 rhn-package-470305 rhn-package-470307 rhn-package-470311 rhn-package-470319 rhn-package-470320 rhn-package-470325 rhn-package-470328 rhn-package-470329 rhn-package-470330 rhn-package-470331 rhn-package-470335 rhn-package-470353 rhn-package-470356 rhn-package-470365 rhn-package-470370 rhn-package-470373 rhn-package-470375 rhn-package-470380 rhn-package-470392 rhn-package-470398 rhn-package-470400 rhn-package-470401 rhn-package-470412 rhn-package-470418 rhn-package-470426 rhn-package-470428 rhn-package-470431 rhn-package-470432 rhn-package-470444 rhn-package-470450 rhn-package-470452 rhn-package-470468 rhn-package-470475 rhn-package-470479 rhn-package-470485 rhn-package-470487 rhn-package-470496 rhn-package-470503 rhn-package-470505 rhn-package-470507 rhn-package-470510 rhn-package-470513 rhn-package-470536 rhn-package-470547 rhn-package-470561 rhn-package-470562 rhn-package-470563 rhn-package-470565 rhn-package-470572 rhn-package-470942 rhn-package-471599 rhn-package-471604 rhn-package-471605 rhn-package-471614 rhn-package-471618 rhn-package-471621 rhn-package-471623 rhn-package-471640 rhn-package-471641 rhn-package-471649 rhn-package-471651 rhn-package-471656 rhn-package-471665 rhn-package-471670 rhn-package-471955 rhn-package-472047 rhn-package-472049 rhn-package-472055 rhn-package-472093 rhn-package-472098 rhn-package-472099 rhn-package-472100 rhn-package-472102 rhn-package-472104 rhn-package-472124 rhn-package-472125 rhn-package-472210 rhn-package-472215 rhn-package-472216 rhn-package-472229 rhn-package-472233 rhn-package-472237 rhn-package-472245 rhn-package-472257 rhn-package-472266 rhn-package-472286 rhn-package-472299 rhn-package-472427 rhn-package-472457 rhn-package-472548 rhn-package-472622 rhn-package-472624 rhn-package-472677 rhn-package-472685 rhn-package-472712 rhn-package-472725 rhn-package-472727 rhn-package-472732 rhn-package-472773 rhn-package-472778 rhn-package-472781 rhn-package-472782 rhn-package-472783 rhn-package-472784 rhn-package-472797 rhn-package-474746 rhn-package-474750 rhn-package-474751 rhn-package-475007 rhn-package-475009 rhn-package-475011 rhn-package-475012 rhn-package-475019 rhn-package-475020 rhn-package-475100 rhn-package-475106 rhn-package-475107 rhn-package-475115 rhn-package-475128 rhn-package-475130 rhn-package-475132 rhn-package-475133 rhn-package-475143 rhn-package-475225 rhn-package-475226 rhn-package-475232 rhn-package-475266 rhn-package-475267 rhn-package-475268 rhn-package-475269 rhn-package-475272 rhn-package-475283 rhn-package-475285 rhn-package-475314 rhn-package-475320 rhn-package-475327 rhn-package-475340 rhn-package-475352 rhn-package-475359 rhn-package-475376 rhn-package-475937 rhn-package-475938 rhn-package-475939 rhn-package-475940 rhn-package-476031 rhn-package-476032 rhn-package-476033 rhn-package-476035 rhn-package-476041 rhn-package-476043 rhn-package-476045 rhn-package-476046 rhn-package-476048 rhn-package-476051 rhn-package-476068 rhn-package-476088 rhn-package-476089 rhn-package-476091 rhn-package-476092 rhn-package-476093 rhn-package-476095 rhn-package-476097 rhn-package-476098 rhn-package-476105 rhn-package-476252 rhn-package-476258 rhn-package-476260 rhn-package-476262 rhn-package-476263 rhn-package-476535 rhn-package-476537 rhn-package-476538 rhn-package-476546 rhn-package-476547 rhn-package-476564 rhn-package-476565 rhn-package-476570 rhn-package-476573 rhn-package-476582 rhn-package-476595 rhn-package-476598 rhn-package-476602 rhn-package-476604 rhn-package-476610 rhn-package-476612 rhn-package-476624 rhn-package-476625 rhn-package-476637 rhn-package-476646 rhn-package-476647 rhn-package-476649 rhn-package-476655 rhn-package-476657 rhn-package-476660 rhn-package-476664 rhn-package-476670 rhn-package-476677 rhn-package-476685 rhn-package-476687 rhn-package-476689 rhn-package-476948 rhn-package-476950 rhn-package-477036 rhn-package-477037 rhn-package-477039 rhn-package-477043 rhn-package-477052 rhn-package-477056 rhn-package-477057 rhn-package-477069 rhn-package-477077 rhn-package-477082 rhn-package-477087 rhn-package-477093 rhn-package-477095 rhn-package-477097 rhn-package-477101 rhn-package-477105 rhn-package-477106 rhn-package-477109 rhn-package-477110 rhn-package-477111 rhn-package-477113 rhn-package-477129 rhn-package-477140 rhn-package-477283 rhn-package-477286 rhn-package-477294 rhn-package-477302 rhn-package-477315 rhn-package-477323 rhn-package-477365 rhn-package-477366 rhn-package-477368 rhn-package-477369 rhn-package-477370 rhn-package-477376 rhn-package-477379 rhn-package-477397 rhn-package-477399 rhn-package-477400 rhn-package-477404 rhn-package-477407 rhn-package-477415 rhn-package-477416 rhn-package-477418 rhn-package-477420 rhn-package-477422 rhn-package-477425 rhn-package-477529 rhn-package-477530 rhn-package-477532 rhn-package-477540 rhn-package-477544 rhn-package-477546 rhn-package-477554 rhn-package-477652 rhn-package-477656 rhn-package-477657 rhn-package-477666 rhn-package-477667 rhn-package-477676 rhn-package-477678 rhn-package-477684 rhn-package-477692 rhn-package-477695 rhn-package-477701 rhn-package-477707 rhn-package-477710 rhn-package-477740 rhn-package-477745 rhn-package-477746 rhn-package-477747 rhn-package-477757 rhn-package-477778 rhn-package-477779 rhn-package-477781 rhn-package-477785 rhn-package-477803 rhn-package-477810 rhn-package-477851 rhn-package-477853 rhn-package-478144 rhn-package-478145 rhn-package-478146 rhn-package-478148 rhn-package-478150 rhn-package-478159 rhn-package-478160 rhn-package-478181 rhn-package-478184 rhn-package-478190 rhn-package-478194 rhn-package-478195 rhn-package-478199 rhn-package-478200 rhn-package-478207 rhn-package-478212 rhn-package-478213 rhn-package-478218 rhn-package-478220 rhn-package-478221 rhn-package-478222 rhn-package-478224 rhn-package-478226 rhn-package-478246 rhn-package-478247 rhn-package-478253 rhn-package-478262 rhn-package-478264 rhn-package-478392 rhn-package-478394 rhn-package-478396 rhn-package-478403 rhn-package-478407 rhn-package-478409 rhn-package-478412 rhn-package-478482 rhn-package-478483 rhn-package-478484 rhn-package-478489 rhn-package-478496 rhn-package-478497 rhn-package-478565 rhn-package-478602 rhn-package-478603 rhn-package-478615 rhn-package-478616 rhn-package-478886 rhn-package-478899 rhn-package-478903 rhn-package-478904 rhn-package-478911 rhn-package-478913 rhn-package-478916 rhn-package-478924 rhn-package-479003 rhn-package-479005 rhn-package-479007 rhn-package-479013 rhn-package-479015 rhn-package-479021 rhn-package-479022 rhn-package-479032 rhn-package-479046 rhn-package-479053 rhn-package-479054 rhn-package-479055 rhn-package-479058 rhn-package-479059 rhn-package-479062 rhn-package-479073 rhn-package-479077 rhn-package-479197 rhn-package-479199 rhn-package-479210 rhn-package-479233 rhn-package-479247 rhn-package-479284 rhn-package-479295 rhn-package-479296 rhn-package-479297 rhn-package-479298 rhn-package-479302 rhn-package-479329 rhn-package-479330 rhn-package-479333 rhn-package-479340 rhn-package-479341 rhn-package-480975 rhn-package-481049 rhn-package-481232 rhn-package-481235 rhn-package-481241 rhn-package-481251 rhn-package-481437 rhn-package-481438 rhn-package-481439 rhn-package-481446 rhn-package-481449 rhn-package-481952 rhn-package-482052 rhn-package-482059 rhn-package-482061 rhn-package-482062 rhn-package-482069 rhn-package-482071 rhn-package-482072 rhn-package-482077 rhn-package-482089 rhn-package-482091 rhn-package-482095 rhn-package-482099 rhn-package-482102 rhn-package-482104 rhn-package-482105 rhn-package-482107 rhn-package-482115 rhn-package-482118 rhn-package-482187 rhn-package-482189 rhn-package-482193 rhn-package-482195 rhn-package-482203 rhn-package-482206 rhn-package-482207 rhn-package-482225 rhn-package-482227 rhn-package-482229 rhn-package-482230 rhn-package-482239 rhn-package-482242 rhn-package-482374 rhn-package-482375 rhn-package-482382 rhn-package-482385 rhn-package-482389 rhn-package-482391 rhn-package-482393 rhn-package-482401 rhn-package-482514 rhn-package-482517 rhn-package-482546 rhn-package-482551 rhn-package-482555 rhn-package-482557 rhn-package-482559 rhn-package-482562 rhn-package-482570 rhn-package-482747 rhn-package-482790 rhn-package-482803 rhn-package-482829 rhn-package-482831 rhn-package-482835 rhn-package-482841 rhn-package-482846 rhn-package-482852 rhn-package-482854 rhn-package-482858 rhn-package-482875 rhn-package-482877 rhn-package-482879 rhn-package-482894 rhn-package-482895 rhn-package-482899 rhn-package-482900 rhn-package-482902 rhn-package-482916 rhn-package-482929 rhn-package-482931 rhn-package-482933 rhn-package-482941 rhn-package-482969 rhn-package-482970 rhn-package-482978 rhn-package-482983 rhn-package-482986 rhn-package-482990 rhn-package-482991 rhn-package-482992 rhn-package-482999 rhn-package-483005 rhn-package-483020 rhn-package-483022 rhn-package-483031 rhn-package-483048 rhn-package-483065 rhn-package-483293 rhn-package-483296 rhn-package-483304 rhn-package-483308 rhn-package-483313 rhn-package-483314 rhn-package-483326 rhn-package-483338 rhn-package-483339 rhn-package-483341 rhn-package-483342 rhn-package-483349 rhn-package-483351 rhn-package-483352 rhn-package-483356 rhn-package-483357 rhn-package-483358 rhn-package-483359 rhn-package-483360 rhn-package-483362 rhn-package-483366 rhn-package-483377 rhn-package-483379 rhn-package-483381 rhn-package-483384 rhn-package-483386 rhn-package-483387 rhn-package-483389 rhn-package-483392 rhn-package-483396 rhn-package-483407 rhn-package-483416 rhn-package-483423 rhn-package-483425 rhn-package-483427 rhn-package-483430 rhn-package-483431 rhn-package-483447 rhn-package-483497 rhn-package-483500 rhn-package-483505 rhn-package-483506 rhn-package-483507 rhn-package-483519 rhn-package-483521 rhn-package-483522 rhn-package-483523 rhn-package-483577 rhn-package-483582 rhn-package-483586 rhn-package-483593 rhn-package-483596 rhn-package-483647 rhn-package-483699 rhn-package-483706 rhn-package-483708 rhn-package-483711 rhn-package-483713 rhn-package-483721 rhn-package-483725 rhn-package-483731 rhn-package-486586 rhn-package-486587 rhn-package-486590 rhn-package-486591 rhn-package-486592 rhn-package-486602 rhn-package-486606 rhn-package-486610 rhn-package-486611 rhn-package-486612 rhn-package-486619 rhn-package-486629 rhn-package-486630 rhn-package-486693 rhn-package-486695 rhn-package-486696 rhn-package-486697 rhn-package-486711 rhn-package-486722 rhn-package-486731 rhn-package-486738 rhn-package-486740 rhn-package-486743 rhn-package-486765 rhn-package-486788 rhn-package-486935 rhn-package-486938 rhn-package-486941 rhn-package-486942 rhn-package-486947 rhn-package-486984 rhn-package-486987 rhn-package-486990 rhn-package-486991 rhn-package-487002 rhn-package-487041 rhn-package-487043 rhn-package-487044 rhn-package-487046 rhn-package-487056 rhn-package-487063 rhn-package-487065 rhn-package-487069 rhn-package-487348 rhn-package-487351 rhn-package-487353 rhn-package-487357 rhn-package-487414 rhn-package-487415 rhn-package-487416 rhn-package-487417 rhn-package-487420 rhn-package-487422 rhn-package-487426 rhn-package-487429 rhn-package-487433 rhn-package-487434 rhn-package-487439 rhn-package-487469 rhn-package-487482 rhn-package-487484 rhn-package-487485 rhn-package-487489 rhn-package-487492 rhn-package-487496 rhn-package-487501 rhn-package-487508 rhn-package-487509 rhn-package-487510 rhn-package-487525 rhn-package-487532 rhn-package-487533 rhn-package-487534 rhn-package-487535 rhn-package-487536 rhn-package-487537 rhn-package-487648 rhn-package-487768 rhn-package-487882 rhn-package-487886 rhn-package-487889 rhn-package-487890 rhn-package-487897 rhn-package-487992 rhn-package-487993 rhn-package-487995 rhn-package-487997 rhn-package-488002 rhn-package-488003 rhn-package-488004 rhn-package-488006 rhn-package-488012 rhn-package-488014 rhn-package-488024 rhn-package-488124 rhn-package-488126 rhn-package-488127 rhn-package-488133 rhn-package-488137 rhn-package-488138 rhn-package-488140 rhn-package-488145 rhn-package-488146 rhn-package-488158 rhn-package-488161 rhn-package-488326 rhn-package-488331 rhn-package-488335 rhn-package-488337 rhn-package-488343 rhn-package-488344 rhn-package-488435 rhn-package-488437 rhn-package-488441 rhn-package-488444 rhn-package-488446 rhn-package-488456 rhn-package-488459 rhn-package-488463 rhn-package-488582 rhn-package-488583 rhn-package-488585 rhn-package-488589 rhn-package-488590 rhn-package-488668 rhn-package-488669 rhn-package-488670 rhn-package-488672 rhn-package-488674 rhn-package-488680 rhn-package-488685 rhn-package-488692 rhn-package-488709 rhn-package-488713 rhn-package-488719 rhn-package-488721 rhn-package-488722 rhn-package-488729 rhn-package-488755 rhn-package-488759 rhn-package-488774 rhn-package-488775 rhn-package-488778 rhn-package-488780 rhn-package-488790 rhn-package-488791 rhn-package-488793 rhn-package-488799 rhn-package-488801 rhn-package-488810 rhn-package-488862 rhn-package-488863 rhn-package-488877 rhn-package-488890 rhn-package-488900 rhn-package-489006 rhn-package-489007 rhn-package-489017 rhn-package-489026 rhn-package-489135 rhn-package-489196 rhn-package-489197 rhn-package-489204 rhn-package-489205 rhn-package-489206 rhn-package-489207 rhn-package-489218 rhn-package-489321 rhn-package-489324 rhn-package-489328 rhn-package-489348 rhn-package-489448 rhn-package-489451 rhn-package-489454 rhn-package-489455 rhn-package-489459 rhn-package-489461 rhn-package-489462 rhn-package-489469 rhn-package-489711 rhn-package-489712 rhn-package-489715 rhn-package-489721 rhn-package-489725 rhn-package-489745 rhn-package-489748 rhn-package-489749 rhn-package-489751 rhn-package-489756 rhn-package-489757 rhn-package-489759 rhn-package-489764 rhn-package-489765 rhn-package-489769 rhn-package-489772 rhn-package-489773 rhn-package-489778 rhn-package-489779 rhn-package-489781 rhn-package-489784 rhn-package-489787 rhn-package-489788 rhn-package-489789 rhn-package-489790 rhn-package-489793 rhn-package-489795 rhn-package-489797 rhn-package-489800 rhn-package-489809 rhn-package-489810 rhn-package-489812 rhn-package-489815 rhn-package-489816 rhn-package-489820 rhn-package-489825 rhn-package-489827 rhn-package-489828 rhn-package-489829 rhn-package-489830 rhn-package-489831 rhn-package-489833 rhn-package-489835 rhn-package-489837 rhn-package-489838 rhn-package-489839 rhn-package-489843 rhn-package-489845 rhn-package-489848 rhn-package-489849 rhn-package-489852 rhn-package-489857 rhn-package-489859 rhn-package-489863 rhn-package-489865 rhn-package-489867 rhn-package-489872 rhn-package-489875 rhn-package-489885 rhn-package-489889 rhn-package-489891 rhn-package-489907 rhn-package-489908 rhn-package-489909 rhn-package-489911 rhn-package-489912 rhn-package-489915 rhn-package-489916 rhn-package-489918 rhn-package-489920 rhn-package-489921 rhn-package-489924 rhn-package-489927 rhn-package-489931 rhn-package-489935 rhn-package-489942 rhn-package-489943 rhn-package-489944 rhn-package-489946 rhn-package-489947 rhn-package-489952 rhn-package-489953 rhn-package-489957 rhn-package-489958 rhn-package-489959 rhn-package-489960 rhn-package-489963 rhn-package-489966 rhn-package-489967 rhn-package-489975 rhn-package-489979 rhn-package-489980 rhn-package-489984 rhn-package-489985 rhn-package-489986 rhn-package-489987 rhn-package-489991 rhn-package-489993 rhn-package-489994 rhn-package-489997 rhn-package-489998 rhn-package-490001 rhn-package-490003 rhn-package-490004 rhn-package-490005 rhn-package-490007 rhn-package-490009 rhn-package-490010 rhn-package-490014 rhn-package-490015 rhn-package-490019 rhn-package-490022 rhn-package-490024 rhn-package-490025 rhn-package-490026 rhn-package-490030 rhn-package-490035 rhn-package-490036 rhn-package-490037 rhn-package-490040 rhn-package-490042 rhn-package-490044 rhn-package-490046 rhn-package-490047 rhn-package-490048 rhn-package-490049 rhn-package-490050 rhn-package-490051 rhn-package-490053 rhn-package-490054 rhn-package-490055 rhn-package-490057 rhn-package-490058 rhn-package-490060 rhn-package-490061 rhn-package-490064 rhn-package-490066 rhn-package-490067 rhn-package-490069 rhn-package-490070 rhn-package-490074 rhn-package-490076 rhn-package-490081 rhn-package-490086 rhn-package-490088 rhn-package-490091 rhn-package-490094 rhn-package-490099 rhn-package-490100 rhn-package-490101 rhn-package-490103 rhn-package-490104 rhn-package-490109 rhn-package-490110 rhn-package-490112 rhn-package-490116 rhn-package-490120 rhn-package-490128 rhn-package-490132 rhn-package-490133 rhn-package-490134 rhn-package-490138 rhn-package-490140 rhn-package-490144 rhn-package-490147 rhn-package-490150 rhn-package-490152 rhn-package-490155 rhn-package-490158 rhn-package-490159 rhn-package-490162 rhn-package-490164 rhn-package-490165 rhn-package-490168 rhn-package-490172 rhn-package-490174 rhn-package-490175 rhn-package-490176 rhn-package-490177 rhn-package-490178 rhn-package-490179 rhn-package-490182 rhn-package-490184 rhn-package-490185 rhn-package-490186 rhn-package-490192 rhn-package-490193 rhn-package-490194 rhn-package-490195 rhn-package-490199 rhn-package-490200 rhn-package-490203 rhn-package-490204 rhn-package-490205 rhn-package-490210 rhn-package-490216 rhn-package-490223 rhn-package-490224 rhn-package-490227 rhn-package-490230 rhn-package-490238 rhn-package-490242 rhn-package-490245 rhn-package-490247 rhn-package-490248 rhn-package-490250 rhn-package-490253 rhn-package-490258 rhn-package-490259 rhn-package-490263 rhn-package-490265 rhn-package-490266 rhn-package-490267 rhn-package-490269 rhn-package-490272 rhn-package-490273 rhn-package-490274 rhn-package-490278 rhn-package-490284 rhn-package-490285 rhn-package-490286 rhn-package-490287 rhn-package-490290 rhn-package-490291 rhn-package-490294 rhn-package-490298 rhn-package-490299 rhn-package-490300 rhn-package-490301 rhn-package-490304 rhn-package-490306 rhn-package-490308 rhn-package-490309 rhn-package-490311 rhn-package-490312 rhn-package-490322 rhn-package-490323 rhn-package-490324 rhn-package-490328 rhn-package-490330 rhn-package-490331 rhn-package-490333 rhn-package-490335 rhn-package-490337 rhn-package-490338 rhn-package-490343 rhn-package-490346 rhn-package-490348 rhn-package-490349 rhn-package-490350 rhn-package-490351 rhn-package-490352 rhn-package-490353 rhn-package-490355 rhn-package-490357 rhn-package-490358 rhn-package-490362 rhn-package-490363 rhn-package-490364 rhn-package-490367 rhn-package-490368 rhn-package-490373 rhn-package-490377 rhn-package-490378 rhn-package-490380 rhn-package-490388 rhn-package-490389 rhn-package-490390 rhn-package-490394 rhn-package-490396 rhn-package-490402 rhn-package-490403 rhn-package-490406 rhn-package-490407 rhn-package-490412 rhn-package-490416 rhn-package-490424 rhn-package-490425 rhn-package-490429 rhn-package-490430 rhn-package-490432 rhn-package-490436 rhn-package-490442 rhn-package-490447 rhn-package-490453 rhn-package-490455 rhn-package-490456 rhn-package-490458 rhn-package-490462 rhn-package-490463 rhn-package-490466 rhn-package-490473 rhn-package-490476 rhn-package-490477 rhn-package-490481 rhn-package-490487 rhn-package-490488 rhn-package-490489 rhn-package-490490 rhn-package-490492 rhn-package-490500 rhn-package-490502 rhn-package-490511 rhn-package-490512 rhn-package-490517 rhn-package-490520 rhn-package-490521 rhn-package-490524 rhn-package-490527 rhn-package-490530 rhn-package-490536 rhn-package-490537 rhn-package-490538 rhn-package-490539 rhn-package-490541 rhn-package-490552 rhn-package-490560 rhn-package-490561 rhn-package-490568 rhn-package-490569 rhn-package-490571 rhn-package-490575 rhn-package-490584 rhn-package-490589 rhn-package-490591 rhn-package-490592 rhn-package-490598 rhn-package-490603 rhn-package-490609 rhn-package-490611 rhn-package-490615 rhn-package-490617 rhn-package-490619 rhn-package-490622 rhn-package-490623 rhn-package-490627 rhn-package-490628 rhn-package-490635 rhn-package-490638 rhn-package-490643 rhn-package-490647 rhn-package-490649 rhn-package-490650 rhn-package-490651 rhn-package-490655 rhn-package-490656 rhn-package-490667 rhn-package-490668 rhn-package-490672 rhn-package-490676 rhn-package-490677 rhn-package-490678 rhn-package-490679 rhn-package-490680 rhn-package-490681 rhn-package-490683 rhn-package-490684 rhn-package-490685 rhn-package-490690 rhn-package-490691 rhn-package-490692 rhn-package-490693 rhn-package-490699 rhn-package-490700 rhn-package-490702 rhn-package-490711 rhn-package-490712 rhn-package-490714 rhn-package-490718 rhn-package-490725 rhn-package-490728 rhn-package-490729 rhn-package-490730 rhn-package-490737 rhn-package-490742 rhn-package-490744 rhn-package-490748 rhn-package-490756 rhn-package-490760 rhn-package-490765 rhn-package-490768 rhn-package-490774 rhn-package-490775 rhn-package-490779 rhn-package-490784 rhn-package-490787 rhn-package-490796 rhn-package-490800 rhn-package-490801 rhn-package-490802 rhn-package-490822 rhn-package-490826 rhn-package-490827 rhn-package-490840 rhn-package-490842 rhn-package-490848 rhn-package-490852 rhn-package-490853 rhn-package-490855 rhn-package-490861 rhn-package-490870 rhn-package-490879 rhn-package-490889 rhn-package-490892 rhn-package-490895 rhn-package-490898 rhn-package-490904 rhn-package-490905 rhn-package-490908 rhn-package-490912 rhn-package-490921 rhn-package-490922 rhn-package-490924 rhn-package-490931 rhn-package-490932 rhn-package-490935 rhn-package-490937 rhn-package-490938 rhn-package-490941 rhn-package-490943 rhn-package-490948 rhn-package-490951 rhn-package-490952 rhn-package-490955 rhn-package-490957 rhn-package-490960 rhn-package-490964 rhn-package-490967 rhn-package-490974 rhn-package-490984 rhn-package-490985 rhn-package-490989 rhn-package-490992 rhn-package-490996 rhn-package-491000 rhn-package-491001 rhn-package-491002 rhn-package-491003 rhn-package-491007 rhn-package-491013 rhn-package-491025 rhn-package-491028 rhn-package-491032 rhn-package-491035 rhn-package-491038 rhn-package-491052 rhn-package-491057 rhn-package-491059 rhn-package-491065 rhn-package-491067 rhn-package-491071 rhn-package-491072 rhn-package-491074 rhn-package-491075 rhn-package-491077 rhn-package-491079 rhn-package-491080 rhn-package-491083 rhn-package-491086 rhn-package-491087 rhn-package-491094 rhn-package-491101 rhn-package-491102 rhn-package-491103 rhn-package-491107 rhn-package-491110 rhn-package-491120 rhn-package-491131 rhn-package-491146 rhn-package-491150 rhn-package-491153 rhn-package-491155 rhn-package-491160 rhn-package-491164 rhn-package-491165 rhn-package-491176 rhn-package-491186 rhn-package-491189 rhn-package-491190 rhn-package-491195 rhn-package-491199 rhn-package-491200 rhn-package-491201 rhn-package-491210 rhn-package-491211 rhn-package-491213 rhn-package-491220 rhn-package-491223 rhn-package-491226 rhn-package-491228 rhn-package-491231 rhn-package-491232 rhn-package-491233 rhn-package-491236 rhn-package-491239 rhn-package-491251 rhn-package-491253 rhn-package-491258 rhn-package-491268 rhn-package-491273 rhn-package-491276 rhn-package-491278 rhn-package-491279 rhn-package-491281 rhn-package-491301 rhn-package-491305 rhn-package-491307 rhn-package-491308 rhn-package-491313 rhn-package-491317 rhn-package-491325 rhn-package-491336 rhn-package-491341 rhn-package-491347 rhn-package-491353 rhn-package-491358 rhn-package-491363 rhn-package-491368 rhn-package-491370 rhn-package-491377 rhn-package-491381 rhn-package-491394 rhn-package-491396 rhn-package-491397 rhn-package-491411 rhn-package-491416 rhn-package-491423 rhn-package-491427 rhn-package-491429 rhn-package-491434 rhn-package-491438 rhn-package-491439 rhn-package-491442 rhn-package-491445 rhn-package-491447 rhn-package-491450 rhn-package-491451 rhn-package-491461 rhn-package-491464 rhn-package-491473 rhn-package-491476 rhn-package-491481 rhn-package-491490 rhn-package-491491 rhn-package-491510 rhn-package-491511 rhn-package-491517 rhn-package-491523 rhn-package-491528 rhn-package-491535 rhn-package-491540 rhn-package-491544 rhn-package-491547 rhn-package-491557 rhn-package-491563 rhn-package-491565 rhn-package-491566 rhn-package-491572 rhn-package-491579 rhn-package-491581 rhn-package-491583 rhn-package-491588 rhn-package-491590 rhn-package-491592 rhn-package-491594 rhn-package-491596 rhn-package-491625 rhn-package-491644 rhn-package-491654 rhn-package-491655 rhn-package-491656 rhn-package-491659 rhn-package-491660 rhn-package-491671 rhn-package-491673 rhn-package-491678 rhn-package-491694 rhn-package-491741 rhn-package-491743 rhn-package-491745 rhn-package-491775 rhn-package-491780 rhn-package-491785 rhn-package-491786 rhn-package-491798 rhn-package-491799 rhn-package-491802 rhn-package-491813 rhn-package-491815 rhn-package-491821 rhn-package-491825 rhn-package-491826 rhn-package-491828 rhn-package-491829 rhn-package-491835 rhn-package-491841 rhn-package-491845 rhn-package-491848 rhn-package-491856 rhn-package-491857 rhn-package-491868 rhn-package-491873 rhn-package-491877 rhn-package-491904 rhn-package-491916 rhn-package-491957 rhn-package-491959 rhn-package-491973 rhn-package-491990 rhn-package-491991 rhn-package-491995 rhn-package-491996 rhn-package-492003 rhn-package-492010 rhn-package-492038 rhn-package-492049 rhn-package-492082 rhn-package-492085 rhn-package-492100 rhn-package-492106 rhn-package-492121 rhn-package-492140 rhn-package-492150 rhn-package-492183 rhn-package-492212 rhn-package-492243 rhn-package-492244 rhn-package-492248 rhn-package-492273 rhn-package-492314 rhn-package-492316 rhn-package-492338 rhn-package-492354 rhn-package-492577 rhn-package-492640 rhn-package-493059 rhn-package-493063 rhn-package-493064 rhn-package-493065 rhn-package-493068 rhn-package-493069 rhn-package-493073 rhn-package-493083 rhn-package-493085 rhn-package-493088 rhn-package-493089 rhn-package-493091 rhn-package-493100 rhn-package-493112 rhn-package-493117 rhn-package-493129 rhn-package-493130 rhn-package-493331 rhn-package-493334 rhn-package-493339 rhn-package-493340 rhn-package-493342 rhn-package-493346 rhn-package-493348 rhn-package-493370 rhn-package-493371 rhn-package-493373 rhn-package-493381 rhn-package-493744 rhn-package-493747 rhn-package-493748 rhn-package-493757 rhn-package-493763 rhn-package-493765 rhn-package-493766 rhn-package-493767 rhn-package-493774 rhn-package-493784 rhn-package-494062 rhn-package-494063 rhn-package-494066 rhn-package-494076 rhn-package-494096 rhn-package-494101 rhn-package-494106 rhn-package-494108 rhn-package-494214 rhn-package-494282 rhn-package-494288 rhn-package-494304 rhn-package-494318 rhn-package-494322 rhn-package-494514 rhn-package-494516 rhn-package-494522 rhn-package-494547 rhn-package-494575 rhn-package-494576 rhn-package-494579 rhn-package-494582 rhn-package-494590 rhn-package-494646 rhn-package-494647 rhn-package-494653 rhn-package-494658 rhn-package-494660 rhn-package-494664 rhn-package-494665 rhn-package-494670 rhn-package-494687 rhn-package-494692 rhn-package-494731 rhn-package-494733 rhn-package-494737 rhn-package-494744 rhn-package-494763 rhn-package-494777 rhn-package-494781 rhn-package-494957 rhn-package-494962 rhn-package-494966 rhn-package-494995 rhn-package-495144 rhn-package-495155 rhn-package-495156 rhn-package-495160 rhn-package-495169 rhn-package-495170 rhn-package-495179 rhn-package-495183 rhn-package-495202 rhn-package-495205 rhn-package-495222 rhn-package-495233 rhn-package-495342 rhn-package-495343 rhn-package-495348 rhn-package-495350 rhn-package-495351 rhn-package-495352 rhn-package-495353 rhn-package-495361 rhn-package-495375 rhn-package-495445 rhn-package-495576 rhn-package-495579 rhn-package-495580 rhn-package-495581 rhn-package-495582 rhn-package-495583 rhn-package-495584 rhn-package-495787 rhn-package-495814 rhn-package-495815 rhn-package-495819 rhn-package-495821 rhn-package-495823 rhn-package-495845 rhn-package-495847 rhn-package-495848 rhn-package-495856 rhn-package-495858 rhn-package-495860 rhn-package-495870 rhn-package-495875" channel-id="rhn-channel-6957"><rhn-channel-parent-channel><rhn-null/></rhn-channel-parent-channel><rhn-channel-basedir>/</rhn-channel-basedir><rhn-channel-name>Red Hat Enterprise Linux (v. 5 for 64-bit x86_64)</rhn-channel-name><rhn-channel-summary>Red Hat Enterprise Linux (v. 5 for 64-bit AMD64 / Intel64 Server)</rhn-channel-summary><rhn-channel-description>Red Hat Enterprise Linux - Server core components (v. 5 for 64-bit AMD64 / Intel64)</rhn-channel-description><rhn-channel-gpg-key-url>file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release</rhn-channel-gpg-key-url><rhn-channel-receiving-updates>Y</rhn-channel-receiving-updates><rhn-channel-last-modified>1255609387</rhn-channel-last-modified><rhn-channel-product-name>rhel</rhn-channel-product-name><rhn-channel-product-version>5</rhn-channel-product-version><rhn-channel-product-beta>N</rhn-channel-product-beta><rhn-channel-families><rhn-channel-family virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" channel-labels="rhel-i386-as-3 rhel-i386-es-3 rhel-ia64-as-3 rhel-ia64-es-3 rhel-x86_64-as-3 rhel-x86_64-es-3 rhel-ppc-as-3 rhel-i386-as-4 rhel-i386-es-4 rhel-x86_64-as-4 rhel-x86_64-es-4 rhel-ia64-as-4 rhel-ia64-es-4 rhel-ppc-as-4 rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5" virt-sub-level-label="virtualization_free virtualization_platform_free" id="rhn-channel-family-5488" label="rhel-server"/></rhn-channel-families><rhn-dists><rhn-dist release="5Server" channel-arch="channel-x86_64" os="Red Hat Linux"/></rhn-dists><source-packages><source-package last-modified="1173828200" id="rhn-source-package-41213" source-rpm="spamassassin-3.1.8-2.el5.src.rpm"/><source-package last-modified="1173831490" id="rhn-source-package-41215" source-rpm="gnupg-1.4.5-13.src.rpm"/><source-package last-modified="1173831886" id="rhn-source-package-41217" source-rpm="tzdata-2007c-1.el5.src.rpm"/><source-package last-modified="1173831901" id="rhn-source-package-41218" source-rpm="emacs-21.4-18.1.el5.src.rpm"/><source-package last-modified="1173832223" id="rhn-source-package-41219" source-rpm="autofs-5.0.1-0.rc2.43.0.2.src.rpm"/><source-package last-modified="1173837656" id="rhn-source-package-41221" source-rpm="php-5.1.6-7.el5.src.rpm"/><source-package last-modified="1173847848" id="rhn-source-package-41222" source-rpm="bind-9.3.3-8.el5.src.rpm"/><source-package last-modified="1173848101" id="rhn-source-package-41223" source-rpm="samba-3.0.23c-2.el5.2.src.rpm"/><source-package last-modified="1173848491" id="rhn-source-package-41224" source-rpm="yelp-2.16.0-14.0.1.el5.src.rpm"/><source-package last-modified="1173848491" id="rhn-source-package-41226" source-rpm="devhelp-0.12-10.0.1.el5.src.rpm"/><source-package last-modified="1173848705" id="rhn-source-package-41227" source-rpm="nss-3.11.5-3.el5.src.rpm"/><source-package last-modified="1173848750" id="rhn-source-package-41228" source-rpm="xen-3.0.3-25.0.3.el5.src.rpm"/><source-package last-modified="1173848794" id="rhn-source-package-41229" source-rpm="postgresql-8.1.8-1.el5.src.rpm"/><source-package last-modified="1173849197" id="rhn-source-package-41230" source-rpm="gcc-4.1.1-52.el5.2.src.rpm"/><source-package last-modified="1173849238" id="rhn-source-package-41231" source-rpm="dhcp-3.0.5-5.el5.src.rpm"/><source-package last-modified="1173849420" id="rhn-source-package-41232" source-rpm="kernel-2.6.18-8.1.1.el5.src.rpm"/><source-package last-modified="1173850747" id="rhn-source-package-41233" source-rpm="evolution-data-server-1.8.0-15.0.2.el5.src.rpm"/><source-package last-modified="1173854091" id="rhn-source-package-41238" source-rpm="module-init-tools-3.3-0.pre3.1.16.0.1.el5.src.rpm"/><source-package last-modified="1173887371" id="rhn-source-package-41239" source-rpm="Deployment_Guide-5.0.0-21.src.rpm"/><source-package last-modified="1173889243" id="rhn-source-package-41243" source-rpm="wireshark-0.99.5-1.el5.src.rpm"/><source-package last-modified="1174644292" id="rhn-source-package-41256" source-rpm="file-4.17-9.el5.src.rpm"/><source-package last-modified="1174687064" id="rhn-source-package-41265" source-rpm="tzdata-2007d-1.el5.src.rpm"/><source-package last-modified="1174928008" id="rhn-source-package-41326" source-rpm="python-imaging-1.1.5-5.el5.src.rpm"/><source-package last-modified="1174928045" id="rhn-source-package-41329" source-rpm="libnotify-0.4.2-6.el5.src.rpm"/><source-package last-modified="1174928055" id="rhn-source-package-41330" source-rpm="perl-5.8.8-10.src.rpm"/><source-package last-modified="1174928802" id="rhn-source-package-41332" source-rpm="samba-3.0.23c-2.src.rpm"/><source-package last-modified="1174928806" id="rhn-source-package-41333" source-rpm="m17n-db-1.3.3-46.el5.src.rpm"/><source-package last-modified="1174928810" id="rhn-source-package-41334" source-rpm="gnome-user-docs-2.16.0-2.fc6.src.rpm"/><source-package last-modified="1174928813" id="rhn-source-package-41335" source-rpm="cdrtools-2.01-10.src.rpm"/><source-package last-modified="1174928815" id="rhn-source-package-41336" source-rpm="lsscsi-0.17-3.el5.src.rpm"/><source-package last-modified="1174928819" id="rhn-source-package-41337" source-rpm="OpenIPMI-2.0.6-5.el5.3.src.rpm"/><source-package last-modified="1174928824" id="rhn-source-package-41338" source-rpm="gnome-panel-2.16.1-6.el5.src.rpm"/><source-package last-modified="1174928846" id="rhn-source-package-41339" source-rpm="fonts-korean-1.0.11-10.el5.src.rpm"/><source-package last-modified="1174928852" id="rhn-source-package-41340" source-rpm="xsane-0.991-4.el5.src.rpm"/><source-package last-modified="1174928853" id="rhn-source-package-41341" source-rpm="setup-2.5.58-1.el5.src.rpm"/><source-package last-modified="1174928866" id="rhn-source-package-41342" source-rpm="vim-7.0.109-3.src.rpm"/><source-package last-modified="1174928869" id="rhn-source-package-41343" source-rpm="star-1.5a75-1.src.rpm"/><source-package last-modified="1174928872" id="rhn-source-package-41344" source-rpm="unixODBC-2.2.11-7.1.src.rpm"/><source-package last-modified="1174928872" id="rhn-source-package-41345" source-rpm="createrepo-0.4.4-2.fc6.src.rpm"/><source-package last-modified="1174928885" id="rhn-source-package-41346" source-rpm="xorg-x11-fonts-7.1-2.1.el5.src.rpm"/><source-package last-modified="1174928886" id="rhn-source-package-41347" source-rpm="perl-XML-SAX-0.14-5.src.rpm"/><source-package last-modified="1174928887" id="rhn-source-package-41348" source-rpm="eog-2.16.0.1-6.el5.src.rpm"/><source-package last-modified="1174928892" id="rhn-source-package-41349" source-rpm="sendmail-8.13.8-2.el5.src.rpm"/><source-package last-modified="1174928932" id="rhn-source-package-41351" source-rpm="gcc-4.1.1-52.el5.src.rpm"/><source-package last-modified="1174928933" id="rhn-source-package-41352" source-rpm="icon-naming-utils-0.8.1-1.fc6.src.rpm"/><source-package last-modified="1174928934" id="rhn-source-package-41353" source-rpm="man-pages-de-0.4-11.src.rpm"/><source-package last-modified="1174928936" id="rhn-source-package-41354" source-rpm="rsync-2.6.8-3.1.src.rpm"/><source-package last-modified="1174928937" id="rhn-source-package-41355" source-rpm="time-1.7-27.2.2.src.rpm"/><source-package last-modified="1174928938" id="rhn-source-package-41356" source-rpm="firstboot-1.4.27.2-1.el5.src.rpm"/><source-package last-modified="1174928945" id="rhn-source-package-41357" source-rpm="kdenetwork-3.5.4-4.fc6.src.rpm"/><source-package last-modified="1174928947" id="rhn-source-package-41358" source-rpm="arts-1.5.4-1.src.rpm"/><source-package last-modified="1174928956" id="rhn-source-package-41359" source-rpm="ghostscript-8.15.2-9.1.el5.src.rpm"/><source-package last-modified="1174929214" id="rhn-source-package-41360" source-rpm="kde-i18n-3.5.4-1.src.rpm"/><source-package last-modified="1174929242" id="rhn-source-package-41363" source-rpm="compat-gcc-32-3.2.3-61.src.rpm"/><source-package last-modified="1174929246" id="rhn-source-package-41364" source-rpm="frysk-0.0.1.2006.12.22.rh1-4.el5.src.rpm"/><source-package last-modified="1174929248" id="rhn-source-package-41365" source-rpm="openhpi-2.4.1-6.el5.1.src.rpm"/><source-package last-modified="1174929249" id="rhn-source-package-41366" source-rpm="bitstream-vera-fonts-1.10-7.src.rpm"/><source-package last-modified="1174929250" id="rhn-source-package-41367" source-rpm="fonts-indic-2.0.13-1.el5.src.rpm"/><source-package last-modified="1174929251" id="rhn-source-package-41368" source-rpm="pcmciautils-014-5.src.rpm"/><source-package last-modified="1174929251" id="rhn-source-package-41369" source-rpm="system-config-display-1.0.48-2.el5.src.rpm"/><source-package last-modified="1174929252" id="rhn-source-package-41370" source-rpm="rwho-0.17-26.src.rpm"/><source-package last-modified="1174929252" id="rhn-source-package-41371" source-rpm="man-pages-cs-0.16-6.src.rpm"/><source-package last-modified="1174929253" id="rhn-source-package-41372" source-rpm="jwhois-3.2.3-8.el5.src.rpm"/><source-package last-modified="1174929254" id="rhn-source-package-41373" source-rpm="nc-1.84-10.fc6.src.rpm"/><source-package last-modified="1174929261" id="rhn-source-package-41374" source-rpm="scim-tables-0.5.6-7.src.rpm"/><source-package last-modified="1174929261" id="rhn-source-package-41375" source-rpm="gtk-doc-1.7-1.fc6.src.rpm"/><source-package last-modified="1174929262" id="rhn-source-package-41376" source-rpm="irqbalance-1.13-9.el5.src.rpm"/><source-package last-modified="1174929263" id="rhn-source-package-41377" source-rpm="postgresql-jdbc-8.1.407-1jpp.4.src.rpm"/><source-package last-modified="1174929264" id="rhn-source-package-41378" source-rpm="fonts-KOI8-R-1.0-9.1.1.src.rpm"/><source-package last-modified="1174929265" id="rhn-source-package-41379" source-rpm="gpm-1.20.1-74.1.src.rpm"/><source-package last-modified="1174929266" id="rhn-source-package-41380" source-rpm="dmraid-1.0.0.rc13-2.el5.src.rpm"/><source-package last-modified="1174929426" id="rhn-source-package-41381" source-rpm="Deployment_Guide-5.0.0-19.src.rpm"/><source-package last-modified="1174929430" id="rhn-source-package-41382" source-rpm="yum-3.0.1-5.el5.src.rpm"/><source-package last-modified="1174929434" id="rhn-source-package-41383" source-rpm="gtk+-1.2.10-56.el5.src.rpm"/><source-package last-modified="1174929459" id="rhn-source-package-41384" source-rpm="compat-gcc-34-3.4.6-4.src.rpm"/><source-package last-modified="1174929461" id="rhn-source-package-41385" source-rpm="sox-12.18.1-1.src.rpm"/><source-package last-modified="1174929469" id="rhn-source-package-41386" source-rpm="openmotif22-2.2.3-18.src.rpm"/><source-package last-modified="1174929470" id="rhn-source-package-41387" source-rpm="aspell-pl-0.51-5.2.2.src.rpm"/><source-package last-modified="1174929484" id="rhn-source-package-41388" source-rpm="compat-gcc-296-2.96-138.src.rpm"/><source-package last-modified="1174929486" id="rhn-source-package-41389" source-rpm="libtermcap-2.0.8-46.1.src.rpm"/><source-package last-modified="1174929491" id="rhn-source-package-41390" source-rpm="gnutls-1.4.1-2.src.rpm"/><source-package last-modified="1174929494" id="rhn-source-package-41391" source-rpm="basesystem-8.0-5.1.1.src.rpm"/><source-package last-modified="1174929534" id="rhn-source-package-41392" source-rpm="firefox-1.5.0.9-10.el5.src.rpm"/><source-package last-modified="1174929535" id="rhn-source-package-41393" source-rpm="xorg-x11-xbitmaps-1.0.1-4.1.src.rpm"/><source-package last-modified="1174929537" id="rhn-source-package-41394" source-rpm="bitmap-fonts-0.3-5.1.1.src.rpm"/><source-package last-modified="1174929537" id="rhn-source-package-41395" source-rpm="dcraw-0.0.20060521-1.1.src.rpm"/><source-package last-modified="1174929538" id="rhn-source-package-41396" source-rpm="gfs2-utils-0.1.25-1.el5.src.rpm"/><source-package last-modified="1174929555" id="rhn-source-package-41397" source-rpm="postgresql-8.1.4-1.1.src.rpm"/><source-package last-modified="1174929565" id="rhn-source-package-41398" source-rpm="cyrus-sasl-2.1.22-4.src.rpm"/><source-package last-modified="1174929566" id="rhn-source-package-41399" source-rpm="pkinit-nss-0.3.5-1.el5.src.rpm"/><source-package last-modified="1174929567" id="rhn-source-package-41400" source-rpm="gnome-nettool-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174929568" id="rhn-source-package-41401" source-rpm="xorg-x11-xfs-1.0.2-3.1.src.rpm"/><source-package last-modified="1174929571" id="rhn-source-package-41402" source-rpm="man-pages-fr-2.39-4.fc6.src.rpm"/><source-package last-modified="1174929572" id="rhn-source-package-41403" source-rpm="mdadm-2.5.4-3.el5.src.rpm"/><source-package last-modified="1174929574" id="rhn-source-package-41404" source-rpm="tcpdump-3.9.4-8.1.src.rpm"/><source-package last-modified="1174929581" id="rhn-source-package-41406" source-rpm="perl-XML-Twig-3.26-1.fc6.src.rpm"/><source-package last-modified="1174929585" id="rhn-source-package-41408" source-rpm="java-1.4.2-gcj-compat-1.4.2.0-40jpp.112.src.rpm"/><source-package last-modified="1174929586" id="rhn-source-package-41410" source-rpm="pam_smb-1.1.7-7.2.1.src.rpm"/><source-package last-modified="1174929587" id="rhn-source-package-41411" source-rpm="bluez-hcidump-1.32-1.src.rpm"/><source-package last-modified="1174929587" id="rhn-source-package-41412" source-rpm="redhat-lsb-3.1-12.2.EL.src.rpm"/><source-package last-modified="1174929588" id="rhn-source-package-41413" source-rpm="docbook-utils-0.6.14-5.1.src.rpm"/><source-package last-modified="1174929624" id="rhn-source-package-41414" source-rpm="system-config-network-1.3.99-1.el5.src.rpm"/><source-package last-modified="1174929630" id="rhn-source-package-41415" source-rpm="rhgb-0.16.4-8.el5.src.rpm"/><source-package last-modified="1174929634" id="rhn-source-package-41416" source-rpm="zsh-4.2.6-1.src.rpm"/><source-package last-modified="1174929634" id="rhn-source-package-41417" source-rpm="unix2dos-2.2-26.2.2.src.rpm"/><source-package last-modified="1174929635" id="rhn-source-package-41418" source-rpm="pax-3.4-1.2.2.src.rpm"/><source-package last-modified="1174929636" id="rhn-source-package-41419" source-rpm="aide-0.12-7.src.rpm"/><source-package last-modified="1174929642" id="rhn-source-package-41420" source-rpm="ruby-1.8.5-5.el5.src.rpm"/><source-package last-modified="1174929643" id="rhn-source-package-41421" source-rpm="acl-2.2.39-1.1.src.rpm"/><source-package last-modified="1174929667" id="rhn-source-package-41423" source-rpm="mutt-1.4.2.2-3.el5.src.rpm"/><source-package last-modified="1174929668" id="rhn-source-package-41424" source-rpm="system-config-securitylevel-1.6.29.1-1.el5.src.rpm"/><source-package last-modified="1174929669" id="rhn-source-package-41425" source-rpm="screen-4.0.3-1.el5.src.rpm"/><source-package last-modified="1174929676" id="rhn-source-package-41426" source-rpm="xorg-x11-server-1.1.1-48.13.el5.src.rpm"/><source-package last-modified="1174929677" id="rhn-source-package-41427" source-rpm="dvgrab-2.0-1.2.2.src.rpm"/><source-package last-modified="1174929678" id="rhn-source-package-41428" source-rpm="yelp-2.16.0-13.el5.src.rpm"/><source-package last-modified="1174929678" id="rhn-source-package-41429" source-rpm="netlabel_tools-0.17-9.el5.src.rpm"/><source-package last-modified="1174929679" id="rhn-source-package-41430" source-rpm="aspell-ga-0.50-4.2.2.src.rpm"/><source-package last-modified="1174929684" id="rhn-source-package-41431" source-rpm="swig-1.3.29-2.el5.src.rpm"/><source-package last-modified="1174929692" id="rhn-source-package-41432" source-rpm="tog-pegasus-2.5.2-5.el5.src.rpm"/><source-package last-modified="1174929693" id="rhn-source-package-41433" source-rpm="patchutils-0.2.31-2.2.2.src.rpm"/><source-package last-modified="1174929694" id="rhn-source-package-41434" source-rpm="file-roller-2.16.0-2.fc6.src.rpm"/><source-package last-modified="1174929787" id="rhn-source-package-41435" source-rpm="tetex-3.0-32.fc6.src.rpm"/><source-package last-modified="1174929789" id="rhn-source-package-41436" source-rpm="scim-bridge-0.4.5-7.el5.src.rpm"/><source-package last-modified="1174929793" id="rhn-source-package-41437" source-rpm="alsa-utils-1.0.12-3.fc6.src.rpm"/><source-package last-modified="1174929794" id="rhn-source-package-41438" source-rpm="gtk2-engines-2.8.0-3.el5.src.rpm"/><source-package last-modified="1174929796" id="rhn-source-package-41439" source-rpm="wget-1.10.2-7.el5.src.rpm"/><source-package last-modified="1174929798" id="rhn-source-package-41440" source-rpm="fonts-ISO8859-2-1.0-17.1.src.rpm"/><source-package last-modified="1174929799" id="rhn-source-package-41441" source-rpm="sysfsutils-2.0.0-6.src.rpm"/><source-package last-modified="1174929799" id="rhn-source-package-41442" source-rpm="im-chooser-0.3.3-6.el5.src.rpm"/><source-package last-modified="1174929801" id="rhn-source-package-41443" source-rpm="aspell-sr-0.02-1.2.1.src.rpm"/><source-package last-modified="1174929803" id="rhn-source-package-41445" source-rpm="rootfiles-8.1-1.1.1.src.rpm"/><source-package last-modified="1174929804" id="rhn-source-package-41446" source-rpm="iscsi-initiator-utils-6.2.0.742-0.5.el5.src.rpm"/><source-package last-modified="1174929805" id="rhn-source-package-41447" source-rpm="mod_nss-1.0.3-4.el5.src.rpm"/><source-package last-modified="1174929821" id="rhn-source-package-41448" source-rpm="glibc-2.5-12.src.rpm"/><source-package last-modified="1174929823" id="rhn-source-package-41449" source-rpm="make-3.81-1.1.src.rpm"/><source-package last-modified="1174929823" id="rhn-source-package-41450" source-rpm="xorg-x11-xauth-1.0.1-2.1.src.rpm"/><source-package last-modified="1174929825" id="rhn-source-package-41451" source-rpm="evince-0.6.0-8.el5.src.rpm"/><source-package last-modified="1174929826" id="rhn-source-package-41452" source-rpm="kudzu-1.2.57.1.13-1.src.rpm"/><source-package last-modified="1174929826" id="rhn-source-package-41453" source-rpm="aspell-fr-0.50-9.2.2.src.rpm"/><source-package last-modified="1174929828" id="rhn-source-package-41454" source-rpm="pciutils-2.2.3-4.src.rpm"/><source-package last-modified="1174929830" id="rhn-source-package-41455" source-rpm="vorbis-tools-1.1.1-3.el5.src.rpm"/><source-package last-modified="1174929830" id="rhn-source-package-41456" source-rpm="wvdial-1.54.0-5.2.2.1.src.rpm"/><source-package last-modified="1174929832" id="rhn-source-package-41457" source-rpm="aspell-hr-0.51-4.2.2.src.rpm"/><source-package last-modified="1174929848" id="rhn-source-package-41458" source-rpm="desktop-backgrounds-2.0-37.src.rpm"/><source-package last-modified="1174929849" id="rhn-source-package-41459" source-rpm="perl-DBD-Pg-1.49-1.fc6.src.rpm"/><source-package last-modified="1174929853" id="rhn-source-package-41460" source-rpm="mc-4.6.1a-34.el5.src.rpm"/><source-package last-modified="1174929854" id="rhn-source-package-41461" source-rpm="policycoreutils-1.33.12-3.el5.src.rpm"/><source-package last-modified="1174929860" id="rhn-source-package-41462" source-rpm="gdm-2.16.0-30.el5.src.rpm"/><source-package last-modified="1174929862" id="rhn-source-package-41463" source-rpm="tftp-0.42-3.1.src.rpm"/><source-package last-modified="1174929866" id="rhn-source-package-41464" source-rpm="words-3.0-9.src.rpm"/><source-package last-modified="1174929867" id="rhn-source-package-41465" source-rpm="aspell-is-0.51.1-2.2.2.src.rpm"/><source-package last-modified="1174929870" id="rhn-source-package-41466" source-rpm="sblim-1-20.EL5.src.rpm"/><source-package last-modified="1174929879" id="rhn-source-package-41467" source-rpm="arptables_jf-0.0.8-8.src.rpm"/><source-package last-modified="1174929880" id="rhn-source-package-41468" source-rpm="eject-2.1.5-4.2.el5.src.rpm"/><source-package last-modified="1174929880" id="rhn-source-package-41469" source-rpm="xdelta-1.1.3-20.src.rpm"/><source-package last-modified="1174929885" id="rhn-source-package-41470" source-rpm="net-snmp-5.3.1-14.el5.src.rpm"/><source-package last-modified="1174929887" id="rhn-source-package-41471" source-rpm="bogl-0.1.18-11.2.1.el5.1.src.rpm"/><source-package last-modified="1174929890" id="rhn-source-package-41472" source-rpm="amanda-2.5.0p2-4.src.rpm"/><source-package last-modified="1174929893" id="rhn-source-package-41473" source-rpm="elinks-0.11.1-5.1.el5.src.rpm"/><source-package last-modified="1174929895" id="rhn-source-package-41474" source-rpm="metacity-2.16.0-8.el5.src.rpm"/><source-package last-modified="1174929911" id="rhn-source-package-41475" source-rpm="anaconda-11.1.2.36-1.src.rpm"/><source-package last-modified="1174929917" id="rhn-source-package-41476" source-rpm="xfig-3.2.4-21.2.el5.src.rpm"/><source-package last-modified="1174929923" id="rhn-source-package-41477" source-rpm="sysstat-7.0.0-3.el5.src.rpm"/><source-package last-modified="1174929923" id="rhn-source-package-41478" source-rpm="vlock-1.3-23.src.rpm"/><source-package last-modified="1174929924" id="rhn-source-package-41479" source-rpm="mtools-3.9.10-2.fc6.src.rpm"/><source-package last-modified="1174929925" id="rhn-source-package-41480" source-rpm="ppp-2.4.4-1.el5.src.rpm"/><source-package last-modified="1174929926" id="rhn-source-package-41481" source-rpm="aspell-ca-0.50-4.2.2.src.rpm"/><source-package last-modified="1174929926" id="rhn-source-package-41482" source-rpm="zisofs-tools-1.0.6-3.2.2.src.rpm"/><source-package last-modified="1174929927" id="rhn-source-package-41483" source-rpm="xmlrpc-2.0.1-3jpp.1.src.rpm"/><source-package last-modified="1174929927" id="rhn-source-package-41484" source-rpm="hwbrowser-0.30-1.el5.src.rpm"/><source-package last-modified="1174929928" id="rhn-source-package-41485" source-rpm="iputils-20020927-43.el5.src.rpm"/><source-package last-modified="1174929930" id="rhn-source-package-41486" source-rpm="gnome-system-monitor-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174929931" id="rhn-source-package-41487" source-rpm="chkconfig-1.3.30.1-1.src.rpm"/><source-package last-modified="1174929937" id="rhn-source-package-41488" source-rpm="gimp-print-4.2.7-22.src.rpm"/><source-package last-modified="1174929938" id="rhn-source-package-41489" source-rpm="xorg-x11-xsm-1.0.2-4.fc6.src.rpm"/><source-package last-modified="1174929940" id="rhn-source-package-41490" source-rpm="fonts-arabic-2.0-4.el5.src.rpm"/><source-package last-modified="1174929941" id="rhn-source-package-41491" source-rpm="xorg-x11-xfwp-1.0.1-3.1.src.rpm"/><source-package last-modified="1174929945" id="rhn-source-package-41494" source-rpm="freeglut-2.4.0-7.1.el5.src.rpm"/><source-package last-modified="1174929954" id="rhn-source-package-41496" source-rpm="e2fsprogs-1.39-8.el5.src.rpm"/><source-package last-modified="1174929955" id="rhn-source-package-41497" source-rpm="gok-1.2.0-2.el5.src.rpm"/><source-package last-modified="1174929958" id="rhn-source-package-41498" source-rpm="openssl097a-0.9.7a-9.src.rpm"/><source-package last-modified="1174929959" id="rhn-source-package-41499" source-rpm="talk-0.17-29.2.2.src.rpm"/><source-package last-modified="1174929959" id="rhn-source-package-41500" source-rpm="libaio-0.3.106-3.2.src.rpm"/><source-package last-modified="1174929960" id="rhn-source-package-41501" source-rpm="mlocate-0.15-1.el5.src.rpm"/><source-package last-modified="1174929960" id="rhn-source-package-41502" source-rpm="logrotate-3.7.4-7.src.rpm"/><source-package last-modified="1174929962" id="rhn-source-package-41503" source-rpm="conman-0.1.9.2-4.el5.src.rpm"/><source-package last-modified="1174929966" id="rhn-source-package-41504" source-rpm="pkgconfig-0.21-1.fc6.src.rpm"/><source-package last-modified="1174929968" id="rhn-source-package-41505" source-rpm="openssh-4.3p2-16.el5.src.rpm"/><source-package last-modified="1174929969" id="rhn-source-package-41506" source-rpm="lksctp-tools-1.0.6-1.el5.1.src.rpm"/><source-package last-modified="1174929969" id="rhn-source-package-41507" source-rpm="dtach-0.7-1.2.2.src.rpm"/><source-package last-modified="1174929971" id="rhn-source-package-41508" source-rpm="bluez-utils-3.7-2.src.rpm"/><source-package last-modified="1174930010" id="rhn-source-package-41509" source-rpm="gimp-help-2-0.1.0.10.1.1.src.rpm"/><source-package last-modified="1174930012" id="rhn-source-package-41510" source-rpm="initscripts-8.45.14.EL-1.src.rpm"/><source-package last-modified="1174930014" id="rhn-source-package-41511" source-rpm="gnome-mag-0.13.1-1.fc6.src.rpm"/><source-package last-modified="1174930014" id="rhn-source-package-41512" source-rpm="krb5-auth-dialog-0.7-1.src.rpm"/><source-package last-modified="1174930015" id="rhn-source-package-41513" source-rpm="ipv6calc-0.61-1.src.rpm"/><source-package last-modified="1174930030" id="rhn-source-package-41514" source-rpm="qt-3.3.6-20.el5.src.rpm"/><source-package last-modified="1174930030" id="rhn-source-package-41515" source-rpm="man-pages-da-0.1.1-12.1.1.src.rpm"/><source-package last-modified="1174930031" id="rhn-source-package-41516" source-rpm="sabayon-2.12.4-3.el5.src.rpm"/><source-package last-modified="1174930032" id="rhn-source-package-41517" source-rpm="perl-libxml-perl-0.08-1.2.1.src.rpm"/><source-package last-modified="1174930033" id="rhn-source-package-41518" source-rpm="bc-1.06-21.src.rpm"/><source-package last-modified="1174930033" id="rhn-source-package-41519" source-rpm="perl-XML-Dumper-0.81-2.fc6.src.rpm"/><source-package last-modified="1174930033" id="rhn-source-package-41520" source-rpm="x86info-1.20-1.26.fc6.src.rpm"/><source-package last-modified="1174930034" id="rhn-source-package-41521" source-rpm="hesinfo-3.1.0-1.1.src.rpm"/><source-package last-modified="1174930036" id="rhn-source-package-41522" source-rpm="man-pages-2.39-9.el5.src.rpm"/><source-package last-modified="1174930038" id="rhn-source-package-41523" source-rpm="lftp-3.5.1-2.fc6.src.rpm"/><source-package last-modified="1174930039" id="rhn-source-package-41524" source-rpm="switchdesk-4.0.8-6.src.rpm"/><source-package last-modified="1174930040" id="rhn-source-package-41525" source-rpm="nautilus-cd-burner-2.16.0-7.el5.src.rpm"/><source-package last-modified="1174930041" id="rhn-source-package-41526" source-rpm="lrzsz-0.12.20-22.1.src.rpm"/><source-package last-modified="1174930041" id="rhn-source-package-41527" source-rpm="autofs-5.0.1-0.rc2.42.src.rpm"/><source-package last-modified="1174930043" id="rhn-source-package-41528" source-rpm="dejagnu-1.4.4-5.1.src.rpm"/><source-package last-modified="1174930046" id="rhn-source-package-41529" source-rpm="devhelp-0.12-9.el5.src.rpm"/><source-package last-modified="1174930047" id="rhn-source-package-41530" source-rpm="NetworkManager-0.6.4-6.el5.src.rpm"/><source-package last-modified="1174930048" id="rhn-source-package-41531" source-rpm="cryptsetup-luks-1.0.3-2.2.el5.src.rpm"/><source-package last-modified="1174930048" id="rhn-source-package-41532" source-rpm="dos2unix-3.1-27.1.src.rpm"/><source-package last-modified="1174930049" id="rhn-source-package-41533" source-rpm="perl-Crypt-SSLeay-0.51-11.el5.src.rpm"/><source-package last-modified="1174930053" id="rhn-source-package-41534" source-rpm="kdeutils-3.5.4-5.fc6.src.rpm"/><source-package last-modified="1174930053" id="rhn-source-package-41535" source-rpm="kcc-2.3-24.2.2.src.rpm"/><source-package last-modified="1174930066" id="rhn-source-package-41536" source-rpm="gettext-0.14.6-4.el5.src.rpm"/><source-package last-modified="1174930119" id="rhn-source-package-41537" source-rpm="kernel-2.6.18-8.el5.src.rpm"/><source-package last-modified="1174930121" id="rhn-source-package-41538" source-rpm="bzip2-1.0.3-3.src.rpm"/><source-package last-modified="1174930123" id="rhn-source-package-41539" source-rpm="ccid-1.0.1-6.el5.src.rpm"/><source-package last-modified="1174930126" id="rhn-source-package-41541" source-rpm="system-config-language-1.1.18-1.el5.src.rpm"/><source-package last-modified="1174930126" id="rhn-source-package-41542" source-rpm="ftp-0.17-33.fc6.src.rpm"/><source-package last-modified="1174930278" id="rhn-source-package-41543" source-rpm="specspo-13-1.el5.src.rpm"/><source-package last-modified="1174930278" id="rhn-source-package-41544" source-rpm="anacron-2.3-45.el5.src.rpm"/><source-package last-modified="1174930279" id="rhn-source-package-41545" source-rpm="aspell-sl-0.50-1.2.1.src.rpm"/><source-package last-modified="1174930281" id="rhn-source-package-41546" source-rpm="dhcp-3.0.5-3.el5.src.rpm"/><source-package last-modified="1174930284" id="rhn-source-package-41547" source-rpm="gnome-utils-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930285" id="rhn-source-package-41548" source-rpm="procps-3.2.7-8.1.el5.src.rpm"/><source-package last-modified="1174930285" id="rhn-source-package-41549" source-rpm="system-switch-mail-0.5.25-12.src.rpm"/><source-package last-modified="1174930286" id="rhn-source-package-41550" source-rpm="pam_krb5-2.2.11-1.src.rpm"/><source-package last-modified="1174930297" id="rhn-source-package-41551" source-rpm="krb5-1.5-17.src.rpm"/><source-package last-modified="1174930298" id="rhn-source-package-41552" source-rpm="compat-readline43-4.3-3.src.rpm"/><source-package last-modified="1174930299" id="rhn-source-package-41553" source-rpm="booty-0.80.4-1.src.rpm"/><source-package last-modified="1174930299" id="rhn-source-package-41554" source-rpm="which-2.16-7.src.rpm"/><source-package last-modified="1174930300" id="rhn-source-package-41555" source-rpm="usbutils-0.71-2.1.src.rpm"/><source-package last-modified="1174930300" id="rhn-source-package-41556" source-rpm="bluez-gnome-0.5-5.fc6.src.rpm"/><source-package last-modified="1174930301" id="rhn-source-package-41557" source-rpm="procinfo-18-19.src.rpm"/><source-package last-modified="1174930315" id="rhn-source-package-41558" source-rpm="gdb-6.5-16.el5.src.rpm"/><source-package last-modified="1174930316" id="rhn-source-package-41559" source-rpm="system-config-users-1.2.51-1.el5.src.rpm"/><source-package last-modified="1174930317" id="rhn-source-package-41560" source-rpm="aspell-ru-0.99f7-2.2.2.src.rpm"/><source-package last-modified="1174930317" id="rhn-source-package-41561" source-rpm="pam_ccreds-3-5.src.rpm"/><source-package last-modified="1174930321" id="rhn-source-package-41562" source-rpm="rhn-client-tools-0.4.13-1.el5.src.rpm"/><source-package last-modified="1174930322" id="rhn-source-package-41563" source-rpm="tree-1.5.0-4.src.rpm"/><source-package last-modified="1174930338" id="rhn-source-package-41564" source-rpm="crash-4.0-3.14.src.rpm"/><source-package last-modified="1174930340" id="rhn-source-package-41565" source-rpm="man-pages-es-1.28-10.1.1.src.rpm"/><source-package last-modified="1174930340" id="rhn-source-package-41566" source-rpm="aspell-pt-0.50-10.2.2.src.rpm"/><source-package last-modified="1174930341" id="rhn-source-package-41567" source-rpm="rdist-6.1.5-44.src.rpm"/><source-package last-modified="1174930342" id="rhn-source-package-41568" source-rpm="agg-2.4-2.1.src.rpm"/><source-package last-modified="1174930342" id="rhn-source-package-41569" source-rpm="hal-cups-utils-0.6.2-5.src.rpm"/><source-package last-modified="1174930343" id="rhn-source-package-41570" source-rpm="perl-LDAP-0.33-3.fc6.src.rpm"/><source-package last-modified="1174930358" id="rhn-source-package-41571" source-rpm="fonts-japanese-0.20061016-4.el5.src.rpm"/><source-package last-modified="1174930373" id="rhn-source-package-41572" source-rpm="openldap-2.3.27-5.src.rpm"/><source-package last-modified="1174930375" id="rhn-source-package-41574" source-rpm="scim-qtimm-0.9.4-5.src.rpm"/><source-package last-modified="1174930384" id="rhn-source-package-41575" source-rpm="hplip-1.6.7-4.1.el5.src.rpm"/><source-package last-modified="1174930385" id="rhn-source-package-41576" source-rpm="desktop-printing-0.19-20.el5.src.rpm"/><source-package last-modified="1174930394" id="rhn-source-package-41577" source-rpm="bind-9.3.3-7.el5.src.rpm"/><source-package last-modified="1174930399" id="rhn-source-package-41578" source-rpm="scim-pinyin-0.5.91-15.el5.src.rpm"/><source-package last-modified="1174930404" id="rhn-source-package-41579" source-rpm="gnome-vfs2-2.16.2-4.el5.src.rpm"/><source-package last-modified="1174930406" id="rhn-source-package-41580" source-rpm="pam_pkcs11-0.5.3-23.src.rpm"/><source-package last-modified="1174930407" id="rhn-source-package-41581" source-rpm="ypbind-1.19-7.el5.src.rpm"/><source-package last-modified="1174930457" id="rhn-source-package-41582" source-rpm="qt4-4.2.1-1.src.rpm"/><source-package last-modified="1174930459" id="rhn-source-package-41583" source-rpm="aspell-sv-0.51-1.2.1.src.rpm"/><source-package last-modified="1174930460" id="rhn-source-package-41584" source-rpm="system-config-date-1.8.12-1.el5.src.rpm"/><source-package last-modified="1174930460" id="rhn-source-package-41585" source-rpm="fbset-2.1-22.src.rpm"/><source-package last-modified="1174930461" id="rhn-source-package-41586" source-rpm="kexec-tools-1.101-164.el5.src.rpm"/><source-package last-modified="1174930462" id="rhn-source-package-41587" source-rpm="setuptool-1.19.2-1.src.rpm"/><source-package last-modified="1174930465" id="rhn-source-package-41588" source-rpm="util-linux-2.13-0.44.el5.src.rpm"/><source-package last-modified="1174930468" id="rhn-source-package-41589" source-rpm="gnuplot-4.0.0-12.src.rpm"/><source-package last-modified="1174930468" id="rhn-source-package-41590" source-rpm="rhel-instnum-1.0.7-1.el5.src.rpm"/><source-package last-modified="1174930472" id="rhn-source-package-41591" source-rpm="libhugetlbfs-1.0.1-1.el5.src.rpm"/><source-package last-modified="1174930472" id="rhn-source-package-41592" source-rpm="convmv-1.10-1.el5.src.rpm"/><source-package last-modified="1174930474" id="rhn-source-package-41593" source-rpm="epic-2.4-1.src.rpm"/><source-package last-modified="1174930475" id="rhn-source-package-41594" source-rpm="gconf-editor-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930476" id="rhn-source-package-41595" source-rpm="man-1.6d-1.1.src.rpm"/><source-package last-modified="1174930476" id="rhn-source-package-41596" source-rpm="xorg-x11-xinit-1.0.2-13.el5.src.rpm"/><source-package last-modified="1174930478" id="rhn-source-package-41597" source-rpm="slrn-0.9.8.1pl1-1.2.2.src.rpm"/><source-package last-modified="1174930480" id="rhn-source-package-41598" source-rpm="shadow-utils-4.0.17-12.el5.src.rpm"/><source-package last-modified="1174930482" id="rhn-source-package-41599" source-rpm="libdbi-drivers-0.8.1a-1.2.2.src.rpm"/><source-package last-modified="1174930483" id="rhn-source-package-41600" source-rpm="mikmod-3.1.6-38.1.src.rpm"/><source-package last-modified="1174930484" id="rhn-source-package-41601" source-rpm="squashfs-tools-3.0-4.src.rpm"/><source-package last-modified="1174930485" id="rhn-source-package-41602" source-rpm="iptables-1.3.5-1.2.1.src.rpm"/><source-package last-modified="1174930485" id="rhn-source-package-41603" source-rpm="amtu-1.0.4-4.src.rpm"/><source-package last-modified="1174930486" id="rhn-source-package-41604" source-rpm="linuxdoc-tools-0.9.21-7.1.src.rpm"/><source-package last-modified="1174930490" id="rhn-source-package-41605" source-rpm="postfix-2.3.3-2.src.rpm"/><source-package last-modified="1174930490" id="rhn-source-package-41606" source-rpm="rsh-0.17-37.el5.src.rpm"/><source-package last-modified="1174930491" id="rhn-source-package-41607" source-rpm="aspell-fo-0.51-4.2.2.src.rpm"/><source-package last-modified="1174930492" id="rhn-source-package-41608" source-rpm="dhcpv6-0.10-33.el5.src.rpm"/><source-package last-modified="1174930493" id="rhn-source-package-41609" source-rpm="tn5250-0.17.3-6.src.rpm"/><source-package last-modified="1174930495" id="rhn-source-package-41610" source-rpm="gnome-audio-2.0.0-3.1.1.src.rpm"/><source-package last-modified="1174930496" id="rhn-source-package-41611" source-rpm="docbook-slides-3.3.1-2.1.1.src.rpm"/><source-package last-modified="1174930499" id="rhn-source-package-41612" source-rpm="netpbm-10.35-6.fc6.src.rpm"/><source-package last-modified="1174930509" id="rhn-source-package-41614" source-rpm="libutempter-1.1.4-3.fc6.src.rpm"/><source-package last-modified="1174930509" id="rhn-source-package-41615" source-rpm="perl-DBD-MySQL-3.0007-1.fc6.src.rpm"/><source-package last-modified="1174930511" id="rhn-source-package-41616" source-rpm="busybox-1.2.0-3.src.rpm"/><source-package last-modified="1174930512" id="rhn-source-package-41617" source-rpm="man-pages-ru-0.97-1.1.1.src.rpm"/><source-package last-modified="1174930513" id="rhn-source-package-41618" source-rpm="docbook-style-dsssl-1.79-4.1.src.rpm"/><source-package last-modified="1174930536" id="rhn-source-package-41619" source-rpm="festival-1.95-5.2.1.src.rpm"/><source-package last-modified="1174930537" id="rhn-source-package-41620" source-rpm="mailcap-2.1.23-1.fc6.src.rpm"/><source-package last-modified="1174930537" id="rhn-source-package-41621" source-rpm="system-config-kdump-1.0.9-3.el5.src.rpm"/><source-package last-modified="1174930538" id="rhn-source-package-41622" source-rpm="ltrace-0.5-6.45svn.fc6.src.rpm"/><source-package last-modified="1174930541" id="rhn-source-package-41623" source-rpm="cvs-1.11.22-5.el5.src.rpm"/><source-package last-modified="1174930542" id="rhn-source-package-41624" source-rpm="adjtimex-1.20-2.1.src.rpm"/><source-package last-modified="1174930544" id="rhn-source-package-41625" source-rpm="kdeadmin-3.5.4-2.fc6.src.rpm"/><source-package last-modified="1174930545" id="rhn-source-package-41626" source-rpm="expect-5.43.0-5.1.src.rpm"/><source-package last-modified="1174930546" id="rhn-source-package-41627" source-rpm="libgnome-java-2.12.4-3.fc6.src.rpm"/><source-package last-modified="1174930547" id="rhn-source-package-41628" source-rpm="dosfstools-2.11-6.2.el5.src.rpm"/><source-package last-modified="1174930548" id="rhn-source-package-41629" source-rpm="nano-1.3.12-1.1.src.rpm"/><source-package last-modified="1174930549" id="rhn-source-package-41630" source-rpm="pinfo-0.6.9-1.fc6.src.rpm"/><source-package last-modified="1174930556" id="rhn-source-package-41631" source-rpm="mesa-6.5.1-7.2.el5.src.rpm"/><source-package last-modified="1174930557" id="rhn-source-package-41632" source-rpm="sysreport-1.4.3-10.el5.src.rpm"/><source-package last-modified="1174930558" id="rhn-source-package-41633" source-rpm="setserial-2.17-19.2.2.src.rpm"/><source-package last-modified="1174930576" id="rhn-source-package-41635" source-rpm="compat-glibc-2.3.4-2.26.src.rpm"/><source-package last-modified="1174930578" id="rhn-source-package-41636" source-rpm="docbook-style-xsl-1.69.1-5.1.src.rpm"/><source-package last-modified="1174930579" id="rhn-source-package-41637" source-rpm="mysql-connector-odbc-3.51.12-2.2.src.rpm"/><source-package last-modified="1174930582" id="rhn-source-package-41638" source-rpm="yum-rhn-plugin-0.4.3-1.el5.src.rpm"/><source-package last-modified="1174930583" id="rhn-source-package-41639" source-rpm="telnet-0.17-38.el5.src.rpm"/><source-package last-modified="1174930584" id="rhn-source-package-41640" source-rpm="audit-1.3.1-1.el5.src.rpm"/><source-package last-modified="1174930590" id="rhn-source-package-41641" source-rpm="isdn4k-utils-3.2-50.1.src.rpm"/><source-package last-modified="1174930594" id="rhn-source-package-41642" source-rpm="nautilus-2.16.2-6.el5.src.rpm"/><source-package last-modified="1174930596" id="rhn-source-package-41643" source-rpm="system-config-lvm-1.0.22-1.0.el5.src.rpm"/><source-package last-modified="1174930597" id="rhn-source-package-41644" source-rpm="nkf-2.07-1.1.fc6.src.rpm"/><source-package last-modified="1174930598" id="rhn-source-package-41645" source-rpm="hdparm-6.6-2.src.rpm"/><source-package last-modified="1174930599" id="rhn-source-package-41646" source-rpm="grub-0.97-13.src.rpm"/><source-package last-modified="1174930601" id="rhn-source-package-41647" source-rpm="tcsh-6.14-12.el5.src.rpm"/><source-package last-modified="1174930601" id="rhn-source-package-41648" source-rpm="xorg-x11-resutils-7.1-2.fc6.src.rpm"/><source-package last-modified="1174930603" id="rhn-source-package-41649" source-rpm="postgresql-odbc-08.01.0200-3.1.src.rpm"/><source-package last-modified="1174930604" id="rhn-source-package-41650" source-rpm="compat-slang-1.4.9-27.2.2.src.rpm"/><source-package last-modified="1174930604" id="rhn-source-package-41651" source-rpm="xmlto-0.0.18-13.1.src.rpm"/><source-package last-modified="1174930605" id="rhn-source-package-41652" source-rpm="statserial-1.1-38.2.2.src.rpm"/><source-package last-modified="1174930606" id="rhn-source-package-41653" source-rpm="openCryptoki-2.2.4-15.el5.src.rpm"/><source-package last-modified="1174930612" id="rhn-source-package-41654" source-rpm="httpd-2.2.3-6.el5.src.rpm"/><source-package last-modified="1174930613" id="rhn-source-package-41655" source-rpm="memtest86+-1.65-4.1.src.rpm"/><source-package last-modified="1174930613" id="rhn-source-package-41656" source-rpm="sos-1.3-1.el5.src.rpm"/><source-package last-modified="1174930614" id="rhn-source-package-41657" source-rpm="attr-2.4.32-1.1.src.rpm"/><source-package last-modified="1174930619" id="rhn-source-package-41658" source-rpm="coreutils-5.97-12.1.el5.src.rpm"/><source-package last-modified="1174930620" id="rhn-source-package-41659" source-rpm="authconfig-5.3.12-2.el5.src.rpm"/><source-package last-modified="1174930622" id="rhn-source-package-41660" source-rpm="system-config-soundcard-2.0.6-1.el5.src.rpm"/><source-package last-modified="1174930623" id="rhn-source-package-41661" source-rpm="psacct-6.3.2-41.1.src.rpm"/><source-package last-modified="1174930625" id="rhn-source-package-41662" source-rpm="gnome-keyring-manager-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930625" id="rhn-source-package-41663" source-rpm="aspell-id-0.50.1-4.2.2.src.rpm"/><source-package last-modified="1174930626" id="rhn-source-package-41664" source-rpm="system-config-services-0.9.4-1.el5.src.rpm"/><source-package last-modified="1174930629" id="rhn-source-package-41665" source-rpm="control-center-2.16.0-14.el5.src.rpm"/><source-package last-modified="1174930630" id="rhn-source-package-41666" source-rpm="rng-utils-2.0-1.14.1.fc6.src.rpm"/><source-package last-modified="1174930631" id="rhn-source-package-41667" source-rpm="sg3_utils-1.20-2.1.src.rpm"/><source-package last-modified="1174930631" id="rhn-source-package-41668" source-rpm="nautilus-open-terminal-0.6-6.el5.src.rpm"/><source-package last-modified="1174930632" id="rhn-source-package-41669" source-rpm="SysVinit-2.86-14.src.rpm"/><source-package last-modified="1174930632" id="rhn-source-package-41670" source-rpm="system-config-rootpassword-1.1.9.1-1.src.rpm"/><source-package last-modified="1174930637" id="rhn-source-package-41671" source-rpm="exim-doc-4.63-2.el5.src.rpm"/><source-package last-modified="1174930637" id="rhn-source-package-41672" source-rpm="perl-XML-NamespaceSupport-1.09-1.2.1.src.rpm"/><source-package last-modified="1174930640" id="rhn-source-package-41673" source-rpm="setroubleshoot-1.8.11-4.el5.src.rpm"/><source-package last-modified="1174930641" id="rhn-source-package-41674" source-rpm="systemtap-0.5.12-1.el5.src.rpm"/><source-package last-modified="1174930642" id="rhn-source-package-41675" source-rpm="aspell-it-0.53-4.2.1.src.rpm"/><source-package last-modified="1174930643" id="rhn-source-package-41676" source-rpm="system-config-printer-0.7.32.5-1.el5.src.rpm"/><source-package last-modified="1174930643" id="rhn-source-package-41677" source-rpm="perl-XML-Grove-0.46alpha-29.1.1.src.rpm"/><source-package last-modified="1174930671" id="rhn-source-package-41678" source-rpm="fonts-chinese-3.02-9.6.el5.src.rpm"/><source-package last-modified="1174930677" id="rhn-source-package-41679" source-rpm="ImageMagick-6.2.8.0-3.el5.4.src.rpm"/><source-package last-modified="1174930678" id="rhn-source-package-41680" source-rpm="hfsutils-3.2.6-7.2.2.src.rpm"/><source-package last-modified="1174930681" id="rhn-source-package-41681" source-rpm="linuxwacom-0.7.4.3-2.el5.src.rpm"/><source-package last-modified="1174930681" id="rhn-source-package-41682" source-rpm="readahead-1.3-7.el5.src.rpm"/><source-package last-modified="1174930682" id="rhn-source-package-41683" source-rpm="mt-st-0.9b-2.2.2.src.rpm"/><source-package last-modified="1174930683" id="rhn-source-package-41684" source-rpm="scim-sinhala-0.2.0-2.fc6.src.rpm"/><source-package last-modified="1174930690" id="rhn-source-package-41685" source-rpm="nss_db-2.2-35.1.src.rpm"/><source-package last-modified="1174930691" id="rhn-source-package-41686" source-rpm="gnome-netstatus-2.12.0-5.el5.src.rpm"/><source-package last-modified="1174930692" id="rhn-source-package-41687" source-rpm="cpio-2.6-20.src.rpm"/><source-package last-modified="1174930694" id="rhn-source-package-41689" source-rpm="dogtail-0.6.1-2.el5.src.rpm"/><source-package last-modified="1174930694" id="rhn-source-package-41690" source-rpm="mkbootdisk-1.5.3-2.1.src.rpm"/><source-package last-modified="1174930696" id="rhn-source-package-41691" source-rpm="iproute-2.6.18-4.el5.src.rpm"/><source-package last-modified="1174930697" id="rhn-source-package-41692" source-rpm="xterm-215-4.el5.src.rpm"/><source-package last-modified="1174930699" id="rhn-source-package-41693" source-rpm="gftp-2.0.18-3.2.2.src.rpm"/><source-package last-modified="1174930700" id="rhn-source-package-41694" source-rpm="pump-0.8.24-1.2.2.1.src.rpm"/><source-package last-modified="1174930700" id="rhn-source-package-41695" source-rpm="rhdb-utils-8.1.1-1.2.2.src.rpm"/><source-package last-modified="1174930705" id="rhn-source-package-41696" source-rpm="anthy-7900-4.el5.src.rpm"/><source-package last-modified="1174930714" id="rhn-source-package-41698" source-rpm="compat-db-4.2.52-5.1.src.rpm"/><source-package last-modified="1174930715" id="rhn-source-package-41699" source-rpm="minicom-2.1-3.src.rpm"/><source-package last-modified="1174930715" id="rhn-source-package-41700" source-rpm="aspell-gl-0.50-4.2.2.src.rpm"/><source-package last-modified="1174930718" id="rhn-source-package-41701" source-rpm="gnome-terminal-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930719" id="rhn-source-package-41702" source-rpm="aspell-de-0.50-11.2.2.src.rpm"/><source-package last-modified="1174930719" id="rhn-source-package-41703" source-rpm="at-3.1.8-82.fc6.src.rpm"/><source-package last-modified="1174930721" id="rhn-source-package-41704" source-rpm="texinfo-4.8-14.el5.src.rpm"/><source-package last-modified="1174930723" id="rhn-source-package-41705" source-rpm="aspell-0.60.3-7.1.src.rpm"/><source-package last-modified="1174930727" id="rhn-source-package-41706" source-rpm="scim-hangul-0.2.2-7.fc6.src.rpm"/><source-package last-modified="1174930727" id="rhn-source-package-41707" source-rpm="python-ldap-2.2.0-2.1.src.rpm"/><source-package last-modified="1174930728" id="rhn-source-package-41708" source-rpm="ed-0.2-38.2.2.src.rpm"/><source-package last-modified="1174930731" id="rhn-source-package-41709" source-rpm="gnome-themes-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174930732" id="rhn-source-package-41710" source-rpm="gnome-session-2.16.0-6.el5.src.rpm"/><source-package last-modified="1174930733" id="rhn-source-package-41711" source-rpm="scim-chewing-0.3.1-10.el5.src.rpm"/><source-package last-modified="1174930734" id="rhn-source-package-41712" source-rpm="man-pages-it-0.3.0-17.1.src.rpm"/><source-package last-modified="1174930747" id="rhn-source-package-41713" source-rpm="gimp-2.2.13-1.fc6.src.rpm"/><source-package last-modified="1174930748" id="rhn-source-package-41714" source-rpm="vixie-cron-4.1-66.1.el5.src.rpm"/><source-package last-modified="1174930748" id="rhn-source-package-41715" source-rpm="quota-3.13-1.2.3.2.el5.src.rpm"/><source-package last-modified="1174930750" id="rhn-source-package-41716" source-rpm="gnome-bluetooth-0.7.0-10.2.el5.src.rpm"/><source-package last-modified="1174930750" id="rhn-source-package-41717" source-rpm="xinetd-2.3.14-10.el5.src.rpm"/><source-package last-modified="1174930751" id="rhn-source-package-41718" source-rpm="tcp_wrappers-7.6-40.2.1.src.rpm"/><source-package last-modified="1174930752" id="rhn-source-package-41719" source-rpm="microcode_ctl-1.15-1.40.el5.src.rpm"/><source-package last-modified="1174930758" id="rhn-source-package-41720" source-rpm="openmotif-2.3.0-0.3.el5.src.rpm"/><source-package last-modified="1174930759" id="rhn-source-package-41721" source-rpm="tsclient-0.148-6.el5.src.rpm"/><source-package last-modified="1174930759" id="rhn-source-package-41722" source-rpm="rdesktop-1.4.1-4.src.rpm"/><source-package last-modified="1174930760" id="rhn-source-package-41723" source-rpm="mkinitrd-5.1.19.6-1.src.rpm"/><source-package last-modified="1174930761" id="rhn-source-package-41724" source-rpm="pm-utils-0.19-3.src.rpm"/><source-package last-modified="1174930791" id="rhn-source-package-41725" source-rpm="esc-1.0.0-20.el5.src.rpm"/><source-package last-modified="1174930793" id="rhn-source-package-41726" source-rpm="joe-3.4-3.src.rpm"/><source-package last-modified="1174930795" id="rhn-source-package-41727" source-rpm="totem-2.16.4-2.el5.src.rpm"/><source-package last-modified="1174930796" id="rhn-source-package-41728" source-rpm="irda-utils-0.9.17-2.fc6.src.rpm"/><source-package last-modified="1174930798" id="rhn-source-package-41729" source-rpm="setools-3.0-3.el5.src.rpm"/><source-package last-modified="1174930801" id="rhn-source-package-41730" source-rpm="termcap-5.5-1.20060701.1.src.rpm"/><source-package last-modified="1174930807" id="rhn-source-package-41731" source-rpm="cachefilesd-0.7-6.el5.src.rpm"/><source-package last-modified="1174930817" id="rhn-source-package-41732" source-rpm="nfs-utils-1.0.9-16.el5.src.rpm"/><source-package last-modified="1174930817" id="rhn-source-package-41733" source-rpm="pam_passwdqc-1.0.2-1.2.2.src.rpm"/><source-package last-modified="1174930859" id="rhn-source-package-41735" source-rpm="aspell-el-0.50-4.2.2.src.rpm"/><source-package last-modified="1174930862" id="rhn-source-package-41736" source-rpm="xcdroast-0.98a15-12.2.2.src.rpm"/><source-package last-modified="1174930864" id="rhn-source-package-41737" source-rpm="prelink-0.3.9-2.src.rpm"/><source-package last-modified="1174930865" id="rhn-source-package-41738" source-rpm="distcache-1.4.5-14.1.src.rpm"/><source-package last-modified="1174930866" id="rhn-source-package-41739" source-rpm="avahi-0.6.16-1.el5.src.rpm"/><source-package last-modified="1174930868" id="rhn-source-package-41740" source-rpm="gnome-backgrounds-2.15.92-1.fc6.src.rpm"/><source-package last-modified="1174930869" id="rhn-source-package-41741" source-rpm="aspell-en-6.0-2.1.src.rpm"/><source-package last-modified="1174930869" id="rhn-source-package-41742" source-rpm="xorg-x11-drivers-7.1-4.1.el5.src.rpm"/><source-package last-modified="1174930871" id="rhn-source-package-41743" source-rpm="aspell-cs-0.51-3.2.2.src.rpm"/><source-package last-modified="1174930873" id="rhn-source-package-41744" source-rpm="gnome-power-manager-2.16.0-7.el5.src.rpm"/><source-package last-modified="1174930880" id="rhn-source-package-41745" source-rpm="vnc-4.1.2-9.el5.src.rpm"/><source-package last-modified="1174930881" id="rhn-source-package-41746" source-rpm="aspell-bg-0.50-11.2.2.src.rpm"/><source-package last-modified="1174930884" id="rhn-source-package-41747" source-rpm="dejavu-lgc-fonts-2.10-1.src.rpm"/><source-package last-modified="1174930885" id="rhn-source-package-41748" source-rpm="dump-0.4b41-2.fc6.src.rpm"/><source-package last-modified="1174930887" id="rhn-source-package-41749" source-rpm="hal-0.5.8.1-19.el5.src.rpm"/><source-package last-modified="1174930905" id="rhn-source-package-41750" source-rpm="mysql-5.0.22-2.1.src.rpm"/><source-package last-modified="1174930930" id="rhn-source-package-41751" source-rpm="kdebase-3.5.4-13.5.el5.src.rpm"/><source-package last-modified="1174930933" id="rhn-source-package-41752" source-rpm="oprofile-0.9.2-6.el5.src.rpm"/><source-package last-modified="1174930935" id="rhn-source-package-41753" source-rpm="spamassassin-3.1.7-4.el5.src.rpm"/><source-package last-modified="1174930949" id="rhn-source-package-41754" source-rpm="redhat-logos-4.9.16-1.src.rpm"/><source-package last-modified="1174930950" id="rhn-source-package-41755" source-rpm="kbd-1.12-19.el5.src.rpm"/><source-package last-modified="1174930952" id="rhn-source-package-41756" source-rpm="parted-1.8.1-4.el5.src.rpm"/><source-package last-modified="1174930952" id="rhn-source-package-41757" source-rpm="sysklogd-1.4.1-39.2.src.rpm"/><source-package last-modified="1174930954" id="rhn-source-package-41758" source-rpm="unzip-5.52-2.2.1.src.rpm"/><source-package last-modified="1174930955" id="rhn-source-package-41759" source-rpm="scim-anthy-1.2.0-5.el5.src.rpm"/><source-package last-modified="1174930955" id="rhn-source-package-41760" source-rpm="perl-Convert-ASN1-0.20-1.1.src.rpm"/><source-package last-modified="1174930957" id="rhn-source-package-41761" source-rpm="synaptics-0.14.4-8.fc6.src.rpm"/><source-package last-modified="1174930957" id="rhn-source-package-41762" source-rpm="authd-1.4.3-9.src.rpm"/><source-package last-modified="1174930958" id="rhn-source-package-41763" source-rpm="aspell-da-0.50-12.2.2.src.rpm"/><source-package last-modified="1174930959" id="rhn-source-package-41764" source-rpm="file-4.17-8.src.rpm"/><source-package last-modified="1174930960" id="rhn-source-package-41765" source-rpm="aspell-no-0.50.1-9.2.2.src.rpm"/><source-package last-modified="1174930964" id="rhn-source-package-41766" source-rpm="cups-1.2.4-11.5.el5.src.rpm"/><source-package last-modified="1174930964" id="rhn-source-package-41767" source-rpm="rp-pppoe-3.5-32.1.src.rpm"/><source-package last-modified="1174930966" id="rhn-source-package-41768" source-rpm="brltty-3.7.2-1.fc6.src.rpm"/><source-package last-modified="1174930967" id="rhn-source-package-41769" source-rpm="sane-frontends-1.0.14-1.2.2.src.rpm"/><source-package last-modified="1174930969" id="rhn-source-package-41770" source-rpm="scim-m17n-0.2.0-6.fc6.src.rpm"/><source-package last-modified="1174930970" id="rhn-source-package-41771" source-rpm="sudo-1.6.8p12-10.src.rpm"/><source-package last-modified="1174930981" id="rhn-source-package-41772" source-rpm="rpm-4.4.2-37.el5.src.rpm"/><source-package last-modified="1174930982" id="rhn-source-package-41773" source-rpm="passwd-0.73-1.src.rpm"/><source-package last-modified="1174930983" id="rhn-source-package-41774" source-rpm="keyutils-1.2-1.el5.src.rpm"/><source-package last-modified="1174930984" id="rhn-source-package-41775" source-rpm="scim-chinese-standard-0.0.2-1.el5.src.rpm"/><source-package last-modified="1174930985" id="rhn-source-package-41776" source-rpm="libgtk-java-2.8.7-3.el5.src.rpm"/><source-package last-modified="1174930985" id="rhn-source-package-41777" source-rpm="finger-0.17-32.2.1.1.src.rpm"/><source-package last-modified="1174930994" id="rhn-source-package-41778" source-rpm="kdeaccessibility-3.5.4-1.fc6.src.rpm"/><source-package last-modified="1174930996" id="rhn-source-package-41779" source-rpm="sound-juicer-2.16.0-3.el5.src.rpm"/><source-package last-modified="1174930997" id="rhn-source-package-41780" source-rpm="stunnel-4.15-2.src.rpm"/><source-package last-modified="1174930997" id="rhn-source-package-41781" source-rpm="dvd+rw-tools-7.0-0.el5.3.src.rpm"/><source-package last-modified="1174931000" id="rhn-source-package-41782" source-rpm="lynx-2.8.5-28.1.src.rpm"/><source-package last-modified="1174931001" id="rhn-source-package-41783" source-rpm="man-pages-ko-1.48-15.1.1.src.rpm"/><source-package last-modified="1174931001" id="rhn-source-package-41784" source-rpm="cpuspeed-1.2.1-1.45.el5.src.rpm"/><source-package last-modified="1174931002" id="rhn-source-package-41785" source-rpm="alacarte-0.10.0-1.fc6.src.rpm"/><source-package last-modified="1174931003" id="rhn-source-package-41786" source-rpm="m2crypto-0.16-6.el5.1.src.rpm"/><source-package last-modified="1174931004" id="rhn-source-package-41787" source-rpm="aspell-af-0.50-4.2.2.src.rpm"/><source-package last-modified="1174931004" id="rhn-source-package-41788" source-rpm="aspell-gd-0.50-4.2.2.src.rpm"/><source-package last-modified="1174931005" id="rhn-source-package-41789" source-rpm="vino-2.13.5-6.el5.src.rpm"/><source-package last-modified="1174931006" id="rhn-source-package-41790" source-rpm="acpid-1.0.4-5.src.rpm"/><source-package last-modified="1174931007" id="rhn-source-package-41791" source-rpm="zip-2.31-1.2.2.src.rpm"/><source-package last-modified="1174931008" id="rhn-source-package-41792" source-rpm="lsof-4.78-3.src.rpm"/><source-package last-modified="1174931009" id="rhn-source-package-41793" source-rpm="pirut-1.2.10-1.el5.src.rpm"/><source-package last-modified="1174931009" id="rhn-source-package-41794" source-rpm="cdparanoia-alpha9.8-27.2.src.rpm"/><source-package last-modified="1174931011" id="rhn-source-package-41795" source-rpm="wireless-tools-28-2.el5.src.rpm"/><source-package last-modified="1174931012" id="rhn-source-package-41796" source-rpm="ipsec-tools-0.6.5-6.src.rpm"/><source-package last-modified="1174931016" id="rhn-source-package-41798" source-rpm="gnupg-1.4.5-12.src.rpm"/><source-package last-modified="1174931017" id="rhn-source-package-41799" source-rpm="stardict-2.4.5-5.src.rpm"/><source-package last-modified="1174931019" id="rhn-source-package-41800" source-rpm="coolkey-1.0.1-16.el5.src.rpm"/><source-package last-modified="1174931019" id="rhn-source-package-41801" source-rpm="filesystem-2.4.0-1.src.rpm"/><source-package last-modified="1174931021" id="rhn-source-package-41802" source-rpm="fonts-hebrew-0.100-4.1.1.src.rpm"/><source-package last-modified="1174931021" id="rhn-source-package-41803" source-rpm="xhtml1-dtds-1.0-7.1.1.src.rpm"/><source-package last-modified="1174931023" id="rhn-source-package-41804" source-rpm="x3270-3.3.4p7-3.el5.1.src.rpm"/><source-package last-modified="1174931025" id="rhn-source-package-41805" source-rpm="orca-1.0.0-5.el5.src.rpm"/><source-package last-modified="1174931026" id="rhn-source-package-41806" source-rpm="selinux-policy-2.4.6-30.el5.src.rpm"/><source-package last-modified="1174931026" id="rhn-source-package-41807" source-rpm="fonts-sinhala-0.2.2-1.src.rpm"/><source-package last-modified="1174931028" id="rhn-source-package-41809" source-rpm="nss_ldap-253-3.src.rpm"/><source-package last-modified="1174931028" id="rhn-source-package-41810" source-rpm="bridge-utils-1.1-2.src.rpm"/><source-package last-modified="1174931029" id="rhn-source-package-41811" source-rpm="oddjob-0.27-7.src.rpm"/><source-package last-modified="1174931030" id="rhn-source-package-41812" source-rpm="bug-buddy-2.16.0-2.el5.src.rpm"/><source-package last-modified="1174931031" id="rhn-source-package-41813" source-rpm="vconfig-1.9-2.1.src.rpm"/><source-package last-modified="1174931031" id="rhn-source-package-41814" source-rpm="system-config-samba-1.2.39-1.el5.src.rpm"/><source-package last-modified="1174931032" id="rhn-source-package-41815" source-rpm="xrestop-0.2-6.2.2.src.rpm"/><source-package last-modified="1174931032" id="rhn-source-package-41816" source-rpm="symlinks-1.2-24.2.2.src.rpm"/><source-package last-modified="1174931033" id="rhn-source-package-41817" source-rpm="system-config-boot-0.2.13-1.el5.src.rpm"/><source-package last-modified="1174931033" id="rhn-source-package-41818" source-rpm="aspell-br-0.50-4.2.2.src.rpm"/><source-package last-modified="1174931034" id="rhn-source-package-41819" source-rpm="gnome-volume-manager-2.15.0-4.el5.src.rpm"/><source-package last-modified="1174931035" id="rhn-source-package-41820" source-rpm="libgconf-java-2.12.4-6.el5.src.rpm"/><source-package last-modified="1174931038" id="rhn-source-package-41821" source-rpm="gnome-media-2.16.1-3.el5.src.rpm"/><source-package last-modified="1174931041" id="rhn-source-package-41822" source-rpm="am-utils-6.1.5-4.1.el5.src.rpm"/><source-package last-modified="1174931046" id="rhn-source-package-41823" source-rpm="gimp-data-extras-2.0.1-1.1.1.src.rpm"/><source-package last-modified="1174931046" id="rhn-source-package-41824" source-rpm="perl-DateManip-5.44-1.2.1.src.rpm"/><source-package last-modified="1174931050" id="rhn-source-package-41825" source-rpm="man-pages-ja-20060815-2.src.rpm"/><source-package last-modified="1174931052" id="rhn-source-package-41826" source-rpm="xorg-x11-apps-7.1-4.el5.src.rpm"/><source-package last-modified="1174931053" id="rhn-source-package-41828" source-rpm="setarch-2.0-1.1.src.rpm"/><source-package last-modified="1174931066" id="rhn-source-package-41829" source-rpm="binutils-2.17.50.0.6-2.el5.src.rpm"/><source-package last-modified="1174931066" id="rhn-source-package-41830" source-rpm="iptstate-1.4-1.1.2.2.src.rpm"/><source-package last-modified="1174931072" id="rhn-source-package-41831" source-rpm="dasher-4.2.0-2.el5.src.rpm"/><source-package last-modified="1174931075" id="rhn-source-package-41832" source-rpm="gnome-screensaver-2.16.1-5.el5.src.rpm"/><source-package last-modified="1174931076" id="rhn-source-package-41833" source-rpm="enscript-1.6.4-4.fc6.src.rpm"/><source-package last-modified="1174931079" id="rhn-source-package-41834" source-rpm="flex-2.5.4a-41.fc6.src.rpm"/><source-package last-modified="1174931079" id="rhn-source-package-41835" source-rpm="crontabs-1.10-8.src.rpm"/><source-package last-modified="1174931080" id="rhn-source-package-41836" source-rpm="lslk-1.29-17.src.rpm"/><source-package last-modified="1174931080" id="rhn-source-package-41837" source-rpm="eruby-1.0.5-6.1.src.rpm"/><source-package last-modified="1174931083" id="rhn-source-package-41838" source-rpm="a2ps-4.13b-57.1.el5.src.rpm"/><source-package last-modified="1174931084" id="rhn-source-package-41839" source-rpm="redhat-rpm-config-8.0.45-17.el5.src.rpm"/><source-package last-modified="1174931084" id="rhn-source-package-41840" source-rpm="logwatch-7.3-5.src.rpm"/><source-package last-modified="1174931085" id="rhn-source-package-41841" source-rpm="lv-4.51-8.1.src.rpm"/><source-package last-modified="1174931087" id="rhn-source-package-41842" source-rpm="xorg-x11-utils-7.1-2.fc6.src.rpm"/><source-package last-modified="1174931087" id="rhn-source-package-41843" source-rpm="joystick-1.2.15-20.2.2.src.rpm"/><source-package last-modified="1174931088" id="rhn-source-package-41844" source-rpm="libglade-java-2.12.5-3.fc6.src.rpm"/><source-package last-modified="1174931095" id="rhn-source-package-41845" source-rpm="gnome-applets-2.16.0.1-19.el5.src.rpm"/><source-package last-modified="1174931096" id="rhn-source-package-41846" source-rpm="iptraf-3.0.0-5.el5.src.rpm"/><source-package last-modified="1174931098" id="rhn-source-package-41847" source-rpm="emacspeak-23.0-2.1.src.rpm"/><source-package last-modified="1174931099" id="rhn-source-package-41848" source-rpm="aspell-cy-0.50-4.2.2.src.rpm"/><source-package last-modified="1174931099" id="rhn-source-package-41849" source-rpm="units-1.85-1.2.2.src.rpm"/><source-package last-modified="1174931101" id="rhn-source-package-41850" source-rpm="strace-4.5.15-1.el5.src.rpm"/><source-package last-modified="1174931107" id="rhn-source-package-41851" source-rpm="cadaver-0.22.3-4.el5.src.rpm"/><source-package last-modified="1174931109" id="rhn-source-package-41852" source-rpm="xchat-2.6.6-8.el5.src.rpm"/><source-package last-modified="1174931111" id="rhn-source-package-41853" source-rpm="xmlsec1-1.2.9-8.1.src.rpm"/><source-package last-modified="1174931111" id="rhn-source-package-41854" source-rpm="traceroute-2.0.1-2.el5.src.rpm"/><source-package last-modified="1174931115" id="rhn-source-package-41855" source-rpm="man-pages-pl-0.24-2.1.src.rpm"/><source-package last-modified="1174931117" id="rhn-source-package-41856" source-rpm="exim-4.63-3.el5.src.rpm"/><source-package last-modified="1174931159" id="rhn-source-package-41859" source-rpm="xen-3.0.3-25.el5.src.rpm"/><source-package last-modified="1174931169" id="rhn-source-package-41863" source-rpm="ant-1.6.5-2jpp.2.src.rpm"/><source-package last-modified="1174931170" id="rhn-source-package-41864" source-rpm="ctags-5.6-1.1.src.rpm"/><source-package last-modified="1174931172" id="rhn-source-package-41865" source-rpm="libchewing-0.3.0-7.el5.src.rpm"/><source-package last-modified="1174931174" id="rhn-source-package-41866" source-rpm="xml-commons-1.3.02-0.b2.7jpp.10.src.rpm"/><source-package last-modified="1174931175" id="rhn-source-package-41867" source-rpm="javacc-4.0-3jpp.3.src.rpm"/><source-package last-modified="1174931176" id="rhn-source-package-41868" source-rpm="junit-3.8.2-3jpp.1.src.rpm"/><source-package last-modified="1174931189" id="rhn-source-package-41869" source-rpm="boost-1.33.1-10.el5.src.rpm"/><source-package last-modified="1174931191" id="rhn-source-package-41870" source-rpm="bison-2.3-2.1.src.rpm"/><source-package last-modified="1174931193" id="rhn-source-package-41871" source-rpm="libwvstreams-4.2.2-2.1.src.rpm"/><source-package last-modified="1174931199" id="rhn-source-package-41872" source-rpm="tomcat5-5.5.17-8jpp.2.src.rpm"/><source-package last-modified="1174931204" id="rhn-source-package-41873" source-rpm="xalan-j2-2.7.0-6jpp.1.src.rpm"/><source-package last-modified="1174931206" id="rhn-source-package-41874" source-rpm="castor-0.9.5-1jpp.7.src.rpm"/><source-package last-modified="1174931208" id="rhn-source-package-41875" source-rpm="libgnomeui-2.16.0-5.el5.src.rpm"/><source-package last-modified="1174931209" id="rhn-source-package-41876" source-rpm="velocity-1.4-6jpp.1.src.rpm"/><source-package last-modified="1174931211" id="rhn-source-package-41877" source-rpm="m17n-lib-1.3.3-1.1.fc6.src.rpm"/><source-package last-modified="1174931212" id="rhn-source-package-41878" source-rpm="libdv-0.104-4.fc6.1.src.rpm"/><source-package last-modified="1174931220" id="rhn-source-package-41879" source-rpm="lam-7.1.2-8.fc6.src.rpm"/><source-package last-modified="1174931233" id="rhn-source-package-41880" source-rpm="openib-1.1-5.el5.src.rpm"/><source-package last-modified="1174931234" id="rhn-source-package-41881" source-rpm="gtkspell-2.0.11-2.1.src.rpm"/><source-package last-modified="1174931238" id="rhn-source-package-41882" source-rpm="tk-8.4.13-3.fc6.src.rpm"/><source-package last-modified="1174931241" id="rhn-source-package-41883" source-rpm="ncurses-5.5-24.20060715.src.rpm"/><source-package last-modified="1174931244" id="rhn-source-package-41884" source-rpm="splint-3.1.1-16.el5.src.rpm"/><source-package last-modified="1174931245" id="rhn-source-package-41885" source-rpm="Xaw3d-1.5E-10.1.src.rpm"/><source-package last-modified="1174931246" id="rhn-source-package-41886" source-rpm="libmusicbrainz-2.1.1-4.1.src.rpm"/><source-package last-modified="1174931272" id="rhn-source-package-41887" source-rpm="emacs-21.4-17.src.rpm"/><source-package last-modified="1174931274" id="rhn-source-package-41888" source-rpm="libexif-0.6.13-4.el5.src.rpm"/><source-package last-modified="1174931276" id="rhn-source-package-41889" source-rpm="libtheora-1.0alpha7-1.src.rpm"/><source-package last-modified="1174931277" id="rhn-source-package-41890" source-rpm="libXtst-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931278" id="rhn-source-package-41891" source-rpm="audiofile-0.2.6-5.src.rpm"/><source-package last-modified="1174931279" id="rhn-source-package-41892" source-rpm="imake-1.0.2-3.src.rpm"/><source-package last-modified="1174931281" id="rhn-source-package-41893" source-rpm="avalon-logkit-1.2-4jpp.3.src.rpm"/><source-package last-modified="1174931282" id="rhn-source-package-41894" source-rpm="xorg-x11-drv-via-0.2.1-9.src.rpm"/><source-package last-modified="1174931283" id="rhn-source-package-41895" source-rpm="mx4j-3.0.1-6jpp.4.src.rpm"/><source-package last-modified="1174931287" id="rhn-source-package-41896" source-rpm="lm_sensors-2.10.0-3.1.src.rpm"/><source-package last-modified="1174931296" id="rhn-source-package-41897" source-rpm="php-5.1.6-5.el5.src.rpm"/><source-package last-modified="1174931305" id="rhn-source-package-41898" source-rpm="iso-codes-0.53-1.src.rpm"/><source-package last-modified="1174931305" id="rhn-source-package-41899" source-rpm="libiec61883-1.0.0-11.fc6.src.rpm"/><source-package last-modified="1174931307" id="rhn-source-package-41900" source-rpm="cman-2.0.60-1.el5.src.rpm"/><source-package last-modified="1174931307" id="rhn-source-package-41901" source-rpm="jakarta-commons-pool-1.3-5jpp.1.src.rpm"/><source-package last-modified="1174931314" id="rhn-source-package-41902" source-rpm="subversion-1.4.2-2.el5.src.rpm"/><source-package last-modified="1174931393" id="rhn-source-package-41903" source-rpm="eclipse-3.2.1-18.el5.src.rpm"/><source-package last-modified="1174931396" id="rhn-source-package-41904" source-rpm="jlex-1.2.6-5jpp.1.src.rpm"/><source-package last-modified="1174931398" id="rhn-source-package-41905" source-rpm="jakarta-commons-lang-2.1-5jpp.1.src.rpm"/><source-package last-modified="1174931399" id="rhn-source-package-41906" source-rpm="indent-2.2.9-14.fc6.src.rpm"/><source-package last-modified="1174931399" id="rhn-source-package-41907" source-rpm="byacc-1.9-29.2.2.src.rpm"/><source-package last-modified="1174931400" id="rhn-source-package-41908" source-rpm="libcroco-0.6.1-2.1.src.rpm"/><source-package last-modified="1174931401" id="rhn-source-package-41909" source-rpm="libXi-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931407" id="rhn-source-package-41910" source-rpm="lapack-3.0-37.el5.src.rpm"/><source-package last-modified="1174931415" id="rhn-source-package-41911" source-rpm="freeradius-1.1.3-1.1.el5.src.rpm"/><source-package last-modified="1174931416" id="rhn-source-package-41912" source-rpm="classpathx-mail-1.1.1-4jpp.2.src.rpm"/><source-package last-modified="1174931438" id="rhn-source-package-41913" source-rpm="python-docs-2.4.3-1.1.src.rpm"/><source-package last-modified="1174931445" id="rhn-source-package-41914" source-rpm="libXft-2.1.10-1.1.src.rpm"/><source-package last-modified="1174931450" id="rhn-source-package-41915" source-rpm="kdesdk-3.5.4-3.el5.src.rpm"/><source-package last-modified="1174931461" id="rhn-source-package-41916" source-rpm="jakarta-commons-collections-3.1-6jpp.1.src.rpm"/><source-package last-modified="1174931468" id="rhn-source-package-41917" source-rpm="pam-0.99.6.2-3.14.el5.src.rpm"/><source-package last-modified="1174931469" id="rhn-source-package-41918" source-rpm="radvd-0.9.1-4.src.rpm"/><source-package last-modified="1174931471" id="rhn-source-package-41919" source-rpm="libidn-0.6.5-1.1.src.rpm"/><source-package last-modified="1174931474" id="rhn-source-package-41920" source-rpm="libxslt-1.1.17-2.src.rpm"/><source-package last-modified="1174931475" id="rhn-source-package-41921" source-rpm="libdhcp-1.17-1.el5.src.rpm"/><source-package last-modified="1174931479" id="rhn-source-package-41922" source-rpm="axis-1.2.1-2jpp.6.src.rpm"/><source-package last-modified="1174931480" id="rhn-source-package-41923" source-rpm="jakarta-commons-logging-1.0.4-6jpp.1.src.rpm"/><source-package last-modified="1174931488" id="rhn-source-package-41924" source-rpm="python-2.4.3-19.el5.src.rpm"/><source-package last-modified="1174931490" id="rhn-source-package-41925" source-rpm="xdoclet-1.2.3-7jpp.2.src.rpm"/><source-package last-modified="1174931494" id="rhn-source-package-41926" source-rpm="libSM-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931494" id="rhn-source-package-41927" source-rpm="jakarta-commons-el-1.0-7jpp.1.src.rpm"/><source-package last-modified="1174931495" id="rhn-source-package-41928" source-rpm="libraw1394-1.2.1-1.fc6.src.rpm"/><source-package last-modified="1174931499" id="rhn-source-package-41929" source-rpm="mod_perl-2.0.2-6.1.src.rpm"/><source-package last-modified="1174931502" id="rhn-source-package-41930" source-rpm="squid-2.6.STABLE6-3.el5.src.rpm"/><source-package last-modified="1174931505" id="rhn-source-package-41931" source-rpm="xerces-j2-2.7.1-7jpp.2.src.rpm"/><source-package last-modified="1174931507" id="rhn-source-package-41932" source-rpm="nasm-0.98.39-3.2.2.src.rpm"/><source-package last-modified="1174931512" id="rhn-source-package-41933" source-rpm="valgrind-3.2.1-6.el5.src.rpm"/><source-package last-modified="1174931517" id="rhn-source-package-41934" source-rpm="gphoto2-2.2.0-3.el5.src.rpm"/><source-package last-modified="1174931519" id="rhn-source-package-41935" source-rpm="gnome-desktop-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174931520" id="rhn-source-package-41936" source-rpm="libICE-1.0.1-2.1.src.rpm"/><source-package last-modified="1174931521" id="rhn-source-package-41937" source-rpm="zlib-1.2.3-3.src.rpm"/><source-package last-modified="1174931523" id="rhn-source-package-41938" source-rpm="libwmf-0.2.8.4-10.1.src.rpm"/><source-package last-modified="1174931524" id="rhn-source-package-41939" source-rpm="jsch-0.1.28-1jpp.5.src.rpm"/><source-package last-modified="1174931526" id="rhn-source-package-41940" source-rpm="pvm-3.4.5-7.fc6.1.src.rpm"/><source-package last-modified="1174931529" id="rhn-source-package-41941" source-rpm="ORBit2-2.14.3-4.el5.src.rpm"/><source-package last-modified="1174931529" id="rhn-source-package-41942" source-rpm="hardlink-1.0-1.26.src.rpm"/><source-package last-modified="1174931530" id="rhn-source-package-41943" source-rpm="avalon-framework-4.1.4-2jpp.13.src.rpm"/><source-package last-modified="1174931530" id="rhn-source-package-41944" source-rpm="libXext-1.0.1-2.1.src.rpm"/><source-package last-modified="1174931531" id="rhn-source-package-41945" source-rpm="device-mapper-multipath-0.4.7-8.el5.src.rpm"/><source-package last-modified="1174931532" id="rhn-source-package-41946" source-rpm="xml-commons-resolver-1.1-1jpp.12.src.rpm"/><source-package last-modified="1174931533" id="rhn-source-package-41947" source-rpm="libgsf-1.14.1-6.1.src.rpm"/><source-package last-modified="1174931533" id="rhn-source-package-41948" source-rpm="gob2-2.0.14-1.1.src.rpm"/><source-package last-modified="1174931536" id="rhn-source-package-41949" source-rpm="cyrus-imapd-2.3.7-1.1.el5.src.rpm"/><source-package last-modified="1174931537" id="rhn-source-package-41950" source-rpm="mtr-0.71-3.1.src.rpm"/><source-package last-modified="1174931538" id="rhn-source-package-41951" source-rpm="gdk-pixbuf-0.22.0-25.el5.src.rpm"/><source-package last-modified="1174931540" id="rhn-source-package-41952" source-rpm="expat-1.95.8-8.2.1.src.rpm"/><source-package last-modified="1174931543" id="rhn-source-package-41953" source-rpm="antlr-2.7.6-4jpp.2.src.rpm"/><source-package last-modified="1174931544" id="rhn-source-package-41954" source-rpm="jakarta-commons-modeler-1.1-8jpp.1.src.rpm"/><source-package last-modified="1174931544" id="rhn-source-package-41955" source-rpm="ElectricFence-2.2.2-20.2.2.src.rpm"/><source-package last-modified="1174931546" id="rhn-source-package-41956" source-rpm="sqlite-3.3.6-2.src.rpm"/><source-package last-modified="1174931547" id="rhn-source-package-41957" source-rpm="jakarta-oro-2.0.8-3jpp.1.src.rpm"/><source-package last-modified="1174931549" id="rhn-source-package-41958" source-rpm="scim-1.4.4-39.el5.src.rpm"/><source-package last-modified="1174931566" id="rhn-source-package-41961" source-rpm="giflib-4.1.3-7.1.el5.1.src.rpm"/><source-package last-modified="1174931568" id="rhn-source-package-41962" source-rpm="fontconfig-2.4.1-6.el5.src.rpm"/><source-package last-modified="1174931570" id="rhn-source-package-41963" source-rpm="GConf2-2.14.0-9.el5.src.rpm"/><source-package last-modified="1174931572" id="rhn-source-package-41964" source-rpm="libgnome-2.16.0-6.el5.src.rpm"/><source-package last-modified="1174931582" id="rhn-source-package-41965" source-rpm="system-config-bind-4.0.3-2.el5.src.rpm"/><source-package last-modified="1174931583" id="rhn-source-package-41966" source-rpm="speex-1.0.5-4.src.rpm"/><source-package last-modified="1174931585" id="rhn-source-package-41967" source-rpm="elfutils-0.125-3.el5.src.rpm"/><source-package last-modified="1174931585" id="rhn-source-package-41968" source-rpm="libXvMC-1.0.2-2.1.src.rpm"/><source-package last-modified="1174931589" id="rhn-source-package-41969" source-rpm="ksh-20060214-1.4.src.rpm"/><source-package last-modified="1174931594" id="rhn-source-package-41970" source-rpm="poppler-0.5.4-4.el5.src.rpm"/><source-package last-modified="1174931594" id="rhn-source-package-41971" source-rpm="jakarta-commons-digester-1.7-5jpp.1.src.rpm"/><source-package last-modified="1174931596" id="rhn-source-package-41972" source-rpm="apr-1.2.7-11.src.rpm"/><source-package last-modified="1174931599" id="rhn-source-package-41973" source-rpm="openmpi-1.1.1-5.el5.src.rpm"/><source-package last-modified="1174931600" id="rhn-source-package-41974" source-rpm="libXrandr-1.1.1-3.1.src.rpm"/><source-package last-modified="1174931601" id="rhn-source-package-41975" source-rpm="libgssapi-0.10-2.src.rpm"/><source-package last-modified="1174931603" id="rhn-source-package-41976" source-rpm="jakarta-commons-httpclient-3.0-7jpp.1.src.rpm"/><source-package last-modified="1174931604" id="rhn-source-package-41977" source-rpm="gnome-keyring-0.6.0-1.fc6.src.rpm"/><source-package last-modified="1174931605" id="rhn-source-package-41978" source-rpm="jakarta-taglibs-standard-1.1.1-7jpp.1.src.rpm"/><source-package last-modified="1174931610" id="rhn-source-package-41979" source-rpm="log4j-1.2.13-3jpp.2.src.rpm"/><source-package last-modified="1174931611" id="rhn-source-package-41980" source-rpm="PyQt-3.16-4.src.rpm"/><source-package last-modified="1174931612" id="rhn-source-package-41981" source-rpm="lockdev-1.0.1-10.src.rpm"/><source-package last-modified="1174931612" id="rhn-source-package-41982" source-rpm="xjavadoc-1.1-4jpp.1.src.rpm"/><source-package last-modified="1174931613" id="rhn-source-package-41983" source-rpm="libdrm-2.0.2-1.1.src.rpm"/><source-package last-modified="1174931614" id="rhn-source-package-41984" source-rpm="libXmu-1.0.2-5.src.rpm"/><source-package last-modified="1174931616" id="rhn-source-package-41985" source-rpm="libgtop2-2.14.4-3.el5.src.rpm"/><source-package last-modified="1174931616" id="rhn-source-package-41986" source-rpm="xferstats-2.16-14.1.src.rpm"/><source-package last-modified="1174931617" id="rhn-source-package-41987" source-rpm="libIDL-0.8.7-1.fc6.src.rpm"/><source-package last-modified="1174931632" id="rhn-source-package-41988" source-rpm="kdelibs-3.5.4-11.el5.src.rpm"/><source-package last-modified="1174931634" id="rhn-source-package-41989" source-rpm="libbonobo-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174931636" id="rhn-source-package-41990" source-rpm="pygtk2-2.10.1-8.el5.src.rpm"/><source-package last-modified="1174931639" id="rhn-source-package-41991" source-rpm="sip-4.4.5-3.src.rpm"/><source-package last-modified="1174931640" id="rhn-source-package-41992" source-rpm="esound-0.2.36-3.src.rpm"/><source-package last-modified="1174931653" id="rhn-source-package-41995" source-rpm="icu-3.6-5.9.src.rpm"/><source-package last-modified="1174931654" id="rhn-source-package-41996" source-rpm="gd-2.0.33-9.3.fc6.src.rpm"/><source-package last-modified="1174931655" id="rhn-source-package-41997" source-rpm="tclx-8.4.0-5.fc6.src.rpm"/><source-package last-modified="1174931656" id="rhn-source-package-41998" source-rpm="cairo-java-1.0.5-3.fc6.src.rpm"/><source-package last-modified="1174931657" id="rhn-source-package-41999" source-rpm="mgetty-1.1.33-9.fc6.src.rpm"/><source-package last-modified="1174931658" id="rhn-source-package-42000" source-rpm="tux-3.2.18-9.fc6.src.rpm"/><source-package last-modified="1174931661" id="rhn-source-package-42001" source-rpm="bcel-5.1-8jpp.1.src.rpm"/><source-package last-modified="1174931662" id="rhn-source-package-42002" source-rpm="gnome-menus-2.16.0-2.fc6.src.rpm"/><source-package last-modified="1174931663" id="rhn-source-package-42003" source-rpm="jakarta-commons-daemon-1.0.1-6jpp.1.src.rpm"/><source-package last-modified="1174931664" id="rhn-source-package-42004" source-rpm="libXaw-1.0.2-8.1.src.rpm"/><source-package last-modified="1174931702" id="rhn-source-package-42023" source-rpm="pycairo-1.2.0-1.1.src.rpm"/><source-package last-modified="1174931703" id="rhn-source-package-42024" source-rpm="libbtctl-0.6.0-9.2.el5.src.rpm"/><source-package last-modified="1174931705" id="rhn-source-package-42025" source-rpm="libpng-1.2.10-7.src.rpm"/><source-package last-modified="1174931705" id="rhn-source-package-42026" source-rpm="libavc1394-0.5.3-1.fc6.src.rpm"/><source-package last-modified="1174931707" id="rhn-source-package-42027" source-rpm="xorg-x11-proto-devel-7.1-9.fc6.src.rpm"/><source-package last-modified="1174931708" id="rhn-source-package-42028" source-rpm="mockobjects-0.09-14jpp.3.src.rpm"/><source-package last-modified="1174931708" id="rhn-source-package-42029" source-rpm="mod_auth_pgsql-2.0.3-2.3.1.src.rpm"/><source-package last-modified="1174931709" id="rhn-source-package-42030" source-rpm="mtx-1.2.18-8.2.2.src.rpm"/><source-package last-modified="1174931710" id="rhn-source-package-42031" source-rpm="libmng-1.0.9-5.1.src.rpm"/><source-package last-modified="1174931720" id="rhn-source-package-42037" source-rpm="libXxf86misc-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931723" id="rhn-source-package-42038" source-rpm="htdig-3.2.0b6-9.el5.src.rpm"/><source-package last-modified="1174931726" id="rhn-source-package-42039" source-rpm="inn-2.4.3-6.fc6.src.rpm"/><source-package last-modified="1174931727" id="rhn-source-package-42040" source-rpm="liboil-0.3.8-2.1.src.rpm"/><source-package last-modified="1174931729" id="rhn-source-package-42041" source-rpm="libX11-1.0.3-8.el5.src.rpm"/><source-package last-modified="1174931730" id="rhn-source-package-42042" source-rpm="bluez-libs-3.7-1.src.rpm"/><source-package last-modified="1174931732" id="rhn-source-package-42043" source-rpm="autoconf-2.59-12.src.rpm"/><source-package last-modified="1174931735" id="rhn-source-package-42044" source-rpm="tix-8.4.0-11.fc6.src.rpm"/><source-package last-modified="1174931739" id="rhn-source-package-42045" source-rpm="cairo-1.2.4-1.fc6.src.rpm"/><source-package last-modified="1174931741" id="rhn-source-package-42046" source-rpm="libpfm-3.2-0.060926.4.el5.src.rpm"/><source-package last-modified="1174931741" id="rhn-source-package-42047" source-rpm="libFS-1.0.0-3.1.src.rpm"/><source-package last-modified="1174931742" id="rhn-source-package-42048" source-rpm="libvte-java-0.12.1-6.el5.src.rpm"/><source-package last-modified="1174931743" id="rhn-source-package-42049" source-rpm="libgnomecanvas-2.14.0-4.1.src.rpm"/><source-package last-modified="1174931745" id="rhn-source-package-42050" source-rpm="neon-0.25.5-5.1.src.rpm"/><source-package last-modified="1174931745" id="rhn-source-package-42051" source-rpm="jakarta-commons-codec-1.3-7jpp.2.src.rpm"/><source-package last-modified="1174931746" id="rhn-source-package-42052" source-rpm="libevent-1.1a-3.2.1.src.rpm"/><source-package last-modified="1174931748" id="rhn-source-package-42053" source-rpm="automake17-1.7.9-7.src.rpm"/><source-package last-modified="1174931749" id="rhn-source-package-42054" source-rpm="regexp-1.4-2jpp.2.src.rpm"/><source-package last-modified="1174931758" id="rhn-source-package-42055" source-rpm="kdevelop-3.3.4-1.fc6.src.rpm"/><source-package last-modified="1174931759" id="rhn-source-package-42056" source-rpm="libgail-gnome-1.1.3-1.2.1.src.rpm"/><source-package last-modified="1174931759" id="rhn-source-package-42057" source-rpm="diffstat-1.41-1.2.2.src.rpm"/><source-package last-modified="1174931760" id="rhn-source-package-42058" source-rpm="check-0.9.3-5.fc6.src.rpm"/><source-package last-modified="1174931761" id="rhn-source-package-42059" source-rpm="libXinerama-1.0.1-2.1.src.rpm"/><source-package last-modified="1174931762" id="rhn-source-package-42060" source-rpm="slang-2.0.6-4.el5.src.rpm"/><source-package last-modified="1174931762" id="rhn-source-package-42061" source-rpm="pstack-1.2-7.2.2.src.rpm"/><source-package last-modified="1174931763" id="rhn-source-package-42063" source-rpm="rdate-1.4-6.src.rpm"/><source-package last-modified="1174931764" id="rhn-source-package-42064" source-rpm="libXp-1.0.0-8.src.rpm"/><source-package last-modified="1174931767" id="rhn-source-package-42065" source-rpm="glib2-2.12.3-2.fc6.src.rpm"/><source-package last-modified="1174931768" id="rhn-source-package-42066" source-rpm="gtksourceview-1.8.0-1.fc6.src.rpm"/><source-package last-modified="1174931769" id="rhn-source-package-42067" source-rpm="openais-0.80.2-1.el5.src.rpm"/><source-package last-modified="1174931771" id="rhn-source-package-42068" source-rpm="libgpg-error-1.4-2.src.rpm"/><source-package last-modified="1174931772" id="rhn-source-package-42069" source-rpm="libxklavier-3.0-3.el5.src.rpm"/><source-package last-modified="1174931773" id="rhn-source-package-42070" source-rpm="libXfontcache-1.0.2-3.1.src.rpm"/><source-package last-modified="1174931773" id="rhn-source-package-42071" source-rpm="libselinux-1.33.4-2.el5.src.rpm"/><source-package last-modified="1174931779" id="rhn-source-package-42072" source-rpm="struts-1.2.9-4jpp.5.src.rpm"/><source-package last-modified="1174931780" id="rhn-source-package-42073" source-rpm="pcsc-lite-1.3.1-7.src.rpm"/><source-package last-modified="1174931783" id="rhn-source-package-42075" source-rpm="libusb-0.1.12-5.1.src.rpm"/><source-package last-modified="1174931783" id="rhn-source-package-42076" source-rpm="hesiod-3.1.0-8.src.rpm"/><source-package last-modified="1174931785" id="rhn-source-package-42077" source-rpm="lucene-1.4.3-1jpp.16.src.rpm"/><source-package last-modified="1174931786" id="rhn-source-package-42078" source-rpm="libXv-1.0.1-4.1.src.rpm"/><source-package last-modified="1174931786" id="rhn-source-package-42079" source-rpm="rcs-5.7-30.1.src.rpm"/><source-package last-modified="1174931789" id="rhn-source-package-42080" source-rpm="ibutils-1.0-3.el5.src.rpm"/><source-package last-modified="1174931790" id="rhn-source-package-42081" source-rpm="php-pear-1.4.9-4.src.rpm"/><source-package last-modified="1174931794" id="rhn-source-package-42082" source-rpm="sane-backends-1.0.18-5.el5.src.rpm"/><source-package last-modified="1174931795" id="rhn-source-package-42083" source-rpm="lcms-1.15-1.2.2.src.rpm"/><source-package last-modified="1174931796" id="rhn-source-package-42084" source-rpm="libxkbfile-1.0.3-3.1.src.rpm"/><source-package last-modified="1174931797" id="rhn-source-package-42085" source-rpm="system-config-nfs-1.3.23-1.el5.src.rpm"/><source-package last-modified="1174931798" id="rhn-source-package-42086" source-rpm="uucp-1.07-12.src.rpm"/><source-package last-modified="1174931799" id="rhn-source-package-42087" source-rpm="libXt-1.0.2-3.1.fc6.src.rpm"/><source-package last-modified="1174931802" id="rhn-source-package-42088" source-rpm="quagga-0.98.6-2.1.src.rpm"/><source-package last-modified="1174931802" id="rhn-source-package-42089" source-rpm="Pyrex-0.9.4-2.fc6.src.rpm"/><source-package last-modified="1174931803" id="rhn-source-package-42090" source-rpm="pygobject2-2.12.1-5.el5.src.rpm"/><source-package last-modified="1174931804" id="rhn-source-package-42091" source-rpm="kdbg-2.0.2-1.2.1.src.rpm"/><source-package last-modified="1174931806" id="rhn-source-package-42092" source-rpm="beecrypt-4.1.2-10.1.1.src.rpm"/><source-package last-modified="1174931807" id="rhn-source-package-42093" source-rpm="pango-1.14.9-3.el5.src.rpm"/><source-package last-modified="1174931809" id="rhn-source-package-42094" source-rpm="mrtg-2.14.5-2.src.rpm"/><source-package last-modified="1174931811" id="rhn-source-package-42095" source-rpm="jdom-1.0-4jpp.1.src.rpm"/><source-package last-modified="1174931812" id="rhn-source-package-42096" source-rpm="jakarta-commons-validator-1.1.4-5jpp.1.src.rpm"/><source-package last-modified="1174931818" id="rhn-source-package-42097" source-rpm="tcl-8.4.13-3.fc6.src.rpm"/><source-package last-modified="1174931820" id="rhn-source-package-42098" source-rpm="fetchmail-6.3.6-1.el5.src.rpm"/><source-package last-modified="1174931824" id="rhn-source-package-42101" source-rpm="libXpm-3.5.5-3.src.rpm"/><source-package last-modified="1174931827" id="rhn-source-package-42102" source-rpm="doxygen-1.4.7-1.1.src.rpm"/><source-package last-modified="1174931828" id="rhn-source-package-42103" source-rpm="mod_authz_ldap-0.26-7.1.src.rpm"/><source-package last-modified="1174931829" id="rhn-source-package-42104" source-rpm="jakarta-commons-launcher-0.9-6jpp.1.src.rpm"/><source-package last-modified="1174931829" id="rhn-source-package-42105" source-rpm="ypserv-2.19-3.src.rpm"/><source-package last-modified="1174931830" id="rhn-source-package-42106" source-rpm="atk-1.12.2-1.fc6.src.rpm"/><source-package last-modified="1174931831" id="rhn-source-package-42107" source-rpm="bootparamd-0.17-24.devel.2.1.src.rpm"/><source-package last-modified="1174931834" id="rhn-source-package-42108" source-rpm="nss-3.11.5-1.el5.src.rpm"/><source-package last-modified="1174931836" id="rhn-source-package-42109" source-rpm="dbus-glib-0.70-5.src.rpm"/><source-package last-modified="1174931836" id="rhn-source-package-42110" source-rpm="openobex-1.3-3.1.src.rpm"/><source-package last-modified="1174931841" id="rhn-source-package-42111" source-rpm="guile-1.8.0-8.20060831cvs.src.rpm"/><source-package last-modified="1174931842" id="rhn-source-package-42112" source-rpm="system-config-httpd-1.3.3.1-1.el5.src.rpm"/><source-package last-modified="1174931844" id="rhn-source-package-42113" source-rpm="libXfixes-4.0.1-2.1.src.rpm"/><source-package last-modified="1174931845" id="rhn-source-package-42114" source-rpm="jdepend-2.6-6jpp.2.src.rpm"/><source-package last-modified="1174931846" id="rhn-source-package-42115" source-rpm="libvorbis-1.1.2-2.src.rpm"/><source-package last-modified="1174931848" id="rhn-source-package-42116" source-rpm="automake-1.9.6-2.1.src.rpm"/><source-package last-modified="1174931848" id="rhn-source-package-42117" source-rpm="webalizer-2.01_10-30.1.src.rpm"/><source-package last-modified="1174931849" id="rhn-source-package-42118" source-rpm="java_cup-0.10-0.k.6jpp.1.src.rpm"/><source-package last-modified="1174931850" id="rhn-source-package-42120" source-rpm="rarpd-ss981107-22.2.2.src.rpm"/><source-package last-modified="1174931850" id="rhn-source-package-42121" source-rpm="libsepol-1.15.2-1.el5.src.rpm"/><source-package last-modified="1174931851" id="rhn-source-package-42122" source-rpm="libdaemon-0.10-5.el5.src.rpm"/><source-package last-modified="1174931852" id="rhn-source-package-42123" source-rpm="mod_auth_kerb-5.1-3.src.rpm"/><source-package last-modified="1174931854" id="rhn-source-package-42124" source-rpm="glade2-2.12.1-6.el5.src.rpm"/><source-package last-modified="1174931856" id="rhn-source-package-42126" source-rpm="glib-1.2.10-20.el5.src.rpm"/><source-package last-modified="1174931856" id="rhn-source-package-42127" source-rpm="libXdmcp-1.0.1-2.1.src.rpm"/><source-package last-modified="1174931857" id="rhn-source-package-42128" source-rpm="libao-0.8.6-5.src.rpm"/><source-package last-modified="1174931864" id="rhn-source-package-42129" source-rpm="db4-4.3.29-9.fc6.src.rpm"/><source-package last-modified="1174931865" id="rhn-source-package-42130" source-rpm="apr-util-1.2.7-6.src.rpm"/><source-package last-modified="1174931868" id="rhn-source-package-42131" source-rpm="SDL-1.2.10-8.el5.src.rpm"/><source-package last-modified="1174931869" id="rhn-source-package-42132" source-rpm="libnl-1.0-0.10.pre5.4.src.rpm"/><source-package last-modified="1174931870" id="rhn-source-package-42133" source-rpm="librsvg2-2.16.1-1.el5.src.rpm"/><source-package last-modified="1174931870" id="rhn-source-package-42134" source-rpm="numactl-0.9.8-2.el5.src.rpm"/><source-package last-modified="1174931872" id="rhn-source-package-42135" source-rpm="icon-slicer-0.3-7.2.2.src.rpm"/><source-package last-modified="1174931872" id="rhn-source-package-42136" source-rpm="libfontenc-1.0.2-2.2.el5.src.rpm"/><source-package last-modified="1174931874" id="rhn-source-package-42137" source-rpm="mod_python-3.2.8-3.1.src.rpm"/><source-package last-modified="1174931878" id="rhn-source-package-42138" source-rpm="gnome-mount-0.5-3.el5.src.rpm"/><source-package last-modified="1174931880" id="rhn-source-package-42139" source-rpm="gstreamer-plugins-good-0.10.4-2.el5.src.rpm"/><source-package last-modified="1174931881" id="rhn-source-package-42140" source-rpm="wsdl4j-1.5.2-4jpp.1.src.rpm"/><source-package last-modified="1174931882" id="rhn-source-package-42141" source-rpm="gnome-speech-0.4.5-1.fc6.src.rpm"/><source-package last-modified="1174931883" id="rhn-source-package-42142" source-rpm="jakarta-commons-fileupload-1.0-6jpp.1.src.rpm"/><source-package last-modified="1174931890" id="rhn-source-package-42143" source-rpm="evolution-data-server-1.8.0-15.el5.src.rpm"/><source-package last-modified="1174931890" id="rhn-source-package-42144" source-rpm="libXevie-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931891" id="rhn-source-package-42145" source-rpm="jakarta-commons-beanutils-1.7.0-5jpp.1.src.rpm"/><source-package last-modified="1174931892" id="rhn-source-package-42146" source-rpm="classpathx-jaf-1.0-9jpp.1.src.rpm"/><source-package last-modified="1174931894" id="rhn-source-package-42147" source-rpm="libXxf86dga-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931894" id="rhn-source-package-42148" source-rpm="bsf-2.3.0-11jpp.1.src.rpm"/><source-package last-modified="1174931895" id="rhn-source-package-42149" source-rpm="pfmon-3.2-0.060926.4.el5.src.rpm"/><source-package last-modified="1174931896" id="rhn-source-package-42150" source-rpm="gtkhtml2-2.11.0-3.src.rpm"/><source-package last-modified="1174931897" id="rhn-source-package-42151" source-rpm="gamin-0.1.7-8.el5.src.rpm"/><source-package last-modified="1174931898" id="rhn-source-package-42152" source-rpm="libglade2-2.6.0-2.src.rpm"/><source-package last-modified="1174931898" id="rhn-source-package-42153" source-rpm="libXScrnSaver-1.1.0-3.1.src.rpm"/><source-package last-modified="1174931899" id="rhn-source-package-42154" source-rpm="libXdamage-1.0.3-2.1.src.rpm"/><source-package last-modified="1174931904" id="rhn-source-package-42155" source-rpm="gucharmap-1.8.0-1.fc6.src.rpm"/><source-package last-modified="1174931905" id="rhn-source-package-42156" source-rpm="startup-notification-0.8-4.1.src.rpm"/><source-package last-modified="1174931910" id="rhn-source-package-42157" source-rpm="kdebindings-3.5.4-1.fc6.src.rpm"/><source-package last-modified="1174931912" id="rhn-source-package-42158" source-rpm="pyorbit-2.14.1-1.1.src.rpm"/><source-package last-modified="1174931913" id="rhn-source-package-42159" source-rpm="libXcursor-1.1.7-1.1.src.rpm"/><source-package last-modified="1174931913" id="rhn-source-package-42160" source-rpm="mod_auth_mysql-3.0.0-3.1.src.rpm"/><source-package last-modified="1174931915" id="rhn-source-package-42161" source-rpm="dovecot-1.0-1.2.rc15.el5.src.rpm"/><source-package last-modified="1174931918" id="rhn-source-package-42162" source-rpm="dbus-1.0.0-6.el5.src.rpm"/><source-package last-modified="1174931918" id="rhn-source-package-42163" source-rpm="automake16-1.6.3-8.src.rpm"/><source-package last-modified="1174931921" id="rhn-source-package-42164" source-rpm="pcre-6.6-1.1.src.rpm"/><source-package last-modified="1174931929" id="rhn-source-package-42165" source-rpm="kdewebdev-3.5.4-2.fc6.src.rpm"/><source-package last-modified="1174931935" id="rhn-source-package-42166" source-rpm="gail-1.9.2-1.fc6.src.rpm"/><source-package last-modified="1174931936" id="rhn-source-package-42167" source-rpm="libXxf86vm-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931936" id="rhn-source-package-42168" source-rpm="jakarta-commons-discovery-0.3-4jpp.1.src.rpm"/><source-package last-modified="1174931937" id="rhn-source-package-42169" source-rpm="adaptx-0.9.13-3jpp.1.src.rpm"/><source-package last-modified="1174931938" id="rhn-source-package-42170" source-rpm="vsftpd-2.0.5-10.el5.src.rpm"/><source-package last-modified="1174931940" id="rhn-source-package-42171" source-rpm="werken-xpath-0.9.4-0.beta.12jpp.1.src.rpm"/><source-package last-modified="1174931944" id="rhn-source-package-42172" source-rpm="glib-java-0.2.6-3.fc6.src.rpm"/><source-package last-modified="1174931945" id="rhn-source-package-42173" source-rpm="eel2-2.16.1-1.el5.src.rpm"/><source-package last-modified="1174931947" id="rhn-source-package-42174" source-rpm="curl-7.15.5-2.el5.src.rpm"/><source-package last-modified="1174931948" id="rhn-source-package-42175" source-rpm="newt-0.52.2-9.src.rpm"/><source-package last-modified="1174931948" id="rhn-source-package-42176" source-rpm="unifdef-1.171-5.fc6.src.rpm"/><source-package last-modified="1174931950" id="rhn-source-package-42177" source-rpm="libgcrypt-1.2.3-1.src.rpm"/><source-package last-modified="1174931951" id="rhn-source-package-42178" source-rpm="alchemist-1.0.36-2.el5.src.rpm"/><source-package last-modified="1174931952" id="rhn-source-package-42179" source-rpm="nfs-utils-lib-1.0.8-7.2.src.rpm"/><source-package last-modified="1174931953" id="rhn-source-package-42180" source-rpm="libXcomposite-0.3-5.1.src.rpm"/><source-package last-modified="1174931954" id="rhn-source-package-42181" source-rpm="libtiff-3.8.2-7.el5.src.rpm"/><source-package last-modified="1174931955" id="rhn-source-package-42182" source-rpm="libXau-1.0.1-3.1.src.rpm"/><source-package last-modified="1174931956" id="rhn-source-package-42183" source-rpm="libieee1284-0.2.9-4.el5.src.rpm"/><source-package last-modified="1174931958" id="rhn-source-package-42184" source-rpm="opensp-1.5.2-4.src.rpm"/><source-package last-modified="1174931959" id="rhn-source-package-42185" source-rpm="libbonoboui-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174931962" id="rhn-source-package-42186" source-rpm="libXfont-1.2.2-1.fc6.src.rpm"/><source-package last-modified="1174931962" id="rhn-source-package-42187" source-rpm="libXTrap-1.0.0-3.1.src.rpm"/><source-package last-modified="1174931963" id="rhn-source-package-42188" source-rpm="libjpeg-6b-37.src.rpm"/><source-package last-modified="1174931964" id="rhn-source-package-42189" source-rpm="psgml-1.2.5-4.3.src.rpm"/><source-package last-modified="1174931966" id="rhn-source-package-42190" source-rpm="privoxy-3.0.3-9.2.2.src.rpm"/><source-package last-modified="1174931967" id="rhn-source-package-42191" source-rpm="libgnomeprintui22-2.12.1-6.src.rpm"/><source-package last-modified="1174931968" id="rhn-source-package-42192" source-rpm="automake14-1.4p6-13.src.rpm"/><source-package last-modified="1174931970" id="rhn-source-package-42193" source-rpm="libc-client-2004g-2.2.1.src.rpm"/><source-package last-modified="1174931972" id="rhn-source-package-42194" source-rpm="libsoup-2.2.98-2.el5.src.rpm"/><source-package last-modified="1174931972" id="rhn-source-package-42195" source-rpm="libXrender-0.9.1-3.1.src.rpm"/><source-package last-modified="1174931975" id="rhn-source-package-42196" source-rpm="openssl-0.9.8b-8.3.el5.src.rpm"/><source-package last-modified="1174931989" id="rhn-source-package-42197" source-rpm="wireshark-0.99.4-2.el5.src.rpm"/><source-package last-modified="1174931990" id="rhn-source-package-42198" source-rpm="libgnomecups-0.2.2-8.src.rpm"/><source-package last-modified="1174931990" id="rhn-source-package-42199" source-rpm="libdmx-1.0.2-3.1.src.rpm"/><source-package last-modified="1174931991" id="rhn-source-package-42200" source-rpm="libwnck-2.16.0-4.fc6.src.rpm"/><source-package last-modified="1174931993" id="rhn-source-package-42201" source-rpm="flac-1.1.2-27.src.rpm"/><source-package last-modified="1174931994" id="rhn-source-package-42202" source-rpm="libgnomeprint22-2.12.1-9.el5.src.rpm"/><source-package last-modified="1174931996" id="rhn-source-package-42203" source-rpm="xorg-x11-drv-i810-1.6.5-9.2.el5.src.rpm"/><source-package last-modified="1174932000" id="rhn-source-package-42204" source-rpm="libxml2-2.6.26-2.1.2.src.rpm"/><source-package last-modified="1174932002" id="rhn-source-package-42205" source-rpm="dev86-0.16.17-2.2.src.rpm"/><source-package last-modified="1174932002" id="rhn-source-package-42206" source-rpm="libcap-1.10-26.src.rpm"/><source-package last-modified="1174932006" id="rhn-source-package-42207" source-rpm="MySQL-python-1.2.1-1.src.rpm"/><source-package last-modified="1174932021" id="rhn-source-package-42208" source-rpm="gmp-4.1.4-10.el5.src.rpm"/><source-package last-modified="1174932024" id="rhn-source-package-42209" source-rpm="PyXML-0.8.4-4.src.rpm"/><source-package last-modified="1174932025" id="rhn-source-package-42210" source-rpm="checkpolicy-1.33.1-2.el5.src.rpm"/><source-package last-modified="1174932040" id="rhn-source-package-42211" source-rpm="cracklib-2.8.9-3.1.src.rpm"/><source-package last-modified="1174932045" id="rhn-source-package-42212" source-rpm="dbus-python-0.70-7.el5.src.rpm"/><source-package last-modified="1174932046" id="rhn-source-package-42213" source-rpm="desktop-file-utils-0.10-7.src.rpm"/><source-package last-modified="1174932047" id="rhn-source-package-42214" source-rpm="device-mapper-1.02.13-1.el5.src.rpm"/><source-package last-modified="1174932047" id="rhn-source-package-42215" source-rpm="dhcdbd-2.2-1.el5.src.rpm"/><source-package last-modified="1174932060" id="rhn-source-package-42216" source-rpm="diffutils-2.8.1-15.2.2.src.rpm"/><source-package last-modified="1174932061" id="rhn-source-package-42217" source-rpm="docbook-dtds-1.0-30.1.src.rpm"/><source-package last-modified="1174932063" id="rhn-source-package-42218" source-rpm="findutils-4.2.27-4.1.src.rpm"/><source-package last-modified="1174932066" id="rhn-source-package-42219" source-rpm="gawk-3.1.5-14.el5.src.rpm"/><source-package last-modified="1174932070" id="rhn-source-package-42220" source-rpm="geronimo-specs-1.0-0.M2.2jpp.12.src.rpm"/><source-package last-modified="1174932072" id="rhn-source-package-42221" source-rpm="gjdoc-0.7.7-12.el5.src.rpm"/><source-package last-modified="1174932073" id="rhn-source-package-42222" source-rpm="gnome-doc-utils-0.8.0-2.fc6.src.rpm"/><source-package last-modified="1174932075" id="rhn-source-package-42223" source-rpm="gnome-icon-theme-2.16.0.1-4.el5.src.rpm"/><source-package last-modified="1174932080" id="rhn-source-package-42224" source-rpm="gnome-mime-data-2.4.2-3.1.src.rpm"/><source-package last-modified="1174932081" id="rhn-source-package-42225" source-rpm="gnome-python2-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174932082" id="rhn-source-package-42226" source-rpm="gnome-python2-desktop-2.16.0-1.fc6.src.rpm"/><source-package last-modified="1174932094" id="rhn-source-package-42227" source-rpm="gnu-crypto-2.1.0-2jpp.1.src.rpm"/><source-package last-modified="1174932096" id="rhn-source-package-42228" source-rpm="gperf-3.0.1-7.2.2.src.rpm"/><source-package last-modified="1174932098" id="rhn-source-package-42229" source-rpm="grep-2.5.1-54.2.el5.src.rpm"/><source-package last-modified="1174932101" id="rhn-source-package-42230" source-rpm="groff-1.18.1.1-11.1.src.rpm"/><source-package last-modified="1174932102" id="rhn-source-package-42231" source-rpm="gzip-1.3.5-9.el5.src.rpm"/><source-package last-modified="1174932102" id="rhn-source-package-42232" source-rpm="htmlview-4.0.0-1.el5.src.rpm"/><source-package last-modified="1174932103" id="rhn-source-package-42233" source-rpm="hwdata-0.194-1.src.rpm"/><source-package last-modified="1174932104" id="rhn-source-package-42234" source-rpm="intltool-0.35.0-2.src.rpm"/><source-package last-modified="1174932104" id="rhn-source-package-42235" source-rpm="jadetex-3.12-13.1.1.src.rpm"/><source-package last-modified="1174932105" id="rhn-source-package-42236" source-rpm="jpackage-utils-1.7.3-1jpp.2.el5.src.rpm"/><source-package last-modified="1174932108" id="rhn-source-package-42237" source-rpm="jrefactory-2.8.9-6jpp.3.src.rpm"/><source-package last-modified="1174932109" id="rhn-source-package-42238" source-rpm="latex2html-2002.2.1-6.src.rpm"/><source-package last-modified="1174932110" id="rhn-source-package-42239" source-rpm="less-394-5.el5.src.rpm"/><source-package last-modified="1174932111" id="rhn-source-package-42240" source-rpm="m4-1.4.5-3.el5.1.src.rpm"/><source-package last-modified="1174932112" id="rhn-source-package-42241" source-rpm="mailx-8.1.1-44.2.2.src.rpm"/><source-package last-modified="1174932112" id="rhn-source-package-42242" source-rpm="mktemp-1.5-23.2.2.src.rpm"/><source-package last-modified="1174932113" id="rhn-source-package-42243" source-rpm="module-init-tools-3.3-0.pre3.1.16.el5.src.rpm"/><source-package last-modified="1174932117" id="rhn-source-package-42246" source-rpm="patch-2.5.4-29.2.2.src.rpm"/><source-package last-modified="1174932118" id="rhn-source-package-42247" source-rpm="perl-Compress-Zlib-1.42-1.fc6.src.rpm"/><source-package last-modified="1174932118" id="rhn-source-package-42248" source-rpm="perl-DBI-1.52-1.fc6.src.rpm"/><source-package last-modified="1174932119" id="rhn-source-package-42249" source-rpm="perl-HTML-Parser-3.55-1.fc6.src.rpm"/><source-package last-modified="1174932120" id="rhn-source-package-42250" source-rpm="perl-IO-Socket-SSL-1.01-1.fc6.src.rpm"/><source-package last-modified="1174932121" id="rhn-source-package-42251" source-rpm="perl-Net-DNS-0.59-1.fc6.src.rpm"/><source-package last-modified="1174932122" id="rhn-source-package-42252" source-rpm="perl-SGMLSpm-1.03ii-16.2.1.src.rpm"/><source-package last-modified="1174932123" id="rhn-source-package-42253" source-rpm="perl-URI-1.35-3.src.rpm"/><source-package last-modified="1174932123" id="rhn-source-package-42254" source-rpm="perl-XML-LibXML-1.58-5.src.rpm"/><source-package last-modified="1174932124" id="rhn-source-package-42255" source-rpm="perl-XML-LibXML-Common-0.13-8.2.2.src.rpm"/><source-package last-modified="1174932124" id="rhn-source-package-42256" source-rpm="perl-XML-Parser-2.34-6.1.2.2.1.src.rpm"/><source-package last-modified="1174932125" id="rhn-source-package-42257" source-rpm="perl-XML-Simple-2.14-4.fc6.src.rpm"/><source-package last-modified="1174932126" id="rhn-source-package-42259" source-rpm="pykickstart-0.43-1.el5.src.rpm"/><source-package last-modified="1174932127" id="rhn-source-package-42260" source-rpm="python-numeric-23.7-2.2.2.src.rpm"/><source-package last-modified="1174932127" id="rhn-source-package-42261" source-rpm="python-urlgrabber-3.1.0-2.src.rpm"/><source-package last-modified="1174932129" id="rhn-source-package-42263" source-rpm="scrollkeeper-0.3.14-9.el5.src.rpm"/><source-package last-modified="1174932130" id="rhn-source-package-42264" source-rpm="sed-4.1.5-5.fc6.src.rpm"/><source-package last-modified="1174932130" id="rhn-source-package-42265" source-rpm="sgml-common-0.6.3-18.src.rpm"/><source-package last-modified="1174932131" id="rhn-source-package-42266" source-rpm="sharutils-4.6.1-2.src.rpm"/><source-package last-modified="1174932134" id="rhn-source-package-42267" source-rpm="tar-1.15.1-23.el5.src.rpm"/><source-package last-modified="1174932135" id="rhn-source-package-42268" source-rpm="texi2html-1.76-4.fc6.src.rpm"/><source-package last-modified="1174932136" id="rhn-source-package-42269" source-rpm="transfig-3.2.4-16.src.rpm"/><source-package last-modified="1174932137" id="rhn-source-package-42270" source-rpm="usermode-1.88-3.el5.src.rpm"/><source-package last-modified="1174932140" id="rhn-source-package-42271" source-rpm="w3m-0.5.1-15.el5.src.rpm"/><source-package last-modified="1174932141" id="rhn-source-package-42272" source-rpm="wpa_supplicant-0.4.8-10.1.fc6.src.rpm"/><source-package last-modified="1174932144" id="rhn-source-package-42277" source-rpm="net-tools-1.60-73.src.rpm"/><source-package last-modified="1174932144" id="rhn-source-package-42278" source-rpm="chkfontpath-1.10.1-1.1.src.rpm"/><source-package last-modified="1174932146" id="rhn-source-package-42279" source-rpm="xorg-x11-drv-jamstudio-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932146" id="rhn-source-package-42280" source-rpm="xorg-x11-drv-microtouch-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932147" id="rhn-source-package-42281" source-rpm="xorg-x11-drv-evdev-1.0.0.5-2.el5.src.rpm"/><source-package last-modified="1174932148" id="rhn-source-package-42282" source-rpm="xorg-x11-drv-calcomp-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932149" id="rhn-source-package-42284" source-rpm="xorg-x11-drv-elographics-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932149" id="rhn-source-package-42285" source-rpm="yp-tools-2.9-0.1.src.rpm"/><source-package last-modified="1174932150" id="rhn-source-package-42286" source-rpm="comps-extras-11.1-1.1.src.rpm"/><source-package last-modified="1174932151" id="rhn-source-package-42287" source-rpm="xorg-x11-drv-dmc-1.1.0-2.src.rpm"/><source-package last-modified="1174932151" id="rhn-source-package-42288" source-rpm="perl-IO-Socket-INET6-2.51-2.fc6.src.rpm"/><source-package last-modified="1174932151" id="rhn-source-package-42289" source-rpm="mingetty-1.07-5.2.2.src.rpm"/><source-package last-modified="1174932152" id="rhn-source-package-42290" source-rpm="MAKEDEV-3.23-1.2.src.rpm"/><source-package last-modified="1174932153" id="rhn-source-package-42291" source-rpm="ethtool-5-1.el5.src.rpm"/><source-package last-modified="1174932154" id="rhn-source-package-42294" source-rpm="xorg-x11-drv-joystick-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932165" id="rhn-source-package-42295" source-rpm="redhat-artwork-5.0.9-1.el5.src.rpm"/><source-package last-modified="1174932165" id="rhn-source-package-42296" source-rpm="perl-Digest-HMAC-1.01-15.src.rpm"/><source-package last-modified="1174932166" id="rhn-source-package-42297" source-rpm="ifd-egate-0.05-15.src.rpm"/><source-package last-modified="1174932167" id="rhn-source-package-42298" source-rpm="notify-python-0.1.0-3.fc6.src.rpm"/><source-package last-modified="1174932167" id="rhn-source-package-42299" source-rpm="docbook-simple-1.0-2.1.1.src.rpm"/><source-package last-modified="1174932171" id="rhn-source-package-42300" source-rpm="passivetex-1.25-5.1.1.src.rpm"/><source-package last-modified="1174932172" id="rhn-source-package-42301" source-rpm="gnome-python2-extras-2.14.2-4.fc6.src.rpm"/><source-package last-modified="1174932172" id="rhn-source-package-42302" source-rpm="perl-Net-IP-1.25-2.fc6.src.rpm"/><source-package last-modified="1174932173" id="rhn-source-package-42304" source-rpm="xorg-x11-drv-sisusb-0.8.1-4.1.src.rpm"/><source-package last-modified="1174932314" id="rhn-source-package-42313" source-rpm="perl-String-CRC32-1.4-2.fc6.src.rpm"/><source-package last-modified="1174932316" id="rhn-source-package-42315" source-rpm="gcalctool-5.8.25-1.el5.src.rpm"/><source-package last-modified="1174932318" id="rhn-source-package-42318" source-rpm="pyparted-1.8.1-4.el5.src.rpm"/><source-package last-modified="1174932319" id="rhn-source-package-42319" source-rpm="python-pyblock-0.25-1.src.rpm"/><source-package last-modified="1174932319" id="rhn-source-package-42320" source-rpm="perl-Archive-Tar-1.30-1.fc6.src.rpm"/><source-package last-modified="1174932320" id="rhn-source-package-42321" source-rpm="tzdata-2006m-2.fc6.src.rpm"/><source-package last-modified="1174932320" id="rhn-source-package-42322" source-rpm="pyspi-0.6.1-1.el5.src.rpm"/><source-package last-modified="1174932321" id="rhn-source-package-42323" source-rpm="xorg-x11-drv-elo2300-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932322" id="rhn-source-package-42324" source-rpm="xorg-x11-drv-keyboard-1.1.0-2.1.src.rpm"/><source-package last-modified="1174932323" id="rhn-source-package-42325" source-rpm="xorg-x11-drv-dummy-0.2.0-2.1.src.rpm"/><source-package last-modified="1174932323" id="rhn-source-package-42326" source-rpm="xorg-x11-drv-vesa-1.2.1-5.2.el5.src.rpm"/><source-package last-modified="1174932324" id="rhn-source-package-42327" source-rpm="xorg-x11-drv-digitaledge-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932325" id="rhn-source-package-42328" source-rpm="rhnlib-2.2.5-1.el5.src.rpm"/><source-package last-modified="1174932327" id="rhn-source-package-42330" source-rpm="perl-Socket6-0.19-3.fc6.src.rpm"/><source-package last-modified="1174932330" id="rhn-source-package-42333" source-rpm="xorg-x11-drv-vmware-10.13.0-2.1.src.rpm"/><source-package last-modified="1174932331" id="rhn-source-package-42334" source-rpm="ghostscript-fonts-5.50-13.1.1.src.rpm"/><source-package last-modified="1174932332" id="rhn-source-package-42335" source-rpm="xorg-x11-drv-penmount-1.1.0-2.1.src.rpm"/><source-package last-modified="1174932333" id="rhn-source-package-42336" source-rpm="dialog-1.0.20051107-1.2.2.src.rpm"/><source-package last-modified="1174932335" id="rhn-source-package-42338" source-rpm="perl-Net-SSLeay-1.30-4.fc6.src.rpm"/><source-package last-modified="1174932335" id="rhn-source-package-42339" source-rpm="xorg-x11-drv-tdfx-1.2.1-3.1.src.rpm"/><source-package last-modified="1174932336" id="rhn-source-package-42340" source-rpm="xorg-x11-drv-nv-1.2.0-4.fc6.src.rpm"/><source-package last-modified="1174932337" id="rhn-source-package-42341" source-rpm="perl-IO-Zlib-1.04-4.2.1.src.rpm"/><source-package last-modified="1174932337" id="rhn-source-package-42342" source-rpm="xorg-x11-drv-magictouch-1.0.0.5-2.1.src.rpm"/><source-package last-modified="1174932339" id="rhn-source-package-42343" source-rpm="xorg-x11-drv-sis-0.9.1-7.src.rpm"/><source-package last-modified="1174932339" id="rhn-source-package-42344" source-rpm="xorg-x11-drv-fbdev-0.3.0-2.src.rpm"/><source-package last-modified="1174932343" id="rhn-source-package-42345" source-rpm="notification-daemon-0.3.5-8.el5.src.rpm"/><source-package last-modified="1174932344" id="rhn-source-package-42346" source-rpm="redhat-menus-6.7.8-1.el5.src.rpm"/><source-package last-modified="1174932345" id="rhn-source-package-42347" source-rpm="lvm2-2.02.16-3.el5.src.rpm"/><source-package last-modified="1174932346" id="rhn-source-package-42348" source-rpm="xorg-x11-drv-ati-6.6.3-3.2.el5.src.rpm"/><source-package last-modified="1174932347" id="rhn-source-package-42349" source-rpm="procmail-3.22-17.1.src.rpm"/><source-package last-modified="1174932349" id="rhn-source-package-42351" source-rpm="xorg-x11-drv-ur98-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932349" id="rhn-source-package-42352" source-rpm="xorg-x11-drv-magellan-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932350" id="rhn-source-package-42353" source-rpm="xorg-x11-drv-void-1.1.0-3.1.src.rpm"/><source-package last-modified="1174932350" id="rhn-source-package-42354" source-rpm="dmidecode-2.7-1.28.2.el5.src.rpm"/><source-package last-modified="1174932351" id="rhn-source-package-42355" source-rpm="xorg-x11-drv-mouse-1.1.1-1.1.src.rpm"/><source-package last-modified="1174932351" id="rhn-source-package-42356" source-rpm="perl-Carp-Clan-5.3-1.2.1.src.rpm"/><source-package last-modified="1174932352" id="rhn-source-package-42357" source-rpm="perl-HTML-Tagset-3.10-2.1.1.src.rpm"/><source-package last-modified="1174932352" id="rhn-source-package-42358" source-rpm="perl-libwww-perl-5.805-1.1.1.src.rpm"/><source-package last-modified="1174932354" id="rhn-source-package-42359" source-rpm="mx-2.0.6-2.2.2.src.rpm"/><source-package last-modified="1174932356" id="rhn-source-package-42360" source-rpm="xorg-x11-drv-dynapro-1.1.0-2.src.rpm"/><source-package last-modified="1174932357" id="rhn-source-package-42361" source-rpm="psmisc-22.2-5.src.rpm"/><source-package last-modified="1174932358" id="rhn-source-package-42362" source-rpm="xorg-x11-drv-vga-4.1.0-2.1.src.rpm"/><source-package last-modified="1174932358" id="rhn-source-package-42363" source-rpm="perl-BSD-Resource-1.28-1.fc6.1.src.rpm"/><source-package last-modified="1174932359" id="rhn-source-package-42364" source-rpm="kasumi-2.0.1-1.1.fc6.src.rpm"/><source-package last-modified="1174932359" id="rhn-source-package-42365" source-rpm="xorg-x11-drv-spaceorb-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932360" id="rhn-source-package-42366" source-rpm="python-sqlite-1.1.7-1.2.1.src.rpm"/><source-package last-modified="1174932360" id="rhn-source-package-42367" source-rpm="xorg-x11-drv-fpit-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932361" id="rhn-source-package-42368" source-rpm="xmltex-20020625-8.src.rpm"/><source-package last-modified="1174932361" id="rhn-source-package-42369" source-rpm="ttmkfdir-3.0.9-23.el5.src.rpm"/><source-package last-modified="1174932361" id="rhn-source-package-42370" source-rpm="rhnsd-4.6.1-1.el5.src.rpm"/><source-package last-modified="1174932363" id="rhn-source-package-42371" source-rpm="xorg-x11-xkb-utils-1.0.2-2.1.src.rpm"/><source-package last-modified="1174932366" id="rhn-source-package-42372" source-rpm="xorg-x11-drv-savage-2.1.1-5.fc6.src.rpm"/><source-package last-modified="1174932369" id="rhn-source-package-42373" source-rpm="ntp-4.2.2p1-5.el5.src.rpm"/><source-package last-modified="1174932370" id="rhn-source-package-42374" source-rpm="xorg-x11-drv-trident-1.2.1-3.fc6.src.rpm"/><source-package last-modified="1174932371" id="rhn-source-package-42375" source-rpm="xorg-x11-drv-ast-0.81.0-3.src.rpm"/><source-package last-modified="1174932371" id="rhn-source-package-42376" source-rpm="xorg-x11-drv-summa-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932372" id="rhn-source-package-42377" source-rpm="perl-Bit-Vector-6.4-2.2.2.1.src.rpm"/><source-package last-modified="1174932373" id="rhn-source-package-42378" source-rpm="xorg-x11-drv-palmax-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932373" id="rhn-source-package-42379" source-rpm="xorg-x11-drv-cirrus-1.1.0-2.fc6.src.rpm"/><source-package last-modified="1174932379" id="rhn-source-package-42380" source-rpm="urw-fonts-2.3-6.1.1.src.rpm"/><source-package last-modified="1174932379" id="rhn-source-package-42381" source-rpm="xorg-x11-drv-vmmouse-12.4.0-2.1.src.rpm"/><source-package last-modified="1174932380" id="rhn-source-package-42382" source-rpm="xorg-x11-drv-hyperpen-1.1.0-2.src.rpm"/><source-package last-modified="1174932383" id="rhn-source-package-42384" source-rpm="xorg-x11-drv-siliconmotion-1.4.1-2.1.src.rpm"/><source-package last-modified="1174932383" id="rhn-source-package-42385" source-rpm="python-elementtree-1.2.6-5.src.rpm"/><source-package last-modified="1174932384" id="rhn-source-package-42386" source-rpm="xorg-x11-drv-s3virge-1.9.1-2.1.src.rpm"/><source-package last-modified="1174932385" id="rhn-source-package-42387" source-rpm="xkeyboard-config-0.8-7.fc6.src.rpm"/><source-package last-modified="1174932388" id="rhn-source-package-42388" source-rpm="xorg-x11-server-utils-7.1-4.fc6.src.rpm"/><source-package last-modified="1174932391" id="rhn-source-package-42389" source-rpm="gthumb-2.7.8-5.el5.src.rpm"/><source-package last-modified="1174932392" id="rhn-source-package-42391" source-rpm="portmap-4.0-65.2.2.1.src.rpm"/><source-package last-modified="1174932394" id="rhn-source-package-42392" source-rpm="cdrdao-1.2.1-2.src.rpm"/><source-package last-modified="1174932394" id="rhn-source-package-42393" source-rpm="perl-Digest-SHA1-2.11-1.2.1.src.rpm"/><source-package last-modified="1174932396" id="rhn-source-package-42395" source-rpm="xorg-x11-drv-tek4957-1.1.0-1.1.src.rpm"/><source-package last-modified="1174932396" id="rhn-source-package-42396" source-rpm="xorg-x11-drv-citron-2.2.0-1.1.src.rpm"/><source-package last-modified="1174932397" id="rhn-source-package-42397" source-rpm="xorg-x11-drv-mutouch-1.1.0-2.src.rpm"/><source-package last-modified="1174932398" id="rhn-source-package-42398" source-rpm="xorg-x11-drv-s3-0.4.1-2.1.src.rpm"/><source-package last-modified="1174932398" id="rhn-source-package-42399" source-rpm="rhpxl-0.41-1.el5.src.rpm"/><source-package last-modified="1174932399" id="rhn-source-package-42400" source-rpm="xorg-x11-drv-aiptek-1.0.1-2.src.rpm"/><source-package last-modified="1174932400" id="rhn-source-package-42401" source-rpm="shared-mime-info-0.19-3.el5.src.rpm"/><source-package last-modified="1174932401" id="rhn-source-package-42402" source-rpm="xorg-x11-drv-mga-1.4.2-5.el5.src.rpm"/><source-package last-modified="1174932401" id="rhn-source-package-42403" source-rpm="mpage-2.5.4-7.1.src.rpm"/><source-package last-modified="1174932402" id="rhn-source-package-42404" source-rpm="perl-IO-String-1.08-1.1.1.src.rpm"/><source-package last-modified="1174932402" id="rhn-source-package-42405" source-rpm="mcelog-0.7-1.22.fc6.src.rpm"/><source-package last-modified="1174932472" id="rhn-source-package-42406" source-rpm="redhat-release-5Server-5.0.0.9.src.rpm"/><source-package last-modified="1174932476" id="rhn-source-package-42407" source-rpm="redhat-release-notes-5Server-5.src.rpm"/><source-package last-modified="1175179614" id="rhn-source-package-42450" source-rpm="net-snmp-5.3.1-14.0.1.el5.src.rpm"/><source-package last-modified="1175623874" id="rhn-source-package-42475" source-rpm="krb5-1.5-23.src.rpm"/><source-package last-modified="1175624969" id="rhn-source-package-42476" source-rpm="libXfont-1.2.2-1.0.2.el5.src.rpm"/><source-package last-modified="1175625793" id="rhn-source-package-42478" source-rpm="xorg-x11-server-1.1.1-48.13.0.1.el5.src.rpm"/><source-package last-modified="1175626387" id="rhn-source-package-42479" source-rpm="squid-2.6.STABLE6-4.el5.src.rpm"/><source-package last-modified="1176722952" id="rhn-source-package-42503" source-rpm="freetype-2.2.1-17.el5.src.rpm"/><source-package last-modified="1176723787" id="rhn-source-package-42506" source-rpm="cups-1.2.4-11.5.1.el5.src.rpm"/><source-package last-modified="1176738095" id="rhn-source-package-42511" source-rpm="xorg-x11-apps-7.1-4.0.1.el5.src.rpm"/><source-package last-modified="1176738095" id="rhn-source-package-42512" source-rpm="libX11-1.0.3-8.0.1.el5.src.rpm"/><source-package last-modified="1177062384" id="rhn-source-package-42525" source-rpm="php-5.1.6-11.el5.src.rpm"/><source-package last-modified="1177950686" id="rhn-source-package-42751" source-rpm="kernel-2.6.18-8.1.3.el5.src.rpm"/><source-package last-modified="1178637852" id="rhn-source-package-42780" source-rpm="postgresql-8.1.9-1.el5.src.rpm"/><source-package last-modified="1178639068" id="rhn-source-package-42782" source-rpm="php-5.1.6-12.el5.src.rpm"/><source-package last-modified="1178716269" id="rhn-source-package-42791" source-rpm="vim-7.0.109-3.el5.3.src.rpm"/><source-package last-modified="1178804159" id="rhn-source-package-42796" source-rpm="cman-2.0.62-1.el5.src.rpm"/><source-package last-modified="1178812686" id="rhn-source-package-42800" source-rpm="freeradius-1.1.3-1.2.el5.src.rpm"/><source-package last-modified="1179155325" id="rhn-source-package-42833" source-rpm="samba-3.0.23c-2.el5.2.0.2.src.rpm"/><source-package last-modified="1179161928" id="rhn-source-package-42836" source-rpm="tomcat5-5.5.23-0jpp.1.0.3.el5.src.rpm"/><source-package last-modified="1179161928" id="rhn-source-package-42837" source-rpm="jakarta-commons-modeler-1.1-8jpp.1.0.2.el5.src.rpm"/><source-package last-modified="1179338448" id="rhn-source-package-42843" source-rpm="yum-rhn-plugin-0.4.3-2.el5.src.rpm"/><source-package last-modified="1179340066" id="rhn-source-package-42844" source-rpm="kernel-2.6.18-8.1.4.el5.src.rpm"/><source-package last-modified="1179411401" id="rhn-source-package-42848" source-rpm="ipsec-tools-0.6.5-8.el5.src.rpm"/><source-package last-modified="1179411519" id="rhn-source-package-42851" source-rpm="vixie-cron-4.1-70.el5.src.rpm"/><source-package last-modified="1179413374" id="rhn-source-package-42856" source-rpm="squirrelmail-1.4.8-4.0.1.el5.src.rpm"/><source-package last-modified="1179437773" id="rhn-source-package-42859" source-rpm="libpng-1.2.10-7.0.2.src.rpm"/><source-package last-modified="1179496299" id="rhn-source-package-42865" source-rpm="cman-2.0.64-1.el5.src.rpm"/><source-package last-modified="1179751939" id="rhn-source-package-42871" source-rpm="gimp-2.2.13-2.el5.src.rpm"/><source-package last-modified="1180011489" id="rhn-source-package-42900" source-rpm="redhat-rpm-config-8.0.45-17.0.1.el5.src.rpm"/><source-package last-modified="1180516316" id="rhn-source-package-42905" source-rpm="evolution-data-server-1.8.0-15.0.3.el5.src.rpm"/><source-package last-modified="1180517266" id="rhn-source-package-42907" source-rpm="quagga-0.98.6-2.1.0.1.el5.src.rpm"/><source-package last-modified="1180517957" id="rhn-source-package-42910" source-rpm="file-4.17-9.0.1.el5.src.rpm"/><source-package last-modified="1180574784" id="rhn-source-package-42915" source-rpm="firefox-1.5.0.12-1.el5.src.rpm"/><source-package last-modified="1180574784" id="rhn-source-package-42916" source-rpm="devhelp-0.12-11.el5.src.rpm"/><source-package last-modified="1180574784" id="rhn-source-package-42918" source-rpm="yelp-2.16.0-15.el5.src.rpm"/><source-package last-modified="1180943776" id="rhn-source-package-42927" source-rpm="mutt-1.4.2.2-3.0.2.el5.src.rpm"/><source-package last-modified="1181203175" id="rhn-source-package-42930" source-rpm="fetchmail-6.3.6-1.0.1.el5.src.rpm"/><source-package last-modified="1181549495" id="rhn-source-package-42999" source-rpm="freetype-2.2.1-19.el5.src.rpm"/><source-package last-modified="1181750122" id="rhn-source-package-43026" source-rpm="spamassassin-3.1.9-1.el5.src.rpm"/><source-package last-modified="1181814996" id="rhn-source-package-43032" source-rpm="iscsi-initiator-utils-6.2.0.742-0.6.el5.src.rpm"/><source-package last-modified="1181815313" id="rhn-source-package-43034" source-rpm="mod_perl-2.0.2-6.3.el5.src.rpm"/><source-package last-modified="1181832624" id="rhn-source-package-43041" source-rpm="kernel-2.6.18-8.1.6.el5.src.rpm"/><source-package last-modified="1181844745" id="rhn-source-package-43043" source-rpm="libexif-0.6.13-4.0.2.el5.src.rpm"/><source-package last-modified="1182155397" id="rhn-source-package-43056" source-rpm="nspr-4.6.5-1.0.1.el5.src.rpm"/><source-package last-modified="1182778701" id="rhn-source-package-43067" source-rpm="evolution-data-server-1.8.0-15.0.4.el5.src.rpm"/><source-package last-modified="1182871284" id="rhn-source-package-43073" source-rpm="httpd-2.2.3-7.el5.src.rpm"/><source-package last-modified="1182883654" id="rhn-source-package-43077" source-rpm="krb5-1.5-26.src.rpm"/><source-package last-modified="1182947345" id="rhn-source-package-43078" source-rpm="sysreport-1.4.3-12.el5.src.rpm"/><source-package last-modified="1182947428" id="rhn-source-package-43079" source-rpm="xterm-215-5.el5.src.rpm"/><source-package last-modified="1182947522" id="rhn-source-package-43080" source-rpm="hardlink-1.0-1.27.src.rpm"/><source-package last-modified="1182947568" id="rhn-source-package-43081" source-rpm="enscript-1.6.4-4.1.el5.src.rpm"/><source-package last-modified="1182947709" id="rhn-source-package-43082" source-rpm="fonts-chinese-3.02-9.9.el5.src.rpm"/><source-package last-modified="1182947876" id="rhn-source-package-43084" source-rpm="sos-1.5-1.el5.src.rpm"/><source-package last-modified="1182948057" id="rhn-source-package-43085" source-rpm="cracklib-2.8.9-3.3.src.rpm"/><source-package last-modified="1182948234" id="rhn-source-package-43086" source-rpm="rhpxl-0.41.1-1.el5.src.rpm"/><source-package last-modified="1182948319" id="rhn-source-package-43087" source-rpm="mc-4.6.1a-35.el5.src.rpm"/><source-package last-modified="1183015999" id="rhn-source-package-43102" source-rpm="cman-2.0.64-1.0.1.el5.src.rpm"/><source-package last-modified="1183649434" id="rhn-source-package-43182" source-rpm="perl-TimeDate-1.16-5.el5.src.rpm"/><source-package last-modified="1183649540" id="rhn-source-package-43183" source-rpm="prelink-0.3.9-2.1.src.rpm"/><source-package last-modified="1183649671" id="rhn-source-package-43184" source-rpm="conman-0.1.9.2-8.el5.src.rpm"/><source-package last-modified="1183649777" id="rhn-source-package-43185" source-rpm="mod_auth_kerb-5.1-3.el5.src.rpm"/><source-package last-modified="1183649876" id="rhn-source-package-43186" source-rpm="mod_authz_ldap-0.26-8.el5.src.rpm"/><source-package last-modified="1184039694" id="rhn-source-package-43188" source-rpm="kernel-2.6.18-8.1.8.el5.src.rpm"/><source-package last-modified="1184230888" id="rhn-source-package-43193" source-rpm="perl-Net-DNS-0.59-3.el5.src.rpm"/><source-package last-modified="1184231901" id="rhn-source-package-43194" source-rpm="xorg-x11-xfs-1.0.2-4.src.rpm"/><source-package last-modified="1184668510" id="rhn-source-package-43216" source-rpm="tomcat5-5.5.23-0jpp.1.0.4.el5.src.rpm"/><source-package last-modified="1184770290" id="rhn-source-package-43218" source-rpm="man-pages-2.39-10.el5.src.rpm"/><source-package last-modified="1184770575" id="rhn-source-package-43219" source-rpm="system-config-kdump-1.0.10-1.el5.src.rpm"/><source-package last-modified="1184770766" id="rhn-source-package-43220" source-rpm="fetchmail-6.3.6-1.1.el5.src.rpm"/><source-package last-modified="1184792490" id="rhn-source-package-43228" source-rpm="man-pages-ja-20060815-5.src.rpm"/><source-package last-modified="1184812911" id="rhn-source-package-43234" source-rpm="firefox-1.5.0.12-3.el5.src.rpm"/><source-package last-modified="1184850750" id="rhn-source-package-43238" source-rpm="tzdata-2007f-1.el5.src.rpm"/><source-package last-modified="1185284803" id="rhn-source-package-43497" source-rpm="bind-9.3.3-9.0.1.el5.src.rpm"/><source-package last-modified="1185484552" id="rhn-source-package-43504" source-rpm="acl-2.2.39-2.1.el5.src.rpm"/><source-package last-modified="1185484595" id="rhn-source-package-43512" source-rpm="binutils-2.17.50.0.6-5.el5.src.rpm"/><source-package last-modified="1185484602" id="rhn-source-package-43515" source-rpm="cairo-1.2.4-2.el5.src.rpm"/><source-package last-modified="1185484885" id="rhn-source-package-43526" source-rpm="dhcp-3.0.5-7.el5.src.rpm"/><source-package last-modified="1185484931" id="rhn-source-package-43531" source-rpm="emacs-21.4-19.el5.src.rpm"/><source-package last-modified="1185485009" id="rhn-source-package-43534" source-rpm="evolution-data-server-1.8.0-25.el5.src.rpm"/><source-package last-modified="1185485193" id="rhn-source-package-43549" source-rpm="icu-3.6-5.11.src.rpm"/><source-package last-modified="1185485303" id="rhn-source-package-43559" source-rpm="liberation-fonts-0.2-2.el5.src.rpm"/><source-package last-modified="1185485304" id="rhn-source-package-43560" source-rpm="libselinux-1.33.4-4.el5.src.rpm"/><source-package last-modified="1185485336" id="rhn-source-package-43573" source-rpm="nspr-4.6.5-3.el5.src.rpm"/><source-package last-modified="1185485344" id="rhn-source-package-43575" source-rpm="nss_ldap-253-5.el5.src.rpm"/><source-package last-modified="1185485349" id="rhn-source-package-43576" source-rpm="ntp-4.2.2p1-7.el5.src.rpm"/><source-package last-modified="1185485352" id="rhn-source-package-43578" source-rpm="openCryptoki-2.2.4-16.el5.src.rpm"/><source-package last-modified="1185485398" id="rhn-source-package-43582" source-rpm="openldap-2.3.27-8.src.rpm"/><source-package last-modified="1185819966" id="rhn-source-package-43595" source-rpm="cups-1.2.4-11.5.3.el5.src.rpm"/><source-package last-modified="1185821879" id="rhn-source-package-43596" source-rpm="poppler-0.5.4-4.1.el5.src.rpm"/><source-package last-modified="1185828304" id="rhn-source-package-43601" source-rpm="openssh-4.3p2-24.el5.src.rpm"/><source-package last-modified="1185828315" id="rhn-source-package-43603" source-rpm="pam_krb5-2.2.14-1.src.rpm"/><source-package last-modified="1185828327" id="rhn-source-package-43610" source-rpm="redhat-lsb-3.1-12.3.EL.src.rpm"/><source-package last-modified="1185828372" id="rhn-source-package-43620" source-rpm="sysklogd-1.4.1-40.el5.src.rpm"/><source-package last-modified="1185828373" id="rhn-source-package-43621" source-rpm="sysreport-1.4.3-13.el5.src.rpm"/><source-package last-modified="1185828376" id="rhn-source-package-43622" source-rpm="systemtap-0.5.14-1.el5.src.rpm"/><source-package last-modified="1185828398" id="rhn-source-package-43628" source-rpm="util-linux-2.13-0.45.el5.src.rpm"/><source-package last-modified="1185904157" id="rhn-source-package-43650" source-rpm="qt-3.3.6-21.el5.src.rpm"/><source-package last-modified="1185960834" id="rhn-source-package-43677" source-rpm="tetex-3.0-33.1.el5.src.rpm"/><source-package last-modified="1186514351" id="rhn-source-package-43700" source-rpm="gdm-2.16.0-31.0.1.el5.src.rpm"/><source-package last-modified="1187872660" id="rhn-source-package-43759" source-rpm="tar-1.15.1-23.0.1.el5.src.rpm"/><source-package last-modified="1188480717" id="rhn-source-package-43905" source-rpm="mysql-5.0.22-2.1.0.1.src.rpm"/><source-package last-modified="1188914520" id="rhn-source-package-43908" source-rpm="aide-0.13.1-2.0.4.el5.src.rpm"/><source-package last-modified="1188917451" id="rhn-source-package-43913" source-rpm="star-1.5a75-2.src.rpm"/><source-package last-modified="1188929562" id="rhn-source-package-43915" source-rpm="krb5-1.5-28.src.rpm"/><source-package last-modified="1189167226" id="rhn-source-package-43928" source-rpm="krb5-1.5-29.src.rpm"/><source-package last-modified="1189674517" id="rhn-source-package-43933" source-rpm="kernel-2.6.18-8.1.10.el5.src.rpm"/><source-package last-modified="1189699429" id="rhn-source-package-43937" source-rpm="qt-3.3.6-23.el5.src.rpm"/><source-package last-modified="1190222218" id="rhn-source-package-44015" source-rpm="libvorbis-1.1.2-3.el5.0.src.rpm"/><source-package last-modified="1190293563" id="rhn-source-package-44016" source-rpm="php-5.1.6-15.el5.src.rpm"/><source-package last-modified="1190794387" id="rhn-source-package-44055" source-rpm="gimp-2.2.13-2.0.7.el5.src.rpm"/><source-package last-modified="1190794572" id="rhn-source-package-44058" source-rpm="tomcat5-5.5.23-0jpp.3.0.2.el5.src.rpm"/><source-package last-modified="1190924207" id="rhn-source-package-44061" source-rpm="kernel-2.6.18-8.1.14.el5.src.rpm"/><source-package last-modified="1191358376" id="rhn-source-package-44075" source-rpm="xen-3.0.3-25.0.4.el5.src.rpm"/><source-package last-modified="1191358472" id="rhn-source-package-44076" source-rpm="nfs-utils-lib-1.0.8-7.2.z2.src.rpm"/><source-package last-modified="1191426218" id="rhn-source-package-44078" source-rpm="elinks-0.11.1-5.1.0.1.el5.src.rpm"/><source-package last-modified="1191505134" id="rhn-source-package-44084" source-rpm="tzdata-2007h-1.el5.src.rpm"/><source-package last-modified="1191829373" id="rhn-source-package-44085" source-rpm="kdebase-3.5.4-15.el5.src.rpm"/><source-package last-modified="1191830694" id="rhn-source-package-44088" source-rpm="kdelibs-3.5.4-13.el5.src.rpm"/><source-package last-modified="1192127121" id="rhn-source-package-44098" source-rpm="hplip-1.6.7-4.1.el5_0.3.src.rpm"/><source-package last-modified="1192186797" id="rhn-source-package-44099" source-rpm="openssl-0.9.8b-8.3.el5_0.2.src.rpm"/><source-package last-modified="1192807897" id="rhn-source-package-44104" source-rpm="firefox-1.5.0.12-6.el5.src.rpm"/><source-package last-modified="1193050083" id="rhn-source-package-44113" source-rpm="kernel-2.6.18-8.1.15.el5.src.rpm"/><source-package last-modified="1193067711" id="rhn-source-package-44115" source-rpm="flac-1.1.2-28.el5_0.1.src.rpm"/><source-package last-modified="1193157868" id="rhn-source-package-44132" source-rpm="libpng-1.2.10-7.1.el5_0.1.src.rpm"/><source-package last-modified="1193755341" id="rhn-source-package-44156" source-rpm="net-snmp-5.3.1-19.el5.src.rpm"/><source-package last-modified="1193756229" id="rhn-source-package-44158" source-rpm="mozldap-6.0.4-1.el5.src.rpm"/><source-package last-modified="1193756241" id="rhn-source-package-44159" source-rpm="svrcore-4.0.4-3.el5.src.rpm"/><source-package last-modified="1193756255" id="rhn-source-package-44160" source-rpm="perl-Mozilla-LDAP-1.5.2-4.el5.src.rpm"/><source-package last-modified="1193756264" id="rhn-source-package-44161" source-rpm="nfs4-acl-tools-0.3.1-1.el5.1.src.rpm"/><source-package last-modified="1193756276" id="rhn-source-package-44162" source-rpm="system-config-kdump-1.0.12-1.el5.src.rpm"/><source-package last-modified="1193756310" id="rhn-source-package-44163" source-rpm="sos-1.7-9.1.el5.src.rpm"/><source-package last-modified="1193756320" id="rhn-source-package-44165" source-rpm="redhat-release-5Server-5.1.0.2.src.rpm"/><source-package last-modified="1193756356" id="rhn-source-package-44166" source-rpm="ldapjdk-4.18-2jpp.3.el5.src.rpm"/><source-package last-modified="1193756646" id="rhn-source-package-44167" source-rpm="module-init-tools-3.3-0.pre3.1.34.el5.src.rpm"/><source-package last-modified="1193756657" id="rhn-source-package-44168" source-rpm="strace-4.5.16-1.el5.1.src.rpm"/><source-package last-modified="1193756723" id="rhn-source-package-44169" source-rpm="nss-3.11.7-1.3.el5.src.rpm"/><source-package last-modified="1193756782" id="rhn-source-package-44170" source-rpm="system-config-network-1.3.99-2.el5.src.rpm"/><source-package last-modified="1193756818" id="rhn-source-package-44171" source-rpm="ypbind-1.19-8.el5.src.rpm"/><source-package last-modified="1193756831" id="rhn-source-package-44172" source-rpm="xorg-x11-drv-mga-1.4.2-6.el5.src.rpm"/><source-package last-modified="1193756839" id="rhn-source-package-44173" source-rpm="redhat-menus-6.7.8-2.el5.src.rpm"/><source-package last-modified="1193757031" id="rhn-source-package-44176" source-rpm="cachefilesd-0.8-2.el5.src.rpm"/><source-package last-modified="1193757051" id="rhn-source-package-44177" source-rpm="initscripts-8.45.17.EL-1.src.rpm"/><source-package last-modified="1193757081" id="rhn-source-package-44178" source-rpm="krb5-1.6.1-17.el5.src.rpm"/><source-package last-modified="1193757109" id="rhn-source-package-44179" source-rpm="kernel-2.6.18-53.el5.src.rpm"/><source-package last-modified="1193757177" id="rhn-source-package-44180" source-rpm="gdb-6.5-25.el5.src.rpm"/><source-package last-modified="1193757205" id="rhn-source-package-44181" source-rpm="crash-4.0-4.6.1.src.rpm"/><source-package last-modified="1193757223" id="rhn-source-package-44182" source-rpm="quagga-0.98.6-5.el5.src.rpm"/><source-package last-modified="1193757238" id="rhn-source-package-44183" source-rpm="openhpi-2.8.1-2.el5.7.src.rpm"/><source-package last-modified="1193757388" id="rhn-source-package-44184" source-rpm="gfs2-utils-0.1.38-1.el5.src.rpm"/><source-package last-modified="1193757398" id="rhn-source-package-44185" source-rpm="cman-2.0.73-1.el5.src.rpm"/><source-package last-modified="1193757411" id="rhn-source-package-44186" source-rpm="openais-0.80.3-7.el5.src.rpm"/><source-package last-modified="1193758413" id="rhn-source-package-44187" source-rpm="edac-utils-0.9-5.el5.src.rpm"/><source-package last-modified="1193758527" id="rhn-source-package-44188" source-rpm="audit-1.5.5-7.el5.src.rpm"/><source-package last-modified="1193758661" id="rhn-source-package-44192" source-rpm="kudzu-1.2.57.1.15-1.src.rpm"/><source-package last-modified="1193758877" id="rhn-source-package-44194" source-rpm="mesa-6.5.1-7.5.el5.src.rpm"/><source-package last-modified="1193758955" id="rhn-source-package-44197" source-rpm="openib-1.2-6.el5.src.rpm"/><source-package last-modified="1193758983" id="rhn-source-package-44198" source-rpm="mkinitrd-5.1.19.6-19.src.rpm"/><source-package last-modified="1193759079" id="rhn-source-package-44199" source-rpm="cups-1.2.4-11.14.el5.src.rpm"/><source-package last-modified="1193759272" id="rhn-source-package-44203" source-rpm="cpufreq-utils-002-1.1.43.el5.src.rpm"/><source-package last-modified="1193759331" id="rhn-source-package-44204" source-rpm="xen-3.0.3-41.el5.src.rpm"/><source-package last-modified="1193759547" id="rhn-source-package-44206" source-rpm="yum-utils-1.0.4-3.el5.src.rpm"/><source-package last-modified="1193759566" id="rhn-source-package-44207" source-rpm="hwdata-0.211-1.src.rpm"/><source-package last-modified="1193759599" id="rhn-source-package-44208" source-rpm="xorg-x11-drv-i810-1.6.5-9.6.el5.src.rpm"/><source-package last-modified="1193759612" id="rhn-source-package-44209" source-rpm="xorg-x11-drv-nv-2.1.2-1.el5.src.rpm"/><source-package last-modified="1193760216" id="rhn-source-package-44211" source-rpm="parted-1.8.1-12.el5.src.rpm"/><source-package last-modified="1193760232" id="rhn-source-package-44212" source-rpm="device-mapper-multipath-0.4.7-12.el5.src.rpm"/><source-package last-modified="1193760233" id="rhn-source-package-44213" source-rpm="rpm-4.4.2-47.el5.src.rpm"/><source-package last-modified="1193760434" id="rhn-source-package-44215" source-rpm="kexec-tools-1.101-194.4.el5.src.rpm"/><source-package last-modified="1193760626" id="rhn-source-package-44216" source-rpm="gtk2-2.10.4-19.el5.src.rpm"/><source-package last-modified="1193760685" id="rhn-source-package-44217" source-rpm="nfs-utils-1.0.9-24.el5.src.rpm"/><source-package last-modified="1193760688" id="rhn-source-package-44218" source-rpm="selinux-policy-2.4.6-104.el5.src.rpm"/><source-package last-modified="1193760707" id="rhn-source-package-44220" source-rpm="fonts-chinese-3.02-12.el5.src.rpm"/><source-package last-modified="1193760734" id="rhn-source-package-44221" source-rpm="hal-0.5.8.1-25.el5.src.rpm"/><source-package last-modified="1193760951" id="rhn-source-package-44222" source-rpm="sblim-1-29.EL5.src.rpm"/><source-package last-modified="1193760965" id="rhn-source-package-44223" source-rpm="Deployment_Guide-5.1.0-11.src.rpm"/><source-package last-modified="1193760992" id="rhn-source-package-44224" source-rpm="jakarta-commons-modeler-1.1-8jpp.3.el5.src.rpm"/><source-package last-modified="1193761007" id="rhn-source-package-44225" source-rpm="pm-utils-0.99.3-6.el5.17.src.rpm"/><source-package last-modified="1193761011" id="rhn-source-package-44226" source-rpm="autofs-5.0.1-0.rc2.55.src.rpm"/><source-package last-modified="1193761028" id="rhn-source-package-44227" source-rpm="sabayon-2.12.4-5.el5.src.rpm"/><source-package last-modified="1193761040" id="rhn-source-package-44229" source-rpm="irqbalance-0.55-6.el5.src.rpm"/><source-package last-modified="1193761055" id="rhn-source-package-44230" source-rpm="tog-pegasus-2.6.1-2.el5.src.rpm"/><source-package last-modified="1193761105" id="rhn-source-package-44232" source-rpm="lvm2-2.02.26-3.el5.src.rpm"/><source-package last-modified="1193761167" id="rhn-source-package-44233" source-rpm="redhat-release-notes-5Server-9.src.rpm"/><source-package last-modified="1193761264" id="rhn-source-package-44235" source-rpm="dmraid-1.0.0.rc13-4.el5.src.rpm"/><source-package last-modified="1193761300" id="rhn-source-package-44236" source-rpm="newt-perl-1.08-9.2.2.src.rpm"/><source-package last-modified="1193761300" id="rhn-source-package-44237" source-rpm="crypto-utils-2.3-1.src.rpm"/><source-package last-modified="1193761338" id="rhn-source-package-44238" source-rpm="iscsi-initiator-utils-6.2.0.865-0.8.el5.src.rpm"/><source-package last-modified="1193761352" id="rhn-source-package-44239" source-rpm="yum-rhn-plugin-0.5.2-3.el5.src.rpm"/><source-package last-modified="1193761659" id="rhn-source-package-44240" source-rpm="wireshark-0.99.6-1.el5.src.rpm"/><source-package last-modified="1193770704" id="rhn-source-package-44253" source-rpm="rhn-client-tools-0.4.16-1.el5.src.rpm"/><source-package last-modified="1193771307" id="rhn-source-package-44255" source-rpm="OpenIPMI-2.0.6-5.el5.4.src.rpm"/><source-package last-modified="1193771537" id="rhn-source-package-44256" source-rpm="pkinit-nss-0.7.3-1.el5.src.rpm"/><source-package last-modified="1193779644" id="rhn-source-package-44257" source-rpm="watchdog-5.3.1-7.el5.src.rpm"/><source-package last-modified="1193779865" id="rhn-source-package-44258" source-rpm="openmpi-1.2.3-4.el5.src.rpm"/><source-package last-modified="1193779875" id="rhn-source-package-44259" source-rpm="ibutils-1.2-2.el5.src.rpm"/><source-package last-modified="1193780050" id="rhn-source-package-44260" source-rpm="libdhcp-1.20-2.el5.src.rpm"/><source-package last-modified="1193784223" id="rhn-source-package-44262" source-rpm="esc-1.0.0-32.el5.src.rpm"/><source-package last-modified="1193784320" id="rhn-source-package-44264" source-rpm="frysk-0.0.1.2007.06.21.rh2-4.el5.src.rpm"/><source-package last-modified="1193784641" id="rhn-source-package-44265" source-rpm="libXp-1.0.0-8.1.el5.src.rpm"/><source-package last-modified="1193784999" id="rhn-source-package-44269" source-rpm="python-pyblock-0.26-1.el5.src.rpm"/><source-package last-modified="1193784999" id="rhn-source-package-44270" source-rpm="anaconda-11.1.2.87-1.src.rpm"/><source-package last-modified="1193785039" id="rhn-source-package-44271" source-rpm="microcode_ctl-1.17-1.42.el5.src.rpm"/><source-package last-modified="1193785052" id="rhn-source-package-44272" source-rpm="xorg-x11-drv-evdev-1.0.0.5-3.el5.src.rpm"/><source-package last-modified="1193785106" id="rhn-source-package-44273" source-rpm="totem-2.16.7-1.el5.src.rpm"/><source-package last-modified="1193785111" id="rhn-source-package-44274" source-rpm="device-mapper-1.02.20-1.el5.src.rpm"/><source-package last-modified="1193785171" id="rhn-source-package-44275" source-rpm="policycoreutils-1.33.12-12.el5.src.rpm"/><source-package last-modified="1193785194" id="rhn-source-package-44276" source-rpm="bind-9.3.3-10.el5.src.rpm"/><source-package last-modified="1193785230" id="rhn-source-package-44277" source-rpm="xorg-x11-drv-vesa-1.3.0-8.1.el5.src.rpm"/><source-package last-modified="1193785242" id="rhn-source-package-44278" source-rpm="firstboot-1.4.27.3-1.el5.src.rpm"/><source-package last-modified="1193785257" id="rhn-source-package-44279" source-rpm="alsa-utils-1.0.14-2.rc4.el5.src.rpm"/><source-package last-modified="1193785257" id="rhn-source-package-44280" source-rpm="alsa-lib-1.0.14-1.rc4.el5.src.rpm"/><source-package last-modified="1193785275" id="rhn-source-package-44281" source-rpm="gnome-power-manager-2.16.0-8.el5.src.rpm"/><source-package last-modified="1193785290" id="rhn-source-package-44282" source-rpm="udev-095-14.9.el5.src.rpm"/><source-package last-modified="1193785323" id="rhn-source-package-44283" source-rpm="glibc-2.5-18.src.rpm"/><source-package last-modified="1193785415" id="rhn-source-package-44284" source-rpm="tcp_wrappers-7.6-40.4.el5.src.rpm"/><source-package last-modified="1193785428" id="rhn-source-package-44285" source-rpm="vixie-cron-4.1-72.el5.src.rpm"/><source-package last-modified="1193785443" id="rhn-source-package-44286" source-rpm="e2fsprogs-1.39-10.el5.src.rpm"/><source-package last-modified="1193785475" id="rhn-source-package-44287" source-rpm="samba-3.0.25b-0.el5.4.src.rpm"/><source-package last-modified="1193785502" id="rhn-source-package-44288" source-rpm="libuser-0.54.7-2.el5.2.src.rpm"/><source-package last-modified="1193785559" id="rhn-source-package-44289" source-rpm="gcc-4.1.2-14.el5.src.rpm"/><source-package last-modified="1193785639" id="rhn-source-package-44290" source-rpm="gstreamer-plugins-good-0.10.4-4.el5.src.rpm"/><source-package last-modified="1193785961" id="rhn-source-package-44291" source-rpm="pam-0.99.6.2-3.26.el5.src.rpm"/><source-package last-modified="1193838431" id="rhn-source-package-44292" source-rpm="cups-1.2.4-11.14.el5_1.1.src.rpm"/><source-package last-modified="1194278790" id="rhn-source-package-44307" source-rpm="pcre-6.6-2.el5_0.1.src.rpm"/><source-package last-modified="1194279147" id="rhn-source-package-44310" source-rpm="perl-5.8.8-10.el5_0.2.src.rpm"/><source-package last-modified="1194453806" id="rhn-source-package-44322" source-rpm="glibc-2.5-18.el5_1.1.src.rpm"/><source-package last-modified="1194454259" id="rhn-source-package-44323" source-rpm="openib-1.2-6.el5_1.1.src.rpm"/><source-package last-modified="1194454347" id="rhn-source-package-44324" source-rpm="cman-2.0.73-1.el5_1.1.src.rpm"/><source-package last-modified="1194454435" id="rhn-source-package-44325" source-rpm="selinux-policy-2.4.6-106.el5_1.3.src.rpm"/><source-package last-modified="1194454555" id="rhn-source-package-44326" source-rpm="hal-0.5.8.1-25.el5_1.1.src.rpm"/><source-package last-modified="1194457459" id="rhn-source-package-44327" source-rpm="cups-1.2.4-11.14.el5_1.3.src.rpm"/><source-package last-modified="1194458911" id="rhn-source-package-44331" source-rpm="poppler-0.5.4-4.3.el5_1.src.rpm"/><source-package last-modified="1194528992" id="rhn-source-package-44337" source-rpm="tetex-3.0-33.2.el5_1.2.src.rpm"/><source-package last-modified="1194540736" id="rhn-source-package-44339" source-rpm="openldap-2.3.27-8.el5_1.1.src.rpm"/><source-package last-modified="1194668039" id="rhn-source-package-44348" source-rpm="pcre-6.6-2.el5_1.1.src.rpm"/><source-package last-modified="1194946597" id="rhn-source-package-44369" source-rpm="ruby-1.8.5-5.el5_1.1.src.rpm"/><source-package last-modified="1195133181" id="rhn-source-package-44505" source-rpm="rsh-0.17-38.el5.src.rpm"/><source-package last-modified="1195134460" id="rhn-source-package-44506" source-rpm="libchewing-0.3.0-8.el5.src.rpm"/><source-package last-modified="1195135587" id="rhn-source-package-44507" source-rpm="logrotate-3.7.4-8.src.rpm"/><source-package last-modified="1195136668" id="rhn-source-package-44508" source-rpm="xorg-x11-drv-keyboard-1.1.0-3.src.rpm"/><source-package last-modified="1195137186" id="rhn-source-package-44509" source-rpm="telnet-0.17-39.el5.src.rpm"/><source-package last-modified="1195141427" id="rhn-source-package-44515" source-rpm="util-linux-2.13-0.45.el5_1.1.src.rpm"/><source-package last-modified="1195144012" id="rhn-source-package-44517" source-rpm="samba-3.0.25b-1.el5_1.2.src.rpm"/><source-package last-modified="1195145236" id="rhn-source-package-44520" source-rpm="net-snmp-5.3.1-19.el5_1.1.src.rpm"/><source-package last-modified="1195582425" id="rhn-source-package-44532" source-rpm="net-snmp-5.3.1-19.el5_1.2.src.rpm"/><source-package last-modified="1195646301" id="rhn-source-package-44533" source-rpm="php-pear-1.4.9-4.el5.1.src.rpm"/><source-package last-modified="1195646529" id="rhn-source-package-44534" source-rpm="psmisc-22.2-6.src.rpm"/><source-package last-modified="1195646607" id="rhn-source-package-44535" source-rpm="acl-2.2.39-3.el5.src.rpm"/><source-package last-modified="1195646677" id="rhn-source-package-44536" source-rpm="desktop-printing-0.19-20.1.el5.src.rpm"/><source-package last-modified="1195648561" id="rhn-source-package-44540" source-rpm="emacspeak-23.0-3.el5.src.rpm"/><source-package last-modified="1195652988" id="rhn-source-package-44541" source-rpm="rhn-client-tools-0.4.16-2.el5_1.9.src.rpm"/><source-package last-modified="1196117002" id="rhn-source-package-44587" source-rpm="firefox-1.5.0.12-7.el5.src.rpm"/><source-package last-modified="1196278273" id="rhn-source-package-44588" source-rpm="ltrace-0.5-7.45svn.el5.src.rpm"/><source-package last-modified="1196278311" id="rhn-source-package-44589" source-rpm="xorg-x11-xinit-1.0.2-15.el5.src.rpm"/><source-package last-modified="1196347202" id="rhn-source-package-44592" source-rpm="kernel-2.6.18-53.1.4.el5.src.rpm"/><source-package last-modified="1196347771" id="rhn-source-package-44593" source-rpm="pcre-6.6-2.el5_1.7.src.rpm"/><source-package last-modified="1196349673" id="rhn-source-package-44597" source-rpm="cairo-1.2.4-3.el5_1.src.rpm"/><source-package last-modified="1197473868" id="rhn-source-package-44665" source-rpm="x3270-3.3.4p7-3.el5.3.src.rpm"/><source-package last-modified="1197473994" id="rhn-source-package-44666" source-rpm="openhpi-2.8.1-2.el5.9.src.rpm"/><source-package last-modified="1197474450" id="rhn-source-package-44667" source-rpm="openmotif-2.3.0-0.4.el5.src.rpm"/><source-package last-modified="1197474582" id="rhn-source-package-44668" source-rpm="traceroute-2.0.1-3.el5.src.rpm"/><source-package last-modified="1197474711" id="rhn-source-package-44669" source-rpm="system-config-users-1.2.51-3.el5.src.rpm"/><source-package last-modified="1197476266" id="rhn-source-package-44670" source-rpm="net-snmp-5.3.1-19.el5_1.3.src.rpm"/><source-package last-modified="1197577108" id="rhn-source-package-44672" source-rpm="mcstrans-0.2.6-1.el5_1.1.src.rpm"/><source-package last-modified="1197662794" id="rhn-source-package-44673" source-rpm="mozldap-6.0.5-1.el5.src.rpm"/><source-package last-modified="1197993449" id="rhn-source-package-44679" source-rpm="squid-2.6.STABLE6-5.el5_1.2.src.rpm"/><source-package last-modified="1197994882" id="rhn-source-package-44681" source-rpm="mysql-5.0.22-2.2.el5_1.1.src.rpm"/><source-package last-modified="1198078376" id="rhn-source-package-44685" source-rpm="libexif-0.6.13-4.0.2.el5_1.1.src.rpm"/><source-package last-modified="1198168654" id="rhn-source-package-44693" source-rpm="metacity-2.16.0-9.el5.src.rpm"/><source-package last-modified="1198168765" id="rhn-source-package-44694" source-rpm="nss_db-2.2-35.3.src.rpm"/><source-package last-modified="1198169149" id="rhn-source-package-44696" source-rpm="createrepo-0.4.11-1.el5.src.rpm"/><source-package last-modified="1198169182" id="rhn-source-package-44697" source-rpm="gthumb-2.7.8-8.el5.src.rpm"/><source-package last-modified="1198169274" id="rhn-source-package-44698" source-rpm="xsane-0.991-5.el5.src.rpm"/><source-package last-modified="1198178547" id="rhn-source-package-44699" source-rpm="autofs-5.0.1-0.rc2.55.el5.2.src.rpm"/><source-package last-modified="1199357948" id="rhn-source-package-44709" source-rpm="shared-mime-info-0.19-5.el5.src.rpm"/><source-package last-modified="1199358062" id="rhn-source-package-44710" source-rpm="totem-2.16.7-2.el5.src.rpm"/><source-package last-modified="1199358304" id="rhn-source-package-44711" source-rpm="emacs-21.4-20.el5.src.rpm"/><source-package last-modified="1199358465" id="rhn-source-package-44712" source-rpm="libraw1394-1.3.0-1.el5.src.rpm"/><source-package last-modified="1199358465" id="rhn-source-package-44713" source-rpm="dvgrab-3.0-1.el5.src.rpm"/><source-package last-modified="1199385189" id="rhn-source-package-44717" source-rpm="tzdata-2007k-1.el5.src.rpm"/><source-package last-modified="1199473237" id="rhn-source-package-44719" source-rpm="fontconfig-2.4.1-7.el5.src.rpm"/><source-package last-modified="1199730173" id="rhn-source-package-44722" source-rpm="tog-pegasus-2.6.1-2.el5_1.1.src.rpm"/><source-package last-modified="1199731096" id="rhn-source-package-44725" source-rpm="e2fsprogs-1.39-10.el5_1.1.src.rpm"/><source-package last-modified="1199892494" id="rhn-source-package-44779" source-rpm="man-pages-ja-20060815-6.el5.src.rpm"/><source-package last-modified="1199892526" id="rhn-source-package-44780" source-rpm="htmlview-4.0.0-2.el5.src.rpm"/><source-package last-modified="1200053596" id="rhn-source-package-44790" source-rpm="libxml2-2.6.26-2.1.2.1.src.rpm"/><source-package last-modified="1200054531" id="rhn-source-package-44793" source-rpm="postgresql-8.1.11-1.el5_1.1.src.rpm"/><source-package last-modified="1200389808" id="rhn-source-package-44827" source-rpm="httpd-2.2.3-11.el5_1.3.src.rpm"/><source-package last-modified="1200492281" id="rhn-source-package-44834" source-rpm="oddjob-0.27-9.el5.src.rpm"/><source-package last-modified="1200492437" id="rhn-source-package-44835" source-rpm="m17n-db-1.3.3-48.el5.src.rpm"/><source-package last-modified="1200492585" id="rhn-source-package-44836" source-rpm="amtu-1.0.6-1.el5.src.rpm"/><source-package last-modified="1200492713" id="rhn-source-package-44837" source-rpm="gedit-2.16.0-9.el5.src.rpm"/><source-package last-modified="1200492892" id="rhn-source-package-44838" source-rpm="gnome-utils-2.16.0-5.el5.src.rpm"/><source-package last-modified="1200493128" id="rhn-source-package-44839" source-rpm="m2crypto-0.16-6.el5.2.src.rpm"/><source-package last-modified="1200493256" id="rhn-source-package-44840" source-rpm="apr-util-1.2.7-7.el5.src.rpm"/><source-package last-modified="1200493392" id="rhn-source-package-44841" source-rpm="crypto-utils-2.3-2.el5.src.rpm"/><source-package last-modified="1200498845" id="rhn-source-package-44842" source-rpm="sysklogd-1.4.1-42.el5.src.rpm"/><source-package last-modified="1200599925" id="rhn-source-package-44843" source-rpm="libXfont-1.2.2-1.0.3.el5_1.src.rpm"/><source-package last-modified="1200600196" id="rhn-source-package-44844" source-rpm="xorg-x11-server-1.1.1-48.26.el5_1.4.src.rpm"/><source-package last-modified="1200706007" id="rhn-source-package-44848" source-rpm="xorg-x11-server-1.1.1-48.26.el5_1.5.src.rpm"/><source-package last-modified="1200903768" id="rhn-source-package-44854" source-rpm="wireshark-0.99.7-1.el5.src.rpm"/><source-package last-modified="1201077990" id="rhn-source-package-44861" source-rpm="yum-rhn-plugin-0.5.2-5.el5_1.2.src.rpm"/><source-package last-modified="1201096656" id="rhn-source-package-44862" source-rpm="hwbrowser-0.30-2.el5.src.rpm"/><source-package last-modified="1201096764" id="rhn-source-package-44863" source-rpm="pygtk2-2.10.1-11.el5.src.rpm"/><source-package last-modified="1201096862" id="rhn-source-package-44864" source-rpm="ntp-4.2.2p1-8.el5.src.rpm"/><source-package last-modified="1201097059" id="rhn-source-package-44865" source-rpm="kdeadmin-3.5.4-3.el5.src.rpm"/><source-package last-modified="1201097551" id="rhn-source-package-44868" source-rpm="a2ps-4.13b-57.2.el5.src.rpm"/><source-package last-modified="1201097658" id="rhn-source-package-44869" source-rpm="gnome-screensaver-2.16.1-6.el5.src.rpm"/><source-package last-modified="1201097861" id="rhn-source-package-44870" source-rpm="gnome-panel-2.16.1-7.el5.src.rpm"/><source-package last-modified="1201098308" id="rhn-source-package-44871" source-rpm="scim-pinyin-0.5.91-16.el5.src.rpm"/><source-package last-modified="1201100324" id="rhn-source-package-44872" source-rpm="kernel-2.6.18-53.1.6.el5.src.rpm"/><source-package last-modified="1201267616" id="rhn-source-package-44875" source-rpm="icu-3.6-5.11.1.src.rpm"/><source-package last-modified="1201705440" id="rhn-source-package-44890" source-rpm="gnome-python2-desktop-2.16.0-2.el5.src.rpm"/><source-package last-modified="1201705555" id="rhn-source-package-44891" source-rpm="gzip-1.3.5-10.el5.src.rpm"/><source-package last-modified="1201705649" id="rhn-source-package-44892" source-rpm="system-config-printer-0.7.32.8-1.el5.src.rpm"/><source-package last-modified="1201705986" id="rhn-source-package-44894" source-rpm="pygtk2-2.10.1-12.el5.src.rpm"/><source-package last-modified="1201706926" id="rhn-source-package-44896" source-rpm="device-mapper-multipath-0.4.7-12.el5_1.2.src.rpm"/><source-package last-modified="1201868812" id="rhn-source-package-44902" source-rpm="autofs-5.0.1-0.rc2.55.el5.3.src.rpm"/><source-package last-modified="1202324388" id="rhn-source-package-44918" source-rpm="liberation-fonts-1.0-1.el5.src.rpm"/><source-package last-modified="1202324417" id="rhn-source-package-44919" source-rpm="pkgconfig-0.21-2.el5.src.rpm"/><source-package last-modified="1202324456" id="rhn-source-package-44920" source-rpm="libgnomeprint22-2.12.1-10.el5.src.rpm"/><source-package last-modified="1202409597" id="rhn-source-package-44923" source-rpm="gdb-6.5-25.el5_1.1.src.rpm"/><source-package last-modified="1202436957" id="rhn-source-package-44930" source-rpm="firefox-1.5.0.12-9.el5.src.rpm"/><source-package last-modified="1202834773" id="rhn-source-package-44932" source-rpm="kernel-2.6.18-53.1.13.el5.src.rpm"/><source-package last-modified="1202937428" id="rhn-source-package-44937" source-rpm="libao-0.8.6-7.src.rpm"/><source-package last-modified="1203077022" id="rhn-source-package-44945" source-rpm="net-snmp-5.3.1-19.el5_1.4.src.rpm"/><source-package last-modified="1203135432" id="rhn-source-package-44982" source-rpm="firefox-1.5.0.12-11.el5_1.src.rpm"/><source-package last-modified="1203542257" id="rhn-source-package-44986" source-rpm="lam-7.1.2-11.el5.src.rpm"/><source-package last-modified="1203627947" id="rhn-source-package-44990" source-rpm="openldap-2.3.27-8.el5_1.3.src.rpm"/><source-package last-modified="1203628854" id="rhn-source-package-44993" source-rpm="tk-8.4.13-5.el5_1.1.src.rpm"/><source-package last-modified="1203629330" id="rhn-source-package-44994" source-rpm="cups-1.2.4-11.14.el5_1.4.src.rpm"/><source-package last-modified="1204129778" id="rhn-source-package-45009" source-rpm="gnome-volume-manager-2.15.0-5.el5.src.rpm"/><source-package last-modified="1204129820" id="rhn-source-package-45010" source-rpm="x3270-3.3.4p7-3.el5.4.src.rpm"/><source-package last-modified="1204133388" id="rhn-source-package-45012" source-rpm="system-config-users-1.2.51-4.el5.src.rpm"/><source-package last-modified="1204147656" id="rhn-source-package-45013" source-rpm="dbus-1.0.0-6.3.el5_1.src.rpm"/><source-package last-modified="1204149429" id="rhn-source-package-45016" source-rpm="ghostscript-8.15.2-9.1.el5_1.1.src.rpm"/><source-package last-modified="1204191646" id="rhn-source-package-45019" source-rpm="gd-2.0.33-9.4.el5_1.1.src.rpm"/><source-package last-modified="1204725003" id="rhn-source-package-45093" source-rpm="kernel-2.6.18-53.1.14.el5.src.rpm"/><source-package last-modified="1205158981" id="rhn-source-package-45098" source-rpm="tzdata-2007k-2.el5.src.rpm"/><source-package last-modified="1205166269" id="rhn-source-package-45101" source-rpm="device-mapper-multipath-0.4.7-12.el5_1.3.src.rpm"/><source-package last-modified="1205182885" id="rhn-source-package-45102" source-rpm="paps-0.6.6-17.el5.src.rpm"/><source-package last-modified="1205182907" id="rhn-source-package-45108" source-rpm="logwatch-7.3-6.el5.src.rpm"/><source-package last-modified="1205182925" id="rhn-source-package-45119" source-rpm="sg3_utils-1.25-1.el5.src.rpm"/><source-package last-modified="1205183006" id="rhn-source-package-45124" source-rpm="nautilus-2.16.2-7.el5.src.rpm"/><source-package last-modified="1205183008" id="rhn-source-package-45126" source-rpm="aspell-es-0.50-13.2.2.src.rpm"/><source-package last-modified="1205183020" id="rhn-source-package-45128" source-rpm="tcpdump-3.9.4-12.el5.src.rpm"/><source-package last-modified="1205183021" id="rhn-source-package-45129" source-rpm="kbd-1.12-20.el5.src.rpm"/><source-package last-modified="1205183056" id="rhn-source-package-45131" source-rpm="aspell-nl-0.1e-1.fc6.src.rpm"/><source-package last-modified="1205183306" id="rhn-source-package-45146" source-rpm="kdeartwork-3.5.4-1.fc6.src.rpm"/><source-package last-modified="1205183307" id="rhn-source-package-45147" source-rpm="dstat-0.6.6-3.el5.src.rpm"/><source-package last-modified="1205183391" id="rhn-source-package-45154" source-rpm="kdebase-3.5.4-18.el5.src.rpm"/><source-package last-modified="1205183396" id="rhn-source-package-45159" source-rpm="xorg-x11-twm-1.0.1-3.1.src.rpm"/><source-package last-modified="1205183396" id="rhn-source-package-45160" source-rpm="rhel-instnum-1.0.8-1.el5.src.rpm"/><source-package last-modified="1205183449" id="rhn-source-package-45164" source-rpm="rpm-4.4.2-48.el5.src.rpm"/><source-package last-modified="1205183719" id="rhn-source-package-45172" source-rpm="shadow-utils-4.0.17-13.el5.src.rpm"/><source-package last-modified="1205183743" id="rhn-source-package-45176" source-rpm="smartmontools-5.36-4.el5.src.rpm"/><source-package last-modified="1205183743" id="rhn-source-package-45177" source-rpm="iptables-1.3.5-4.el5.src.rpm"/><source-package last-modified="1205183751" id="rhn-source-package-45180" source-rpm="fonts-indic-2.1.7-2.el5.src.rpm"/><source-package last-modified="1205183758" id="rhn-source-package-45183" source-rpm="sblim-1-31.el5.src.rpm"/><source-package last-modified="1205183766" id="rhn-source-package-45190" source-rpm="system-config-keyboard-1.2.11-1.el5.src.rpm"/><source-package last-modified="1205183767" id="rhn-source-package-45191" source-rpm="notification-daemon-0.3.5-9.el5.src.rpm"/><source-package last-modified="1205183774" id="rhn-source-package-45193" source-rpm="coreutils-5.97-14.el5.src.rpm"/><source-package last-modified="1205183780" id="rhn-source-package-45196" source-rpm="sysstat-7.0.2-1.el5.src.rpm"/><source-package last-modified="1205183794" id="rhn-source-package-45201" source-rpm="redhat-rpm-config-8.0.45-24.el5.src.rpm"/><source-package last-modified="1205183801" id="rhn-source-package-45205" source-rpm="spamassassin-3.2.4-1.el5.src.rpm"/><source-package last-modified="1205183812" id="rhn-source-package-45211" source-rpm="pciutils-2.2.3-5.src.rpm"/><source-package last-modified="1205183817" id="rhn-source-package-45215" source-rpm="scim-anthy-1.2.0-6.el5.src.rpm"/><source-package last-modified="1205183819" id="rhn-source-package-45216" source-rpm="openssh-4.3p2-26.el5.src.rpm"/><source-package last-modified="1205183824" id="rhn-source-package-45220" source-rpm="busybox-1.2.0-4.el5.src.rpm"/><source-package last-modified="1205183899" id="rhn-source-package-45225" source-rpm="procps-3.2.7-9.el5.src.rpm"/><source-package last-modified="1205183971" id="rhn-source-package-45238" source-rpm="libtool-1.5.22-6.1.src.rpm"/><source-package last-modified="1205183974" id="rhn-source-package-45239" source-rpm="gstreamer-0.10.9-3.el5.src.rpm"/><source-package last-modified="1205183978" id="rhn-source-package-45240" source-rpm="ksh-20060214-1.7.src.rpm"/><source-package last-modified="1205183980" id="rhn-source-package-45242" source-rpm="vte-0.14.0-2.el5.src.rpm"/><source-package last-modified="1205183981" id="rhn-source-package-45243" source-rpm="xorg-x11-xtrans-devel-1.0.1-1.1.fc6.src.rpm"/><source-package last-modified="1205183981" id="rhn-source-package-45244" source-rpm="libart_lgpl-2.3.17-4.src.rpm"/><source-package last-modified="1205183998" id="rhn-source-package-45246" source-rpm="gtk2-2.10.4-20.el5.src.rpm"/><source-package last-modified="1205184000" id="rhn-source-package-45249" source-rpm="kdnssd-avahi-0.1.3-0.1.20060713svn.fc6.src.rpm"/><source-package last-modified="1205184011" id="rhn-source-package-45253" source-rpm="mailman-2.1.9-4.el5.src.rpm"/><source-package last-modified="1205184106" id="rhn-source-package-45257" source-rpm="pcsc-lite-1.4.4-0.1.el5.src.rpm"/><source-package last-modified="1205184127" id="rhn-source-package-45259" source-rpm="kdelibs-3.5.4-16.el5.src.rpm"/><source-package last-modified="1205184129" id="rhn-source-package-45261" source-rpm="cscope-15.5-15.fc6.1.src.rpm"/><source-package last-modified="1205184132" id="rhn-source-package-45262" source-rpm="cairo-1.2.4-5.el5.src.rpm"/><source-package last-modified="1205184134" id="rhn-source-package-45264" source-rpm="libogg-1.1.3-3.el5.src.rpm"/><source-package last-modified="1205184142" id="rhn-source-package-45265" source-rpm="python-2.4.3-21.el5.src.rpm"/><source-package last-modified="1205184147" id="rhn-source-package-45269" source-rpm="libX11-1.0.3-9.el5.src.rpm"/><source-package last-modified="1205184185" id="rhn-source-package-45272" source-rpm="libXres-1.0.1-3.1.src.rpm"/><source-package last-modified="1205184185" id="rhn-source-package-45273" source-rpm="automake15-1.5-16.src.rpm"/><source-package last-modified="1205184188" id="rhn-source-package-45274" source-rpm="nmap-4.11-1.1.src.rpm"/><source-package last-modified="1205184207" id="rhn-source-package-45283" source-rpm="pam-0.99.6.2-3.27.el5.src.rpm"/><source-package last-modified="1205184211" id="rhn-source-package-45286" source-rpm="libsemanage-1.9.1-3.el5.src.rpm"/><source-package last-modified="1205184214" id="rhn-source-package-45289" source-rpm="jakarta-commons-dbcp-1.2.1-7jpp.1.src.rpm"/><source-package last-modified="1205184214" id="rhn-source-package-45290" source-rpm="vsftpd-2.0.5-12.el5.src.rpm"/><source-package last-modified="1205184227" id="rhn-source-package-45294" source-rpm="php-5.1.6-20.el5.src.rpm"/><source-package last-modified="1205184230" id="rhn-source-package-45296" source-rpm="gdbm-1.8.0-26.2.1.src.rpm"/><source-package last-modified="1205184231" id="rhn-source-package-45297" source-rpm="bsh-1.3.0-9jpp.1.src.rpm"/><source-package last-modified="1205184234" id="rhn-source-package-45301" source-rpm="newt-0.52.2-10.el5.src.rpm"/><source-package last-modified="1205184252" id="rhn-source-package-45308" source-rpm="libselinux-1.33.4-5.el5.src.rpm"/><source-package last-modified="1205184253" id="rhn-source-package-45309" source-rpm="xorg-x11-font-utils-7.1-2.src.rpm"/><source-package last-modified="1205184255" id="rhn-source-package-45313" source-rpm="xorg-x11-filesystem-7.1-2.fc6.src.rpm"/><source-package last-modified="1205184261" id="rhn-source-package-45319" source-rpm="module-init-tools-3.3-0.pre3.1.37.el5.src.rpm"/><source-package last-modified="1205184262" id="rhn-source-package-45320" source-rpm="openjade-1.3.2-27.src.rpm"/><source-package last-modified="1205184262" id="rhn-source-package-45321" source-rpm="python-iniparse-0.2.3-4.el5.src.rpm"/><source-package last-modified="1205184263" id="rhn-source-package-45322" source-rpm="ncompress-4.2.4-47.src.rpm"/><source-package last-modified="1205184263" id="rhn-source-package-45323" source-rpm="xorg-x11-util-macros-1.0.2-4.fc6.src.rpm"/><source-package last-modified="1205184263" id="rhn-source-package-45324" source-rpm="hicolor-icon-theme-0.9-2.1.src.rpm"/><source-package last-modified="1205184264" id="rhn-source-package-45325" source-rpm="psutils-1.17-26.1.src.rpm"/><source-package last-modified="1205184268" id="rhn-source-package-45328" source-rpm="xorg-x11-drv-sis-0.9.1-7.1.el5.src.rpm"/><source-package last-modified="1205184277" id="rhn-source-package-45334" source-rpm="python-setuptools-0.6c5-2.el5.src.rpm"/><source-package last-modified="1205232584" id="rhn-source-package-45356" source-rpm="tomcat5-5.5.23-0jpp.3.0.3.el5_1.src.rpm"/><source-package last-modified="1205868261" id="rhn-source-package-45384" source-rpm="krb5-1.6.1-17.el5_1.1.src.rpm"/><source-package last-modified="1206398593" id="rhn-source-package-45400" source-rpm="cman-2.0.73-1.el5_1.5.src.rpm"/><source-package last-modified="1206578483" id="rhn-source-package-45401" source-rpm="firefox-1.5.0.12-14.el5_1.src.rpm"/><source-package last-modified="1207058891" id="rhn-source-package-45408" source-rpm="cups-1.2.4-11.14.el5_1.6.src.rpm"/><source-package last-modified="1207135924" id="rhn-source-package-45413" source-rpm="gnome-screensaver-2.16.1-5.el5_1.1.src.rpm"/><source-package last-modified="1207234634" id="rhn-source-package-45416" source-rpm="gnome-screensaver-2.16.1-8.el5.src.rpm"/><source-package last-modified="1207670166" id="rhn-source-package-45428" source-rpm="sos-1.7-9.2.el5.src.rpm"/><source-package last-modified="1207697341" id="rhn-source-package-45432" source-rpm="squid-2.6.STABLE6-5.el5_1.3.src.rpm"/><source-package last-modified="1208389641" id="rhn-source-package-45550" source-rpm="speex-1.0.5-4.el5_1.1.src.rpm"/><source-package last-modified="1208393492" id="rhn-source-package-45555" source-rpm="firefox-1.5.0.12-15.el5_1.src.rpm"/><source-package last-modified="1208394648" id="rhn-source-package-45558" source-rpm="ImageMagick-6.2.8.0-4.el5_1.1.src.rpm"/><source-package last-modified="1208452524" id="rhn-source-package-45574" source-rpm="poppler-0.5.4-4.4.el5_1.src.rpm"/><source-package last-modified="1210145414" id="rhn-source-package-45677" source-rpm="kernel-2.6.18-53.1.19.el5.src.rpm"/><source-package last-modified="1210341530" id="rhn-source-package-45685" source-rpm="mcstrans-0.2.7-1.el5.src.rpm"/><source-package last-modified="1210681609" id="rhn-source-package-45753" source-rpm="xen-3.0.3-41.el5_1.5.src.rpm"/><source-package last-modified="1210750482" id="rhn-source-package-45756" source-rpm="libvorbis-1.1.2-3.el5_1.2.src.rpm"/><source-package last-modified="1210934130" id="rhn-source-package-45766" source-rpm="device-mapper-multipath-0.4.7-12.el5_1.4.src.rpm"/><source-package last-modified="1211226849" id="rhn-source-package-45793" source-rpm="ipsec-tools-0.6.5-9.el5.src.rpm"/><source-package last-modified="1211226892" id="rhn-source-package-45794" source-rpm="mkinitrd-5.1.19.6-28.src.rpm"/><source-package last-modified="1211226923" id="rhn-source-package-45795" source-rpm="system-config-lvm-1.1.3-2.0.el5.src.rpm"/><source-package last-modified="1211226957" id="rhn-source-package-45796" source-rpm="metacity-2.16.0-10.el5.src.rpm"/><source-package last-modified="1211226981" id="rhn-source-package-45797" source-rpm="libnl-1.0-0.10.pre5.5.src.rpm"/><source-package last-modified="1211227043" id="rhn-source-package-45798" source-rpm="openmotif-2.3.0-0.5.el5.src.rpm"/><source-package last-modified="1211227220" id="rhn-source-package-45802" source-rpm="dbus-1.0.0-7.el5.src.rpm"/><source-package last-modified="1211227437" id="rhn-source-package-45805" source-rpm="java-1.4.2-gcj-compat-1.4.2.0-40jpp.115.src.rpm"/><source-package last-modified="1211227505" id="rhn-source-package-45807" source-rpm="redhat-release-5Server-5.2.0.4.src.rpm"/><source-package last-modified="1211230462" id="rhn-source-package-45809" source-rpm="Deployment_Guide-5.2-9.src.rpm"/><source-package last-modified="1211230589" id="rhn-source-package-45811" source-rpm="mpi-selector-1.0.0-2.el5.src.rpm"/><source-package last-modified="1211230589" id="rhn-source-package-45812" source-rpm="lam-7.1.2-14.el5.src.rpm"/><source-package last-modified="1211230589" id="rhn-source-package-45813" source-rpm="openmpi-1.2.5-5.el5.src.rpm"/><source-package last-modified="1211230623" id="rhn-source-package-45814" source-rpm="iscsi-initiator-utils-6.2.0.868-0.7.el5.src.rpm"/><source-package last-modified="1211230753" id="rhn-source-package-45815" source-rpm="tomcat5-5.5.23-0jpp.7.el5.src.rpm"/><source-package last-modified="1211230871" id="rhn-source-package-45817" source-rpm="nss-3.11.99.5-2.el5.src.rpm"/><source-package last-modified="1211230899" id="rhn-source-package-45818" source-rpm="ecryptfs-utils-41-1.el5.src.rpm"/><source-package last-modified="1211236221" id="rhn-source-package-45820" source-rpm="sysklogd-1.4.1-44.el5.src.rpm"/><source-package last-modified="1211236259" id="rhn-source-package-45821" source-rpm="cachefilesd-0.8-5.el5.src.rpm"/><source-package last-modified="1211236300" id="rhn-source-package-45822" source-rpm="openhpi-2.10.2-1.el5.src.rpm"/><source-package last-modified="1211236324" id="rhn-source-package-45823" source-rpm="irqbalance-0.55-10.el5.src.rpm"/><source-package last-modified="1211236346" id="rhn-source-package-45824" source-rpm="freeipmi-0.5.1-5.el5.src.rpm"/><source-package last-modified="1211236358" id="rhn-source-package-45825" source-rpm="xorg-x11-drv-nv-2.1.6-6.el5.src.rpm"/><source-package last-modified="1211236518" id="rhn-source-package-45827" source-rpm="openais-0.80.3-15.el5.src.rpm"/><source-package last-modified="1211236536" id="rhn-source-package-45828" source-rpm="xorg-x11-drv-i810-1.6.5-9.13.el5.src.rpm"/><source-package last-modified="1211236571" id="rhn-source-package-45829" source-rpm="nfs-utils-1.0.9-33.el5.src.rpm"/><source-package last-modified="1211238541" id="rhn-source-package-45831" source-rpm="gdm-2.16.0-46.el5.src.rpm"/><source-package last-modified="1211238551" id="rhn-source-package-45832" source-rpm="system-config-kdump-1.0.14-1.el5.src.rpm"/><source-package last-modified="1211238584" id="rhn-source-package-45833" source-rpm="openswan-2.6.12-2.el5.src.rpm"/><source-package last-modified="1211238675" id="rhn-source-package-45834" source-rpm="anaconda-11.1.2.113-1.src.rpm"/><source-package last-modified="1211238693" id="rhn-source-package-45835" source-rpm="createrepo-0.4.11-3.el5.src.rpm"/><source-package last-modified="1211238761" id="rhn-source-package-45836" source-rpm="microcode_ctl-1.17-1.47.el5.src.rpm"/><source-package last-modified="1211260138" id="rhn-source-package-45844" source-rpm="NetworkManager-0.6.4-8.el5.src.rpm"/><source-package last-modified="1211260139" id="rhn-source-package-45845" source-rpm="audit-1.6.5-9.el5.src.rpm"/><source-package last-modified="1211260140" id="rhn-source-package-45846" source-rpm="authconfig-5.3.21-3.el5.src.rpm"/><source-package last-modified="1211260141" id="rhn-source-package-45847" source-rpm="autofs-5.0.1-0.rc2.88.src.rpm"/><source-package last-modified="1211260146" id="rhn-source-package-45848" source-rpm="bind-9.3.4-6.P1.el5.src.rpm"/><source-package last-modified="1211260147" id="rhn-source-package-45849" source-rpm="cman-2.0.84-2.el5.src.rpm"/><source-package last-modified="1211260148" id="rhn-source-package-45850" source-rpm="device-mapper-multipath-0.4.7-17.el5.src.rpm"/><source-package last-modified="1211260186" id="rhn-source-package-45852" source-rpm="control-center-2.16.0-16.el5.src.rpm"/><source-package last-modified="1211260204" id="rhn-source-package-45853" source-rpm="crash-4.0-5.0.3.src.rpm"/><source-package last-modified="1211260209" id="rhn-source-package-45854" source-rpm="cups-1.2.4-11.18.el5.src.rpm"/><source-package last-modified="1211260211" id="rhn-source-package-45855" source-rpm="dapl-2.0.7-2.el5.src.rpm"/><source-package last-modified="1211260212" id="rhn-source-package-45856" source-rpm="devhelp-0.12-16.el5.src.rpm"/><source-package last-modified="1211260214" id="rhn-source-package-45857" source-rpm="dhcp-3.0.5-13.el5.src.rpm"/><source-package last-modified="1211260223" id="rhn-source-package-45859" source-rpm="dhcpv6-1.0.10-4.el5.src.rpm"/><source-package last-modified="1211260225" id="rhn-source-package-45860" source-rpm="dovecot-1.0.7-2.el5.src.rpm"/><source-package last-modified="1211260229" id="rhn-source-package-45861" source-rpm="e2fsprogs-1.39-15.el5.src.rpm"/><source-package last-modified="1211260229" id="rhn-source-package-45862" source-rpm="efax-0.9-27.2.1.src.rpm"/><source-package last-modified="1211260257" id="rhn-source-package-45864" source-rpm="file-4.17-13.src.rpm"/><source-package last-modified="1211260297" id="rhn-source-package-45865" source-rpm="firefox-3.0-0.beta5.6.el5.src.rpm"/><source-package last-modified="1211260312" id="rhn-source-package-45866" source-rpm="frysk-0.0.1.2008.03.19.rh1-1.el5.src.rpm"/><source-package last-modified="1211260350" id="rhn-source-package-45867" source-rpm="gcc-4.1.2-42.el5.src.rpm"/><source-package last-modified="1211260351" id="rhn-source-package-45868" source-rpm="gfs2-utils-0.1.44-1.el5.src.rpm"/><source-package last-modified="1211260367" id="rhn-source-package-45869" source-rpm="glibc-2.5-24.src.rpm"/><source-package last-modified="1211260370" id="rhn-source-package-45870" source-rpm="gstreamer-plugins-base-0.10.9-6.el5.src.rpm"/><source-package last-modified="1211260372" id="rhn-source-package-45871" source-rpm="hal-0.5.8.1-35.el5.src.rpm"/><source-package last-modified="1211260372" id="rhn-source-package-45872" source-rpm="hal-cups-utils-0.6.2-5.2.el5.src.rpm"/><source-package last-modified="1211260373" id="rhn-source-package-45873" source-rpm="hwdata-0.213.6-1.el5.src.rpm"/><source-package last-modified="1211260374" id="rhn-source-package-45874" source-rpm="infiniband-diags-1.3.6-1.el5.src.rpm"/><source-package last-modified="1211260434" id="rhn-source-package-45875" source-rpm="kernel-2.6.18-92.el5.src.rpm"/><source-package last-modified="1211260436" id="rhn-source-package-45876" source-rpm="kexec-tools-1.102pre-21.el5.src.rpm"/><source-package last-modified="1211260451" id="rhn-source-package-45877" source-rpm="krb5-1.6.1-25.el5.src.rpm"/><source-package last-modified="1211260452" id="rhn-source-package-45878" source-rpm="kudzu-1.2.57.1.17-1.src.rpm"/><source-package last-modified="1211260452" id="rhn-source-package-45879" source-rpm="libcxgb3-1.1.4-1.el5.src.rpm"/><source-package last-modified="1211260454" id="rhn-source-package-45880" source-rpm="libdbi-0.8.1-2.1.src.rpm"/><source-package last-modified="1211260454" id="rhn-source-package-45881" source-rpm="libdhcp-1.20-5.el5.src.rpm"/><source-package last-modified="1211260455" id="rhn-source-package-45882" source-rpm="libibcm-1.0.2-1.el5.src.rpm"/><source-package last-modified="1211260456" id="rhn-source-package-45883" source-rpm="libibcommon-1.0.8-1.el5.src.rpm"/><source-package last-modified="1211260457" id="rhn-source-package-45884" source-rpm="libibmad-1.1.6-1.el5.src.rpm"/><source-package last-modified="1211260458" id="rhn-source-package-45885" source-rpm="libibumad-1.1.7-1.el5.src.rpm"/><source-package last-modified="1211260459" id="rhn-source-package-45886" source-rpm="libibverbs-1.1.1-9.el5.src.rpm"/><source-package last-modified="1211260460" id="rhn-source-package-45887" source-rpm="libipathverbs-1.1-10.el5.src.rpm"/><source-package last-modified="1211260461" id="rhn-source-package-45888" source-rpm="libmlx4-1.0-3.el5.src.rpm"/><source-package last-modified="1211260462" id="rhn-source-package-45889" source-rpm="librdmacm-1.0.7-1.el5.src.rpm"/><source-package last-modified="1211260463" id="rhn-source-package-45890" source-rpm="libsdp-1.1.99-9.el5.src.rpm"/><source-package last-modified="1211260465" id="rhn-source-package-45891" source-rpm="libuser-0.54.7-2.el5.5.src.rpm"/><source-package last-modified="1211260469" id="rhn-source-package-45893" source-rpm="lvm2-2.02.32-4.el5.src.rpm"/><source-package last-modified="1211260470" id="rhn-source-package-45894" source-rpm="make-3.81-3.el5.src.rpm"/><source-package last-modified="1211260472" id="rhn-source-package-45895" source-rpm="mstflint-1.3-1.el5.src.rpm"/><source-package last-modified="1211260495" id="rhn-source-package-45896" source-rpm="mysql-5.0.45-7.el5.src.rpm"/><source-package last-modified="1211260500" id="rhn-source-package-45897" source-rpm="net-snmp-5.3.1-24.el5.src.rpm"/><source-package last-modified="1211260501" id="rhn-source-package-45898" source-rpm="net-tools-1.60-78.el5.src.rpm"/><source-package last-modified="1211260502" id="rhn-source-package-45899" source-rpm="nspluginwrapper-0.9.91.5-21.el5.src.rpm"/><source-package last-modified="1211260504" id="rhn-source-package-45900" source-rpm="nspr-4.7.0.99.2-1.el5.src.rpm"/><source-package last-modified="1211260505" id="rhn-source-package-45901" source-rpm="nss_ldap-253-12.el5.src.rpm"/><source-package last-modified="1211260505" id="rhn-source-package-45902" source-rpm="ofed-docs-1.3-3.el5.src.rpm"/><source-package last-modified="1211260507" id="rhn-source-package-45903" source-rpm="openCryptoki-2.2.4-21.el5.src.rpm"/><source-package last-modified="1211260507" id="rhn-source-package-45904" source-rpm="openib-1.3-3.el5.src.rpm"/><source-package last-modified="1211260740" id="rhn-source-package-45906" source-rpm="parted-1.8.1-17.el5.src.rpm"/><source-package last-modified="1211260740" id="rhn-source-package-45907" source-rpm="perftest-1.2-10.el5.src.rpm"/><source-package last-modified="1211260742" id="rhn-source-package-45909" source-rpm="qlvnictools-0.0.1-8.el5.src.rpm"/><source-package last-modified="1211260749" id="rhn-source-package-45913" source-rpm="rhpxl-0.41.1-6.el5.src.rpm"/><source-package last-modified="1211260767" id="rhn-source-package-45914" source-rpm="samba-3.0.28-0.el5.8.src.rpm"/><source-package last-modified="1211260768" id="rhn-source-package-45915" source-rpm="selinux-policy-2.4.6-137.el5.src.rpm"/><source-package last-modified="1211260769" id="rhn-source-package-45916" source-rpm="srptools-0.0.4-2.el5.src.rpm"/><source-package last-modified="1211260771" id="rhn-source-package-45917" source-rpm="setroubleshoot-2.0.5-3.el5.src.rpm"/><source-package last-modified="1211260773" id="rhn-source-package-45918" source-rpm="setroubleshoot-plugins-2.0.4-2.el5.src.rpm"/><source-package last-modified="1211260774" id="rhn-source-package-45919" source-rpm="sudo-1.6.8p12-12.el5.src.rpm"/><source-package last-modified="1211260777" id="rhn-source-package-45920" source-rpm="systemtap-0.6.2-1.el5.src.rpm"/><source-package last-modified="1211260778" id="rhn-source-package-45921" source-rpm="system-config-kickstart-2.6.19.6-1.el5.src.rpm"/><source-package last-modified="1211260779" id="rhn-source-package-45922" source-rpm="system-config-netboot-0.1.45.1-1.el5.src.rpm"/><source-package last-modified="1211260782" id="rhn-source-package-45923" source-rpm="system-config-network-1.3.99.10-2.el5.src.rpm"/><source-package last-modified="1211260783" id="rhn-source-package-45924" source-rpm="tmpwatch-2.9.7-1.1.el5.1.src.rpm"/><source-package last-modified="1211260783" id="rhn-source-package-45925" source-rpm="system-config-securitylevel-1.6.29.1-2.1.el5.src.rpm"/><source-package last-modified="1211260790" id="rhn-source-package-45926" source-rpm="tog-pegasus-2.7.0-2.el5.src.rpm"/><source-package last-modified="1211260792" id="rhn-source-package-45927" source-rpm="trousers-0.3.1-4.el5.src.rpm"/><source-package last-modified="1211260793" id="rhn-source-package-45928" source-rpm="tvflash-0.9.0-2.el5.src.rpm"/><source-package last-modified="1211260794" id="rhn-source-package-45929" source-rpm="udev-095-14.16.el5.src.rpm"/><source-package last-modified="1211260852" id="rhn-source-package-45933" source-rpm="xen-3.0.3-64.el5.src.rpm"/><source-package last-modified="1211260854" id="rhn-source-package-45934" source-rpm="yelp-2.16.0-18.el5.src.rpm"/><source-package last-modified="1211260855" id="rhn-source-package-45935" source-rpm="yum-3.2.8-9.el5.src.rpm"/><source-package last-modified="1211260857" id="rhn-source-package-45936" source-rpm="xorg-x11-drv-ati-6.6.3-3.13.el5.src.rpm"/><source-package last-modified="1211260867" id="rhn-source-package-45937" source-rpm="xorg-x11-server-1.1.1-48.41.el5.src.rpm"/><source-package last-modified="1211260868" id="rhn-source-package-45938" source-rpm="yum-utils-1.1.10-9.el5.src.rpm"/><source-package last-modified="1211260902" id="rhn-source-package-45939" source-rpm="xulrunner-1.9-0.beta5.6.el5.src.rpm"/><source-package last-modified="1211260903" id="rhn-source-package-45940" source-rpm="yum-rhn-plugin-0.5.3-6.el5.src.rpm"/><source-package last-modified="1211260906" id="rhn-source-package-45944" source-rpm="gtk-vnc-0.3.2-3.el5.src.rpm"/><source-package last-modified="1211260911" id="rhn-source-package-45949" source-rpm="pirut-1.3.28-13.el5.src.rpm"/><source-package last-modified="1211260912" id="rhn-source-package-45950" source-rpm="qperf-0.4.0-1.el5.src.rpm"/><source-package last-modified="1211260921" id="rhn-source-package-45951" source-rpm="redhat-release-notes-5Server-12.src.rpm"/><source-package last-modified="1211268671" id="rhn-source-package-45958" source-rpm="xenpv-0.1-9.el5.src.rpm"/><source-package last-modified="1211271106" id="rhn-source-package-45960" source-rpm="xen-3.0.3-41.el5_1.6.src.rpm"/><source-package last-modified="1211294723" id="rhn-source-package-45968" source-rpm="OpenIPMI-2.0.6-6.el5.src.rpm"/><source-package last-modified="1211294724" id="rhn-source-package-45969" source-rpm="alsa-utils-1.0.14-3.rc4.el5.src.rpm"/><source-package last-modified="1211294726" id="rhn-source-package-45970" source-rpm="at-spi-1.7.11-3.el5.src.rpm"/><source-package last-modified="1211294730" id="rhn-source-package-45971" source-rpm="bash-3.2-21.el5.src.rpm"/><source-package last-modified="1211294743" id="rhn-source-package-45972" source-rpm="binutils-2.17.50.0.6-6.el5.src.rpm"/><source-package last-modified="1211294745" id="rhn-source-package-45973" source-rpm="booty-0.80.4-6.src.rpm"/><source-package last-modified="1211294745" id="rhn-source-package-45974" source-rpm="coolkey-1.1.0-6.el5.src.rpm"/><source-package last-modified="1211294746" id="rhn-source-package-45975" source-rpm="cpuspeed-1.2.1-3.el5.src.rpm"/><source-package last-modified="1211294746" id="rhn-source-package-45976" source-rpm="device-mapper-1.02.24-1.el5.src.rpm"/><source-package last-modified="1211294747" id="rhn-source-package-45977" source-rpm="dmraid-1.0.0.rc13-9.el5.src.rpm"/><source-package last-modified="1211294811" id="rhn-source-package-45978" source-rpm="gnutls-1.4.1-3.el5_1.src.rpm"/><source-package last-modified="1211294826" id="rhn-source-package-45979" source-rpm="eclipse-3.2.1-19.el5.src.rpm"/><source-package last-modified="1211294859" id="rhn-source-package-45980" source-rpm="esc-1.0.0-33.el5.src.rpm"/><source-package last-modified="1211294875" id="rhn-source-package-45982" source-rpm="gdb-6.5-37.el5.src.rpm"/><source-package last-modified="1211294878" id="rhn-source-package-45983" source-rpm="gnome-power-manager-2.16.0-9.el5.src.rpm"/><source-package last-modified="1211294879" id="rhn-source-package-45984" source-rpm="gnome-python2-extras-2.14.2-6.el5.src.rpm"/><source-package last-modified="1211294880" id="rhn-source-package-45985" source-rpm="grub-0.97-13.2.src.rpm"/><source-package last-modified="1211294882" id="rhn-source-package-45986" source-rpm="gtkhtml3-3.16.3-1.el5.src.rpm"/><source-package last-modified="1211294886" id="rhn-source-package-45988" source-rpm="ibsim-0.4-2.el5.src.rpm"/><source-package last-modified="1211294890" id="rhn-source-package-45989" source-rpm="ibutils-1.2-3.el5.src.rpm"/><source-package last-modified="1211294892" id="rhn-source-package-45990" source-rpm="initscripts-8.45.19.EL-1.src.rpm"/><source-package last-modified="1211294893" id="rhn-source-package-45991" source-rpm="libmthca-1.0.4-9.el5.src.rpm"/><source-package last-modified="1211294894" id="rhn-source-package-45992" source-rpm="libnes-0.5-2.el5.src.rpm"/><source-package last-modified="1211294895" id="rhn-source-package-45993" source-rpm="mdadm-2.6.4-1.el5.src.rpm"/><source-package last-modified="1211294897" id="rhn-source-package-45994" source-rpm="opensm-3.1.8-1.el5.src.rpm"/><source-package last-modified="1211294900" id="rhn-source-package-45995" source-rpm="openssl-0.9.8b-10.el5.src.rpm"/><source-package last-modified="1211294901" id="rhn-source-package-45996" source-rpm="oprofile-0.9.3-16.el5.src.rpm"/><source-package last-modified="1211294902" id="rhn-source-package-45997" source-rpm="pexpect-2.3-1.el5.src.rpm"/><source-package last-modified="1211294903" id="rhn-source-package-45998" source-rpm="policycoreutils-1.33.12-14.el5.src.rpm"/><source-package last-modified="1211294904" id="rhn-source-package-45999" source-rpm="rsyslog-2.0.0-11.el5.src.rpm"/><source-package last-modified="1211294916" id="rhn-source-package-46001" source-rpm="system-config-language-1.1.18-2.el5.src.rpm"/><source-package last-modified="1211294918" id="rhn-source-package-46002" source-rpm="totem-2.16.7-4.el5.src.rpm"/><source-package last-modified="1211294919" id="rhn-source-package-46003" source-rpm="tpm-tools-1.3.1-1.el5.src.rpm"/><source-package last-modified="1211294920" id="rhn-source-package-46004" source-rpm="udftools-1.0.0b3-0.1.el5.src.rpm"/><source-package last-modified="1211294921" id="rhn-source-package-46005" source-rpm="usermode-1.88-3.el5.1.src.rpm"/><source-package last-modified="1211294924" id="rhn-source-package-46006" source-rpm="util-linux-2.13-0.47.el5.src.rpm"/><source-package last-modified="1211294924" id="rhn-source-package-46007" source-rpm="wdaemon-0.13-1.src.rpm"/><source-package last-modified="1211294926" id="rhn-source-package-46008" source-rpm="wpa_supplicant-0.4.8-10.2.el5.src.rpm"/><source-package last-modified="1211294927" id="rhn-source-package-46009" source-rpm="yum-updatesd-0.9-2.el5.src.rpm"/><source-package last-modified="1211294928" id="rhn-source-package-46010" source-rpm="xorg-x11-drv-mga-1.4.2-7.el5.src.rpm"/><source-package last-modified="1211294928" id="rhn-source-package-46011" source-rpm="yum-metadata-parser-1.1.2-2.el5.src.rpm"/><source-package last-modified="1211294929" id="rhn-source-package-46013" source-rpm="libhugetlbfs-1.2-5.el5.src.rpm"/><source-package last-modified="1211354109" id="rhn-source-package-46019" source-rpm="libxslt-1.1.17-2.el5_1.1.src.rpm"/><source-package last-modified="1211382848" id="rhn-source-package-46024" source-rpm="gdb-6.5-37.el5_2.1.src.rpm"/><source-package last-modified="1211383741" id="rhn-source-package-46026" source-rpm="xen-3.0.3-64.el5_2.1.src.rpm"/><source-package last-modified="1211385351" id="rhn-source-package-46027" source-rpm="redhat-release-notes-5Server-15.src.rpm"/><source-package last-modified="1211386924" id="rhn-source-package-46029" source-rpm="yum-rhn-plugin-0.5.3-6.el5_2.6.src.rpm"/><source-package last-modified="1211387661" id="rhn-source-package-46030" source-rpm="yum-3.2.8-9.el5_2.1.src.rpm"/><source-package last-modified="1211964965" id="rhn-source-package-46062" source-rpm="tzdata-2008b-3.el5.src.rpm"/><source-package last-modified="1211973546" id="rhn-source-package-46070" source-rpm="samba-3.0.28-1.el5_2.1.src.rpm"/><source-package last-modified="1212589109" id="rhn-source-package-46299" source-rpm="cups-1.2.4-11.18.el5_2.1.src.rpm"/><source-package last-modified="1212659133" id="rhn-source-package-46302" source-rpm="kernel-2.6.18-92.1.1.el5.src.rpm"/><source-package last-modified="1212670179" id="rhn-source-package-46304" source-rpm="ipsec-tools-0.6.5-9.el5_2.1.src.rpm"/><source-package last-modified="1213012868" id="rhn-source-package-46311" source-rpm="dhcpv6-1.0.10-4.el5_2.2.src.rpm"/><source-package last-modified="1213105959" id="rhn-source-package-46330" source-rpm="net-snmp-5.3.1-24.el5_2.1.src.rpm"/><source-package last-modified="1213169390" id="rhn-source-package-46345" source-rpm="openswan-2.6.14-1.el5_2.1.src.rpm"/><source-package last-modified="1213210291" id="rhn-source-package-46352" source-rpm="perl-5.8.8-10.el5_2.3.src.rpm"/><source-package last-modified="1213212743" id="rhn-source-package-46354" source-rpm="xorg-x11-server-1.1.1-48.41.el5_2.1.src.rpm"/><source-package last-modified="1213261305" id="rhn-source-package-46390" source-rpm="ghostscript-8.15.2-9.3.el5.src.rpm"/><source-package last-modified="1213266148" id="rhn-source-package-46392" source-rpm="gdb-6.5-37.el5_2.2.src.rpm"/><source-package last-modified="1213969756" id="rhn-source-package-46464" source-rpm="freetype-2.2.1-20.el5_2.src.rpm"/><source-package last-modified="1214298543" id="rhn-source-package-46470" source-rpm="sblim-1-31.el5_2.1.src.rpm"/><source-package last-modified="1214402850" id="rhn-source-package-46493" source-rpm="Deployment_Guide-5.2-11.src.rpm"/><source-package last-modified="1214408093" id="rhn-source-package-46495" source-rpm="kernel-2.6.18-92.1.6.el5.src.rpm"/><source-package last-modified="1214589715" id="rhn-source-package-46532" source-rpm="gfs2-utils-0.1.44-1.el5_2.1.src.rpm"/><source-package last-modified="1215002041" id="rhn-source-package-46538" source-rpm="yelp-2.16.0-19.el5.src.rpm"/><source-package last-modified="1215002042" id="rhn-source-package-46539" source-rpm="xulrunner-1.9-1.el5.src.rpm"/><source-package last-modified="1215002042" id="rhn-source-package-46540" source-rpm="devhelp-0.12-17.el5.src.rpm"/><source-package last-modified="1215002042" id="rhn-source-package-46541" source-rpm="firefox-3.0-2.el5.src.rpm"/><source-package last-modified="1215022644" id="rhn-source-package-46567" source-rpm="nss-3.12.0.3-1.el5.src.rpm"/><source-package last-modified="1215022644" id="rhn-source-package-46568" source-rpm="nspr-4.7.1-1.el5.src.rpm"/><source-package last-modified="1215539655" id="rhn-source-package-46621" source-rpm="bind-9.3.4-6.0.1.P1.el5_2.src.rpm"/><source-package last-modified="1215539655" id="rhn-source-package-46622" source-rpm="selinux-policy-2.4.6-137.1.el5_2.src.rpm"/><source-package last-modified="1215612901" id="rhn-source-package-46628" source-rpm="openldap-2.3.27-8.el5_2.4.src.rpm"/><source-package last-modified="1215719366" id="rhn-source-package-46633" source-rpm="bind-9.3.4-6.0.2.P1.el5_2.src.rpm"/><source-package last-modified="1215766216" id="rhn-source-package-46639" source-rpm="libsdp-1.1.99-10.el5_2.src.rpm"/><source-package last-modified="1215766216" id="rhn-source-package-46640" source-rpm="openib-mstflint-1.3-1.el5_2.src.rpm"/><source-package last-modified="1215766216" id="rhn-source-package-46641" source-rpm="openib-perftest-1.2-11.el5_2.src.rpm"/><source-package last-modified="1215766216" id="rhn-source-package-46642" source-rpm="openib-tvflash-0.9.2-8.el5_2.src.rpm"/><source-package last-modified="1216041282" id="rhn-source-package-46670" source-rpm="ruby-1.8.5-5.el5_2.3.src.rpm"/><source-package last-modified="1216043252" id="rhn-source-package-46674" source-rpm="bluez-utils-3.7-2.2.src.rpm"/><source-package last-modified="1216043252" id="rhn-source-package-46675" source-rpm="bluez-libs-3.7-1.1.src.rpm"/><source-package last-modified="1216200464" id="rhn-source-package-46707" source-rpm="php-5.1.6-20.el5_2.1.src.rpm"/><source-package last-modified="1216212868" id="rhn-source-package-46716" source-rpm="devhelp-0.12-18.el5.src.rpm"/><source-package last-modified="1216212868" id="rhn-source-package-46717" source-rpm="xulrunner-1.9.0.1-1.el5.src.rpm"/><source-package last-modified="1216212868" id="rhn-source-package-46718" source-rpm="yelp-2.16.0-20.el5.src.rpm"/><source-package last-modified="1216212868" id="rhn-source-package-46719" source-rpm="firefox-3.0.1-1.el5.src.rpm"/><source-package last-modified="1216250700" id="rhn-source-package-46725" source-rpm="nspluginwrapper-0.9.91.5-22.el5.src.rpm"/><source-package last-modified="1216919509" id="rhn-source-package-47332" source-rpm="rdesktop-1.4.1-6.src.rpm"/><source-package last-modified="1217260790" id="rhn-source-package-47370" source-rpm="nss_ldap-253-13.el5_2.1.src.rpm"/><source-package last-modified="1217517944" id="rhn-source-package-47401" source-rpm="libxslt-1.1.17-2.el5_2.2.src.rpm"/><source-package last-modified="1217518293" id="rhn-source-package-47403" source-rpm="nfs-utils-1.0.9-35z.el5_2.src.rpm"/><source-package last-modified="1217872472" id="rhn-source-package-47429" source-rpm="kernel-2.6.18-92.1.10.el5.src.rpm"/><source-package last-modified="1218016252" id="rhn-source-package-47438" source-rpm="strace-4.5.16-1.el5_2.2.src.rpm"/><source-package last-modified="1218439751" id="rhn-source-package-47452" source-rpm="kexec-tools-1.102pre-21.el5_2.2.src.rpm"/><source-package last-modified="1218473987" id="rhn-source-package-47456" source-rpm="dnsmasq-2.45-1.el5_2.1.src.rpm"/><source-package last-modified="1218572058" id="rhn-source-package-47467" source-rpm="hplip-1.6.7-4.1.el5_2.4.src.rpm"/><source-package last-modified="1218719167" id="rhn-source-package-47480" source-rpm="yum-rhn-plugin-0.5.3-12.el5_2.9.src.rpm"/><source-package last-modified="1218741244" id="rhn-source-package-47484" source-rpm="postfix-2.3.3-2.1.el5_2.src.rpm"/><source-package last-modified="1219333859" id="rhn-source-package-47500" source-rpm="libxml2-2.6.26-2.1.2.3.src.rpm"/><source-package last-modified="1219406231" id="rhn-source-package-47505" source-rpm="openssh-4.3p2-26.el5_2.1.src.rpm"/><source-package last-modified="1219738263" id="rhn-source-package-47514" source-rpm="libxml2-2.6.26-2.1.2.4.src.rpm"/><source-package last-modified="1219777490" id="rhn-source-package-47523" source-rpm="ipsec-tools-0.6.5-9.el5_2.3.src.rpm"/><source-package last-modified="1219857059" id="rhn-source-package-47539" source-rpm="tomcat5-5.5.23-0jpp.7.el5_2.1.src.rpm"/><source-package last-modified="1219961389" id="rhn-source-package-47557" source-rpm="libtiff-3.8.2-7.el5_2.2.src.rpm"/><source-package last-modified="1220043919" id="rhn-source-package-47564" source-rpm="tzdata-2008e-1.el5.src.rpm"/><source-package last-modified="1220342022" id="rhn-source-package-47567" source-rpm="sos-1.7-9.2.el5_2.2.src.rpm"/><source-package last-modified="1220375950" id="rhn-source-package-47568" source-rpm="libxml2-2.6.26-2.1.2.5.src.rpm"/><source-package last-modified="1221139827" id="rhn-source-package-47665" source-rpm="libxml2-2.6.26-2.1.2.6.src.rpm"/><source-package last-modified="1221568092" id="rhn-source-package-47703" source-rpm="bzip2-1.0.3-4.el5_2.src.rpm"/><source-package last-modified="1221666493" id="rhn-source-package-47724" source-rpm="perl-5.8.8-15.el5_2.1.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47832" source-rpm="firefox-3.0.2-3.el5.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47834" source-rpm="nss-3.12.1.1-1.el5.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47835" source-rpm="devhelp-0.12-19.el5.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47836" source-rpm="yelp-2.16.0-21.el5.src.rpm"/><source-package last-modified="1222219744" id="rhn-source-package-47837" source-rpm="xulrunner-1.9.0.2-5.el5.src.rpm"/><source-package last-modified="1222280505" id="rhn-source-package-47850" source-rpm="kernel-2.6.18-92.1.13.el5.src.rpm"/><source-package last-modified="1222371764" id="rhn-source-package-47864" source-rpm="cman-2.0.84-2.el5_2.1.src.rpm"/><source-package last-modified="1222771381" id="rhn-source-package-47912" source-rpm="initscripts-8.45.19.1.EL-1.src.rpm"/><source-package last-modified="1222873571" id="rhn-source-package-47919" source-rpm="xen-3.0.3-64.el5_2.3.src.rpm"/><source-package last-modified="1222873605" id="rhn-source-package-47920" source-rpm="wireshark-1.0.3-4.el5_2.src.rpm"/><source-package last-modified="1222944609" id="rhn-source-package-47926" source-rpm="dhcpv6-1.0.10-4.el5_2.3.src.rpm"/><source-package last-modified="1222951063" id="rhn-source-package-47927" source-rpm="krb5-1.6.1-25.el5_2.1.src.rpm"/><source-package last-modified="1222955826" id="rhn-source-package-47928" source-rpm="pam_krb5-2.2.14-1.el5_2.1.src.rpm"/><source-package last-modified="1223470078" id="rhn-source-package-47964" source-rpm="tzdata-2008f-3.el5.src.rpm"/><source-package last-modified="1223623400" id="rhn-source-package-47983" source-rpm="cups-1.2.4-11.18.el5_2.2.src.rpm"/><source-package last-modified="1223912332" id="rhn-source-package-47993" source-rpm="libdhcp-1.20-5.el5_2.1.src.rpm"/><source-package last-modified="1224058135" id="rhn-source-package-48108" source-rpm="OpenIPMI-2.0.6-6.el5_2.2.src.rpm"/><source-package last-modified="1224599859" id="rhn-source-package-48134" source-rpm="ruby-1.8.5-5.el5_2.5.src.rpm"/><source-package last-modified="1224601649" id="rhn-source-package-48142" source-rpm="ed-0.2-39.el5_2.src.rpm"/><source-package last-modified="1225126270" id="rhn-source-package-48193" source-rpm="lynx-2.8.5-28.1.el5_2.1.src.rpm"/><source-package last-modified="1225722984" id="rhn-source-package-48447" source-rpm="net-snmp-5.3.1-24.el5_2.2.src.rpm"/><source-package last-modified="1225792914" id="rhn-source-package-48451" source-rpm="kernel-2.6.18-92.1.17.el5.src.rpm"/><source-package last-modified="1225826680" id="rhn-source-package-48452" source-rpm="systemtap-0.6.2-1.el5_2.2.src.rpm"/><source-package last-modified="1225888921" id="rhn-source-package-48462" source-rpm="tzdata-2008i-1.el5.src.rpm"/><source-package last-modified="1225907248" id="rhn-source-package-48464" source-rpm="lvm2-2.02.32-4.el5_2.1.src.rpm"/><source-package last-modified="1225909972" id="rhn-source-package-48466" source-rpm="dmraid-1.0.0.rc13-14.el5_2.1.src.rpm"/><source-package last-modified="1226426860" id="rhn-source-package-48529" source-rpm="httpd-2.2.3-11.el5_2.4.src.rpm"/><source-package last-modified="1226427696" id="rhn-source-package-48530" source-rpm="gnutls-1.4.1-3.el5_2.1.src.rpm"/><source-package last-modified="1226481673" id="rhn-source-package-48540" source-rpm="kernel-2.6.18-92.1.18.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48552" source-rpm="yelp-2.16.0-22.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48553" source-rpm="firefox-3.0.4-1.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48554" source-rpm="nss-3.12.1.1-3.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48555" source-rpm="devhelp-0.12-20.el5.src.rpm"/><source-package last-modified="1226541211" id="rhn-source-package-48556" source-rpm="xulrunner-1.9.0.4-1.el5.src.rpm"/><source-package last-modified="1226937458" id="rhn-source-package-48563" source-rpm="libxml2-2.6.26-2.1.2.7.src.rpm"/><source-package last-modified="1227602325" id="rhn-source-package-48598" source-rpm="vim-7.0.109-4.el5_2.4z.src.rpm"/><source-package last-modified="1227603768" id="rhn-source-package-48602" source-rpm="tog-pegasus-2.7.0-2.el5_2.1.src.rpm"/><source-package last-modified="1227605042" id="rhn-source-package-48603" source-rpm="dmraid-1.0.0.rc13-15.el5_2.1.src.rpm"/><source-package last-modified="1227646398" id="rhn-source-package-48605" source-rpm="cman-2.0.84-2.el5_2.2.src.rpm"/><source-package last-modified="1228131828" id="rhn-source-package-48607" source-rpm="evolution-data-server-1.12.3-6.el5_2.3.src.rpm"/><source-package last-modified="1228236988" id="rhn-source-package-48610" source-rpm="glibc-2.5-24.el5_2.2.src.rpm"/><source-package last-modified="1228405398" id="rhn-source-package-48633" source-rpm="ruby-1.8.5-5.el5_2.6.src.rpm"/><source-package last-modified="1228941420" id="rhn-source-package-48662" source-rpm="cman-2.0.84-2.el5_2.3.src.rpm"/><source-package last-modified="1228992862" id="rhn-source-package-48663" source-rpm="autofs-5.0.1-0.rc2.88.el5_2.1.src.rpm"/><source-package last-modified="1229345375" id="rhn-source-package-48672" source-rpm="enscript-1.6.4-4.1.1.el5_2.src.rpm"/><source-package last-modified="1229347397" id="rhn-source-package-48676" source-rpm="cups-1.2.4-11.18.el5_2.3.src.rpm"/><source-package last-modified="1229412119" id="rhn-source-package-48680" source-rpm="kernel-2.6.18-92.1.22.el5.src.rpm"/><source-package last-modified="1229475848" id="rhn-source-package-48686" source-rpm="nss-3.12.2.0-2.el5.src.rpm"/><source-package last-modified="1229475848" id="rhn-source-package-48687" source-rpm="nspr-4.7.3-2.el5.src.rpm"/><source-package last-modified="1229475848" id="rhn-source-package-48688" source-rpm="xulrunner-1.9.0.5-1.el5_2.src.rpm"/><source-package last-modified="1229475848" id="rhn-source-package-48690" source-rpm="firefox-3.0.5-1.el5_2.src.rpm"/><source-package last-modified="1231324322" id="rhn-source-package-48766" source-rpm="xen-3.0.3-64.el5_2.9.src.rpm"/><source-package last-modified="1231325528" id="rhn-source-package-48772" source-rpm="xterm-215-5.el5_2.2.src.rpm"/><source-package last-modified="1231333540" id="rhn-source-package-48776" source-rpm="openssl097a-0.9.7a-9.el5_2.1.src.rpm"/><source-package last-modified="1231333540" id="rhn-source-package-48782" source-rpm="openssl-0.9.8b-10.el5_2.1.src.rpm"/><source-package last-modified="1231334901" id="rhn-source-package-48783" source-rpm="dbus-1.0.0-7.el5_2.1.src.rpm"/><source-package last-modified="1231335395" id="rhn-source-package-48784" source-rpm="lcms-1.15-1.2.2.el5_2.2.src.rpm"/><source-package last-modified="1231438002" id="rhn-source-package-48793" source-rpm="bind-9.3.4-6.0.3.P1.el5_2.src.rpm"/><source-package last-modified="1231750545" id="rhn-source-package-48803" source-rpm="krb5-1.6.1-25.el5_2.2.src.rpm"/><source-package last-modified="1231769161" id="rhn-source-package-48804" source-rpm="squirrelmail-1.4.8-5.el5_2.2.src.rpm"/><source-package last-modified="1231769191" id="rhn-source-package-48807" source-rpm="avahi-0.6.16-1.el5_2.1.src.rpm"/><source-package last-modified="1231970739" id="rhn-source-package-48833" source-rpm="xterm-215-8.el5.src.rpm"/><source-package last-modified="1232398062" id="rhn-source-package-48852" source-rpm="rhnlib-2.2.6-2.el5.src.rpm"/><source-package last-modified="1232398112" id="rhn-source-package-48853" source-rpm="php-5.1.6-23.el5.src.rpm"/><source-package last-modified="1232398135" id="rhn-source-package-48855" source-rpm="dosfstools-2.11-7.el5.src.rpm"/><source-package last-modified="1232398809" id="rhn-source-package-48856" source-rpm="squirrelmail-1.4.8-5.el5_2.3.src.rpm"/><source-package last-modified="1232399255" id="rhn-source-package-48860" source-rpm="libutempter-1.1.4-4.el5.src.rpm"/><source-package last-modified="1232399314" id="rhn-source-package-48861" source-rpm="unzip-5.52-3.el5.src.rpm"/><source-package last-modified="1232399524" id="rhn-source-package-48862" source-rpm="audit-1.7.7-6.el5.src.rpm"/><source-package last-modified="1232399603" id="rhn-source-package-48863" source-rpm="pykickstart-0.43.3-1.el5.src.rpm"/><source-package last-modified="1232399685" id="rhn-source-package-48865" source-rpm="ypserv-2.19-5.el5.src.rpm"/><source-package last-modified="1232399741" id="rhn-source-package-48867" source-rpm="iscsi-initiator-utils-6.2.0.868-0.18.el5.src.rpm"/><source-package last-modified="1232399782" id="rhn-source-package-48868" source-rpm="initscripts-8.45.25-1.el5.src.rpm"/><source-package last-modified="1232399899" id="rhn-source-package-48870" source-rpm="neon-0.25.5-10.el5.src.rpm"/><source-package last-modified="1232399931" id="rhn-source-package-48871" source-rpm="libcxgb3-1.2.2-1.el5.src.rpm"/><source-package last-modified="1232399968" id="rhn-source-package-48872" source-rpm="diffstat-1.41-1.2.3.el5.src.rpm"/><source-package last-modified="1232400032" id="rhn-source-package-48873" source-rpm="gcc43-4.3.2-7.el5.src.rpm"/><source-package last-modified="1232400170" id="rhn-source-package-48876" source-rpm="pm-utils-0.99.3-10.el5.src.rpm"/><source-package last-modified="1232400278" id="rhn-source-package-48877" source-rpm="yum-utils-1.1.16-13.el5.src.rpm"/><source-package last-modified="1232400292" id="rhn-source-package-48878" source-rpm="paps-0.6.6-18.el5.src.rpm"/><source-package last-modified="1232400343" id="rhn-source-package-48879" source-rpm="smartmontools-5.38-2.el5.src.rpm"/><source-package last-modified="1232400350" id="rhn-source-package-48880" source-rpm="ksh-20080202-2.el5.src.rpm"/><source-package last-modified="1232400359" id="rhn-source-package-48881" source-rpm="bind-9.3.4-10.P1.el5.src.rpm"/><source-package last-modified="1232400525" id="rhn-source-package-48883" source-rpm="ppp-2.4.4-2.el5.src.rpm"/><source-package last-modified="1232400571" id="rhn-source-package-48884" source-rpm="rdate-1.4-8.el5.src.rpm"/><source-package last-modified="1232400580" id="rhn-source-package-48885" source-rpm="scim-bridge-0.4.5-8.el5.src.rpm"/><source-package last-modified="1232400664" id="rhn-source-package-48886" source-rpm="gnuplot-4.0.0-14.el5.src.rpm"/><source-package last-modified="1232400782" id="rhn-source-package-48887" source-rpm="mesa-6.5.1-7.7.el5.src.rpm"/><source-package last-modified="1232400788" id="rhn-source-package-48888" source-rpm="dovecot-1.0.7-7.el5.src.rpm"/><source-package last-modified="1232400789" id="rhn-source-package-48889" source-rpm="cryptsetup-luks-1.0.3-4.el5.src.rpm"/><source-package last-modified="1232400790" id="rhn-source-package-48890" source-rpm="xorg-x11-drv-mga-1.4.2-10.el5.src.rpm"/><source-package last-modified="1232400808" id="rhn-source-package-48891" source-rpm="kexec-tools-1.102pre-56.el5.src.rpm"/><source-package last-modified="1232400918" id="rhn-source-package-48892" source-rpm="vnc-4.1.2-14.el5.src.rpm"/><source-package last-modified="1232401045" id="rhn-source-package-48894" source-rpm="kdebindings-3.5.4-6.el5.src.rpm"/><source-package last-modified="1232401068" id="rhn-source-package-48895" source-rpm="iputils-20020927-45.el5.src.rpm"/><source-package last-modified="1232401090" id="rhn-source-package-48896" source-rpm="rhn-client-tools-0.4.19-17.el5.src.rpm"/><source-package last-modified="1232401095" id="rhn-source-package-48898" source-rpm="dapl-2.0.13-4.el5.src.rpm"/><source-package last-modified="1232401103" id="rhn-source-package-48899" source-rpm="e4fsprogs-1.41.1-2.el5.src.rpm"/><source-package last-modified="1232401125" id="rhn-source-package-48900" source-rpm="vixie-cron-4.1-76.el5.src.rpm"/><source-package last-modified="1232401129" id="rhn-source-package-48901" source-rpm="gstreamer-plugins-good-0.10.9-1.el5.src.rpm"/><source-package last-modified="1232401130" id="rhn-source-package-48902" source-rpm="m2crypto-0.16-6.el5.3.src.rpm"/><source-package last-modified="1232401200" id="rhn-source-package-48903" source-rpm="usermode-1.88-3.el5.2.src.rpm"/><source-package last-modified="1232401226" id="rhn-source-package-48904" source-rpm="man-pages-2.39-12.el5.src.rpm"/><source-package last-modified="1232401234" id="rhn-source-package-48905" source-rpm="libibcommon-1.1.1-1.el5.src.rpm"/><source-package last-modified="1232401284" id="rhn-source-package-48906" source-rpm="binutils-2.17.50.0.6-9.el5.src.rpm"/><source-package last-modified="1232401316" id="rhn-source-package-48907" source-rpm="nfs-utils-1.0.9-40.el5.src.rpm"/><source-package last-modified="1232401321" id="rhn-source-package-48908" source-rpm="lvm2-2.02.40-6.el5.src.rpm"/><source-package last-modified="1232401350" id="rhn-source-package-48909" source-rpm="procps-3.2.7-11.1.el5.src.rpm"/><source-package last-modified="1232401355" id="rhn-source-package-48910" source-rpm="bash-3.2-24.el5.src.rpm"/><source-package last-modified="1232401405" id="rhn-source-package-48912" source-rpm="tcsh-6.14-14.el5.src.rpm"/><source-package last-modified="1232401466" id="rhn-source-package-48913" source-rpm="libhugetlbfs-1.3-3.el5.src.rpm"/><source-package last-modified="1232401545" id="rhn-source-package-48916" source-rpm="ypbind-1.19-11.el5.src.rpm"/><source-package last-modified="1232401658" id="rhn-source-package-48917" source-rpm="nss_ldap-253-17.el5.src.rpm"/><source-package last-modified="1232401660" id="rhn-source-package-48918" source-rpm="module-init-tools-3.3-0.pre3.1.42.el5.src.rpm"/><source-package last-modified="1232401737" id="rhn-source-package-48919" source-rpm="openssh-4.3p2-29.el5.src.rpm"/><source-package last-modified="1232401792" id="rhn-source-package-48920" source-rpm="freeradius-1.1.3-1.4.el5.src.rpm"/><source-package last-modified="1232401800" id="rhn-source-package-48921" source-rpm="edac-utils-0.9-6.el5.src.rpm"/><source-package last-modified="1232401814" id="rhn-source-package-48922" source-rpm="openmotif-2.3.1-2.el5.src.rpm"/><source-package last-modified="1232401844" id="rhn-source-package-48923" source-rpm="man-pages-ja-20060815-9.el5.src.rpm"/><source-package last-modified="1232401900" id="rhn-source-package-48924" source-rpm="libdhcp-1.20-6.el5.src.rpm"/><source-package last-modified="1232401947" id="rhn-source-package-48925" source-rpm="libipathverbs-1.1-11.el5.src.rpm"/><source-package last-modified="1232402028" id="rhn-source-package-48926" source-rpm="pam-0.99.6.2-4.el5.src.rpm"/><source-package last-modified="1232402043" id="rhn-source-package-48927" source-rpm="python-2.4.3-24.el5.src.rpm"/><source-package last-modified="1232402046" id="rhn-source-package-48928" source-rpm="redhat-rpm-config-8.0.45-29.el5.src.rpm"/><source-package last-modified="1232402058" id="rhn-source-package-48929" source-rpm="mlocate-0.15-1.el5.1.src.rpm"/><source-package last-modified="1232402083" id="rhn-source-package-48930" source-rpm="device-mapper-multipath-0.4.7-23.el5.src.rpm"/><source-package last-modified="1232402098" id="rhn-source-package-48931" source-rpm="python-pyblock-0.26-3.el5.src.rpm"/><source-package last-modified="1232402325" id="rhn-source-package-48932" source-rpm="quota-3.13-1.2.5.el5.src.rpm"/><source-package last-modified="1232402326" id="rhn-source-package-48933" source-rpm="libibmad-1.2.1-1.el5.src.rpm"/><source-package last-modified="1232402333" id="rhn-source-package-48934" source-rpm="words-3.0-9.1.src.rpm"/><source-package last-modified="1232402451" id="rhn-source-package-48935" source-rpm="ntp-4.2.2p1-9.el5.src.rpm"/><source-package last-modified="1232402456" id="rhn-source-package-48936" source-rpm="ibutils-1.2-9.el5.src.rpm"/><source-package last-modified="1232402515" id="rhn-source-package-48937" source-rpm="desktop-printing-0.19-20.2.el5.src.rpm"/><source-package last-modified="1232402551" id="rhn-source-package-48938" source-rpm="ORBit2-2.14.3-5.el5.src.rpm"/><source-package last-modified="1232402568" id="rhn-source-package-48939" source-rpm="strace-4.5.18-2.el5.src.rpm"/><source-package last-modified="1232402607" id="rhn-source-package-48940" source-rpm="cman-2.0.98-1.el5.src.rpm"/><source-package last-modified="1232402680" id="rhn-source-package-48942" source-rpm="xorg-x11-drv-mutouch-1.1.0-3.src.rpm"/><source-package last-modified="1232402694" id="rhn-source-package-48943" source-rpm="freeipmi-0.5.1-6.el5.src.rpm"/><source-package last-modified="1232402809" id="rhn-source-package-48944" source-rpm="file-4.17-15.src.rpm"/><source-package last-modified="1232402820" id="rhn-source-package-48945" source-rpm="zip-2.31-2.el5.src.rpm"/><source-package last-modified="1232402823" id="rhn-source-package-48948" source-rpm="acpid-1.0.4-7.el5.src.rpm"/><source-package last-modified="1232402862" id="rhn-source-package-48949" source-rpm="mvapich-1.1.0-0.2931.3.el5.src.rpm"/><source-package last-modified="1232402939" id="rhn-source-package-48951" source-rpm="ktune-0.2-3.el5.src.rpm"/><source-package last-modified="1232402952" id="rhn-source-package-48952" source-rpm="rhpxl-0.41.1-7.el5.src.rpm"/><source-package last-modified="1232402959" id="rhn-source-package-48953" source-rpm="perl-DBD-MySQL-3.0007-2.el5.src.rpm"/><source-package last-modified="1232402963" id="rhn-source-package-48954" source-rpm="python-urlgrabber-3.1.0-5.el5.src.rpm"/><source-package last-modified="1232402965" id="rhn-source-package-48955" source-rpm="dbus-1.1.2-12.el5.src.rpm"/><source-package last-modified="1232403002" id="rhn-source-package-48956" source-rpm="mpitests-3.0-2.el5.src.rpm"/><source-package last-modified="1232403020" id="rhn-source-package-48957" source-rpm="traceroute-2.0.1-5.el5.src.rpm"/><source-package last-modified="1232403078" id="rhn-source-package-48959" source-rpm="hwdata-0.213.11-1.el5.src.rpm"/><source-package last-modified="1232403091" id="rhn-source-package-48960" source-rpm="pkinit-nss-0.7.6-1.el5.src.rpm"/><source-package last-modified="1232403093" id="rhn-source-package-48961" source-rpm="iproute-2.6.18-9.el5.src.rpm"/><source-package last-modified="1232403110" id="rhn-source-package-48962" source-rpm="parted-1.8.1-23.el5.src.rpm"/><source-package last-modified="1232403138" id="rhn-source-package-48963" source-rpm="anaconda-11.1.2.168-1.src.rpm"/><source-package last-modified="1232403164" id="rhn-source-package-48964" source-rpm="xorg-x11-drv-ati-6.6.3-3.22.el5.src.rpm"/><source-package last-modified="1232403218" id="rhn-source-package-48965" source-rpm="samba-3.0.33-3.7.el5.src.rpm"/><source-package last-modified="1232403220" id="rhn-source-package-48966" source-rpm="ofed-docs-1.3.2-0.20080728.0355.1.el5.src.rpm"/><source-package last-modified="1232403232" id="rhn-source-package-48968" source-rpm="elfutils-0.137-3.el5.src.rpm"/><source-package last-modified="1232403241" id="rhn-source-package-48969" source-rpm="dhcp-3.0.5-18.el5.src.rpm"/><source-package last-modified="1232403285" id="rhn-source-package-48970" source-rpm="gdb-6.8-27.el5.src.rpm"/><source-package last-modified="1232403299" id="rhn-source-package-48971" source-rpm="libibumad-1.2.1-1.el5.src.rpm"/><source-package last-modified="1232403336" id="rhn-source-package-48973" source-rpm="mod_perl-2.0.4-6.el5.src.rpm"/><source-package last-modified="1232403346" id="rhn-source-package-48974" source-rpm="gstreamer-plugins-base-0.10.20-3.el5.src.rpm"/><source-package last-modified="1232403377" id="rhn-source-package-48975" source-rpm="libibverbs-1.1.2-1.el5.src.rpm"/><source-package last-modified="1232403430" id="rhn-source-package-48976" source-rpm="libselinux-1.33.4-5.1.el5.src.rpm"/><source-package last-modified="1232403474" id="rhn-source-package-48977" source-rpm="qlvnictools-0.0.1-10.el5.src.rpm"/><source-package last-modified="1232403540" id="rhn-source-package-48978" source-rpm="gstreamer-0.10.20-3.el5.src.rpm"/><source-package last-modified="1232403564" id="rhn-source-package-48979" source-rpm="authconfig-5.3.21-5.el5.src.rpm"/><source-package last-modified="1232403566" id="rhn-source-package-48980" source-rpm="dbus-glib-0.73-8.el5.src.rpm"/><source-package last-modified="1232403605" id="rhn-source-package-48981" source-rpm="qperf-0.4.1-2.el5.src.rpm"/><source-package last-modified="1232403644" id="rhn-source-package-48982" source-rpm="shadow-utils-4.0.17-14.el5.src.rpm"/><source-package last-modified="1232403649" id="rhn-source-package-48983" source-rpm="readline-5.1-1.1.src.rpm"/><source-package last-modified="1232403761" id="rhn-source-package-48984" source-rpm="dmraid-1.0.0.rc13-33.el5.src.rpm"/><source-package last-modified="1232403762" id="rhn-source-package-48985" source-rpm="pam_krb5-2.2.14-10.src.rpm"/><source-package last-modified="1232403792" id="rhn-source-package-48986" source-rpm="net-snmp-5.3.2.2-5.el5.src.rpm"/><source-package last-modified="1232403807" id="rhn-source-package-48987" source-rpm="librdmacm-1.0.8-1.el5.src.rpm"/><source-package last-modified="1232403809" id="rhn-source-package-48988" source-rpm="sabayon-2.12.4-6.el5.src.rpm"/><source-package last-modified="1232403867" id="rhn-source-package-48989" source-rpm="krb5-1.6.1-31.el5.src.rpm"/><source-package last-modified="1232403875" id="rhn-source-package-48990" source-rpm="fonts-indic-2.3.1-1.el5.src.rpm"/><source-package last-modified="1232403879" id="rhn-source-package-48991" source-rpm="system-config-printer-0.7.32.10-1.el5.src.rpm"/><source-package last-modified="1232404483" id="rhn-source-package-48993" source-rpm="cpufreq-utils-005-1.el5.src.rpm"/><source-package last-modified="1232404487" id="rhn-source-package-48994" source-rpm="udev-095-14.19.el5.src.rpm"/><source-package last-modified="1232404495" id="rhn-source-package-48995" source-rpm="xorg-x11-drv-i810-1.6.5-9.21.el5.src.rpm"/><source-package last-modified="1232404587" id="rhn-source-package-48996" source-rpm="newt-0.52.2-12.el5.src.rpm"/><source-package last-modified="1232404615" id="rhn-source-package-48997" source-rpm="perl-DBI-1.52-2.el5.src.rpm"/><source-package last-modified="1232404647" id="rhn-source-package-48998" source-rpm="scim-1.4.4-41.el5.src.rpm"/><source-package last-modified="1232404651" id="rhn-source-package-48999" source-rpm="gnupg-1.4.5-14.src.rpm"/><source-package last-modified="1232404665" id="rhn-source-package-49000" source-rpm="tmpwatch-2.9.7-1.1.el5.2.src.rpm"/><source-package last-modified="1232404697" id="rhn-source-package-49001" source-rpm="tog-pegasus-2.7.1-2.el5.src.rpm"/><source-package last-modified="1232404728" id="rhn-source-package-49002" source-rpm="perl-DBD-Pg-1.49-2.el5.src.rpm"/><source-package last-modified="1232404914" id="rhn-source-package-49006" source-rpm="sos-1.7-9.16.el5.src.rpm"/><source-package last-modified="1232404917" id="rhn-source-package-49007" source-rpm="mpi-selector-1.0.1-1.el5.src.rpm"/><source-package last-modified="1232404921" id="rhn-source-package-49008" source-rpm="alsa-utils-1.0.17-1.el5.src.rpm"/><source-package last-modified="1232404925" id="rhn-source-package-49009" source-rpm="opensm-3.2.2-3.el5.src.rpm"/><source-package last-modified="1232404928" id="rhn-source-package-49010" source-rpm="system-config-samba-1.2.41-3.el5.src.rpm"/><source-package last-modified="1232404970" id="rhn-source-package-49011" source-rpm="redhat-menus-6.7.8-3.el5.src.rpm"/><source-package last-modified="1232405062" id="rhn-source-package-49014" source-rpm="hal-0.5.8.1-38.el5.src.rpm"/><source-package last-modified="1232405067" id="rhn-source-package-49015" source-rpm="gfs2-utils-0.1.53-1.el5.src.rpm"/><source-package last-modified="1232405124" id="rhn-source-package-49017" source-rpm="perftest-1.2-11.el5.src.rpm"/><source-package last-modified="1232405133" id="rhn-source-package-49018" source-rpm="dhcdbd-2.2-2.el5.src.rpm"/><source-package last-modified="1232405136" id="rhn-source-package-49019" source-rpm="wdaemon-0.14-2.src.rpm"/><source-package last-modified="1232405182" id="rhn-source-package-49021" source-rpm="logrotate-3.7.4-9.src.rpm"/><source-package last-modified="1232405218" id="rhn-source-package-49022" source-rpm="kdelibs-3.5.4-18.el5.src.rpm"/><source-package last-modified="1232405242" id="rhn-source-package-49023" source-rpm="mkinitrd-5.1.19.6-44.src.rpm"/><source-package last-modified="1232405257" id="rhn-source-package-49024" source-rpm="xen-3.0.3-80.el5.src.rpm"/><source-package last-modified="1232405662" id="rhn-source-package-49025" source-rpm="device-mapper-1.02.28-2.el5.src.rpm"/><source-package last-modified="1232405668" id="rhn-source-package-49026" source-rpm="libsmi-0.4.5-2.el5.src.rpm"/><source-package last-modified="1232405716" id="rhn-source-package-49027" source-rpm="openib-1.3.2-0.20080728.0355.3.el5.src.rpm"/><source-package last-modified="1232405722" id="rhn-source-package-49028" source-rpm="mod_nss-1.0.3-6.el5.src.rpm"/><source-package last-modified="1232405729" id="rhn-source-package-49029" source-rpm="util-linux-2.13-0.50.el5.src.rpm"/><source-package last-modified="1232405828" id="rhn-source-package-49030" source-rpm="pfmon-3.2-0.060926.5.el5.src.rpm"/><source-package last-modified="1232405833" id="rhn-source-package-49031" source-rpm="gimp-print-4.2.7-22.2.el5.src.rpm"/><source-package last-modified="1232405837" id="rhn-source-package-49032" source-rpm="openais-0.80.3-22.el5.src.rpm"/><source-package last-modified="1232405842" id="rhn-source-package-49033" source-rpm="xorg-x11-drv-nv-2.1.12-3.el5.src.rpm"/><source-package last-modified="1232405854" id="rhn-source-package-49034" source-rpm="system-config-network-1.3.99.12-1.el5.src.rpm"/><source-package last-modified="1232405931" id="rhn-source-package-49035" source-rpm="spamassassin-3.2.5-1.el5.src.rpm"/><source-package last-modified="1232405978" id="rhn-source-package-49038" source-rpm="systemtap-0.7.2-2.el5.src.rpm"/><source-package last-modified="1232405991" id="rhn-source-package-49039" source-rpm="subversion-1.4.2-4.el5.src.rpm"/><source-package last-modified="1232406043" id="rhn-source-package-49041" source-rpm="tcp_wrappers-7.6-40.6.el5.src.rpm"/><source-package last-modified="1232406050" id="rhn-source-package-49042" source-rpm="setup-2.5.58-4.el5.src.rpm"/><source-package last-modified="1232406063" id="rhn-source-package-49043" source-rpm="rpm-4.4.2.3-9.el5.src.rpm"/><source-package last-modified="1232406068" id="rhn-source-package-49044" source-rpm="ipsec-tools-0.6.5-13.el5.src.rpm"/><source-package last-modified="1232406107" id="rhn-source-package-49045" source-rpm="glibc-2.5-34.src.rpm"/><source-package last-modified="1232406213" id="rhn-source-package-49046" source-rpm="openmpi-1.2.7-6.el5.src.rpm"/><source-package last-modified="1232406256" id="rhn-source-package-49047" source-rpm="yum-rhn-plugin-0.5.3-30.el5.src.rpm"/><source-package last-modified="1232406281" id="rhn-source-package-49048" source-rpm="infiniband-diags-1.4.1-2.el5.src.rpm"/><source-package last-modified="1232406352" id="rhn-source-package-49049" source-rpm="patch-2.5.4-29.2.3.el5.src.rpm"/><source-package last-modified="1232406387" id="rhn-source-package-49050" source-rpm="libmthca-1.0.5-1.el5.src.rpm"/><source-package last-modified="1232406400" id="rhn-source-package-49051" source-rpm="policycoreutils-1.33.12-14.2.el5.src.rpm"/><source-package last-modified="1232406449" id="rhn-source-package-49052" source-rpm="perl-5.8.8-18.el5.src.rpm"/><source-package last-modified="1232406458" id="rhn-source-package-49053" source-rpm="tcpdump-3.9.4-14.el5.src.rpm"/><source-package last-modified="1232406485" id="rhn-source-package-49054" source-rpm="cups-1.3.7-8.el5.src.rpm"/><source-package last-modified="1232406489" id="rhn-source-package-49055" source-rpm="inn-2.4.3-8.el5.src.rpm"/><source-package last-modified="1232406521" id="rhn-source-package-49056" source-rpm="crash-4.0-7.2.3.src.rpm"/><source-package last-modified="1232406531" id="rhn-source-package-49057" source-rpm="nedit-5.5-21.el5.src.rpm"/><source-package last-modified="1232406554" id="rhn-source-package-49059" source-rpm="openldap-2.3.43-3.el5.src.rpm"/><source-package last-modified="1232406569" id="rhn-source-package-49060" source-rpm="gnome-power-manager-2.16.0-10.el5.src.rpm"/><source-package last-modified="1232406590" id="rhn-source-package-49061" source-rpm="yum-3.2.19-18.el5.src.rpm"/><source-package last-modified="1232406630" id="rhn-source-package-49062" source-rpm="system-config-kdump-1.0.14-4.el5.src.rpm"/><source-package last-modified="1232406661" id="rhn-source-package-49063" source-rpm="kdebase-3.5.4-19.el5.src.rpm"/><source-package last-modified="1232406664" id="rhn-source-package-49064" source-rpm="system-config-kickstart-2.6.19.8-2.el5.src.rpm"/><source-package last-modified="1232406679" id="rhn-source-package-49065" source-rpm="mvapich2-1.0.3-3.el5.src.rpm"/><source-package last-modified="1232406682" id="rhn-source-package-49066" source-rpm="ibsim-0.4-3.el5.src.rpm"/><source-package last-modified="1232406703" id="rhn-source-package-49067" source-rpm="system-config-bind-4.0.3-4.el5.src.rpm"/><source-package last-modified="1232406726" id="rhn-source-package-49069" source-rpm="sudo-1.6.9p17-3.el5.src.rpm"/><source-package last-modified="1232406743" id="rhn-source-package-49070" source-rpm="xfig-3.2.4-21.3.el5.src.rpm"/><source-package last-modified="1232406750" id="rhn-source-package-49071" source-rpm="privoxy-3.0.3-9.3.el5.src.rpm"/><source-package last-modified="1232406758" id="rhn-source-package-49072" source-rpm="httpd-2.2.3-22.el5.src.rpm"/><source-package last-modified="1232406763" id="rhn-source-package-49073" source-rpm="ethtool-6-2.el5.src.rpm"/><source-package last-modified="1232406807" id="rhn-source-package-49074" source-rpm="stunnel-4.15-2.el5.1.src.rpm"/><source-package last-modified="1232406818" id="rhn-source-package-49075" source-rpm="libmlx4-1.0-4.el5.src.rpm"/><source-package last-modified="1232406828" id="rhn-source-package-49076" source-rpm="dhcpv6-1.0.10-16.el5.src.rpm"/><source-package last-modified="1232406852" id="rhn-source-package-49077" source-rpm="redhat-release-notes-5Server-25.src.rpm"/><source-package last-modified="1232406898" id="rhn-source-package-49078" source-rpm="xorg-x11-server-1.1.1-48.52.el5.src.rpm"/><source-package last-modified="1232406903" id="rhn-source-package-49079" source-rpm="firstboot-1.4.27.7-1.el5.src.rpm"/><source-package last-modified="1232406913" id="rhn-source-package-49080" source-rpm="compat-libcom_err-1.0-7.src.rpm"/><source-package last-modified="1232406980" id="rhn-source-package-49081" source-rpm="gcc-4.1.2-44.el5.src.rpm"/><source-package last-modified="1232407197" id="rhn-source-package-49082" source-rpm="java-1.6.0-openjdk-1.6.0.0-0.25.b09.el5.src.rpm"/><source-package last-modified="1232407202" id="rhn-source-package-49083" source-rpm="rsyslog-2.0.6-1.el5.src.rpm"/><source-package last-modified="1232407244" id="rhn-source-package-49084" source-rpm="libibcm-1.0.3-1.el5.src.rpm"/><source-package last-modified="1232407251" id="rhn-source-package-49085" source-rpm="fipscheck-1.0.3-1.el5.src.rpm"/><source-package last-modified="1232408485" id="rhn-source-package-49086" source-rpm="rhel-instnum-1.0.9-1.el5.src.rpm"/><source-package last-modified="1232408511" id="rhn-source-package-49087" source-rpm="SysVinit-2.86-15.el5.src.rpm"/><source-package last-modified="1232408545" id="rhn-source-package-49088" source-rpm="squid-2.6.STABLE21-3.el5.src.rpm"/><source-package last-modified="1232408577" id="rhn-source-package-49089" source-rpm="ftp-0.17-35.el5.src.rpm"/><source-package last-modified="1232408590" id="rhn-source-package-49090" source-rpm="kdenetwork-3.5.4-8.el5.src.rpm"/><source-package last-modified="1232408595" id="rhn-source-package-49091" source-rpm="kbd-1.12-21.el5.src.rpm"/><source-package last-modified="1232408688" id="rhn-source-package-49092" source-rpm="NetworkManager-0.7.0-3.el5.src.rpm"/><source-package last-modified="1232408899" id="rhn-source-package-49093" source-rpm="sgpio-1.2.0_10-2.el5.src.rpm"/><source-package last-modified="1232408943" id="rhn-source-package-49094" source-rpm="ccid-1.3.8-1.el5.src.rpm"/><source-package last-modified="1232408961" id="rhn-source-package-49095" source-rpm="booty-0.80.6-5.src.rpm"/><source-package last-modified="1232408977" id="rhn-source-package-49096" source-rpm="libnes-0.5-4.el5.src.rpm"/><source-package last-modified="1232408987" id="rhn-source-package-49097" source-rpm="cdrtools-2.01-10.7.el5.src.rpm"/><source-package last-modified="1232408995" id="rhn-source-package-49098" source-rpm="selinux-policy-2.4.6-203.el5.src.rpm"/><source-package last-modified="1232409022" id="rhn-source-package-49100" source-rpm="kudzu-1.2.57.1.21-1.src.rpm"/><source-package last-modified="1232409066" id="rhn-source-package-49101" source-rpm="openCryptoki-2.2.4-22.el5.src.rpm"/><source-package last-modified="1232409101" id="rhn-source-package-49102" source-rpm="filesystem-2.4.0-2.src.rpm"/><source-package last-modified="1232409108" id="rhn-source-package-49103" source-rpm="OpenIPMI-2.0.6-11.el5.src.rpm"/><source-package last-modified="1232409137" id="rhn-source-package-49104" source-rpm="system-config-lvm-1.1.5-1.0.el5.src.rpm"/><source-package last-modified="1232409171" id="rhn-source-package-49106" source-rpm="redhat-release-5Server-5.3.0.3.src.rpm"/><source-package last-modified="1232409174" id="rhn-source-package-49107" source-rpm="psacct-6.3.2-44.el5.src.rpm"/><source-package last-modified="1232409270" id="rhn-source-package-49109" source-rpm="oprofile-0.9.3-18.el5.src.rpm"/><source-package last-modified="1232409276" id="rhn-source-package-49110" source-rpm="openssl-0.9.8e-7.el5.src.rpm"/><source-package last-modified="1232409282" id="rhn-source-package-49111" source-rpm="ecryptfs-utils-56-8.el5.src.rpm"/><source-package last-modified="1232409352" id="rhn-source-package-49113" source-rpm="libgcrypt-1.2.4-1.el5.src.rpm"/><source-package last-modified="1232409404" id="rhn-source-package-49114" source-rpm="wpa_supplicant-0.5.10-8.el5.src.rpm"/><source-package last-modified="1232409406" id="rhn-source-package-49115" source-rpm="findutils-4.2.27-5.el5.src.rpm"/><source-package last-modified="1232409454" id="rhn-source-package-49116" source-rpm="linuxwacom-0.7.8.3-5.el5.src.rpm"/><source-package last-modified="1232409605" id="rhn-source-package-49117" source-rpm="mcstrans-0.2.11-3.el5.src.rpm"/><source-package last-modified="1232409671" id="rhn-source-package-49118" source-rpm="numactl-0.9.8-7.el5.src.rpm"/><source-package last-modified="1232409739" id="rhn-source-package-49119" source-rpm="sysstat-7.0.2-3.el5.src.rpm"/><source-package last-modified="1232409742" id="rhn-source-package-49120" source-rpm="gnome-terminal-2.16.0-5.3.el5.src.rpm"/><source-package last-modified="1232409747" id="rhn-source-package-49121" source-rpm="cpuspeed-1.2.1-5.el5.src.rpm"/><source-package last-modified="1232410156" id="rhn-source-package-49123" source-rpm="prelink-0.4.0-2.el5.src.rpm"/><source-package last-modified="1232410159" id="rhn-source-package-49124" source-rpm="lm_sensors-2.10.7-4.el5.src.rpm"/><source-package last-modified="1232410176" id="rhn-source-package-49125" source-rpm="autofs-5.0.1-0.rc2.102.src.rpm"/><source-package last-modified="1232410229" id="rhn-source-package-49126" source-rpm="wacomexpresskeys-0.4.1-1.el5.src.rpm"/><source-package last-modified="1232410237" id="rhn-source-package-49127" source-rpm="metacity-2.16.0-12.el5.src.rpm"/><source-package last-modified="1232410250" id="rhn-source-package-49128" source-rpm="alsa-lib-1.0.17-1.el5.src.rpm"/><source-package last-modified="1232410251" id="rhn-source-package-49129" source-rpm="perl-Archive-Zip-1.16-1.2.1.src.rpm"/><source-package last-modified="1232410284" id="rhn-source-package-49130" source-rpm="coreutils-5.97-19.el5.src.rpm"/><source-package last-modified="1232410341" id="rhn-source-package-49131" source-rpm="ghostscript-8.15.2-9.4.el5.src.rpm"/><source-package last-modified="1232410344" id="rhn-source-package-49132" source-rpm="esc-1.0.0-39.el5.src.rpm"/><source-package last-modified="1232459632" id="rhn-source-package-49137" source-rpm="module-init-tools-3.3-0.pre3.1.37.el5_2.1.src.rpm"/><source-package last-modified="1232489751" id="rhn-source-package-49141" source-rpm="crash-4.0-7.2.3.el5_3.1.src.rpm"/><source-package last-modified="1232489764" id="rhn-source-package-49142" source-rpm="kexec-tools-1.102pre-56.el5_3.1.src.rpm"/><source-package last-modified="1232490104" id="rhn-source-package-49143" source-rpm="strace-4.5.18-2.el5_3.2.src.rpm"/><source-package last-modified="1233221465" id="rhn-source-package-49260" source-rpm="ntp-4.2.2p1-9.el5_3.1.src.rpm"/><source-package last-modified="1233737075" id="rhn-source-package-49576" source-rpm="firefox-3.0.6-1.el5.src.rpm"/><source-package last-modified="1233737075" id="rhn-source-package-49577" source-rpm="nss-3.12.2.0-4.el5.src.rpm"/><source-package last-modified="1233737075" id="rhn-source-package-49578" source-rpm="xulrunner-1.9.0.6-1.el5.src.rpm"/><source-package last-modified="1233849341" id="rhn-source-package-49631" source-rpm="sudo-1.6.9p17-3.el5_3.1.src.rpm"/><source-package last-modified="1233923900" id="rhn-source-package-49636" source-rpm="gstreamer-plugins-good-0.10.9-1.el5_3.1.src.rpm"/><source-package last-modified="1234280500" id="rhn-source-package-49644" source-rpm="kernel-2.6.18-128.1.1.el5.src.rpm"/><source-package last-modified="1234362522" id="rhn-source-package-49645" source-rpm="dos2unix-3.1-27.2.el5.src.rpm"/><source-package last-modified="1234362529" id="rhn-source-package-49646" source-rpm="hwbrowser-0.30-3.el5.src.rpm"/><source-package last-modified="1234362542" id="rhn-source-package-49647" source-rpm="system-config-date-1.8.12-4.el5.src.rpm"/><source-package last-modified="1234370305" id="rhn-source-package-49650" source-rpm="netpbm-10.35-6.1.el5_3.1.src.rpm"/><source-package last-modified="1234371327" id="rhn-source-package-49651" source-rpm="mod_auth_mysql-3.0.0-3.2.el5_3.src.rpm"/><source-package last-modified="1234371517" id="rhn-source-package-49653" source-rpm="vnc-4.1.2-14.el5_3.1.src.rpm"/><source-package last-modified="1234951245" id="rhn-source-package-49666" source-rpm="unix2dos-2.2-26.2.3.el5.src.rpm"/><source-package last-modified="1234975295" id="rhn-source-package-49667" source-rpm="strace-4.5.18-2.el5_3.3.src.rpm"/><source-package last-modified="1235512939" id="rhn-source-package-49682" source-rpm="gfs2-utils-0.1.53-1.el5_3.1.src.rpm"/><source-package last-modified="1235749521" id="rhn-source-package-49687" source-rpm="device-mapper-multipath-0.4.7-23.el5_3.1.src.rpm"/><source-package last-modified="1236193446" id="rhn-source-package-49701" source-rpm="wireshark-1.0.6-2.el5_3.src.rpm"/><source-package last-modified="1236193625" id="rhn-source-package-49704" source-rpm="libpng-1.2.10-7.1.el5_3.2.src.rpm"/><source-package last-modified="1236210974" id="rhn-source-package-49709" source-rpm="xulrunner-1.9.0.7-1.el5.src.rpm"/><source-package last-modified="1236210974" id="rhn-source-package-49710" source-rpm="firefox-3.0.7-1.el5.src.rpm"/><source-package last-modified="1236787732" id="rhn-source-package-49976" source-rpm="mod_authz_ldap-0.26-9.el5.src.rpm"/><source-package last-modified="1236787878" id="rhn-source-package-49977" source-rpm="htdig-3.2.0b6-11.el5.src.rpm"/><source-package last-modified="1236866978" id="rhn-source-package-49998" source-rpm="icu-3.6-5.11.2.src.rpm"/><source-package last-modified="1237210830" id="rhn-source-package-50003" source-rpm="libsoup-2.2.98-2.el5_3.1.src.rpm"/><source-package last-modified="1237211194" id="rhn-source-package-50005" source-rpm="evolution-data-server-1.12.3-10.el5_3.3.src.rpm"/><source-package last-modified="1237388126" id="rhn-source-package-50010" source-rpm="jadetex-3.12-15.el5.src.rpm"/><source-package last-modified="1237388248" id="rhn-source-package-50011" source-rpm="cpio-2.6-23.el5.src.rpm"/><source-package last-modified="1237388438" id="rhn-source-package-50012" source-rpm="ltrace-0.5-13.45svn.el5.src.rpm"/><source-package last-modified="1237474961" id="rhn-source-package-50018" source-rpm="lcms-1.18-0.1.beta1.el5_3.2.src.rpm"/><source-package last-modified="1237475352" id="rhn-source-package-50022" source-rpm="curl-7.15.5-2.1.el5_3.4.src.rpm"/><source-package last-modified="1237476796" id="rhn-source-package-50025" source-rpm="ghostscript-8.15.2-9.4.el5_3.4.src.rpm"/><source-package last-modified="1237895801" id="rhn-source-package-50044" source-rpm="glib2-2.12.3-4.el5_3.1.src.rpm"/><source-package last-modified="1237984158" id="rhn-source-package-50050" source-rpm="numactl-0.9.8-8.el5.src.rpm"/><source-package last-modified="1237984344" id="rhn-source-package-50051" source-rpm="db4-4.3.29-10.el5.src.rpm"/><source-package last-modified="1237989317" id="rhn-source-package-50053" source-rpm="NetworkManager-0.7.0-4.el5_3.src.rpm"/><source-package last-modified="1238082570" id="rhn-source-package-50055" source-rpm="systemtap-0.7.2-3.el5_3.src.rpm"/><source-package last-modified="1238195400" id="rhn-source-package-50087" source-rpm="xulrunner-1.9.0.7-3.el5.src.rpm"/><source-package last-modified="1238423485" id="rhn-source-package-50101" source-rpm="xen-3.0.3-80.el5_3.2.src.rpm"/><source-package last-modified="1238431767" id="rhn-source-package-50102" source-rpm="openswan-2.6.14-1.el5_3.2.src.rpm"/><source-package last-modified="1238488706" id="rhn-source-package-50103" source-rpm="mod_nss-1.0.3-7.el5_3.1.src.rpm"/><source-package last-modified="1238573732" id="rhn-source-package-50106" source-rpm="kernel-2.6.18-128.1.6.el5.src.rpm"/><source-package last-modified="1238575521" id="rhn-source-package-50107" source-rpm="iproute-2.6.18-10.el5.src.rpm"/><source-package last-modified="1238575797" id="rhn-source-package-50108" source-rpm="gnome-python2-desktop-2.16.0-3.el5.src.rpm"/><source-package last-modified="1238684145" id="rhn-source-package-50148" source-rpm="perl-5.8.8-18.el5_3.1.src.rpm"/><source-package last-modified="1239035288" id="rhn-source-package-50154" source-rpm="gstreamer-plugins-base-0.10.20-3.0.1.el5_3.src.rpm"/><source-package last-modified="1239035300" id="rhn-source-package-50155" source-rpm="php-5.1.6-23.2.el5_3.src.rpm"/><source-package last-modified="1239129265" id="rhn-source-package-50163" source-rpm="krb5-1.6.1-31.el5_3.3.src.rpm"/><source-package last-modified="1239129272" id="rhn-source-package-50167" source-rpm="java-1.6.0-openjdk-1.6.0.0-0.30.b09.el5.src.rpm"/><source-package last-modified="1239129436" id="rhn-source-package-50168" source-rpm="device-mapper-multipath-0.4.7-23.el5_3.2.src.rpm"/><source-package last-modified="1239176743" id="rhn-source-package-50171" source-rpm="lksctp-tools-1.0.6-3.el5.src.rpm"/><source-package last-modified="1239176764" id="rhn-source-package-50172" source-rpm="less-394-6.el5.src.rpm"/><source-package last-modified="1239176867" id="rhn-source-package-50173" source-rpm="tcl-8.4.13-4.el5.src.rpm"/><source-package last-modified="1239307153" id="rhn-source-package-50183" source-rpm="cman-2.0.98-1.el5_3.1.src.rpm"/><source-package last-modified="1239307231" id="rhn-source-package-50184" source-rpm="openais-0.80.3-22.el5_3.4.src.rpm"/><source-package last-modified="1239307432" id="rhn-source-package-50185" source-rpm="gfs2-utils-0.1.53-1.el5_3.2.src.rpm"/><source-package last-modified="1239731456" id="rhn-source-package-50193" source-rpm="ghostscript-8.15.2-9.4.el5_3.7.src.rpm"/><source-package last-modified="1239786942" id="rhn-source-package-50197" source-rpm="tzdata-2009f-1.el5.src.rpm"/><source-package last-modified="1239789435" id="rhn-source-package-50198" source-rpm="rsh-0.17-40.el5.src.rpm"/><source-package last-modified="1239790480" id="rhn-source-package-50200" source-rpm="dump-0.4b41-4.el5.src.rpm"/><source-package last-modified="1239791165" id="rhn-source-package-50201" source-rpm="scim-bridge-0.4.5-9.el5.src.rpm"/><source-package last-modified="1239910316" id="rhn-source-package-50209" source-rpm="udev-095-14.20.el5_3.src.rpm"/><source-package last-modified="1239919080" id="rhn-source-package-50212" source-rpm="cups-1.3.7-8.el5_3.4.src.rpm"/><source-package last-modified="1239975231" id="rhn-source-package-50218" source-rpm="device-mapper-multipath-0.4.7-23.el5_3.4.src.rpm"/><source-package last-modified="1240363553" id="rhn-source-package-50265" source-rpm="firefox-3.0.9-1.el5.src.rpm"/><source-package last-modified="1240363553" id="rhn-source-package-50267" source-rpm="xulrunner-1.9.0.9-1.el5.src.rpm"/><source-package last-modified="1240404139" id="rhn-source-package-50268" source-rpm="sudo-1.6.9p17-5.el5.src.rpm"/><source-package last-modified="1240404250" id="rhn-source-package-50269" source-rpm="psmisc-22.2-7.src.rpm"/><source-package last-modified="1240404398" id="rhn-source-package-50270" source-rpm="yum-metadata-parser-1.1.2-3.el5.src.rpm"/><source-package last-modified="1240404603" id="rhn-source-package-50271" source-rpm="sqlite-3.3.6-5.src.rpm"/><source-package last-modified="1240404715" id="rhn-source-package-50272" source-rpm="authd-1.4.3-14.src.rpm"/><source-package last-modified="1240404886" id="rhn-source-package-50273" source-rpm="audit-1.7.7-6.el5_3.2.src.rpm"/><source-package last-modified="1240421649" id="rhn-source-package-50274" source-rpm="giflib-4.1.3-7.1.el5_3.1.src.rpm"/><source-package last-modified="1240864918" id="rhn-source-package-50284" source-rpm="firefox-3.0.10-1.el5.src.rpm"/><source-package last-modified="1240864918" id="rhn-source-package-50285" source-rpm="xulrunner-1.9.0.10-1.el5.src.rpm"/><source-package last-modified="1241012373" id="rhn-source-package-50291" source-rpm="kdenetwork-3.5.4-9.el5.src.rpm"/><source-package last-modified="1241012560" id="rhn-source-package-50292" source-rpm="tcp_wrappers-7.6-40.7.el5.src.rpm"/><source-package last-modified="1241095412" id="rhn-source-package-50317" source-rpm="file-4.17-15.el5_3.1.src.rpm"/><source-package last-modified="1241122231" id="rhn-source-package-50324" source-rpm="libwmf-0.2.8.4-10.2.src.rpm"/><source-package last-modified="1241606742" id="rhn-source-package-50341" source-rpm="sos-1.7-9.16.el5_3.5.src.rpm"/><source-package last-modified="1241623776" id="rhn-source-package-50344" source-rpm="ypbind-1.19-12.el5.src.rpm"/><source-package last-modified="1241623888" id="rhn-source-package-50345" source-rpm="zsh-4.2.6-3.el5.src.rpm"/><source-package last-modified="1241624111" id="rhn-source-package-50347" source-rpm="binutils-2.17.50.0.6-12.el5.src.rpm"/><source-package last-modified="1241689733" id="rhn-source-package-50349" source-rpm="kexec-tools-1.102pre-56.el5_3.2.src.rpm"/><source-package last-modified="1241693068" id="rhn-source-package-50355" source-rpm="kernel-2.6.18-128.1.10.el5.src.rpm"/><source-package last-modified="1241696250" id="rhn-source-package-50359" source-rpm="acpid-1.0.4-7.el5_3.1.src.rpm"/><source-package last-modified="1241697346" id="rhn-source-package-50360" source-rpm="audit-1.7.7-6.el5_3.3.src.rpm"/><source-package last-modified="1241772894" id="rhn-source-package-50366" source-rpm="pango-1.14.9-5.el5_3.src.rpm"/><source-package last-modified="1241804597" id="rhn-source-package-50367" source-rpm="gfs2-utils-0.1.53-1.el5_3.3.src.rpm"/><source-package last-modified="1242224643" id="rhn-source-package-50372" source-rpm="perl-DBD-Pg-1.49-2.el5_3.1.src.rpm"/><source-package last-modified="1242224949" id="rhn-source-package-50373" source-rpm="poppler-0.5.4-4.4.el5_3.9.src.rpm"/><source-package last-modified="1242286340" id="rhn-source-package-50382" source-rpm="grep-2.5.1-55.el5.src.rpm"/><source-package last-modified="1242286522" id="rhn-source-package-50383" source-rpm="authconfig-5.3.21-6.el5.src.rpm"/><source-package last-modified="1242286685" id="rhn-source-package-50384" source-rpm="man-pages-ja-20060815-11.el5.src.rpm"/><source-package last-modified="1242286854" id="rhn-source-package-50385" source-rpm="setup-2.5.58-7.el5.src.rpm"/><source-package last-modified="1242677163" id="rhn-source-package-50489" source-rpm="ipsec-tools-0.6.5-13.el5_3.1.src.rpm"/><source-package last-modified="1242678540" id="rhn-source-package-50490" source-rpm="ntp-4.2.2p1-9.el5_3.2.src.rpm"/><source-package last-modified="1242811334" id="rhn-source-package-50509" source-rpm="pyorbit-2.14.1-3.el5.src.rpm"/><source-package last-modified="1242813826" id="rhn-source-package-50511" source-rpm="cpuspeed-1.2.1-8.el5.src.rpm"/><source-package last-modified="1242993563" id="rhn-source-package-50521" source-rpm="freetype-2.2.1-21.el5_3.src.rpm"/><source-package last-modified="1243357474" id="rhn-source-package-50528" source-rpm="squirrelmail-1.4.8-5.el5_3.7.src.rpm"/><source-package last-modified="1243411419" id="rhn-source-package-50540" source-rpm="vsftpd-2.0.5-12.el5_3.1.src.rpm"/><source-package last-modified="1243412086" id="rhn-source-package-50541" source-rpm="net-snmp-5.3.2.2-5.el5_3.1.src.rpm"/><source-package last-modified="1243431955" id="rhn-source-package-50542" source-rpm="aspell-nl-0.1e-2.el5.src.rpm"/><source-package last-modified="1243432018" id="rhn-source-package-50543" source-rpm="php-pear-1.4.9-6.el5.src.rpm"/><source-package last-modified="1243432116" id="rhn-source-package-50544" source-rpm="dvd+rw-tools-7.0-1.el5.src.rpm"/><source-package last-modified="1243432180" id="rhn-source-package-50545" source-rpm="aide-0.13.1-4.el5.src.rpm"/><source-package last-modified="1243432235" id="rhn-source-package-50546" source-rpm="system-config-language-1.1.18-3.el5.src.rpm"/><source-package last-modified="1243433692" id="rhn-source-package-50547" source-rpm="httpd-2.2.3-22.el5_3.1.src.rpm"/><source-package last-modified="1244033497" id="rhn-source-package-50556" source-rpm="readline-5.1-3.el5.src.rpm"/><source-package last-modified="1244033616" id="rhn-source-package-50557" source-rpm="gnome-session-2.16.0-7.el5.src.rpm"/><source-package last-modified="1244033684" id="rhn-source-package-50558" source-rpm="setroubleshoot-2.0.5-5.el5.src.rpm"/><source-package last-modified="1244043021" id="rhn-source-package-50564" source-rpm="cups-1.3.7-8.el5_3.6.src.rpm"/><source-package last-modified="1244633001" id="rhn-source-package-50576" source-rpm="redhat-rpm-config-8.0.45-32.el5.src.rpm"/><source-package last-modified="1244633082" id="rhn-source-package-50577" source-rpm="iputils-20020927-46.el5.src.rpm"/><source-package last-modified="1244647648" id="rhn-source-package-50578" source-rpm="mkinitrd-5.1.19.6-44.1.src.rpm"/><source-package last-modified="1244712474" id="rhn-source-package-50615" source-rpm="xen-3.0.3-80.el5_3.3.src.rpm"/><source-package last-modified="1244759193" id="rhn-source-package-50617" source-rpm="firefox-3.0.11-2.el5_3.src.rpm"/><source-package last-modified="1244759193" id="rhn-source-package-50618" source-rpm="xulrunner-1.9.0.11-3.el5_3.src.rpm"/><source-package last-modified="1245049819" id="rhn-source-package-50629" source-rpm="iscsi-initiator-utils-6.2.0.868-0.18.el5_3.1.src.rpm"/><source-package last-modified="1245096858" id="rhn-source-package-50638" source-rpm="wireshark-1.0.8-1.el5_3.1.src.rpm"/><source-package last-modified="1245100039" id="rhn-source-package-50642" source-rpm="cscope-15.5-15.1.el5_3.1.src.rpm"/><source-package last-modified="1245137388" id="rhn-source-package-50643" source-rpm="cman-2.0.98-1.el5_3.4.src.rpm"/><source-package last-modified="1245156936" id="rhn-source-package-50644" source-rpm="openais-0.80.3-22.el5_3.8.src.rpm"/><source-package last-modified="1245167499" id="rhn-source-package-50647" source-rpm="tzdata-2009i-2.el5.src.rpm"/><source-package last-modified="1245186787" id="rhn-source-package-50648" source-rpm="kernel-2.6.18-128.1.14.el5.src.rpm"/><source-package last-modified="1245188091" id="rhn-source-package-50650" source-rpm="apr-util-1.2.7-7.el5_3.1.src.rpm"/><source-package last-modified="1245249782" id="rhn-source-package-50652" source-rpm="pciutils-2.2.3-7.el5.src.rpm"/><source-package last-modified="1245249881" id="rhn-source-package-50653" source-rpm="wdaemon-0.14-4.src.rpm"/><source-package last-modified="1245250064" id="rhn-source-package-50654" source-rpm="isdn4k-utils-3.2-56.el5.src.rpm"/><source-package last-modified="1245250076" id="rhn-source-package-50655" source-rpm="efax-0.9-28.el5.src.rpm"/><source-package last-modified="1245345072" id="rhn-source-package-50661" source-rpm="cyrus-imapd-2.3.7-2.el5_3.2.src.rpm"/><source-package last-modified="1245691628" id="rhn-source-package-50667" source-rpm="vim-7.0.109-6.el5.src.rpm"/><source-package last-modified="1245694218" id="rhn-source-package-50668" source-rpm="tetex-3.0-33.8.el5.src.rpm"/><source-package last-modified="1245694415" id="rhn-source-package-50669" source-rpm="avahi-0.6.16-6.el5.src.rpm"/><source-package last-modified="1245694565" id="rhn-source-package-50670" source-rpm="cyrus-imapd-2.3.7-7.el5.src.rpm"/><source-package last-modified="1245694660" id="rhn-source-package-50671" source-rpm="vino-2.13.5-7.el5.src.rpm"/><source-package last-modified="1245938594" id="rhn-source-package-50674" source-rpm="icu-3.6-5.11.4.src.rpm"/><source-package last-modified="1245939029" id="rhn-source-package-50675" source-rpm="gstreamer-plugins-good-0.10.9-1.el5_3.2.src.rpm"/><source-package last-modified="1245944161" id="rhn-source-package-50679" source-rpm="kdelibs-3.5.4-22.el5_3.src.rpm"/><source-package last-modified="1246018238" id="rhn-source-package-50687" source-rpm="autofs-5.0.1-0.rc2.102.el5_3.1.src.rpm"/><source-package last-modified="1246350314" id="rhn-source-package-50689" source-rpm="kernel-2.6.18-128.1.16.el5.src.rpm"/><source-package last-modified="1246362442" id="rhn-source-package-50706" source-rpm="pango-1.14.9-6.el5.src.rpm"/><source-package last-modified="1246364605" id="rhn-source-package-50753" source-rpm="crash-4.0-8.9.1.el5.src.rpm"/><source-package last-modified="1246366355" id="rhn-source-package-50784" source-rpm="evince-0.6.0-9.el5.src.rpm"/><source-package last-modified="1246367075" id="rhn-source-package-50798" source-rpm="cryptsetup-luks-1.0.3-5.el5.src.rpm"/><source-package last-modified="1246368582" id="rhn-source-package-50809" source-rpm="kdebase-3.5.4-20.el5.src.rpm"/><source-package last-modified="1246368782" id="rhn-source-package-50813" source-rpm="irqbalance-0.55-15.el5.src.rpm"/><source-package last-modified="1246372650" id="rhn-source-package-50860" source-rpm="foomatic-3.0.2-38.3.el5.src.rpm"/><source-package last-modified="1246374642" id="rhn-source-package-50880" source-rpm="xorg-x11-xdm-1.0.5-6.el5.src.rpm"/><source-package last-modified="1246530866" id="rhn-source-package-50909" source-rpm="bind-9.3.4-10.P1.el5_3.1.src.rpm"/><source-package last-modified="1246546767" id="rhn-source-package-50910" source-rpm="openswan-2.6.14-1.el5_3.3.src.rpm"/><source-package last-modified="1246552727" id="rhn-source-package-50913" source-rpm="ruby-1.8.5-5.el5_3.7.src.rpm"/><source-package last-modified="1246606077" id="rhn-source-package-50916" source-rpm="yum-3.2.19-18.el5_3.1.src.rpm"/><source-package last-modified="1247155587" id="rhn-source-package-50978" source-rpm="httpd-2.2.3-22.el5_3.2.src.rpm"/><source-package last-modified="1247238073" id="rhn-source-package-51000" source-rpm="samba-3.0.33-3.7.el5_3.1.src.rpm"/><source-package last-modified="1247562136" id="rhn-source-package-51006" source-rpm="kernel-2.6.18-128.2.1.el5.src.rpm"/><source-package last-modified="1247771313" id="rhn-source-package-51027" source-rpm="libtiff-3.8.2-7.el5_3.4.src.rpm"/><source-package last-modified="1248074800" id="rhn-source-package-51036" source-rpm="nss-3.12.3.99.3-1.el5_3.2.src.rpm"/><source-package last-modified="1248074800" id="rhn-source-package-51037" source-rpm="nspr-4.7.4-1.el5_3.1.src.rpm"/><source-package last-modified="1248209166" id="rhn-source-package-51041" source-rpm="tomcat5-5.5.23-0jpp.7.el5_3.2.src.rpm"/><source-package last-modified="1248221589" id="rhn-source-package-51042" source-rpm="xulrunner-1.9.0.12-1.el5_3.src.rpm"/><source-package last-modified="1248221589" id="rhn-source-package-51043" source-rpm="firefox-3.0.12-1.el5_3.src.rpm"/><source-package last-modified="1248246871" id="rhn-source-package-51047" source-rpm="ksh-20080202-2.el5_3.1.src.rpm"/><source-package last-modified="1248282282" id="rhn-source-package-51062" source-rpm="esc-1.1.0-9.el5.src.rpm"/><source-package last-modified="1248686340" id="rhn-source-package-51095" source-rpm="python-2.4.3-24.el5_3.6.src.rpm"/><source-package last-modified="1248889231" id="rhn-source-package-51101" source-rpm="bind-9.3.4-10.P1.el5_3.2.src.rpm"/><source-package last-modified="1248907966" id="rhn-source-package-51107" source-rpm="bind-9.3.4-10.P1.el5_3.3.src.rpm"/><source-package last-modified="1249284752" id="rhn-source-package-51120" source-rpm="openais-0.80.3-22.el5_3.9.src.rpm"/><source-package last-modified="1249285048" id="rhn-source-package-51121" source-rpm="cman-2.0.98-1.el5_3.7.src.rpm"/><source-package last-modified="1249390877" id="rhn-source-package-51124" source-rpm="kernel-2.6.18-128.4.1.el5.src.rpm"/><source-package last-modified="1249593151" id="rhn-source-package-51140" source-rpm="java-1.6.0-openjdk-1.6.0.0-1.2.b09.el5.src.rpm"/><source-package last-modified="1249634951" id="rhn-source-package-51141" source-rpm="glibc-2.5-34.el5_3.1.src.rpm"/><source-package last-modified="1249922126" id="rhn-source-package-51142" source-rpm="subversion-1.4.2-4.el5_3.1.src.rpm"/><source-package last-modified="1249923708" id="rhn-source-package-51144" source-rpm="apr-1.2.7-11.el5_3.1.src.rpm"/><source-package last-modified="1249923708" id="rhn-source-package-51147" source-rpm="apr-util-1.2.7-7.el5_3.2.src.rpm"/><source-package last-modified="1249926432" id="rhn-source-package-51152" source-rpm="libxml2-2.6.26-2.1.2.8.src.rpm"/><source-package last-modified="1250172789" id="rhn-source-package-51159" source-rpm="curl-7.15.5-2.1.el5_3.5.src.rpm"/><source-package last-modified="1250513801" id="rhn-source-package-51166" source-rpm="tzdata-2009k-1.el5.src.rpm"/><source-package last-modified="1250586921" id="rhn-source-package-51169" source-rpm="net-snmp-5.3.2.2-5.el5_3.2.src.rpm"/><source-package last-modified="1250618136" id="rhn-source-package-51176" source-rpm="libvorbis-1.1.2-3.el5_3.3.src.rpm"/><source-package last-modified="1251112134" id="rhn-source-package-51187" source-rpm="kernel-2.6.18-128.7.1.el5.src.rpm"/><source-package last-modified="1251297019" id="rhn-source-package-51206" source-rpm="gnutls-1.4.1-3.el5_3.5.src.rpm"/><source-package last-modified="1251378276" id="rhn-source-package-51207" source-rpm="mdadm-2.6.9-2.el5.src.rpm"/><source-package last-modified="1251378334" id="rhn-source-package-51208" source-rpm="device-mapper-multipath-0.4.7-30.el5.src.rpm"/><source-package last-modified="1251378342" id="rhn-source-package-51209" source-rpm="nfs4-acl-tools-0.3.3-1.el5.src.rpm"/><source-package last-modified="1251378387" id="rhn-source-package-51210" source-rpm="util-linux-2.13-0.52.el5.src.rpm"/><source-package last-modified="1251378442" id="rhn-source-package-51212" source-rpm="xorg-x11-server-1.1.1-48.67.el5.src.rpm"/><source-package last-modified="1251378492" id="rhn-source-package-51213" source-rpm="xorg-x11-drv-mga-1.4.10-5.el5.src.rpm"/><source-package last-modified="1251378707" id="rhn-source-package-51214" source-rpm="openswan-2.6.21-5.el5.src.rpm"/><source-package last-modified="1251378735" id="rhn-source-package-51215" source-rpm="xen-3.0.3-94.el5.src.rpm"/><source-package last-modified="1251378932" id="rhn-source-package-51217" source-rpm="perl-5.8.8-27.el5.src.rpm"/><source-package last-modified="1251379084" id="rhn-source-package-51218" source-rpm="anaconda-11.1.2.195-1.src.rpm"/><source-package last-modified="1251379266" id="rhn-source-package-51219" source-rpm="oprofile-0.9.4-11.el5.src.rpm"/><source-package last-modified="1251379271" id="rhn-source-package-51220" source-rpm="libcxgb3-1.2.3-1.el5.src.rpm"/><source-package last-modified="1251379350" id="rhn-source-package-51221" source-rpm="openssl-0.9.8e-12.el5.src.rpm"/><source-package last-modified="1251379372" id="rhn-source-package-51222" source-rpm="rhnsd-4.7.0-4.el5.src.rpm"/><source-package last-modified="1251379410" id="rhn-source-package-51223" source-rpm="yum-rhn-plugin-0.5.4-13.el5.src.rpm"/><source-package last-modified="1251379604" id="rhn-source-package-51224" source-rpm="glibc-2.5-42.src.rpm"/><source-package last-modified="1251379751" id="rhn-source-package-51225" source-rpm="grub-0.97-13.5.src.rpm"/><source-package last-modified="1251379956" id="rhn-source-package-51226" source-rpm="bind-9.3.6-4.P1.el5.src.rpm"/><source-package last-modified="1251380315" id="rhn-source-package-51228" source-rpm="m2crypto-0.16-6.el5.6.src.rpm"/><source-package last-modified="1251380332" id="rhn-source-package-51229" source-rpm="OpenIPMI-2.0.16-5.el5.src.rpm"/><source-package last-modified="1251380784" id="rhn-source-package-51231" source-rpm="sblim-1-35.el5.src.rpm"/><source-package last-modified="1251380785" id="rhn-source-package-51232" source-rpm="pykickstart-0.43.5-1.el5.src.rpm"/><source-package last-modified="1251381084" id="rhn-source-package-51233" source-rpm="openais-0.80.6-8.el5.src.rpm"/><source-package last-modified="1251381138" id="rhn-source-package-51234" source-rpm="rdesktop-1.6.0-3.src.rpm"/><source-package last-modified="1251381327" id="rhn-source-package-51235" source-rpm="xorg-x11-proto-devel-7.1-13.el5.src.rpm"/><source-package last-modified="1251381399" id="rhn-source-package-51236" source-rpm="hwdata-0.213.16-1.el5.src.rpm"/><source-package last-modified="1251381471" id="rhn-source-package-51237" source-rpm="gfs2-utils-0.1.62-1.el5.src.rpm"/><source-package last-modified="1251381485" id="rhn-source-package-51238" source-rpm="autofs-5.0.1-0.rc2.131.el5.src.rpm"/><source-package last-modified="1251381702" id="rhn-source-package-51239" source-rpm="selinux-policy-2.4.6-255.el5.src.rpm"/><source-package last-modified="1251382174" id="rhn-source-package-51240" source-rpm="mysql-5.0.77-3.el5.src.rpm"/><source-package last-modified="1251382392" id="rhn-source-package-51242" source-rpm="kernel-2.6.18-164.el5.src.rpm"/><source-package last-modified="1251382562" id="rhn-source-package-51243" source-rpm="sos-1.7-9.27.el5.src.rpm"/><source-package last-modified="1251382771" id="rhn-source-package-51244" source-rpm="sg3_utils-1.25-4.el5.src.rpm"/><source-package last-modified="1251382887" id="rhn-source-package-51245" source-rpm="system-config-network-1.3.99.18-1.el5.src.rpm"/><source-package last-modified="1251383081" id="rhn-source-package-51246" source-rpm="kexec-tools-1.102pre-77.el5.src.rpm"/><source-package last-modified="1251383831" id="rhn-source-package-51247" source-rpm="net-snmp-5.3.2.2-7.el5.src.rpm"/><source-package last-modified="1251384753" id="rhn-source-package-51249" source-rpm="system-config-samba-1.2.41-5.el5.src.rpm"/><source-package last-modified="1251384803" id="rhn-source-package-51250" source-rpm="mcelog-0.9pre-1.27.el5.src.rpm"/><source-package last-modified="1251384904" id="rhn-source-package-51252" source-rpm="rpm-4.4.2.3-18.el5.src.rpm"/><source-package last-modified="1251385028" id="rhn-source-package-51253" source-rpm="cman-2.0.115-1.el5.src.rpm"/><source-package last-modified="1251385221" id="rhn-source-package-51254" source-rpm="evolution-data-server-1.12.3-18.el5.src.rpm"/><source-package last-modified="1251385906" id="rhn-source-package-51256" source-rpm="pth-2.0.7-6.el5.src.rpm"/><source-package last-modified="1251386048" id="rhn-source-package-51257" source-rpm="httpd-2.2.3-31.el5.src.rpm"/><source-package last-modified="1251386996" id="rhn-source-package-51260" source-rpm="module-init-tools-3.3-0.pre3.1.54.el5.src.rpm"/><source-package last-modified="1251387058" id="rhn-source-package-51261" source-rpm="findutils-4.2.27-6.el5.src.rpm"/><source-package last-modified="1251388299" id="rhn-source-package-51264" source-rpm="ethtool-6-3.el5.src.rpm"/><source-package last-modified="1251388769" id="rhn-source-package-51267" source-rpm="busybox-1.2.0-7.el5.src.rpm"/><source-package last-modified="1251389199" id="rhn-source-package-51268" source-rpm="iscsi-initiator-utils-6.2.0.871-0.10.el5.src.rpm"/><source-package last-modified="1251389370" id="rhn-source-package-51269" source-rpm="hal-0.5.8.1-52.el5.src.rpm"/><source-package last-modified="1251389709" id="rhn-source-package-51270" source-rpm="rhn-client-tools-0.4.20-9.el5.src.rpm"/><source-package last-modified="1251390130" id="rhn-source-package-51271" source-rpm="dhcpv6-1.0.10-17.el5.src.rpm"/><source-package last-modified="1251390242" id="rhn-source-package-51273" source-rpm="ksh-20080202-14.el5.src.rpm"/><source-package last-modified="1251390924" id="rhn-source-package-51276" source-rpm="amanda-2.5.0p2-8.el5.src.rpm"/><source-package last-modified="1251391067" id="rhn-source-package-51277" source-rpm="yum-3.2.22-20.el5.src.rpm"/><source-package last-modified="1251391969" id="rhn-source-package-51278" source-rpm="openib-1.4.1-3.el5.src.rpm"/><source-package last-modified="1251392244" id="rhn-source-package-51279" source-rpm="openssh-4.3p2-36.el5.src.rpm"/><source-package last-modified="1251393000" id="rhn-source-package-51282" source-rpm="coreutils-5.97-23.el5.src.rpm"/><source-package last-modified="1251393088" id="rhn-source-package-51283" source-rpm="xorg-x11-drv-qxl-0.0.4-1.1.el5.src.rpm"/><source-package last-modified="1251393231" id="rhn-source-package-51284" source-rpm="xorg-x11-drv-ati-6.6.3-3.27.el5.src.rpm"/><source-package last-modified="1251393279" id="rhn-source-package-51285" source-rpm="libksba-1.0.5-2.el5.src.rpm"/><source-package last-modified="1251394307" id="rhn-source-package-51286" source-rpm="rds-tools-1.4-2.el5.src.rpm"/><source-package last-modified="1251395284" id="rhn-source-package-51287" source-rpm="gtk-vnc-0.3.8-3.el5.src.rpm"/><source-package last-modified="1251395433" id="rhn-source-package-51288" source-rpm="redhat-release-5Server-5.4.0.3.src.rpm"/><source-package last-modified="1251396677" id="rhn-source-package-51290" source-rpm="dmraid-1.0.0.rc13-53.el5.src.rpm"/><source-package last-modified="1251397261" id="rhn-source-package-51291" source-rpm="policycoreutils-1.33.12-14.6.el5.src.rpm"/><source-package last-modified="1251397325" id="rhn-source-package-51292" source-rpm="libsemanage-1.9.1-4.4.el5.src.rpm"/><source-package last-modified="1251397720" id="rhn-source-package-51293" source-rpm="initscripts-8.45.30-2.el5.src.rpm"/><source-package last-modified="1251398606" id="rhn-source-package-51295" source-rpm="e4fsprogs-1.41.5-3.el5.src.rpm"/><source-package last-modified="1251399102" id="rhn-source-package-51296" source-rpm="redhat-release-notes-5Server-29.src.rpm"/><source-package last-modified="1251399725" id="rhn-source-package-51297" source-rpm="e2fsprogs-1.39-23.el5.src.rpm"/><source-package last-modified="1251449616" id="rhn-source-package-51299" source-rpm="xorg-x11-drv-nv-2.1.12-6.el5.src.rpm"/><source-package last-modified="1251449622" id="rhn-source-package-51301" source-rpm="libsdp-1.1.99-11.el5.src.rpm"/><source-package last-modified="1251449623" id="rhn-source-package-51302" source-rpm="mkinitrd-5.1.19.6-54.src.rpm"/><source-package last-modified="1251449625" id="rhn-source-package-51303" source-rpm="libdhcp-1.20-10.el5.src.rpm"/><source-package last-modified="1251449627" id="rhn-source-package-51304" source-rpm="iptables-1.3.5-5.3.el5.src.rpm"/><source-package last-modified="1251449629" id="rhn-source-package-51305" source-rpm="libhbaapi-2.2-4.el5.src.rpm"/><source-package last-modified="1251449634" id="rhn-source-package-51307" source-rpm="libassuan-1.0.4-5.el5.src.rpm"/><source-package last-modified="1251449639" id="rhn-source-package-51308" source-rpm="blktrace-1.0.0-6.el5.src.rpm"/><source-package last-modified="1251449642" id="rhn-source-package-51309" source-rpm="microcode_ctl-1.17-1.48.el5.src.rpm"/><source-package last-modified="1251449646" id="rhn-source-package-51310" source-rpm="opensm-3.2.6-2.el5.src.rpm"/><source-package last-modified="1251449649" id="rhn-source-package-51311" source-rpm="lvm2-2.02.46-8.el5.src.rpm"/><source-package last-modified="1251449650" id="rhn-source-package-51312" source-rpm="perftest-1.2-14.el5.src.rpm"/><source-package last-modified="1251449653" id="rhn-source-package-51313" source-rpm="nfs-utils-lib-1.0.8-7.6.el5.src.rpm"/><source-package last-modified="1251449690" id="rhn-source-package-51314" source-rpm="mvapich-1.1.0-0.3355.2.el5.src.rpm"/><source-package last-modified="1251449692" id="rhn-source-package-51315" source-rpm="nss_ldap-253-21.el5.src.rpm"/><source-package last-modified="1251449704" id="rhn-source-package-51317" source-rpm="gnupg2-2.0.10-3.el5.src.rpm"/><source-package last-modified="1251449708" id="rhn-source-package-51318" source-rpm="libgcrypt-1.4.4-5.el5.src.rpm"/><source-package last-modified="1251449711" id="rhn-source-package-51319" source-rpm="linuxwacom-0.7.8.3-6.el5.src.rpm"/><source-package last-modified="1251449719" id="rhn-source-package-51320" source-rpm="NetworkManager-0.7.0-9.el5.src.rpm"/><source-package last-modified="1251449726" id="rhn-source-package-51321" source-rpm="netpbm-10.35.58-8.el5.src.rpm"/><source-package last-modified="1251449728" id="rhn-source-package-51322" source-rpm="libibmad-1.2.3-1.el5.src.rpm"/><source-package last-modified="1251449731" id="rhn-source-package-51323" source-rpm="ecryptfs-utils-75-5.el5.src.rpm"/><source-package last-modified="1251449735" id="rhn-source-package-51325" source-rpm="librdmacm-1.0.8-5.el5.src.rpm"/><source-package last-modified="1251449737" id="rhn-source-package-51326" source-rpm="fipscheck-1.2.0-1.el5.src.rpm"/><source-package last-modified="1251449753" id="rhn-source-package-51327" source-rpm="pam-0.99.6.2-6.el5.src.rpm"/><source-package last-modified="1251449758" id="rhn-source-package-51329" source-rpm="libmlx4-1.0.1-2.el5.src.rpm"/><source-package last-modified="1251449761" id="rhn-source-package-51330" source-rpm="fuse-2.7.4-8.el5.src.rpm"/><source-package last-modified="1251449777" id="rhn-source-package-51332" source-rpm="openmpi-1.3.2-2.el5.src.rpm"/><source-package last-modified="1251449794" id="rhn-source-package-51333" source-rpm="cyrus-sasl-2.1.22-5.el5.src.rpm"/><source-package last-modified="1251449795" id="rhn-source-package-51334" source-rpm="acpid-1.0.4-9.el5.src.rpm"/><source-package last-modified="1251449814" id="rhn-source-package-51335" source-rpm="python-2.4.3-27.el5.src.rpm"/><source-package last-modified="1251449818" id="rhn-source-package-51336" source-rpm="libX11-1.0.3-11.el5.src.rpm"/><source-package last-modified="1251449821" id="rhn-source-package-51337" source-rpm="infiniband-diags-1.4.4-1.el5.src.rpm"/><source-package last-modified="1251449826" id="rhn-source-package-51338" source-rpm="dapl-2.0.19-2.el5.src.rpm"/><source-package last-modified="1251449837" id="rhn-source-package-51339" source-rpm="openhpi-2.14.0-5.el5.src.rpm"/><source-package last-modified="1251449840" id="rhn-source-package-51340" source-rpm="libnes-0.6-2.el5.src.rpm"/><source-package last-modified="1251449853" id="rhn-source-package-51341" source-rpm="gdm-2.16.0-56.el5.src.rpm"/><source-package last-modified="1251449855" id="rhn-source-package-51342" source-rpm="libsepol-1.15.2-2.el5.src.rpm"/><source-package last-modified="1251449859" id="rhn-source-package-51343" source-rpm="wget-1.11.4-2.el5.src.rpm"/><source-package last-modified="1251449868" id="rhn-source-package-51344" source-rpm="ibutils-1.2-10.el5.src.rpm"/><source-package last-modified="1251449870" id="rhn-source-package-51345" source-rpm="qlvnictools-0.0.1-11.el5.src.rpm"/><source-package last-modified="1251449872" id="rhn-source-package-51346" source-rpm="libibverbs-1.1.2-4.el5.src.rpm"/><source-package last-modified="1251449874" id="rhn-source-package-51347" source-rpm="udev-095-14.21.el5.src.rpm"/><source-package last-modified="1251449876" id="rhn-source-package-51348" source-rpm="device-mapper-1.02.32-1.el5.src.rpm"/><source-package last-modified="1251449880" id="rhn-source-package-51349" source-rpm="mstflint-1.4-1.el5.src.rpm"/><source-package last-modified="1251449917" id="rhn-source-package-51350" source-rpm="krb5-1.6.1-36.el5.src.rpm"/><source-package last-modified="1251449920" id="rhn-source-package-51351" source-rpm="xkeyboard-config-0.8-9.el5.src.rpm"/><source-package last-modified="1251450034" id="rhn-source-package-51353" source-rpm="samba-3.0.33-3.14.el5.src.rpm"/><source-package last-modified="1251450040" id="rhn-source-package-51354" source-rpm="libibcommon-1.1.2-1.el5.src.rpm"/><source-package last-modified="1251450042" id="rhn-source-package-51355" source-rpm="libibumad-1.2.3-1.el5.src.rpm"/><source-package last-modified="1251450048" id="rhn-source-package-51357" source-rpm="mpitests-3.1-3.el5.src.rpm"/><source-package last-modified="1251450049" id="rhn-source-package-51358" source-rpm="srptools-0.0.4-6.el5.src.rpm"/><source-package last-modified="1251450058" id="rhn-source-package-51359" source-rpm="cvs-1.11.22-7.el5.src.rpm"/><source-package last-modified="1251450110" id="rhn-source-package-51361" source-rpm="mvapich2-1.2-0.p1.3.el5.src.rpm"/><source-package last-modified="1251450113" id="rhn-source-package-51362" source-rpm="pinentry-0.7.3-3.el5.src.rpm"/><source-package last-modified="1251450114" id="rhn-source-package-51363" source-rpm="fcoe-utils-1.0.7-4.el5.src.rpm"/><source-package last-modified="1251450117" id="rhn-source-package-51364" source-rpm="pdksh-5.2.14-36.el5.src.rpm"/><source-package last-modified="1251450122" id="rhn-source-package-51365" source-rpm="totem-2.16.7-6.el5.src.rpm"/><source-package last-modified="1251450123" id="rhn-source-package-51366" source-rpm="python-pyblock-0.26-4.el5.src.rpm"/><source-package last-modified="1251450157" id="rhn-source-package-51367" source-rpm="gdb-6.8-37.el5.src.rpm"/><source-package last-modified="1251450159" id="rhn-source-package-51368" source-rpm="hmaccalc-0.9.6-1.el5.src.rpm"/><source-package last-modified="1251450162" id="rhn-source-package-51369" source-rpm="libipathverbs-1.1-14.el5.src.rpm"/><source-package last-modified="1251450163" id="rhn-source-package-51370" source-rpm="tftp-0.49-2.src.rpm"/><source-package last-modified="1251450166" id="rhn-source-package-51371" source-rpm="dhcp-3.0.5-21.el5.src.rpm"/><source-package last-modified="1251450168" id="rhn-source-package-51372" source-rpm="vsftpd-2.0.5-16.el5.src.rpm"/><source-package last-modified="1251450170" id="rhn-source-package-51373" source-rpm="mlocate-0.15-1.el5.2.src.rpm"/><source-package last-modified="1251450172" id="rhn-source-package-51374" source-rpm="mod_nss-1.0.3-8.el5.src.rpm"/><source-package last-modified="1251450174" id="rhn-source-package-51375" source-rpm="libhbalinux-1.0.7-3.el5.src.rpm"/><source-package last-modified="1251450177" id="rhn-source-package-51376" source-rpm="nfs-utils-1.0.9-42.el5.src.rpm"/><source-package last-modified="1251450181" id="rhn-source-package-51377" source-rpm="libibcm-1.0.4-3.el5.src.rpm"/><source-package last-modified="1251450182" id="rhn-source-package-51378" source-rpm="ofed-docs-1.4.1-2.el5.src.rpm"/><source-package last-modified="1251450185" id="rhn-source-package-51379" source-rpm="strace-4.5.18-5.el5.src.rpm"/><source-package last-modified="1251450193" id="rhn-source-package-51380" source-rpm="systemtap-0.9.7-5.el5.src.rpm"/><source-package last-modified="1251450197" id="rhn-source-package-51382" source-rpm="dmidecode-2.9-1.el5.src.rpm"/><source-package last-modified="1251450199" id="rhn-source-package-51383" source-rpm="libpciaccess-0.10.5-2.el5.src.rpm"/><source-package last-modified="1251450200" id="rhn-source-package-51384" source-rpm="watchdog-5.6-1.el5.src.rpm"/><source-package last-modified="1251450201" id="rhn-source-package-51385" source-rpm="rhnlib-2.2.7-2.el5.src.rpm"/><source-package last-modified="1251450205" id="rhn-source-package-51387" source-rpm="mpi-selector-1.0.2-1.el5.src.rpm"/><source-package last-modified="1251450215" id="rhn-source-package-51388" source-rpm="cups-1.3.7-11.el5.src.rpm"/><source-package last-modified="1251450345" id="rhn-source-package-51389" source-rpm="gcc44-4.4.0-6.el5.src.rpm"/><source-package last-modified="1251450347" id="rhn-source-package-51390" source-rpm="qperf-0.4.4-3.el5.src.rpm"/><source-package last-modified="1251450351" id="rhn-source-package-51391" source-rpm="lftp-3.7.11-4.el5.src.rpm"/><source-package last-modified="1251450432" id="rhn-source-package-51392" source-rpm="gcc-4.1.2-46.el5.src.rpm"/><source-package last-modified="1251450436" id="rhn-source-package-51394" source-rpm="libselinux-1.33.4-5.5.el5.src.rpm"/><source-package last-modified="1251450438" id="rhn-source-package-51395" source-rpm="libmthca-1.0.5-4.el5.src.rpm"/><source-package last-modified="1251450439" id="rhn-source-package-51396" source-rpm="ibsim-0.5-1.el5.src.rpm"/><source-package last-modified="1251450443" id="rhn-source-package-51397" source-rpm="xorg-x11-drv-i810-1.6.5-9.25.el5.src.rpm"/><source-package last-modified="1251450459" id="rhn-source-package-51398" source-rpm="tog-pegasus-2.7.2-1.el5.src.rpm"/><source-package last-modified="1251450463" id="rhn-source-package-51399" source-rpm="audit-1.7.13-2.el5.src.rpm"/><source-package last-modified="1251450467" id="rhn-source-package-51400" source-rpm="mysql-connector-odbc-3.51.26r1127-1.el5.src.rpm"/><source-package last-modified="1251450540" id="rhn-source-package-51404" source-rpm="ghostscript-8.15.2-9.11.el5.src.rpm"/><source-package last-modified="1251899746" id="rhn-source-package-51422" source-rpm="ktune-0.2-4.el5_4.3.src.rpm"/><source-package last-modified="1252421014" id="rhn-source-package-51439" source-rpm="fetchmail-6.3.6-1.1.el5_3.1.src.rpm"/><source-package last-modified="1252423508" id="rhn-source-package-51440" source-rpm="xmlsec1-1.2.9-8.1.1.src.rpm"/><source-package last-modified="1252537523" id="rhn-source-package-51552" source-rpm="nspr-4.7.5-1.el5_4.src.rpm"/><source-package last-modified="1252537523" id="rhn-source-package-51553" source-rpm="firefox-3.0.14-1.el5_4.src.rpm"/><source-package last-modified="1252537523" id="rhn-source-package-51554" source-rpm="xulrunner-1.9.0.14-1.el5_4.src.rpm"/><source-package last-modified="1252608416" id="rhn-source-package-51603" source-rpm="cman-2.0.115-1.el5_4.2.src.rpm"/><source-package last-modified="1252657160" id="rhn-source-package-51605" source-rpm="net-snmp-5.3.2.2-7.el5_4.2.src.rpm"/><source-package last-modified="1253198035" id="rhn-source-package-51629" source-rpm="freeradius-1.1.3-1.5.el5_4.src.rpm"/><source-package last-modified="1253545119" id="rhn-source-package-51633" source-rpm="neon-0.25.5-10.el5_4.1.src.rpm"/><source-package last-modified="1253610673" id="rhn-source-package-51640" source-rpm="dmidecode-2.10-2.el5.src.rpm"/><source-package last-modified="1253716552" id="rhn-source-package-51648" source-rpm="cyrus-imapd-2.3.7-7.el5_4.3.src.rpm"/><source-package last-modified="1253818201" id="rhn-source-package-51657" source-rpm="newt-0.52.2-12.el5_4.1.src.rpm"/><source-package last-modified="1254210412" id="rhn-source-package-51668" source-rpm="kdelibs-3.5.4-22.el5_4.1.src.rpm"/><source-package last-modified="1254252004" id="rhn-source-package-51670" source-rpm="kernel-2.6.18-164.2.1.el5.src.rpm"/><source-package last-modified="1254298538" id="rhn-source-package-51672" source-rpm="tzdata-2009m-1.el5.src.rpm"/><source-package last-modified="1254299200" id="rhn-source-package-51674" source-rpm="autofs-5.0.1-0.rc2.131.el5_4.1.src.rpm"/><source-package last-modified="1254323011" id="rhn-source-package-51676" source-rpm="openssh-4.3p2-36.el5_4.2.src.rpm"/><source-package last-modified="1254416076" id="rhn-source-package-51678" source-rpm="elinks-0.11.1-6.el5_4.1.src.rpm"/><source-package last-modified="1254419558" id="rhn-source-package-51679" source-rpm="xen-3.0.3-94.el5_4.1.src.rpm"/><source-package last-modified="1254490262" id="rhn-source-package-51751" source-rpm="openais-0.80.6-8.el5_4.1.src.rpm"/><source-package last-modified="1254726884" id="rhn-source-package-51754" source-rpm="lvm2-2.02.46-8.el5_4.1.src.rpm"/><source-package last-modified="1254928154" id="rhn-source-package-51764" source-rpm="postgresql-8.1.18-2.el5_4.1.src.rpm"/><source-package last-modified="1254997670" id="rhn-source-package-51767" source-rpm="OpenIPMI-2.0.16-5.el5_4.1.src.rpm"/><source-package last-modified="1255031432" id="rhn-source-package-51775" source-rpm="squirrelmail-1.4.8-5.el5_4.10.src.rpm"/><source-package last-modified="1255418970" id="rhn-source-package-51785" source-rpm="tcsh-6.14-14.el5_4.2.src.rpm"/><source-package last-modified="1255421490" id="rhn-source-package-51786" source-rpm="selinux-policy-2.4.6-255.el5_4.1.src.rpm"/><source-package last-modified="1255591926" id="rhn-source-package-51815" source-rpm="coreutils-5.97-23.el5_4.1.src.rpm"/><source-package last-modified="1255596254" id="rhn-source-package-51820" source-rpm="poppler-0.5.4-4.4.el5_4.11.src.rpm"/><source-package last-modified="1255596858" id="rhn-source-package-51822" source-rpm="cups-1.3.7-11.el5_4.3.src.rpm"/><source-package last-modified="1255609237" id="rhn-source-package-51823" source-rpm="xen-3.0.3-94.el5_4.2.src.rpm"/></source-packages><rhn-channel-errata><erratum last-modified="1173884075" id="rhn-erratum-5388" advisory-name="RHSA-2007:0075"/><erratum last-modified="1173884812" id="rhn-erratum-5390" advisory-name="RHSA-2007:0107"/><erratum last-modified="1173884788" id="rhn-erratum-5392" advisory-name="RHEA-2007:0105"/><erratum last-modified="1173885139" id="rhn-erratum-5393" advisory-name="RHBA-2007:0109"/><erratum last-modified="1173884466" id="rhn-erratum-5394" advisory-name="RHBA-2007:0098"/><erratum last-modified="1173884228" id="rhn-erratum-5396" advisory-name="RHSA-2007:0082"/><erratum last-modified="1173884120" id="rhn-erratum-5397" advisory-name="RHSA-2007:0057"/><erratum last-modified="1173884286" id="rhn-erratum-5398" advisory-name="RHSA-2007:0061"/><erratum last-modified="1173884494" id="rhn-erratum-5399" advisory-name="RHSA-2007:0097"/><erratum last-modified="1173885169" id="rhn-erratum-5400" advisory-name="RHBA-2007:0113"/><erratum last-modified="1173885206" id="rhn-erratum-5401" advisory-name="RHSA-2007:0114"/><erratum last-modified="1173884509" id="rhn-erratum-5402" advisory-name="RHSA-2007:0068"/><erratum last-modified="1173884663" id="rhn-erratum-5403" advisory-name="RHBA-2007:0103"/><erratum last-modified="1173885044" id="rhn-erratum-5404" advisory-name="RHBA-2007:0100"/><erratum last-modified="1173884681" id="rhn-erratum-5405" advisory-name="RHSA-2007:0099"/><erratum last-modified="1173885203" id="rhn-erratum-5406" advisory-name="RHEA-2007:0115"/><erratum last-modified="1173885075" id="rhn-erratum-5407" advisory-name="RHBA-2007:0110"/><erratum last-modified="1173887436" id="rhn-erratum-5411" advisory-name="RHEA-2007:0121"/><erratum last-modified="1173889743" id="rhn-erratum-5412" advisory-name="RHSA-2007:0066"/><erratum last-modified="1174644491" id="rhn-erratum-5427" advisory-name="RHSA-2007:0124"/><erratum last-modified="1174688135" id="rhn-erratum-5428" advisory-name="RHEA-2007:0128"/><erratum last-modified="1175179674" id="rhn-erratum-5431" advisory-name="RHBA-2007:0129"/><erratum last-modified="1175624424" id="rhn-erratum-5443" advisory-name="RHSA-2007:0095"/><erratum last-modified="1175625002" id="rhn-erratum-5444" advisory-name="RHSA-2007:0132"/><erratum last-modified="1175625829" id="rhn-erratum-5445" advisory-name="RHSA-2007:0127"/><erratum last-modified="1175626420" id="rhn-erratum-5447" advisory-name="RHSA-2007:0131"/><erratum last-modified="1176723344" id="rhn-erratum-5465" advisory-name="RHSA-2007:0150"/><erratum last-modified="1176724173" id="rhn-erratum-5466" advisory-name="RHSA-2007:0123"/><erratum last-modified="1176738127" id="rhn-erratum-5470" advisory-name="RHSA-2007:0157"/><erratum last-modified="1177062426" id="rhn-erratum-5475" advisory-name="RHSA-2007:0153"/><erratum last-modified="1177951006" id="rhn-erratum-5619" advisory-name="RHSA-2007:0169"/><erratum last-modified="1199735207" id="rhn-erratum-5645" advisory-name="RHSA-2007:0336"/><erratum last-modified="1178639124" id="rhn-erratum-5646" advisory-name="RHSA-2007:0348"/><erratum last-modified="1178716315" id="rhn-erratum-5647" advisory-name="RHSA-2007:0346"/><erratum last-modified="1179496330" id="rhn-erratum-5655" advisory-name="RHBA-2007:0161"/><erratum last-modified="1199735373" id="rhn-erratum-5656" advisory-name="RHSA-2007:0338"/><erratum last-modified="1199906533" id="rhn-erratum-5676" advisory-name="RHSA-2007:0354"/><erratum last-modified="1179161981" id="rhn-erratum-5677" advisory-name="RHSA-2007:0327"/><erratum last-modified="1179338483" id="rhn-erratum-5689" advisory-name="RHBA-2007:0352"/><erratum last-modified="1179340366" id="rhn-erratum-5690" advisory-name="RHSA-2007:0347"/><erratum last-modified="1179411433" id="rhn-erratum-5694" advisory-name="RHSA-2007:0342"/><erratum last-modified="1199735437" id="rhn-erratum-5695" advisory-name="RHSA-2007:0345"/><erratum last-modified="1199742173" id="rhn-erratum-5697" advisory-name="RHSA-2007:0358"/><erratum last-modified="1199743831" id="rhn-erratum-5698" advisory-name="RHSA-2007:0356"/><erratum last-modified="1199735668" id="rhn-erratum-5707" advisory-name="RHSA-2007:0343"/><erratum last-modified="1180011522" id="rhn-erratum-5710" advisory-name="RHBA-2007:0365"/><erratum last-modified="1180516364" id="rhn-erratum-5718" advisory-name="RHSA-2007:0344"/><erratum last-modified="1199742671" id="rhn-erratum-5720" advisory-name="RHSA-2007:0389"/><erratum last-modified="1199742298" id="rhn-erratum-5721" advisory-name="RHSA-2007:0391"/><erratum last-modified="1199897038" id="rhn-erratum-5724" advisory-name="RHSA-2007:0400"/><erratum last-modified="1199743349" id="rhn-erratum-5728" advisory-name="RHSA-2007:0386"/><erratum last-modified="1199743812" id="rhn-erratum-5730" advisory-name="RHSA-2007:0385"/><erratum last-modified="1199893698" id="rhn-erratum-5800" advisory-name="RHSA-2007:0403"/><erratum last-modified="1199900997" id="rhn-erratum-5806" advisory-name="RHSA-2007:0494"/><erratum last-modified="1199891884" id="rhn-erratum-5807" advisory-name="RHSA-2007:0492"/><erratum last-modified="1181815032" id="rhn-erratum-5809" advisory-name="RHSA-2007:0497"/><erratum last-modified="1199729488" id="rhn-erratum-5812" advisory-name="RHSA-2007:0395"/><erratum last-modified="1181832884" id="rhn-erratum-5816" advisory-name="RHSA-2007:0376"/><erratum last-modified="1199744532" id="rhn-erratum-5817" advisory-name="RHSA-2007:0501"/><erratum last-modified="1182155439" id="rhn-erratum-5820" advisory-name="RHBA-2007:0504"/><erratum last-modified="1182778752" id="rhn-erratum-5825" advisory-name="RHSA-2007:0510"/><erratum last-modified="1182871332" id="rhn-erratum-5833" advisory-name="RHSA-2007:0556"/><erratum last-modified="1199744251" id="rhn-erratum-5835" advisory-name="RHSA-2007:0562"/><erratum last-modified="1211378384" id="rhn-erratum-5836" advisory-name="RHBA-2007:0373"/><erratum last-modified="1211378384" id="rhn-erratum-5837" advisory-name="RHBA-2007:0370"/><erratum last-modified="1211378431" id="rhn-erratum-5838" advisory-name="RHBA-2007:0357"/><erratum last-modified="1211378384" id="rhn-erratum-5839" advisory-name="RHBA-2007:0339"/><erratum last-modified="1211378384" id="rhn-erratum-5840" advisory-name="RHBA-2007:0333"/><erratum last-modified="1211378384" id="rhn-erratum-5842" advisory-name="RHBA-2007:0496"/><erratum last-modified="1211378384" id="rhn-erratum-5843" advisory-name="RHBA-2007:0407"/><erratum last-modified="1211378384" id="rhn-erratum-5844" advisory-name="RHEA-2007:0399"/><erratum last-modified="1211378384" id="rhn-erratum-5845" advisory-name="RHBA-2007:0382"/><erratum last-modified="1183016029" id="rhn-erratum-5854" advisory-name="RHSA-2007:0559"/><erratum last-modified="1211378384" id="rhn-erratum-5859" advisory-name="RHEA-2007:0629"/><erratum last-modified="1211378384" id="rhn-erratum-5860" advisory-name="RHBA-2007:0622"/><erratum last-modified="1211378384" id="rhn-erratum-5861" advisory-name="RHBA-2007:0585"/><erratum last-modified="1211378431" id="rhn-erratum-5862" advisory-name="RHBA-2007:0517"/><erratum last-modified="1211378431" id="rhn-erratum-5863" advisory-name="RHBA-2007:0515"/><erratum last-modified="1184040025" id="rhn-erratum-5865" advisory-name="RHSA-2007:0595"/><erratum last-modified="1184231207" id="rhn-erratum-5870" advisory-name="RHSA-2007:0674"/><erratum last-modified="1184231932" id="rhn-erratum-5871" advisory-name="RHSA-2007:0520"/><erratum last-modified="1184668567" id="rhn-erratum-5877" advisory-name="RHSA-2007:0569"/><erratum last-modified="1211378384" id="rhn-erratum-5879" advisory-name="RHBA-2007:0529"/><erratum last-modified="1211378384" id="rhn-erratum-5880" advisory-name="RHBA-2007:0527"/><erratum last-modified="1211378431" id="rhn-erratum-5881" advisory-name="RHBA-2007:0495"/><erratum last-modified="1211378384" id="rhn-erratum-5887" advisory-name="RHBA-2007:0693"/><erratum last-modified="1199899221" id="rhn-erratum-5890" advisory-name="RHSA-2007:0724"/><erratum last-modified="1184852000" id="rhn-erratum-5891" advisory-name="RHEA-2007:0689"/><erratum last-modified="1199898988" id="rhn-erratum-5892" advisory-name="RHSA-2007:0740"/><erratum last-modified="1199746499" id="rhn-erratum-5915" advisory-name="RHSA-2007:0720"/><erratum last-modified="1185821923" id="rhn-erratum-5916" advisory-name="RHSA-2007:0732"/><erratum last-modified="1199746097" id="rhn-erratum-5919" advisory-name="RHSA-2007:0721"/><erratum last-modified="1199734585" id="rhn-erratum-5920" advisory-name="RHSA-2007:0731"/><erratum last-modified="1186514400" id="rhn-erratum-5928" advisory-name="RHSA-2007:0777"/><erratum last-modified="1199753089" id="rhn-erratum-5960" advisory-name="RHSA-2007:0860"/><erratum last-modified="1199753000" id="rhn-erratum-5969" advisory-name="RHSA-2007:0875"/><erratum last-modified="1188914573" id="rhn-erratum-5970" advisory-name="RHSA-2007:0539"/><erratum last-modified="1199750666" id="rhn-erratum-5973" advisory-name="RHSA-2007:0873"/><erratum last-modified="1188929617" id="rhn-erratum-5975" advisory-name="RHSA-2007:0858"/><erratum last-modified="1189167282" id="rhn-erratum-5982" advisory-name="RHSA-2007:0892"/><erratum last-modified="1189674787" id="rhn-erratum-5984" advisory-name="RHSA-2007:0705"/><erratum last-modified="1199750631" id="rhn-erratum-5985" advisory-name="RHSA-2007:0883"/><erratum last-modified="1199753060" id="rhn-erratum-5992" advisory-name="RHSA-2007:0845"/><erratum last-modified="1199749936" id="rhn-erratum-5993" advisory-name="RHSA-2007:0890"/><erratum last-modified="1199733043" id="rhn-erratum-5998" advisory-name="RHSA-2007:0513"/><erratum last-modified="1190795252" id="rhn-erratum-5999" advisory-name="RHSA-2007:0871"/><erratum last-modified="1190924497" id="rhn-erratum-6027" advisory-name="RHSA-2007:0936"/><erratum last-modified="1191358414" id="rhn-erratum-6038" advisory-name="RHSA-2007:0323"/><erratum last-modified="1191358509" id="rhn-erratum-6039" advisory-name="RHSA-2007:0951"/><erratum last-modified="1199814823" id="rhn-erratum-6040" advisory-name="RHSA-2007:0933"/><erratum last-modified="1191510370" id="rhn-erratum-6043" advisory-name="RHEA-2007:0928"/><erratum last-modified="1199814624" id="rhn-erratum-6045" advisory-name="RHSA-2007:0905"/><erratum last-modified="1199841433" id="rhn-erratum-6048" advisory-name="RHSA-2007:0909"/><erratum last-modified="1192127161" id="rhn-erratum-6052" advisory-name="RHSA-2007:0960"/><erratum last-modified="1192198966" id="rhn-erratum-6054" advisory-name="RHSA-2007:0964"/><erratum last-modified="1199839438" id="rhn-erratum-6056" advisory-name="RHSA-2007:0979"/><erratum last-modified="1193050357" id="rhn-erratum-6060" advisory-name="RHSA-2007:0940"/><erratum last-modified="1199814764" id="rhn-erratum-6061" advisory-name="RHSA-2007:0975"/><erratum last-modified="1199840209" id="rhn-erratum-6065" advisory-name="RHSA-2007:0992"/><erratum last-modified="1194449155" id="rhn-erratum-6071" advisory-name="RHBA-2007:0383"/><erratum last-modified="1194449155" id="rhn-erratum-6072" advisory-name="RHBA-2007:0499"/><erratum last-modified="1194449155" id="rhn-erratum-6073" advisory-name="RHEA-2007:0374"/><erratum last-modified="1194449155" id="rhn-erratum-6074" advisory-name="RHBA-2007:0500"/><erratum last-modified="1194449155" id="rhn-erratum-6075" advisory-name="RHBA-2007:0498"/><erratum last-modified="1194449155" id="rhn-erratum-6076" advisory-name="RHBA-2007:0381"/><erratum last-modified="1194449155" id="rhn-erratum-6078" advisory-name="RHBA-2007:0325"/><erratum last-modified="1194449155" id="rhn-erratum-6079" advisory-name="RHEA-2007:0900"/><erratum last-modified="1194449155" id="rhn-erratum-6080" advisory-name="RHEA-2007:0899"/><erratum last-modified="1194449155" id="rhn-erratum-6081" advisory-name="RHEA-2007:0901"/><erratum last-modified="1194449155" id="rhn-erratum-6082" advisory-name="RHEA-2007:0874"/><erratum last-modified="1194449155" id="rhn-erratum-6083" advisory-name="RHEA-2007:0882"/><erratum last-modified="1194449155" id="rhn-erratum-6084" advisory-name="RHEA-2007:0855"/><erratum last-modified="1194449155" id="rhn-erratum-6085" advisory-name="RHEA-2007:0854"/><erratum last-modified="1194449155" id="rhn-erratum-6086" advisory-name="RHBA-2007:0887"/><erratum last-modified="1194449155" id="rhn-erratum-6087" advisory-name="RHBA-2007:0659"/><erratum last-modified="1194531234" id="rhn-erratum-6088" advisory-name="RHBA-2007:0826"/><erratum last-modified="1194449155" id="rhn-erratum-6090" advisory-name="RHBA-2007:0821"/><erratum last-modified="1194449155" id="rhn-erratum-6091" advisory-name="RHBA-2007:0692"/><erratum last-modified="1194449155" id="rhn-erratum-6092" advisory-name="RHEA-2007:0852"/><erratum last-modified="1194449155" id="rhn-erratum-6094" advisory-name="RHBA-2007:0676"/><erratum last-modified="1194449155" id="rhn-erratum-6095" advisory-name="RHBA-2007:0719"/><erratum last-modified="1194446118" id="rhn-erratum-6096" advisory-name="RHBA-2007:0836"/><erratum last-modified="1194449155" id="rhn-erratum-6097" advisory-name="RHBA-2007:0760"/><erratum last-modified="1194449155" id="rhn-erratum-6099" advisory-name="RHBA-2007:0718"/><erratum last-modified="1194449155" id="rhn-erratum-6101" advisory-name="RHBA-2007:0712"/><erratum last-modified="1194449155" id="rhn-erratum-6102" advisory-name="RHBA-2007:0663"/><erratum last-modified="1194449155" id="rhn-erratum-6103" advisory-name="RHEA-2007:0678"/><erratum last-modified="1194449155" id="rhn-erratum-6104" advisory-name="RHEA-2007:0893"/><erratum last-modified="1194449155" id="rhn-erratum-6105" advisory-name="RHBA-2007:0561"/><erratum last-modified="1194449155" id="rhn-erratum-6106" advisory-name="RHBA-2007:0560"/><erratum last-modified="1194449155" id="rhn-erratum-6107" advisory-name="RHBA-2007:0554"/><erratum last-modified="1194449155" id="rhn-erratum-6108" advisory-name="RHEA-2007:0568"/><erratum last-modified="1194449155" id="rhn-erratum-6109" advisory-name="RHBA-2007:0553"/><erratum last-modified="1194476961" id="rhn-erratum-6110" advisory-name="RHBA-2007:0563"/><erratum last-modified="1194449155" id="rhn-erratum-6111" advisory-name="RHEA-2007:0567"/><erratum last-modified="1194531182" id="rhn-erratum-6112" advisory-name="RHBA-2007:0579"/><erratum last-modified="1194449155" id="rhn-erratum-6113" advisory-name="RHBA-2007:0575"/><erratum last-modified="1194449155" id="rhn-erratum-6114" advisory-name="RHBA-2007:0599"/><erratum last-modified="1194482853" id="rhn-erratum-6115" advisory-name="RHBA-2007:0959"/><erratum last-modified="1194449155" id="rhn-erratum-6116" advisory-name="RHBA-2007:0397"/><erratum last-modified="1194446118" id="rhn-erratum-6117" advisory-name="RHEA-2007:0601"/><erratum last-modified="1194449155" id="rhn-erratum-6119" advisory-name="RHBA-2007:0603"/><erratum last-modified="1194449155" id="rhn-erratum-6120" advisory-name="RHBA-2007:0602"/><erratum last-modified="1194449155" id="rhn-erratum-6124" advisory-name="RHEA-2007:0551"/><erratum last-modified="1194449155" id="rhn-erratum-6126" advisory-name="RHEA-2007:0641"/><erratum last-modified="1194449155" id="rhn-erratum-6129" advisory-name="RHEA-2007:0645"/><erratum last-modified="1194449155" id="rhn-erratum-6130" advisory-name="RHBA-2007:0656"/><erratum last-modified="1194449155" id="rhn-erratum-6132" advisory-name="RHBA-2007:0511"/><erratum last-modified="1194449155" id="rhn-erratum-6136" advisory-name="RHEA-2007:0630"/><erratum last-modified="1194446125" id="rhn-erratum-6137" advisory-name="RHEA-2007:0635"/><erratum last-modified="1194449155" id="rhn-erratum-6138" advisory-name="RHEA-2007:0607"/><erratum last-modified="1194449155" id="rhn-erratum-6139" advisory-name="RHEA-2007:0524"/><erratum last-modified="1194446118" id="rhn-erratum-6140" advisory-name="RHEA-2007:0587"/><erratum last-modified="1194449155" id="rhn-erratum-6142" advisory-name="RHEA-2007:0583"/><erratum last-modified="1194449155" id="rhn-erratum-6144" advisory-name="RHBA-2007:0598"/><erratum last-modified="1194449155" id="rhn-erratum-6146" advisory-name="RHEA-2007:0531"/><erratum last-modified="1194449155" id="rhn-erratum-6148" advisory-name="RHBA-2007:0620"/><erratum last-modified="1194449155" id="rhn-erratum-6149" advisory-name="RHBA-2007:0548"/><erratum last-modified="1194449155" id="rhn-erratum-6150" advisory-name="RHEA-2007:0521"/><erratum last-modified="1194449155" id="rhn-erratum-6151" advisory-name="RHBA-2007:0549"/><erratum last-modified="1194449155" id="rhn-erratum-6152" advisory-name="RHBA-2007:0541"/><erratum last-modified="1194449155" id="rhn-erratum-6153" advisory-name="RHBA-2007:0651"/><erratum last-modified="1194531406" id="rhn-erratum-6154" advisory-name="RHBA-2007:0544"/><erratum last-modified="1194449155" id="rhn-erratum-6156" advisory-name="RHBA-2007:0834"/><erratum last-modified="1194449155" id="rhn-erratum-6157" advisory-name="RHBA-2007:0632"/><erratum last-modified="1194449155" id="rhn-erratum-6158" advisory-name="RHBA-2007:0523"/><erratum last-modified="1194449155" id="rhn-erratum-6159" advisory-name="RHBA-2007:0610"/><erratum last-modified="1194449155" id="rhn-erratum-6160" advisory-name="RHBA-2007:0545"/><erratum last-modified="1194449155" id="rhn-erratum-6161" advisory-name="RHBA-2007:0538"/><erratum last-modified="1194449155" id="rhn-erratum-6162" advisory-name="RHBA-2007:0621"/><erratum last-modified="1194449155" id="rhn-erratum-6163" advisory-name="RHBA-2007:0536"/><erratum last-modified="1194449155" id="rhn-erratum-6164" advisory-name="RHBA-2007:0550"/><erratum last-modified="1194449155" id="rhn-erratum-6166" advisory-name="RHBA-2007:0522"/><erratum last-modified="1194449155" id="rhn-erratum-6168" advisory-name="RHBA-2007:0516"/><erratum last-modified="1194449155" id="rhn-erratum-6169" advisory-name="RHBA-2007:0614"/><erratum last-modified="1194449155" id="rhn-erratum-6170" advisory-name="RHBA-2007:0618"/><erratum last-modified="1194449155" id="rhn-erratum-6171" advisory-name="RHEA-2007:0617"/><erratum last-modified="1194449155" id="rhn-erratum-6172" advisory-name="RHBA-2007:0626"/><erratum last-modified="1194449155" id="rhn-erratum-6173" advisory-name="RHBA-2007:0594"/><erratum last-modified="1194449155" id="rhn-erratum-6174" advisory-name="RHBA-2007:0590"/><erratum last-modified="1194452816" id="rhn-erratum-6175" advisory-name="RHSA-2007:0710"/><erratum last-modified="1194452863" id="rhn-erratum-6176" advisory-name="RHSA-2007:0746"/><erratum last-modified="1194452580" id="rhn-erratum-6177" advisory-name="RHSA-2007:0631"/><erratum last-modified="1194452300" id="rhn-erratum-6178" advisory-name="RHSA-2007:0368"/><erratum last-modified="1194453594" id="rhn-erratum-6179" advisory-name="RHSA-2007:0542"/><erratum last-modified="1194449155" id="rhn-erratum-6181" advisory-name="RHBA-2007:0573"/><erratum last-modified="1194449155" id="rhn-erratum-6182" advisory-name="RHEA-2007:0653"/><erratum last-modified="1194449155" id="rhn-erratum-6183" advisory-name="RHBA-2007:0748"/><erratum last-modified="1194452355" id="rhn-erratum-6184" advisory-name="RHSA-2007:0540"/><erratum last-modified="1194531242" id="rhn-erratum-6185" advisory-name="RHEA-2007:0658"/><erratum last-modified="1194449155" id="rhn-erratum-6186" advisory-name="RHEA-2007:0609"/><erratum last-modified="1194449155" id="rhn-erratum-6189" advisory-name="RHBA-2007:0591"/><erratum last-modified="1194449155" id="rhn-erratum-6191" advisory-name="RHBA-2007:0537"/><erratum last-modified="1194449155" id="rhn-erratum-6192" advisory-name="RHBA-2007:0572"/><erratum last-modified="1194449155" id="rhn-erratum-6193" advisory-name="RHEA-2007:0715"/><erratum last-modified="1194449155" id="rhn-erratum-6195" advisory-name="RHEA-2007:0649"/><erratum last-modified="1194449155" id="rhn-erratum-6196" advisory-name="RHEA-2007:0648"/><erratum last-modified="1194449155" id="rhn-erratum-6197" advisory-name="RHBA-2007:0596"/><erratum last-modified="1194449155" id="rhn-erratum-6198" advisory-name="RHBA-2007:0597"/><erratum last-modified="1194449155" id="rhn-erratum-6199" advisory-name="RHBA-2007:0634"/><erratum last-modified="1194446118" id="rhn-erratum-6201" advisory-name="RHEA-2007:0592"/><erratum last-modified="1194531426" id="rhn-erratum-6202" advisory-name="RHBA-2007:0574"/><erratum last-modified="1194449155" id="rhn-erratum-6206" advisory-name="RHBA-2007:0644"/><erratum last-modified="1194446118" id="rhn-erratum-6208" advisory-name="RHEA-2007:0657"/><erratum last-modified="1194449155" id="rhn-erratum-6209" advisory-name="RHEA-2007:0528"/><erratum last-modified="1194449155" id="rhn-erratum-6210" advisory-name="RHBA-2007:0628"/><erratum last-modified="1194449155" id="rhn-erratum-6211" advisory-name="RHBA-2007:0514"/><erratum last-modified="1194449155" id="rhn-erratum-6212" advisory-name="RHBA-2007:0543"/><erratum last-modified="1194449155" id="rhn-erratum-6213" advisory-name="RHBA-2007:0744"/><erratum last-modified="1194449155" id="rhn-erratum-6214" advisory-name="RHBA-2007:0581"/><erratum last-modified="1194449155" id="rhn-erratum-6215" advisory-name="RHBA-2007:0661"/><erratum last-modified="1194449155" id="rhn-erratum-6216" advisory-name="RHBA-2007:0480"/><erratum last-modified="1194449155" id="rhn-erratum-6217" advisory-name="RHBA-2007:0633"/><erratum last-modified="1194449155" id="rhn-erratum-6218" advisory-name="RHBA-2007:0404"/><erratum last-modified="1194449155" id="rhn-erratum-6219" advisory-name="RHBA-2007:0619"/><erratum last-modified="1194449155" id="rhn-erratum-6220" advisory-name="RHBA-2007:0565"/><erratum last-modified="1194449155" id="rhn-erratum-6221" advisory-name="RHBA-2007:0564"/><erratum last-modified="1194449155" id="rhn-erratum-6222" advisory-name="RHBA-2007:0571"/><erratum last-modified="1194449155" id="rhn-erratum-6223" advisory-name="RHEA-2007:0638"/><erratum last-modified="1194449155" id="rhn-erratum-6224" advisory-name="RHEA-2007:0558"/><erratum last-modified="1194449155" id="rhn-erratum-6225" advisory-name="RHBA-2007:0616"/><erratum last-modified="1194449155" id="rhn-erratum-6226" advisory-name="RHBA-2007:0627"/><erratum last-modified="1194452539" id="rhn-erratum-6227" advisory-name="RHSA-2007:0555"/><erratum last-modified="1193838510" id="rhn-erratum-6228" advisory-name="RHSA-2007:1020"/><erratum last-modified="1194281157" id="rhn-erratum-6236" advisory-name="RHSA-2007:0967"/><erratum last-modified="1199815247" id="rhn-erratum-6238" advisory-name="RHSA-2007:0966"/><erratum last-modified="1194453985" id="rhn-erratum-6240" advisory-name="RHBA-2007:0989"/><erratum last-modified="1194454329" id="rhn-erratum-6241" advisory-name="RHBA-2007:0974"/><erratum last-modified="1194454418" id="rhn-erratum-6242" advisory-name="RHBA-2007:0987"/><erratum last-modified="1194454517" id="rhn-erratum-6243" advisory-name="RHBA-2007:0985"/><erratum last-modified="1194454641" id="rhn-erratum-6244" advisory-name="RHBA-2007:0976"/><erratum last-modified="1194457548" id="rhn-erratum-6245" advisory-name="RHSA-2007:1021"/><erratum last-modified="1194459002" id="rhn-erratum-6249" advisory-name="RHSA-2007:1026"/><erratum last-modified="1194529544" id="rhn-erratum-6254" advisory-name="RHSA-2007:1027"/><erratum last-modified="1194540840" id="rhn-erratum-6255" advisory-name="RHSA-2007:1037"/><erratum last-modified="1195129236" id="rhn-erratum-6256" advisory-name="RHSA-2007:1052"/><erratum last-modified="1194946761" id="rhn-erratum-6263" advisory-name="RHSA-2007:0965"/><erratum last-modified="1195133259" id="rhn-erratum-6383" advisory-name="RHBA-2007:0972"/><erratum last-modified="1195134535" id="rhn-erratum-6389" advisory-name="RHBA-2007:0984"/><erratum last-modified="1195135655" id="rhn-erratum-6390" advisory-name="RHBA-2007:1002"/><erratum last-modified="1195136724" id="rhn-erratum-6392" advisory-name="RHBA-2007:1010"/><erratum last-modified="1195137230" id="rhn-erratum-6393" advisory-name="RHBA-2007:1012"/><erratum last-modified="1195142859" id="rhn-erratum-6396" advisory-name="RHSA-2007:0969"/><erratum last-modified="1195144149" id="rhn-erratum-6398" advisory-name="RHSA-2007:1017"/><erratum last-modified="1195146693" id="rhn-erratum-6400" advisory-name="RHSA-2007:1045"/><erratum last-modified="1195582547" id="rhn-erratum-6404" advisory-name="RHBA-2007:1073"/><erratum last-modified="1211378431" id="rhn-erratum-6405" advisory-name="RHBA-2007:0958"/><erratum last-modified="1211378384" id="rhn-erratum-6406" advisory-name="RHBA-2007:1009"/><erratum last-modified="1211378431" id="rhn-erratum-6407" advisory-name="RHBA-2007:1033"/><erratum last-modified="1211378384" id="rhn-erratum-6408" advisory-name="RHBA-2007:1039"/><erratum last-modified="1211378384" id="rhn-erratum-6412" advisory-name="RHBA-2007:0971"/><erratum last-modified="1195653093" id="rhn-erratum-6413" advisory-name="RHBA-2007:1067"/><erratum last-modified="1196119399" id="rhn-erratum-6435" advisory-name="RHSA-2007:1082"/><erratum last-modified="1211378384" id="rhn-erratum-6436" advisory-name="RHBA-2007:1057"/><erratum last-modified="1211378384" id="rhn-erratum-6437" advisory-name="RHBA-2007:1046"/><erratum last-modified="1196347593" id="rhn-erratum-6439" advisory-name="RHSA-2007:0993"/><erratum last-modified="1196347858" id="rhn-erratum-6440" advisory-name="RHSA-2007:1059"/><erratum last-modified="1196350728" id="rhn-erratum-6444" advisory-name="RHSA-2007:1078"/><erratum last-modified="1196696817" id="rhn-erratum-6448" advisory-name="RHSA-2007:1095"/><erratum last-modified="1211378384" id="rhn-erratum-6452" advisory-name="RHBA-2007:1072"/><erratum last-modified="1211378431" id="rhn-erratum-6453" advisory-name="RHBA-2007:1066"/><erratum last-modified="1211378431" id="rhn-erratum-6454" advisory-name="RHBA-2007:1075"/><erratum last-modified="1211378384" id="rhn-erratum-6455" advisory-name="RHBA-2007:1089"/><erratum last-modified="1197050972" id="rhn-erratum-6464" advisory-name="RHEA-2007:1132"/><erratum last-modified="1197305586" id="rhn-erratum-6466" advisory-name="RHSA-2007:1114"/><erratum last-modified="1197463014" id="rhn-erratum-6473" advisory-name="RHSA-2007:1128"/><erratum last-modified="1211378384" id="rhn-erratum-6476" advisory-name="RHBA-2007:1047"/><erratum last-modified="1211378431" id="rhn-erratum-6477" advisory-name="RHBA-2007:1064"/><erratum last-modified="1211378431" id="rhn-erratum-6478" advisory-name="RHBA-2007:1102"/><erratum last-modified="1211378384" id="rhn-erratum-6479" advisory-name="RHBA-2007:1103"/><erratum last-modified="1211378384" id="rhn-erratum-6480" advisory-name="RHBA-2007:1110"/><erratum last-modified="1197476377" id="rhn-erratum-6481" advisory-name="RHBA-2007:1131"/><erratum last-modified="1197577209" id="rhn-erratum-6482" advisory-name="RHBA-2007:1133"/><erratum last-modified="1197662892" id="rhn-erratum-6483" advisory-name="RHBA-2007:1127"/><erratum last-modified="1197994745" id="rhn-erratum-6485" advisory-name="RHSA-2007:1130"/><erratum last-modified="1197995854" id="rhn-erratum-6486" advisory-name="RHSA-2007:1155"/><erratum last-modified="1198078495" id="rhn-erratum-6488" advisory-name="RHSA-2007:1165"/><erratum last-modified="1211378384" id="rhn-erratum-6494" advisory-name="RHBA-2007:1146"/><erratum last-modified="1211378384" id="rhn-erratum-6495" advisory-name="RHBA-2007:1145"/><erratum last-modified="1211378384" id="rhn-erratum-6497" advisory-name="RHEA-2007:1125"/><erratum last-modified="1211378384" id="rhn-erratum-6498" advisory-name="RHBA-2007:1115"/><erratum last-modified="1211378384" id="rhn-erratum-6499" advisory-name="RHBA-2007:1109"/><erratum last-modified="1198178650" id="rhn-erratum-6500" advisory-name="RHSA-2007:1176"/><erratum last-modified="1211378384" id="rhn-erratum-6516" advisory-name="RHBA-2008:0015"/><erratum last-modified="1211378431" id="rhn-erratum-6517" advisory-name="RHBA-2008:0014"/><erratum last-modified="1211378384" id="rhn-erratum-6518" advisory-name="RHBA-2008:0012"/><erratum last-modified="1211378431" id="rhn-erratum-6519" advisory-name="RHEA-2008:0011"/><erratum last-modified="1199387416" id="rhn-erratum-6520" advisory-name="RHEA-2008:0028"/><erratum last-modified="1199473380" id="rhn-erratum-6522" advisory-name="RHEA-2008:0001"/><erratum last-modified="1199731010" id="rhn-erratum-6524" advisory-name="RHSA-2008:0002"/><erratum last-modified="1199732110" id="rhn-erratum-6525" advisory-name="RHSA-2008:0003"/><erratum last-modified="1211378384" id="rhn-erratum-6527" advisory-name="RHBA-2008:0020"/><erratum last-modified="1211378384" id="rhn-erratum-6528" advisory-name="RHBA-2008:0017"/><erratum last-modified="1200054423" id="rhn-erratum-6537" advisory-name="RHSA-2008:0032"/><erratum last-modified="1200055042" id="rhn-erratum-6538" advisory-name="RHSA-2008:0038"/><erratum last-modified="1200389908" id="rhn-erratum-6544" advisory-name="RHSA-2008:0008"/><erratum last-modified="1211378431" id="rhn-erratum-6550" advisory-name="RHBA-2008:0021"/><erratum last-modified="1211378384" id="rhn-erratum-6551" advisory-name="RHBA-2008:0010"/><erratum last-modified="1211378384" id="rhn-erratum-6552" advisory-name="RHBA-2008:0016"/><erratum last-modified="1211378431" id="rhn-erratum-6553" advisory-name="RHBA-2008:0019"/><erratum last-modified="1211378431" id="rhn-erratum-6554" advisory-name="RHBA-2008:0044"/><erratum last-modified="1211378384" id="rhn-erratum-6555" advisory-name="RHBA-2008:0041"/><erratum last-modified="1211378431" id="rhn-erratum-6556" advisory-name="RHBA-2008:0047"/><erratum last-modified="1211378384" id="rhn-erratum-6557" advisory-name="RHBA-2008:0056"/><erratum last-modified="1211378384" id="rhn-erratum-6558" advisory-name="RHBA-2008:0043"/><erratum last-modified="1200600032" id="rhn-erratum-6560" advisory-name="RHSA-2008:0064"/><erratum last-modified="1200706116" id="rhn-erratum-6561" advisory-name="RHSA-2008:0031"/><erratum last-modified="1200904274" id="rhn-erratum-6564" advisory-name="RHSA-2008:0058"/><erratum last-modified="1201078075" id="rhn-erratum-6568" advisory-name="RHBA-2008:0057"/><erratum last-modified="1211378384" id="rhn-erratum-6569" advisory-name="RHBA-2008:0085"/><erratum last-modified="1211378431" id="rhn-erratum-6570" advisory-name="RHBA-2008:0079"/><erratum last-modified="1211378384" id="rhn-erratum-6571" advisory-name="RHBA-2008:0077"/><erratum last-modified="1211378384" id="rhn-erratum-6572" advisory-name="RHBA-2008:0073"/><erratum last-modified="1211378384" id="rhn-erratum-6573" advisory-name="RHBA-2008:0072"/><erratum last-modified="1211378384" id="rhn-erratum-6574" advisory-name="RHBA-2008:0068"/><erratum last-modified="1211378384" id="rhn-erratum-6575" advisory-name="RHBA-2008:0067"/><erratum last-modified="1211378384" id="rhn-erratum-6576" advisory-name="RHBA-2008:0046"/><erratum last-modified="1211378431" id="rhn-erratum-6577" advisory-name="RHBA-2008:0045"/><erratum last-modified="1211378384" id="rhn-erratum-6578" advisory-name="RHBA-2008:0013"/><erratum last-modified="1201100825" id="rhn-erratum-6579" advisory-name="RHSA-2008:0089"/><erratum last-modified="1201267716" id="rhn-erratum-6580" advisory-name="RHSA-2008:0090"/><erratum last-modified="1211378384" id="rhn-erratum-6596" advisory-name="RHBA-2008:0078"/><erratum last-modified="1211378384" id="rhn-erratum-6597" advisory-name="RHBA-2008:0065"/><erratum last-modified="1211378384" id="rhn-erratum-6598" advisory-name="RHBA-2008:0063"/><erratum last-modified="1201707073" id="rhn-erratum-6601" advisory-name="RHBA-2008:0050"/><erratum last-modified="1201868901" id="rhn-erratum-6603" advisory-name="RHBA-2008:0099"/><erratum last-modified="1211378384" id="rhn-erratum-6618" advisory-name="RHBA-2008:0071"/><erratum last-modified="1211378384" id="rhn-erratum-6619" advisory-name="RHBA-2008:0108"/><erratum last-modified="1211378431" id="rhn-erratum-6620" advisory-name="RHBA-2008:0109"/><erratum last-modified="1202409708" id="rhn-erratum-6622" advisory-name="RHBA-2008:0102"/><erratum last-modified="1202438303" id="rhn-erratum-6625" advisory-name="RHSA-2008:0103"/><erratum last-modified="1202835190" id="rhn-erratum-6628" advisory-name="RHSA-2008:0129"/><erratum last-modified="1211378431" id="rhn-erratum-6631" advisory-name="RHBA-2008:0101"/><erratum last-modified="1203077128" id="rhn-erratum-6638" advisory-name="RHBA-2008:0143"/><erratum last-modified="1203135547" id="rhn-erratum-6642" advisory-name="RHBA-2008:0147"/><erratum last-modified="1211378431" id="rhn-erratum-6659" advisory-name="RHBA-2008:0087"/><erratum last-modified="1203628528" id="rhn-erratum-6662" advisory-name="RHSA-2008:0110"/><erratum last-modified="1203628947" id="rhn-erratum-6664" advisory-name="RHSA-2008:0136"/><erratum last-modified="1203629444" id="rhn-erratum-6665" advisory-name="RHSA-2008:0157"/><erratum last-modified="1211378384" id="rhn-erratum-6680" advisory-name="RHBA-2008:0106"/><erratum last-modified="1204147755" id="rhn-erratum-6681" advisory-name="RHSA-2008:0159"/><erratum last-modified="1204150462" id="rhn-erratum-6682" advisory-name="RHSA-2008:0155"/><erratum last-modified="1204192756" id="rhn-erratum-6683" advisory-name="RHSA-2008:0146"/><erratum last-modified="1204725396" id="rhn-erratum-6697" advisory-name="RHSA-2008:0154"/><erratum last-modified="1205160912" id="rhn-erratum-6717" advisory-name="RHEA-2008:0185"/><erratum last-modified="1205166351" id="rhn-erratum-6718" advisory-name="RHBA-2008:0128"/><erratum last-modified="1205232700" id="rhn-erratum-6719" advisory-name="RHSA-2008:0042"/><erratum last-modified="1205868372" id="rhn-erratum-6739" advisory-name="RHSA-2008:0164"/><erratum last-modified="1206398670" id="rhn-erratum-6747" advisory-name="RHBA-2008:0188"/><erratum last-modified="1206580098" id="rhn-erratum-6748" advisory-name="RHSA-2008:0207"/><erratum last-modified="1207059008" id="rhn-erratum-6752" advisory-name="RHSA-2008:0192"/><erratum last-modified="1207136024" id="rhn-erratum-6756" advisory-name="RHSA-2008:0197"/><erratum last-modified="1211378384" id="rhn-erratum-6764" advisory-name="RHSA-2008:0218"/><erratum last-modified="1207670266" id="rhn-erratum-6777" advisory-name="RHBA-2008:8237"/><erratum last-modified="1207698438" id="rhn-erratum-6779" advisory-name="RHSA-2008:0214"/><erratum last-modified="1208390558" id="rhn-erratum-6795" advisory-name="RHSA-2008:0235"/><erratum last-modified="1208396243" id="rhn-erratum-6797" advisory-name="RHSA-2008:0222"/><erratum last-modified="1208395929" id="rhn-erratum-6798" advisory-name="RHSA-2008:0145"/><erratum last-modified="1208453661" id="rhn-erratum-6803" advisory-name="RHSA-2008:0239"/><erratum last-modified="1210145958" id="rhn-erratum-6860" advisory-name="RHSA-2008:0233"/><erratum last-modified="1210341648" id="rhn-erratum-6868" advisory-name="RHBA-2008:0258"/><erratum last-modified="1210681682" id="rhn-erratum-6898" advisory-name="RHSA-2008:0194"/><erratum last-modified="1210751665" id="rhn-erratum-6902" advisory-name="RHSA-2008:0270"/><erratum last-modified="1210934227" id="rhn-erratum-6903" advisory-name="RHBA-2008:0219"/><erratum last-modified="1211378688" id="rhn-erratum-6919" advisory-name="RHBA-2008:0455"/><erratum last-modified="1211378688" id="rhn-erratum-6920" advisory-name="RHBA-2008:0437"/><erratum last-modified="1211378688" id="rhn-erratum-6921" advisory-name="RHBA-2008:0442"/><erratum last-modified="1211378688" id="rhn-erratum-6922" advisory-name="RHBA-2008:0484"/><erratum last-modified="1211378688" id="rhn-erratum-6923" advisory-name="RHBA-2008:0457"/><erratum last-modified="1211378688" id="rhn-erratum-6924" advisory-name="RHBA-2008:0453"/><erratum last-modified="1211378688" id="rhn-erratum-6925" advisory-name="RHBA-2008:0450"/><erratum last-modified="1211378688" id="rhn-erratum-6926" advisory-name="RHBA-2008:0459"/><erratum last-modified="1211378688" id="rhn-erratum-6928" advisory-name="RHBA-2008:0458"/><erratum last-modified="1211378688" id="rhn-erratum-6929" advisory-name="RHEA-2008:0454"/><erratum last-modified="1211378688" id="rhn-erratum-6930" advisory-name="RHEA-2008:0451"/><erratum last-modified="1211378688" id="rhn-erratum-6931" advisory-name="RHBA-2008:0462"/><erratum last-modified="1211392488" id="rhn-erratum-6932" advisory-name="RHEA-2008:0436"/><erratum last-modified="1211378688" id="rhn-erratum-6934" advisory-name="RHBA-2008:0434"/><erratum last-modified="1211378688" id="rhn-erratum-6935" advisory-name="RHBA-2008:0481"/><erratum last-modified="1211378688" id="rhn-erratum-6936" advisory-name="RHBA-2008:0424"/><erratum last-modified="1211378688" id="rhn-erratum-6937" advisory-name="RHBA-2008:0431"/><erratum last-modified="1211378688" id="rhn-erratum-6939" advisory-name="RHEA-2008:0427"/><erratum last-modified="1211378688" id="rhn-erratum-6940" advisory-name="RHEA-2008:0430"/><erratum last-modified="1211378688" id="rhn-erratum-6941" advisory-name="RHEA-2008:0418"/><erratum last-modified="1211378688" id="rhn-erratum-6942" advisory-name="RHBA-2008:0404"/><erratum last-modified="1211378688" id="rhn-erratum-6943" advisory-name="RHBA-2008:0412"/><erratum last-modified="1211378688" id="rhn-erratum-6944" advisory-name="RHEA-2008:0422"/><erratum last-modified="1211378688" id="rhn-erratum-6945" advisory-name="RHBA-2008:0419"/><erratum last-modified="1211378688" id="rhn-erratum-6946" advisory-name="RHEA-2008:0413"/><erratum last-modified="1211378688" id="rhn-erratum-6947" advisory-name="RHBA-2008:0403"/><erratum last-modified="1211378688" id="rhn-erratum-6949" advisory-name="RHBA-2008:0416"/><erratum last-modified="1211378688" id="rhn-erratum-6950" advisory-name="RHBA-2008:0414"/><erratum last-modified="1211378688" id="rhn-erratum-6951" advisory-name="RHBA-2008:0411"/><erratum last-modified="1211378688" id="rhn-erratum-6952" advisory-name="RHEA-2008:0420"/><erratum last-modified="1211378688" id="rhn-erratum-6954" advisory-name="RHBA-2008:0408"/><erratum last-modified="1211378688" id="rhn-erratum-6956" advisory-name="RHBA-2008:0470"/><erratum last-modified="1211378688" id="rhn-erratum-6957" advisory-name="RHBA-2008:0398"/><erratum last-modified="1211378688" id="rhn-erratum-6958" advisory-name="RHBA-2008:0396"/><erratum last-modified="1211378688" id="rhn-erratum-6959" advisory-name="RHBA-2008:0395"/><erratum last-modified="1211378688" id="rhn-erratum-6960" advisory-name="RHBA-2008:0397"/><erratum last-modified="1211378688" id="rhn-erratum-6961" advisory-name="RHBA-2008:0394"/><erratum last-modified="1211378688" id="rhn-erratum-6962" advisory-name="RHBA-2008:0393"/><erratum last-modified="1211378688" id="rhn-erratum-6963" advisory-name="RHEA-2008:0399"/><erratum last-modified="1211378688" id="rhn-erratum-6964" advisory-name="RHBA-2008:0386"/><erratum last-modified="1211378688" id="rhn-erratum-6965" advisory-name="RHEA-2008:0392"/><erratum last-modified="1211271165" id="rhn-erratum-6967" advisory-name="RHBA-2008:0280"/><erratum last-modified="1211277450" id="rhn-erratum-6968" advisory-name="RHSA-2008:0275"/><erratum last-modified="1211378688" id="rhn-erratum-6969" advisory-name="RHEA-2008:0387"/><erratum last-modified="1211378688" id="rhn-erratum-6970" advisory-name="RHEA-2008:0384"/><erratum last-modified="1211378688" id="rhn-erratum-6971" advisory-name="RHBA-2008:0446"/><erratum last-modified="1211378688" id="rhn-erratum-6972" advisory-name="RHBA-2008:0377"/><erratum last-modified="1211378688" id="rhn-erratum-6973" advisory-name="RHBA-2008:0381"/><erratum last-modified="1211378688" id="rhn-erratum-6974" advisory-name="RHBA-2008:0362"/><erratum last-modified="1211378688" id="rhn-erratum-6975" advisory-name="RHBA-2008:0382"/><erratum last-modified="1211378688" id="rhn-erratum-6976" advisory-name="RHEA-2008:0390"/><erratum last-modified="1211378688" id="rhn-erratum-6977" advisory-name="RHBA-2008:0461"/><erratum last-modified="1211378688" id="rhn-erratum-6978" advisory-name="RHBA-2008:0385"/><erratum last-modified="1211378688" id="rhn-erratum-6979" advisory-name="RHBA-2008:0347"/><erratum last-modified="1211378688" id="rhn-erratum-6980" advisory-name="RHBA-2008:0343"/><erratum last-modified="1211378688" id="rhn-erratum-6981" advisory-name="RHEA-2008:0356"/><erratum last-modified="1211379958" id="rhn-erratum-6983" advisory-name="RHSA-2008:0364"/><erratum last-modified="1211378688" id="rhn-erratum-6984" advisory-name="RHBA-2008:0350"/><erratum last-modified="1211378688" id="rhn-erratum-6985" advisory-name="RHBA-2008:0360"/><erratum last-modified="1211378688" id="rhn-erratum-6986" advisory-name="RHBA-2008:0346"/><erratum last-modified="1211378688" id="rhn-erratum-6987" advisory-name="RHBA-2008:0340"/><erratum last-modified="1211378688" id="rhn-erratum-6989" advisory-name="RHEA-2008:0358"/><erratum last-modified="1211378688" id="rhn-erratum-6990" advisory-name="RHBA-2008:0363"/><erratum last-modified="1211378688" id="rhn-erratum-6993" advisory-name="RHBA-2008:0357"/><erratum last-modified="1211378688" id="rhn-erratum-6995" advisory-name="RHBA-2008:0351"/><erratum last-modified="1211378688" id="rhn-erratum-6996" advisory-name="RHEA-2008:0468"/><erratum last-modified="1211378688" id="rhn-erratum-6998" advisory-name="RHBA-2008:0354"/><erratum last-modified="1211378688" id="rhn-erratum-7000" advisory-name="RHBA-2008:0333"/><erratum last-modified="1211378688" id="rhn-erratum-7001" advisory-name="RHBA-2008:0341"/><erratum last-modified="1211378688" id="rhn-erratum-7002" advisory-name="RHBA-2008:0083"/><erratum last-modified="1211378688" id="rhn-erratum-7003" advisory-name="RHEA-2008:0084"/><erratum last-modified="1211378688" id="rhn-erratum-7004" advisory-name="RHBA-2008:0376"/><erratum last-modified="1211378688" id="rhn-erratum-7005" advisory-name="RHBA-2008:0322"/><erratum last-modified="1211378688" id="rhn-erratum-7006" advisory-name="RHBA-2008:0334"/><erratum last-modified="1211378688" id="rhn-erratum-7007" advisory-name="RHBA-2008:0323"/><erratum last-modified="1211379958" id="rhn-erratum-7008" advisory-name="RHSA-2008:0061"/><erratum last-modified="1211378688" id="rhn-erratum-7009" advisory-name="RHBA-2008:0335"/><erratum last-modified="1211378688" id="rhn-erratum-7010" advisory-name="RHEA-2008:0331"/><erratum last-modified="1211378688" id="rhn-erratum-7011" advisory-name="RHBA-2008:0374"/><erratum last-modified="1211378688" id="rhn-erratum-7012" advisory-name="RHBA-2008:0336"/><erratum last-modified="1211378688" id="rhn-erratum-7014" advisory-name="RHBA-2008:0329"/><erratum last-modified="1211378688" id="rhn-erratum-7015" advisory-name="RHBA-2008:0324"/><erratum last-modified="1211378688" id="rhn-erratum-7016" advisory-name="RHBA-2008:0327"/><erratum last-modified="1211378688" id="rhn-erratum-7017" advisory-name="RHBA-2008:0337"/><erratum last-modified="1211378688" id="rhn-erratum-7018" advisory-name="RHBA-2008:0325"/><erratum last-modified="1211378688" id="rhn-erratum-7019" advisory-name="RHEA-2008:0477"/><erratum last-modified="1211378688" id="rhn-erratum-7020" advisory-name="RHBA-2008:0054"/><erratum last-modified="1211378688" id="rhn-erratum-7021" advisory-name="RHEA-2008:0338"/><erratum last-modified="1211378688" id="rhn-erratum-7022" advisory-name="RHBA-2008:0328"/><erratum last-modified="1214319667" id="rhn-erratum-7023" advisory-name="RHEA-2008:0479"/><erratum last-modified="1211378688" id="rhn-erratum-7026" advisory-name="RHBA-2008:0372"/><erratum last-modified="1211378688" id="rhn-erratum-7027" advisory-name="RHBA-2008:0375"/><erratum last-modified="1211378688" id="rhn-erratum-7028" advisory-name="RHBA-2008:0369"/><erratum last-modified="1211379302" id="rhn-erratum-7034" advisory-name="RHSA-2008:0389"/><erratum last-modified="1211378688" id="rhn-erratum-7035" advisory-name="RHBA-2008:0366"/><erratum last-modified="1211378688" id="rhn-erratum-7036" advisory-name="RHBA-2008:0367"/><erratum last-modified="1211378688" id="rhn-erratum-7037" advisory-name="RHBA-2008:0460"/><erratum last-modified="1211378688" id="rhn-erratum-7039" advisory-name="RHBA-2008:0368"/><erratum last-modified="1211378688" id="rhn-erratum-7040" advisory-name="RHBA-2008:0476"/><erratum last-modified="1211378688" id="rhn-erratum-7041" advisory-name="RHEA-2008:0474"/><erratum last-modified="1211378688" id="rhn-erratum-7042" advisory-name="RHBA-2008:0482"/><erratum last-modified="1211378688" id="rhn-erratum-7044" advisory-name="RHBA-2008:0326"/><erratum last-modified="1211378688" id="rhn-erratum-7045" advisory-name="RHEA-2008:0370"/><erratum last-modified="1211378688" id="rhn-erratum-7046" advisory-name="RHBA-2008:0383"/><erratum last-modified="1211378688" id="rhn-erratum-7047" advisory-name="RHBA-2008:0321"/><erratum last-modified="1211379607" id="rhn-erratum-7048" advisory-name="RHSA-2008:0297"/><erratum last-modified="1211378688" id="rhn-erratum-7049" advisory-name="RHBA-2008:0456"/><erratum last-modified="1211378688" id="rhn-erratum-7050" advisory-name="RHBA-2008:0312"/><erratum last-modified="1211379437" id="rhn-erratum-7051" advisory-name="RHSA-2008:0300"/><erratum last-modified="1211378688" id="rhn-erratum-7052" advisory-name="RHBA-2008:0465"/><erratum last-modified="1211378688" id="rhn-erratum-7053" advisory-name="RHBA-2008:0373"/><erratum last-modified="1211378688" id="rhn-erratum-7054" advisory-name="RHBA-2008:0307"/><erratum last-modified="1211378688" id="rhn-erratum-7055" advisory-name="RHBA-2008:0472"/><erratum last-modified="1211378688" id="rhn-erratum-7056" advisory-name="RHBA-2008:0296"/><erratum last-modified="1211294907" id="rhn-erratum-7058" advisory-name="RHSA-2008:0489"/><erratum last-modified="1211378688" id="rhn-erratum-7059" advisory-name="RHBA-2008:0314"/><erratum last-modified="1211378688" id="rhn-erratum-7061" advisory-name="RHBA-2008:0445"/><erratum last-modified="1211378688" id="rhn-erratum-7062" advisory-name="RHBA-2008:0444"/><erratum last-modified="1211378688" id="rhn-erratum-7063" advisory-name="RHBA-2008:0440"/><erratum last-modified="1211378688" id="rhn-erratum-7064" advisory-name="RHBA-2008:0309"/><erratum last-modified="1211378688" id="rhn-erratum-7065" advisory-name="RHBA-2008:0316"/><erratum last-modified="1211378688" id="rhn-erratum-7066" advisory-name="RHBA-2008:0306"/><erratum last-modified="1211378688" id="rhn-erratum-7067" advisory-name="RHBA-2008:0313"/><erratum last-modified="1211378688" id="rhn-erratum-7068" advisory-name="RHBA-2008:0311"/><erratum last-modified="1211378688" id="rhn-erratum-7069" advisory-name="RHBA-2008:0319"/><erratum last-modified="1211378688" id="rhn-erratum-7070" advisory-name="RHBA-2008:0308"/><erratum last-modified="1211378688" id="rhn-erratum-7071" advisory-name="RHBA-2008:0220"/><erratum last-modified="1211378688" id="rhn-erratum-7073" advisory-name="RHBA-2008:0388"/><erratum last-modified="1211378688" id="rhn-erratum-7074" advisory-name="RHBA-2008:0428"/><erratum last-modified="1211378688" id="rhn-erratum-7075" advisory-name="RHBA-2008:0449"/><erratum last-modified="1211378688" id="rhn-erratum-7076" advisory-name="RHEA-2008:0438"/><erratum last-modified="1211378688" id="rhn-erratum-7077" advisory-name="RHBA-2008:0475"/><erratum last-modified="1211378688" id="rhn-erratum-7078" advisory-name="RHBA-2008:0447"/><erratum last-modified="1211378688" id="rhn-erratum-7079" advisory-name="RHBA-2008:0405"/><erratum last-modified="1211378688" id="rhn-erratum-7080" advisory-name="RHBA-2008:0443"/><erratum last-modified="1211378688" id="rhn-erratum-7081" advisory-name="RHBA-2008:0432"/><erratum last-modified="1211378688" id="rhn-erratum-7082" advisory-name="RHBA-2008:0410"/><erratum last-modified="1211378688" id="rhn-erratum-7083" advisory-name="RHEA-2008:0402"/><erratum last-modified="1211378688" id="rhn-erratum-7084" advisory-name="RHBA-2008:0380"/><erratum last-modified="1211378688" id="rhn-erratum-7085" advisory-name="RHEA-2008:0429"/><erratum last-modified="1211378688" id="rhn-erratum-7087" advisory-name="RHEA-2008:0435"/><erratum last-modified="1211378688" id="rhn-erratum-7088" advisory-name="RHEA-2008:0439"/><erratum last-modified="1211378688" id="rhn-erratum-7089" advisory-name="RHEA-2008:0391"/><erratum last-modified="1211378688" id="rhn-erratum-7091" advisory-name="RHEA-2008:0417"/><erratum last-modified="1211378688" id="rhn-erratum-7092" advisory-name="RHBA-2008:0441"/><erratum last-modified="1211378688" id="rhn-erratum-7093" advisory-name="RHEA-2008:0400"/><erratum last-modified="1211378688" id="rhn-erratum-7095" advisory-name="RHBA-2008:0339"/><erratum last-modified="1211378688" id="rhn-erratum-7096" advisory-name="RHBA-2008:0345"/><erratum last-modified="1211378688" id="rhn-erratum-7098" advisory-name="RHBA-2008:0303"/><erratum last-modified="1211378688" id="rhn-erratum-7099" advisory-name="RHBA-2008:0332"/><erratum last-modified="1211465127" id="rhn-erratum-7100" advisory-name="RHBA-2008:0361"/><erratum last-modified="1211378711" id="rhn-erratum-7101" advisory-name="RHBA-2008:0305"/><erratum last-modified="1211378688" id="rhn-erratum-7102" advisory-name="RHBA-2008:0302"/><erratum last-modified="1211378688" id="rhn-erratum-7103" advisory-name="RHEA-2008:0304"/><erratum last-modified="1211378688" id="rhn-erratum-7104" advisory-name="RHEA-2008:0452"/><erratum last-modified="1211378688" id="rhn-erratum-7106" advisory-name="RHBA-2008:0478"/><erratum last-modified="1211378688" id="rhn-erratum-7107" advisory-name="RHBA-2008:0344"/><erratum last-modified="1211378688" id="rhn-erratum-7108" advisory-name="RHBA-2008:0081"/><erratum last-modified="1211378688" id="rhn-erratum-7109" advisory-name="RHBA-2008:0330"/><erratum last-modified="1211378688" id="rhn-erratum-7110" advisory-name="RHBA-2008:0301"/><erratum last-modified="1211378688" id="rhn-erratum-7112" advisory-name="RHBA-2008:0469"/><erratum last-modified="1211378688" id="rhn-erratum-7114" advisory-name="RHBA-2008:0466"/><erratum last-modified="1211378688" id="rhn-erratum-7115" advisory-name="RHBA-2008:0473"/><erratum last-modified="1211378688" id="rhn-erratum-7116" advisory-name="RHEA-2008:0317"/><erratum last-modified="1211378688" id="rhn-erratum-7117" advisory-name="RHBA-2008:0298"/><erratum last-modified="1211378688" id="rhn-erratum-7118" advisory-name="RHBA-2008:0294"/><erratum last-modified="1211378688" id="rhn-erratum-7119" advisory-name="RHBA-2008:0292"/><erratum last-modified="1211378688" id="rhn-erratum-7120" advisory-name="RHBA-2008:0293"/><erratum last-modified="1211378688" id="rhn-erratum-7121" advisory-name="RHBA-2008:0299"/><erratum last-modified="1211378688" id="rhn-erratum-7122" advisory-name="RHBA-2008:0310"/><erratum last-modified="1211378688" id="rhn-erratum-7123" advisory-name="RHBA-2008:0401"/><erratum last-modified="1211378688" id="rhn-erratum-7124" advisory-name="RHBA-2008:0378"/><erratum last-modified="1211355036" id="rhn-erratum-7126" advisory-name="RHSA-2008:0287"/><erratum last-modified="1211392804" id="rhn-erratum-7127" advisory-name="RHBA-2008:0464"/><erratum last-modified="1211378688" id="rhn-erratum-7128" advisory-name="RHBA-2008:0365"/><erratum last-modified="1211379396" id="rhn-erratum-7130" advisory-name="RHSA-2008:0295"/><erratum last-modified="1211386894" id="rhn-erratum-7131" advisory-name="RHBA-2008:0283"/><erratum last-modified="1211385551" id="rhn-erratum-7133" advisory-name="RHBA-2008:0279"/><erratum last-modified="1211386850" id="rhn-erratum-7134" advisory-name="RHBA-2008:0278"/><erratum last-modified="1211386980" id="rhn-erratum-7135" advisory-name="RHBA-2008:0488"/><erratum last-modified="1211387731" id="rhn-erratum-7136" advisory-name="RHBA-2008:0487"/><erratum last-modified="1211966851" id="rhn-erratum-7144" advisory-name="RHEA-2008:0506"/><erratum last-modified="1211973628" id="rhn-erratum-7147" advisory-name="RHSA-2008:0290"/><erratum last-modified="1232480208" id="rhn-erratum-7178" advisory-name="RHBA-2008:0286"/><erratum last-modified="1232480208" id="rhn-erratum-7179" advisory-name="RHBA-2008:0490"/><erratum last-modified="1232480208" id="rhn-erratum-7180" advisory-name="RHBA-2008:0491"/><erratum last-modified="1212652858" id="rhn-erratum-7185" advisory-name="RHSA-2008:0498"/><erratum last-modified="1212659953" id="rhn-erratum-7186" advisory-name="RHBA-2008:0499"/><erratum last-modified="1212670283" id="rhn-erratum-7188" advisory-name="RHBA-2008:0513"/><erratum last-modified="1213012998" id="rhn-erratum-7189" advisory-name="RHBA-2008:0526"/><erratum last-modified="1213106876" id="rhn-erratum-7191" advisory-name="RHSA-2008:0529"/><erratum last-modified="1213169531" id="rhn-erratum-7192" advisory-name="RHBA-2008:0536"/><erratum last-modified="1213211574" id="rhn-erratum-7194" advisory-name="RHSA-2008:0522"/><erratum last-modified="1213212894" id="rhn-erratum-7196" advisory-name="RHSA-2008:0504"/><erratum last-modified="1232480208" id="rhn-erratum-7198" advisory-name="RHBA-2008:0534"/><erratum last-modified="1232480208" id="rhn-erratum-7199" advisory-name="RHBA-2008:0531"/><erratum last-modified="1232480208" id="rhn-erratum-7200" advisory-name="RHBA-2008:0530"/><erratum last-modified="1213266274" id="rhn-erratum-7201" advisory-name="RHBA-2008:0527"/><erratum last-modified="1214393985" id="rhn-erratum-7219" advisory-name="RHSA-2008:0556"/><erratum last-modified="1214299895" id="rhn-erratum-7223" advisory-name="RHSA-2008:0497"/><erratum last-modified="1232480208" id="rhn-erratum-7225" advisory-name="RHBA-2008:0567"/><erratum last-modified="1214402999" id="rhn-erratum-7226" advisory-name="RHBA-2008:0551"/><erratum last-modified="1214408624" id="rhn-erratum-7228" advisory-name="RHSA-2008:0519"/><erratum last-modified="1214589842" id="rhn-erratum-7237" advisory-name="RHBA-2008:0573"/><erratum last-modified="1215002227" id="rhn-erratum-7259" advisory-name="RHSA-2008:0569"/><erratum last-modified="1215022795" id="rhn-erratum-7265" advisory-name="RHBA-2008:0557"/><erratum last-modified="1215719579" id="rhn-erratum-7269" advisory-name="RHSA-2008:0533"/><erratum last-modified="1232480208" id="rhn-erratum-7271" advisory-name="RHBA-2008:0559"/><erratum last-modified="1215614648" id="rhn-erratum-7272" advisory-name="RHSA-2008:0583"/><erratum last-modified="1215766327" id="rhn-erratum-7273" advisory-name="RHBA-2008:0565"/><erratum last-modified="1216041981" id="rhn-erratum-7275" advisory-name="RHSA-2008:0561"/><erratum last-modified="1216043746" id="rhn-erratum-7277" advisory-name="RHSA-2008:0581"/><erratum last-modified="1216200981" id="rhn-erratum-7280" advisory-name="RHSA-2008:0544"/><erratum last-modified="1216250824" id="rhn-erratum-7284" advisory-name="RHSA-2008:0597"/><erratum last-modified="1232480208" id="rhn-erratum-7287" advisory-name="RHBA-2008:0587"/><erratum last-modified="1232470477" id="rhn-erratum-7292" advisory-name="RHBA-2008:0613"/><erratum last-modified="1232469848" id="rhn-erratum-7293" advisory-name="RHBA-2008:0610"/><erratum last-modified="1232480208" id="rhn-erratum-7294" advisory-name="RHBA-2008:0600"/><erratum last-modified="1232471900" id="rhn-erratum-7295" advisory-name="RHBA-2008:0589"/><erratum last-modified="1232471827" id="rhn-erratum-7296" advisory-name="RHBA-2008:0586"/><erratum last-modified="1216919718" id="rhn-erratum-7435" advisory-name="RHSA-2008:0575"/><erratum last-modified="1217260961" id="rhn-erratum-7459" advisory-name="RHBA-2008:0611"/><erratum last-modified="1232480208" id="rhn-erratum-7479" advisory-name="RHBA-2008:0535"/><erratum last-modified="1232480208" id="rhn-erratum-7480" advisory-name="RHBA-2008:0593"/><erratum last-modified="1232480208" id="rhn-erratum-7481" advisory-name="RHBA-2008:0609"/><erratum last-modified="1232480208" id="rhn-erratum-7482" advisory-name="RHBA-2008:0626"/><erratum last-modified="1232471506" id="rhn-erratum-7483" advisory-name="RHBA-2008:0637"/><erratum last-modified="1218054405" id="rhn-erratum-7487" advisory-name="RHSA-2008:0649"/><erratum last-modified="1217518732" id="rhn-erratum-7488" advisory-name="RHSA-2008:0486"/><erratum last-modified="1218051005" id="rhn-erratum-7498" advisory-name="RHSA-2008:0612"/><erratum last-modified="1218016403" id="rhn-erratum-7511" advisory-name="RHBA-2008:0824"/><erratum last-modified="1232480208" id="rhn-erratum-7512" advisory-name="RHBA-2008:0786"/><erratum last-modified="1232471750" id="rhn-erratum-7513" advisory-name="RHBA-2008:0652"/><erratum last-modified="1232480208" id="rhn-erratum-7515" advisory-name="RHBA-2008:0644"/><erratum last-modified="1232480208" id="rhn-erratum-7516" advisory-name="RHBA-2008:0614"/><erratum last-modified="1218439900" id="rhn-erratum-7517" advisory-name="RHBA-2008:0829"/><erratum last-modified="1218474123" id="rhn-erratum-7518" advisory-name="RHSA-2008:0789"/><erratum last-modified="1218573097" id="rhn-erratum-7521" advisory-name="RHSA-2008:0818"/><erratum last-modified="1232480208" id="rhn-erratum-7527" advisory-name="RHBA-2008:0830"/><erratum last-modified="1232471959" id="rhn-erratum-7530" advisory-name="RHBA-2008:0809"/><erratum last-modified="1232480208" id="rhn-erratum-7531" advisory-name="RHBA-2008:0574"/><erratum last-modified="1218721404" id="rhn-erratum-7532" advisory-name="RHSA-2008:0815"/><erratum last-modified="1218742318" id="rhn-erratum-7533" advisory-name="RHSA-2008:0839"/><erratum last-modified="1219739888" id="rhn-erratum-7538" advisory-name="RHSA-2008:0836"/><erratum last-modified="1219407017" id="rhn-erratum-7539" advisory-name="RHSA-2008:0855"/><erratum last-modified="1219778653" id="rhn-erratum-7560" advisory-name="RHSA-2008:0849"/><erratum last-modified="1232469934" id="rhn-erratum-7562" advisory-name="RHBA-2008:0840"/><erratum last-modified="1232480208" id="rhn-erratum-7563" advisory-name="RHEA-2008:0838"/><erratum last-modified="1232480208" id="rhn-erratum-7564" advisory-name="RHBA-2008:0811"/><erratum last-modified="1232471170" id="rhn-erratum-7565" advisory-name="RHBA-2008:0631"/><erratum last-modified="1219857228" id="rhn-erratum-7568" advisory-name="RHSA-2008:0648"/><erratum last-modified="1219961566" id="rhn-erratum-7574" advisory-name="RHSA-2008:0847"/><erratum last-modified="1220439894" id="rhn-erratum-7578" advisory-name="RHEA-2008:0875"/><erratum last-modified="1220342177" id="rhn-erratum-7590" advisory-name="RHBA-2008:0639"/><erratum last-modified="1220380576" id="rhn-erratum-7591" advisory-name="RHBA-2008:0878"/><erratum last-modified="1232480208" id="rhn-erratum-7592" advisory-name="RHBA-2008:0266"/><erratum last-modified="1232471669" id="rhn-erratum-7593" advisory-name="RHBA-2008:0646"/><erratum last-modified="1232480208" id="rhn-erratum-7594" advisory-name="RHBA-2008:0844"/><erratum last-modified="1232480208" id="rhn-erratum-7595" advisory-name="RHBA-2008:0853"/><erratum last-modified="1232471607" id="rhn-erratum-7596" advisory-name="RHBA-2008:0866"/><erratum last-modified="1221141028" id="rhn-erratum-7607" advisory-name="RHSA-2008:0884"/><erratum last-modified="1221569125" id="rhn-erratum-7618" advisory-name="RHSA-2008:0893"/><erratum last-modified="1221666679" id="rhn-erratum-7619" advisory-name="RHBA-2008:0876"/><erratum last-modified="1232480208" id="rhn-erratum-7620" advisory-name="RHBA-2008:0881"/><erratum last-modified="1232480208" id="rhn-erratum-7621" advisory-name="RHBA-2008:0889"/><erratum last-modified="1222220548" id="rhn-erratum-7638" advisory-name="RHSA-2008:0879"/><erratum last-modified="1232472306" id="rhn-erratum-7640" advisory-name="RHBA-2008:0913"/><erratum last-modified="1232480208" id="rhn-erratum-7641" advisory-name="RHBA-2008:0931"/><erratum last-modified="1232480208" id="rhn-erratum-7642" advisory-name="RHBA-2008:0894"/><erratum last-modified="1222281827" id="rhn-erratum-7643" advisory-name="RHSA-2008:0885"/><erratum last-modified="1222371933" id="rhn-erratum-7646" advisory-name="RHBA-2008:0898"/><erratum last-modified="1222771548" id="rhn-erratum-7658" advisory-name="RHBA-2008:0933"/><erratum last-modified="1222875066" id="rhn-erratum-7659" advisory-name="RHSA-2008:0890"/><erratum last-modified="1222874832" id="rhn-erratum-7660" advisory-name="RHSA-2008:0892"/><erratum last-modified="1232480208" id="rhn-erratum-7662" advisory-name="RHBA-2008:0914"/><erratum last-modified="1222944761" id="rhn-erratum-7663" advisory-name="RHBA-2008:0647"/><erratum last-modified="1222951493" id="rhn-erratum-7664" advisory-name="RHBA-2008:0902"/><erratum last-modified="1222955994" id="rhn-erratum-7665" advisory-name="RHSA-2008:0907"/><erratum last-modified="1232480208" id="rhn-erratum-7704" advisory-name="RHBA-2008:0920"/><erratum last-modified="1232472272" id="rhn-erratum-7705" advisory-name="RHBA-2008:0912"/><erratum last-modified="1232472188" id="rhn-erratum-7707" advisory-name="RHBA-2008:0905"/><erratum last-modified="1232480208" id="rhn-erratum-7708" advisory-name="RHBA-2008:0899"/><erratum last-modified="1223471927" id="rhn-erratum-7710" advisory-name="RHEA-2008:0941"/><erratum last-modified="1223624846" id="rhn-erratum-7717" advisory-name="RHSA-2008:0937"/><erratum last-modified="1223912487" id="rhn-erratum-7719" advisory-name="RHBA-2008:0850"/><erratum last-modified="1224058340" id="rhn-erratum-7721" advisory-name="RHBA-2008:0909"/><erratum last-modified="1232480208" id="rhn-erratum-7725" advisory-name="RHBA-2008:0921"/><erratum last-modified="1232480208" id="rhn-erratum-7726" advisory-name="RHBA-2008:0917"/><erratum last-modified="1232480208" id="rhn-erratum-7727" advisory-name="RHBA-2008:0900"/><erratum last-modified="1232480208" id="rhn-erratum-7728" advisory-name="RHBA-2008:0845"/><erratum last-modified="1232472902" id="rhn-erratum-7738" advisory-name="RHBA-2008:0918"/><erratum last-modified="1224600759" id="rhn-erratum-7739" advisory-name="RHSA-2008:0897"/><erratum last-modified="1224602762" id="rhn-erratum-7742" advisory-name="RHSA-2008:0946"/><erratum last-modified="1225127389" id="rhn-erratum-7778" advisory-name="RHSA-2008:0965"/><erratum last-modified="1225723995" id="rhn-erratum-7799" advisory-name="RHSA-2008:0971"/><erratum last-modified="1226482482" id="rhn-erratum-7800" advisory-name="RHSA-2008:0957"/><erratum last-modified="1225826819" id="rhn-erratum-7801" advisory-name="RHBA-2008:0923"/><erratum last-modified="1225897383" id="rhn-erratum-7803" advisory-name="RHEA-2008:0969"/><erratum last-modified="1225907418" id="rhn-erratum-7805" advisory-name="RHBA-2008:0947"/><erratum last-modified="1225910118" id="rhn-erratum-7806" advisory-name="RHBA-2008:0956"/><erratum last-modified="1226428000" id="rhn-erratum-7820" advisory-name="RHSA-2008:0967"/><erratum last-modified="1226427998" id="rhn-erratum-7821" advisory-name="RHSA-2008:0982"/><erratum last-modified="1226542692" id="rhn-erratum-7828" advisory-name="RHSA-2008:0978"/><erratum last-modified="1226938556" id="rhn-erratum-7830" advisory-name="RHSA-2008:0988"/><erratum last-modified="1227602466" id="rhn-erratum-7863" advisory-name="RHSA-2008:0580"/><erratum last-modified="1227603932" id="rhn-erratum-7866" advisory-name="RHSA-2008:1001"/><erratum last-modified="1227605180" id="rhn-erratum-7867" advisory-name="RHBA-2008:0992"/><erratum last-modified="1227646521" id="rhn-erratum-7870" advisory-name="RHBA-2008:1009"/><erratum last-modified="1228132653" id="rhn-erratum-7879" advisory-name="RHBA-2008:0996"/><erratum last-modified="1228237181" id="rhn-erratum-7880" advisory-name="RHBA-2008:0962"/><erratum last-modified="1229103319" id="rhn-erratum-7901" advisory-name="RHSA-2008:0981"/><erratum last-modified="1228942168" id="rhn-erratum-7906" advisory-name="RHBA-2008:1030"/><erratum last-modified="1228992998" id="rhn-erratum-7918" advisory-name="RHBA-2008:0999"/><erratum last-modified="1229345508" id="rhn-erratum-7919" advisory-name="RHSA-2008:1016"/><erratum last-modified="1229347540" id="rhn-erratum-7922" advisory-name="RHSA-2008:1029"/><erratum last-modified="1229481511" id="rhn-erratum-7924" advisory-name="RHSA-2008:1017"/><erratum last-modified="1229477477" id="rhn-erratum-7926" advisory-name="RHSA-2008:1036"/><erratum last-modified="1231324405" id="rhn-erratum-7959" advisory-name="RHSA-2009:0003"/><erratum last-modified="1231326579" id="rhn-erratum-7961" advisory-name="RHSA-2009:0018"/><erratum last-modified="1231334838" id="rhn-erratum-7962" advisory-name="RHSA-2009:0004"/><erratum last-modified="1231335043" id="rhn-erratum-7963" advisory-name="RHSA-2009:0008"/><erratum last-modified="1231335537" id="rhn-erratum-7964" advisory-name="RHSA-2009:0011"/><erratum last-modified="1231439171" id="rhn-erratum-7979" advisory-name="RHSA-2009:0020"/><erratum last-modified="1231750715" id="rhn-erratum-7980" advisory-name="RHBA-2008:1034"/><erratum last-modified="1231769347" id="rhn-erratum-7981" advisory-name="RHSA-2009:0013"/><erratum last-modified="1231770400" id="rhn-erratum-7982" advisory-name="RHSA-2009:0010"/><erratum last-modified="1232399801" id="rhn-erratum-8007" advisory-name="RHSA-2009:0057"/><erratum last-modified="1232459797" id="rhn-erratum-8008" advisory-name="RHBA-2009:0056"/><erratum last-modified="1232480208" id="rhn-erratum-8009" advisory-name="RHBA-2009:0058"/><erratum last-modified="1232480208" id="rhn-erratum-8011" advisory-name="RHBA-2009:0060"/><erratum last-modified="1232480208" id="rhn-erratum-8012" advisory-name="RHBA-2009:0062"/><erratum last-modified="1232480208" id="rhn-erratum-8013" advisory-name="RHEA-2009:0063"/><erratum last-modified="1232480208" id="rhn-erratum-8016" advisory-name="RHBA-2009:0066"/><erratum last-modified="1232480208" id="rhn-erratum-8017" advisory-name="RHBA-2009:0067"/><erratum last-modified="1232480208" id="rhn-erratum-8018" advisory-name="RHBA-2009:0068"/><erratum last-modified="1232480208" id="rhn-erratum-8019" advisory-name="RHBA-2009:0069"/><erratum last-modified="1232480208" id="rhn-erratum-8020" advisory-name="RHBA-2009:0070"/><erratum last-modified="1232480208" id="rhn-erratum-8021" advisory-name="RHBA-2009:0071"/><erratum last-modified="1232480208" id="rhn-erratum-8022" advisory-name="RHBA-2009:0072"/><erratum last-modified="1232480208" id="rhn-erratum-8023" advisory-name="RHBA-2009:0073"/><erratum last-modified="1232480208" id="rhn-erratum-8024" advisory-name="RHBA-2009:0074"/><erratum last-modified="1232480208" id="rhn-erratum-8025" advisory-name="RHEA-2009:0075"/><erratum last-modified="1232480208" id="rhn-erratum-8026" advisory-name="RHBA-2009:0076"/><erratum last-modified="1232480208" id="rhn-erratum-8027" advisory-name="RHEA-2009:0077"/><erratum last-modified="1232480208" id="rhn-erratum-8028" advisory-name="RHEA-2009:0078"/><erratum last-modified="1232480208" id="rhn-erratum-8029" advisory-name="RHBA-2009:0079"/><erratum last-modified="1232480208" id="rhn-erratum-8030" advisory-name="RHBA-2009:0080"/><erratum last-modified="1232480208" id="rhn-erratum-8031" advisory-name="RHBA-2009:0082"/><erratum last-modified="1232480208" id="rhn-erratum-8032" advisory-name="RHEA-2009:0083"/><erratum last-modified="1232480208" id="rhn-erratum-8033" advisory-name="RHBA-2009:0084"/><erratum last-modified="1232480208" id="rhn-erratum-8034" advisory-name="RHBA-2009:0085"/><erratum last-modified="1232480208" id="rhn-erratum-8036" advisory-name="RHBA-2009:0087"/><erratum last-modified="1232480208" id="rhn-erratum-8037" advisory-name="RHBA-2009:0088"/><erratum last-modified="1232480208" id="rhn-erratum-8038" advisory-name="RHEA-2009:0089"/><erratum last-modified="1232480208" id="rhn-erratum-8039" advisory-name="RHBA-2009:0090"/><erratum last-modified="1232480208" id="rhn-erratum-8040" advisory-name="RHBA-2009:0091"/><erratum last-modified="1232480208" id="rhn-erratum-8041" advisory-name="RHEA-2009:0092"/><erratum last-modified="1232480208" id="rhn-erratum-8042" advisory-name="RHBA-2009:0093"/><erratum last-modified="1232480208" id="rhn-erratum-8043" advisory-name="RHBA-2009:0094"/><erratum last-modified="1232480208" id="rhn-erratum-8045" advisory-name="RHEA-2009:0096"/><erratum last-modified="1232480208" id="rhn-erratum-8046" advisory-name="RHEA-2009:0097"/><erratum last-modified="1232480208" id="rhn-erratum-8047" advisory-name="RHEA-2009:0098"/><erratum last-modified="1232480208" id="rhn-erratum-8052" advisory-name="RHBA-2009:0103"/><erratum last-modified="1232480208" id="rhn-erratum-8054" advisory-name="RHBA-2009:0105"/><erratum last-modified="1232480208" id="rhn-erratum-8055" advisory-name="RHEA-2009:0106"/><erratum last-modified="1232480208" id="rhn-erratum-8056" advisory-name="RHBA-2009:0107"/><erratum last-modified="1232480208" id="rhn-erratum-8057" advisory-name="RHEA-2009:0108"/><erratum last-modified="1232480208" id="rhn-erratum-8058" advisory-name="RHBA-2009:0109"/><erratum last-modified="1232480208" id="rhn-erratum-8059" advisory-name="RHBA-2009:0110"/><erratum last-modified="1232480208" id="rhn-erratum-8060" advisory-name="RHBA-2009:0111"/><erratum last-modified="1232480208" id="rhn-erratum-8061" advisory-name="RHBA-2009:0112"/><erratum last-modified="1232480208" id="rhn-erratum-8062" advisory-name="RHBA-2009:0113"/><erratum last-modified="1232480208" id="rhn-erratum-8063" advisory-name="RHBA-2009:0114"/><erratum last-modified="1232480208" id="rhn-erratum-8064" advisory-name="RHBA-2009:0115"/><erratum last-modified="1232480208" id="rhn-erratum-8065" advisory-name="RHBA-2009:0116"/><erratum last-modified="1232480208" id="rhn-erratum-8066" advisory-name="RHBA-2009:0117"/><erratum last-modified="1232480224" id="rhn-erratum-8067" advisory-name="RHBA-2009:0118"/><erratum last-modified="1232480208" id="rhn-erratum-8068" advisory-name="RHBA-2009:0119"/><erratum last-modified="1232480208" id="rhn-erratum-8069" advisory-name="RHBA-2009:0120"/><erratum last-modified="1232480208" id="rhn-erratum-8070" advisory-name="RHEA-2009:0123"/><erratum last-modified="1232480208" id="rhn-erratum-8072" advisory-name="RHEA-2009:0124"/><erratum last-modified="1232480208" id="rhn-erratum-8073" advisory-name="RHBA-2009:0125"/><erratum last-modified="1232480208" id="rhn-erratum-8074" advisory-name="RHBA-2009:0126"/><erratum last-modified="1232480208" id="rhn-erratum-8075" advisory-name="RHBA-2009:0127"/><erratum last-modified="1232480208" id="rhn-erratum-8076" advisory-name="RHBA-2009:0128"/><erratum last-modified="1232480208" id="rhn-erratum-8077" advisory-name="RHBA-2009:0130"/><erratum last-modified="1232480208" id="rhn-erratum-8078" advisory-name="RHBA-2009:0131"/><erratum last-modified="1232480208" id="rhn-erratum-8080" advisory-name="RHEA-2009:0133"/><erratum last-modified="1232480208" id="rhn-erratum-8081" advisory-name="RHBA-2009:0134"/><erratum last-modified="1232480208" id="rhn-erratum-8082" advisory-name="RHBA-2009:0135"/><erratum last-modified="1232480208" id="rhn-erratum-8083" advisory-name="RHBA-2009:0136"/><erratum last-modified="1232480208" id="rhn-erratum-8085" advisory-name="RHBA-2009:0138"/><erratum last-modified="1232480208" id="rhn-erratum-8086" advisory-name="RHBA-2009:0139"/><erratum last-modified="1232480208" id="rhn-erratum-8090" advisory-name="RHBA-2009:0143"/><erratum last-modified="1232480208" id="rhn-erratum-8091" advisory-name="RHBA-2009:0144"/><erratum last-modified="1232480208" id="rhn-erratum-8092" advisory-name="RHBA-2009:0145"/><erratum last-modified="1232480208" id="rhn-erratum-8093" advisory-name="RHBA-2009:0146"/><erratum last-modified="1232480208" id="rhn-erratum-8094" advisory-name="RHBA-2009:0147"/><erratum last-modified="1232480208" id="rhn-erratum-8095" advisory-name="RHBA-2009:0148"/><erratum last-modified="1232480208" id="rhn-erratum-8096" advisory-name="RHBA-2009:0149"/><erratum last-modified="1232480208" id="rhn-erratum-8098" advisory-name="RHEA-2009:0151"/><erratum last-modified="1232480208" id="rhn-erratum-8099" advisory-name="RHEA-2009:0152"/><erratum last-modified="1232480208" id="rhn-erratum-8100" advisory-name="RHEA-2009:0153"/><erratum last-modified="1232480208" id="rhn-erratum-8101" advisory-name="RHEA-2009:0154"/><erratum last-modified="1232480208" id="rhn-erratum-8103" advisory-name="RHBA-2009:0156"/><erratum last-modified="1232480208" id="rhn-erratum-8104" advisory-name="RHBA-2009:0157"/><erratum last-modified="1232480208" id="rhn-erratum-8107" advisory-name="RHEA-2009:0160"/><erratum last-modified="1232480208" id="rhn-erratum-8108" advisory-name="RHEA-2009:0161"/><erratum last-modified="1232480208" id="rhn-erratum-8109" advisory-name="RHBA-2009:0162"/><erratum last-modified="1232480208" id="rhn-erratum-8110" advisory-name="RHBA-2009:0163"/><erratum last-modified="1232480208" id="rhn-erratum-8111" advisory-name="RHBA-2009:0164"/><erratum last-modified="1232480208" id="rhn-erratum-8112" advisory-name="RHBA-2009:0165"/><erratum last-modified="1232480208" id="rhn-erratum-8113" advisory-name="RHEA-2009:0166"/><erratum last-modified="1232480208" id="rhn-erratum-8114" advisory-name="RHBA-2009:0167"/><erratum last-modified="1232480208" id="rhn-erratum-8115" advisory-name="RHBA-2009:0168"/><erratum last-modified="1232480208" id="rhn-erratum-8116" advisory-name="RHBA-2009:0170"/><erratum last-modified="1232480208" id="rhn-erratum-8117" advisory-name="RHBA-2009:0171"/><erratum last-modified="1232480208" id="rhn-erratum-8118" advisory-name="RHBA-2009:0172"/><erratum last-modified="1232480208" id="rhn-erratum-8119" advisory-name="RHBA-2009:0173"/><erratum last-modified="1232480208" id="rhn-erratum-8120" advisory-name="RHEA-2009:0174"/><erratum last-modified="1232480208" id="rhn-erratum-8121" advisory-name="RHBA-2009:0175"/><erratum last-modified="1232480208" id="rhn-erratum-8122" advisory-name="RHBA-2009:0176"/><erratum last-modified="1232480208" id="rhn-erratum-8124" advisory-name="RHBA-2009:0178"/><erratum last-modified="1232480208" id="rhn-erratum-8125" advisory-name="RHBA-2009:0179"/><erratum last-modified="1232480208" id="rhn-erratum-8126" advisory-name="RHBA-2009:0180"/><erratum last-modified="1232480208" id="rhn-erratum-8127" advisory-name="RHBA-2009:0181"/><erratum last-modified="1232480208" id="rhn-erratum-8128" advisory-name="RHBA-2009:0182"/><erratum last-modified="1232480208" id="rhn-erratum-8129" advisory-name="RHEA-2009:0183"/><erratum last-modified="1232480208" id="rhn-erratum-8130" advisory-name="RHEA-2009:0184"/><erratum last-modified="1232480208" id="rhn-erratum-8131" advisory-name="RHBA-2009:0186"/><erratum last-modified="1232480208" id="rhn-erratum-8132" advisory-name="RHEA-2009:0187"/><erratum last-modified="1232480208" id="rhn-erratum-8134" advisory-name="RHBA-2009:0189"/><erratum last-modified="1232480208" id="rhn-erratum-8135" advisory-name="RHEA-2009:0190"/><erratum last-modified="1232480208" id="rhn-erratum-8136" advisory-name="RHEA-2009:0191"/><erratum last-modified="1232480208" id="rhn-erratum-8137" advisory-name="RHEA-2009:0192"/><erratum last-modified="1232480208" id="rhn-erratum-8138" advisory-name="RHBA-2009:0193"/><erratum last-modified="1232480208" id="rhn-erratum-8139" advisory-name="RHEA-2009:0194"/><erratum last-modified="1232480208" id="rhn-erratum-8140" advisory-name="RHBA-2009:0195"/><erratum last-modified="1232480208" id="rhn-erratum-8142" advisory-name="RHEA-2009:0197"/><erratum last-modified="1232480208" id="rhn-erratum-8143" advisory-name="RHBA-2009:0198"/><erratum last-modified="1232480208" id="rhn-erratum-8144" advisory-name="RHEA-2009:0199"/><erratum last-modified="1232480208" id="rhn-erratum-8145" advisory-name="RHBA-2009:0200"/><erratum last-modified="1232480208" id="rhn-erratum-8146" advisory-name="RHEA-2009:0201"/><erratum last-modified="1232480208" id="rhn-erratum-8147" advisory-name="RHBA-2009:0202"/><erratum last-modified="1232480208" id="rhn-erratum-8148" advisory-name="RHBA-2009:0203"/><erratum last-modified="1232480208" id="rhn-erratum-8149" advisory-name="RHBA-2009:0204"/><erratum last-modified="1232479510" id="rhn-erratum-8150" advisory-name="RHSA-2009:0205"/><erratum last-modified="1232480208" id="rhn-erratum-8151" advisory-name="RHBA-2009:0206"/><erratum last-modified="1232480208" id="rhn-erratum-8152" advisory-name="RHBA-2009:0207"/><erratum last-modified="1232480208" id="rhn-erratum-8153" advisory-name="RHBA-2009:0208"/><erratum last-modified="1232480208" id="rhn-erratum-8154" advisory-name="RHBA-2009:0209"/><erratum last-modified="1232480208" id="rhn-erratum-8155" advisory-name="RHBA-2009:0210"/><erratum last-modified="1232480208" id="rhn-erratum-8156" advisory-name="RHEA-2009:0211"/><erratum last-modified="1232480208" id="rhn-erratum-8157" advisory-name="RHEA-2009:0212"/><erratum last-modified="1232480208" id="rhn-erratum-8158" advisory-name="RHBA-2009:0213"/><erratum last-modified="1232480208" id="rhn-erratum-8159" advisory-name="RHBA-2009:0214"/><erratum last-modified="1232480208" id="rhn-erratum-8162" advisory-name="RHEA-2009:0217"/><erratum last-modified="1232480208" id="rhn-erratum-8163" advisory-name="RHEA-2009:0218"/><erratum last-modified="1232480208" id="rhn-erratum-8164" advisory-name="RHBA-2009:0220"/><erratum last-modified="1232480208" id="rhn-erratum-8165" advisory-name="RHBA-2009:0221"/><erratum last-modified="1232480208" id="rhn-erratum-8166" advisory-name="RHBA-2009:0222"/><erratum last-modified="1232480208" id="rhn-erratum-8167" advisory-name="RHBA-2009:0224"/><erratum last-modified="1232659228" id="rhn-erratum-8168" advisory-name="RHSA-2009:0225"/><erratum last-modified="1232480208" id="rhn-erratum-8169" advisory-name="RHBA-2009:0226"/><erratum last-modified="1232480208" id="rhn-erratum-8170" advisory-name="RHBA-2009:0227"/><erratum last-modified="1232480208" id="rhn-erratum-8171" advisory-name="RHBA-2009:0228"/><erratum last-modified="1232480208" id="rhn-erratum-8172" advisory-name="RHBA-2009:0229"/><erratum last-modified="1232480208" id="rhn-erratum-8173" advisory-name="RHBA-2009:0230"/><erratum last-modified="1232480208" id="rhn-erratum-8174" advisory-name="RHBA-2009:0231"/><erratum last-modified="1232480208" id="rhn-erratum-8175" advisory-name="RHEA-2009:0232"/><erratum last-modified="1232480208" id="rhn-erratum-8176" advisory-name="RHBA-2009:0233"/><erratum last-modified="1232480208" id="rhn-erratum-8177" advisory-name="RHBA-2009:0234"/><erratum last-modified="1232480208" id="rhn-erratum-8178" advisory-name="RHEA-2009:0235"/><erratum last-modified="1232480208" id="rhn-erratum-8179" advisory-name="RHEA-2009:0236"/><erratum last-modified="1232480208" id="rhn-erratum-8180" advisory-name="RHBA-2009:0237"/><erratum last-modified="1232480208" id="rhn-erratum-8182" advisory-name="RHBA-2009:0239"/><erratum last-modified="1232480208" id="rhn-erratum-8183" advisory-name="RHBA-2009:0240"/><erratum last-modified="1232480208" id="rhn-erratum-8184" advisory-name="RHBA-2009:0241"/><erratum last-modified="1232480208" id="rhn-erratum-8185" advisory-name="RHBA-2009:0242"/><erratum last-modified="1232480208" id="rhn-erratum-8187" advisory-name="RHBA-2009:0245"/><erratum last-modified="1232480208" id="rhn-erratum-8188" advisory-name="RHBA-2009:0246"/><erratum last-modified="1232480208" id="rhn-erratum-8189" advisory-name="RHBA-2009:0247"/><erratum last-modified="1232480208" id="rhn-erratum-8190" advisory-name="RHBA-2009:0248"/><erratum last-modified="1232480208" id="rhn-erratum-8191" advisory-name="RHBA-2009:0249"/><erratum last-modified="1232480208" id="rhn-erratum-8192" advisory-name="RHBA-2009:0250"/><erratum last-modified="1232470005" id="rhn-erratum-8193" advisory-name="RHBA-2009:0252"/><erratum last-modified="1232480208" id="rhn-erratum-8194" advisory-name="RHBA-2009:0185"/><erratum last-modified="1232495455" id="rhn-erratum-8195" advisory-name="RHBA-2009:0169"/><erratum last-modified="1232497996" id="rhn-erratum-8203" advisory-name="RHBA-2009:0017"/><erratum last-modified="1232503970" id="rhn-erratum-8204" advisory-name="RHBA-2009:0048"/><erratum last-modified="1232495619" id="rhn-erratum-8205" advisory-name="RHBA-2009:0049"/><erratum last-modified="1233222316" id="rhn-erratum-8243" advisory-name="RHSA-2009:0046"/><erratum last-modified="1233737974" id="rhn-erratum-8266" advisory-name="RHSA-2009:0256"/><erratum last-modified="1233849544" id="rhn-erratum-8276" advisory-name="RHSA-2009:0267"/><erratum last-modified="1233925487" id="rhn-erratum-8279" advisory-name="RHSA-2009:0271"/><erratum last-modified="1234281035" id="rhn-erratum-8283" advisory-name="RHSA-2009:0264"/><erratum last-modified="1251890453" id="rhn-erratum-8284" advisory-name="RHBA-2009:0276"/><erratum last-modified="1251890602" id="rhn-erratum-8285" advisory-name="RHBA-2009:0277"/><erratum last-modified="1251890770" id="rhn-erratum-8286" advisory-name="RHBA-2009:0279"/><erratum last-modified="1234371093" id="rhn-erratum-8288" advisory-name="RHSA-2009:0012"/><erratum last-modified="1234371489" id="rhn-erratum-8289" advisory-name="RHSA-2009:0259"/><erratum last-modified="1234374733" id="rhn-erratum-8291" advisory-name="RHSA-2009:0261"/><erratum last-modified="1251891421" id="rhn-erratum-8301" advisory-name="RHBA-2009:0294"/><erratum last-modified="1234975480" id="rhn-erratum-8304" advisory-name="RHBA-2009:0309"/><erratum last-modified="1235513125" id="rhn-erratum-8319" advisory-name="RHBA-2009:0280"/><erratum last-modified="1235749692" id="rhn-erratum-8325" advisory-name="RHBA-2009:0283"/><erratum last-modified="1236194593" id="rhn-erratum-8327" advisory-name="RHSA-2009:0313"/><erratum last-modified="1236196706" id="rhn-erratum-8328" advisory-name="RHSA-2009:0333"/><erratum last-modified="1236211859" id="rhn-erratum-8330" advisory-name="RHSA-2009:0315"/><erratum last-modified="1251891574" id="rhn-erratum-8338" advisory-name="RHBA-2009:0305"/><erratum last-modified="1251891276" id="rhn-erratum-8339" advisory-name="RHBA-2009:0291"/><erratum last-modified="1236867191" id="rhn-erratum-8358" advisory-name="RHSA-2009:0296"/><erratum last-modified="1237211621" id="rhn-erratum-8362" advisory-name="RHSA-2009:0344"/><erratum last-modified="1237212400" id="rhn-erratum-8363" advisory-name="RHSA-2009:0354"/><erratum last-modified="1251892651" id="rhn-erratum-8378" advisory-name="RHBA-2009:0378"/><erratum last-modified="1251901881" id="rhn-erratum-8379" advisory-name="RHBA-2009:0379"/><erratum last-modified="1251892890" id="rhn-erratum-8380" advisory-name="RHBA-2009:0380"/><erratum last-modified="1237475158" id="rhn-erratum-8382" advisory-name="RHSA-2009:0339"/><erratum last-modified="1237476611" id="rhn-erratum-8383" advisory-name="RHSA-2009:0341"/><erratum last-modified="1237478023" id="rhn-erratum-8384" advisory-name="RHSA-2009:0345"/><erratum last-modified="1237896260" id="rhn-erratum-8399" advisory-name="RHSA-2009:0336"/><erratum last-modified="1251892784" id="rhn-erratum-8400" advisory-name="RHBA-2009:0389"/><erratum last-modified="1251891869" id="rhn-erratum-8401" advisory-name="RHBA-2009:0390"/><erratum last-modified="1237989484" id="rhn-erratum-8403" advisory-name="RHSA-2009:0361"/><erratum last-modified="1238083248" id="rhn-erratum-8409" advisory-name="RHSA-2009:0373"/><erratum last-modified="1238196859" id="rhn-erratum-8423" advisory-name="RHSA-2009:0397"/><erratum last-modified="1238423623" id="rhn-erratum-8424" advisory-name="RHBA-2009:0401"/><erratum last-modified="1238431951" id="rhn-erratum-8425" advisory-name="RHSA-2009:0402"/><erratum last-modified="1238488903" id="rhn-erratum-8426" advisory-name="RHEA-2009:0403"/><erratum last-modified="1238574216" id="rhn-erratum-8427" advisory-name="RHSA-2009:0326"/><erratum last-modified="1251893018" id="rhn-erratum-8428" advisory-name="RHBA-2009:0404"/><erratum last-modified="1251901555" id="rhn-erratum-8429" advisory-name="RHBA-2009:0405"/><erratum last-modified="1238684368" id="rhn-erratum-8431" advisory-name="RHBA-2009:0406"/><erratum last-modified="1239035514" id="rhn-erratum-8437" advisory-name="RHSA-2009:0352"/><erratum last-modified="1239035685" id="rhn-erratum-8438" advisory-name="RHSA-2009:0338"/><erratum last-modified="1239129395" id="rhn-erratum-8440" advisory-name="RHSA-2009:0377"/><erratum last-modified="1239129589" id="rhn-erratum-8441" advisory-name="RHSA-2009:0408"/><erratum last-modified="1239131002" id="rhn-erratum-8444" advisory-name="RHSA-2009:0411"/><erratum last-modified="1251893998" id="rhn-erratum-8445" advisory-name="RHBA-2009:0412"/><erratum last-modified="1251893770" id="rhn-erratum-8446" advisory-name="RHBA-2009:0413"/><erratum last-modified="1251893573" id="rhn-erratum-8447" advisory-name="RHBA-2009:0414"/><erratum last-modified="1239307344" id="rhn-erratum-8449" advisory-name="RHBA-2009:0416"/><erratum last-modified="1239307510" id="rhn-erratum-8450" advisory-name="RHBA-2009:0417"/><erratum last-modified="1239307689" id="rhn-erratum-8451" advisory-name="RHBA-2009:0418"/><erratum last-modified="1239731641" id="rhn-erratum-8461" advisory-name="RHSA-2009:0421"/><erratum last-modified="1239788525" id="rhn-erratum-8462" advisory-name="RHEA-2009:0422"/><erratum last-modified="1251894185" id="rhn-erratum-8463" advisory-name="RHBA-2009:0423"/><erratum last-modified="1251893153" id="rhn-erratum-8464" advisory-name="RHBA-2009:0424"/><erratum last-modified="1251892498" id="rhn-erratum-8465" advisory-name="RHBA-2009:0425"/><erratum last-modified="1251892034" id="rhn-erratum-8466" advisory-name="RHBA-2009:0426"/><erratum last-modified="1239910537" id="rhn-erratum-8467" advisory-name="RHSA-2009:0427"/><erratum last-modified="1239919907" id="rhn-erratum-8469" advisory-name="RHSA-2009:0429"/><erratum last-modified="1239975414" id="rhn-erratum-8472" advisory-name="RHBA-2009:0432"/><erratum last-modified="1240364412" id="rhn-erratum-8476" advisory-name="RHSA-2009:0436"/><erratum last-modified="1251895891" id="rhn-erratum-8477" advisory-name="RHBA-2009:0438"/><erratum last-modified="1251895717" id="rhn-erratum-8478" advisory-name="RHBA-2009:0439"/><erratum last-modified="1251895285" id="rhn-erratum-8479" advisory-name="RHBA-2009:0440"/><erratum last-modified="1251894684" id="rhn-erratum-8480" advisory-name="RHBA-2009:0441"/><erratum last-modified="1251894498" id="rhn-erratum-8481" advisory-name="RHBA-2009:0442"/><erratum last-modified="1240405100" id="rhn-erratum-8482" advisory-name="RHBA-2009:0443"/><erratum last-modified="1240421850" id="rhn-erratum-8483" advisory-name="RHSA-2009:0444"/><erratum last-modified="1240866192" id="rhn-erratum-8521" advisory-name="RHSA-2009:0449"/><erratum last-modified="1251897739" id="rhn-erratum-8524" advisory-name="RHBA-2009:0452"/><erratum last-modified="1251895441" id="rhn-erratum-8525" advisory-name="RHBA-2009:0453"/><erratum last-modified="1241095601" id="rhn-erratum-8528" advisory-name="RHBA-2009:0456"/><erratum last-modified="1241124168" id="rhn-erratum-8529" advisory-name="RHSA-2009:0457"/><erratum last-modified="1241606946" id="rhn-erratum-8538" advisory-name="RHBA-2009:0461"/><erratum last-modified="1251896232" id="rhn-erratum-8539" advisory-name="RHBA-2009:0462"/><erratum last-modified="1251896081" id="rhn-erratum-8540" advisory-name="RHBA-2009:0463"/><erratum last-modified="1251895131" id="rhn-erratum-8542" advisory-name="RHBA-2009:0465"/><erratum last-modified="1241689947" id="rhn-erratum-8543" advisory-name="RHBA-2009:0467"/><erratum last-modified="1241693590" id="rhn-erratum-8549" advisory-name="RHSA-2009:0473"/><erratum last-modified="1241697393" id="rhn-erratum-8551" advisory-name="RHSA-2009:0474"/><erratum last-modified="1241698624" id="rhn-erratum-8552" advisory-name="RHBA-2009:0475"/><erratum last-modified="1241774754" id="rhn-erratum-8558" advisory-name="RHSA-2009:0476"/><erratum last-modified="1241804814" id="rhn-erratum-8559" advisory-name="RHBA-2009:0477"/><erratum last-modified="1242224830" id="rhn-erratum-8561" advisory-name="RHSA-2009:0479"/><erratum last-modified="1242225153" id="rhn-erratum-8562" advisory-name="RHSA-2009:0480"/><erratum last-modified="1251902269" id="rhn-erratum-8563" advisory-name="RHBA-2009:0481"/><erratum last-modified="1251896851" id="rhn-erratum-8564" advisory-name="RHBA-2009:0482"/><erratum last-modified="1251896558" id="rhn-erratum-8565" advisory-name="RHBA-2009:0483"/><erratum last-modified="1251894347" id="rhn-erratum-8566" advisory-name="RHBA-2009:0484"/><erratum last-modified="1242677390" id="rhn-erratum-8671" advisory-name="RHSA-2009:1036"/><erratum last-modified="1242678906" id="rhn-erratum-8673" advisory-name="RHSA-2009:1039"/><erratum last-modified="1251898985" id="rhn-erratum-8690" advisory-name="RHBA-2009:1056"/><erratum last-modified="1242993962" id="rhn-erratum-8703" advisory-name="RHSA-2009:1061"/><erratum last-modified="1243358818" id="rhn-erratum-8724" advisory-name="RHSA-2009:1066"/><erratum last-modified="1243411642" id="rhn-erratum-8725" advisory-name="RHBA-2009:1068"/><erratum last-modified="1243412316" id="rhn-erratum-8726" advisory-name="RHBA-2009:1069"/><erratum last-modified="1251902639" id="rhn-erratum-8727" advisory-name="RHBA-2009:1070"/><erratum last-modified="1251902447" id="rhn-erratum-8728" advisory-name="RHBA-2009:1071"/><erratum last-modified="1251899735" id="rhn-erratum-8729" advisory-name="RHBA-2009:1072"/><erratum last-modified="1251898792" id="rhn-erratum-8730" advisory-name="RHEA-2009:1073"/><erratum last-modified="1251898432" id="rhn-erratum-8731" advisory-name="RHBA-2009:1074"/><erratum last-modified="1243433945" id="rhn-erratum-8732" advisory-name="RHSA-2009:1075"/><erratum last-modified="1251899215" id="rhn-erratum-8742" advisory-name="RHBA-2009:1078"/><erratum last-modified="1251896388" id="rhn-erratum-8743" advisory-name="RHBA-2009:1079"/><erratum last-modified="1251894855" id="rhn-erratum-8744" advisory-name="RHBA-2009:1080"/><erratum last-modified="1244043269" id="rhn-erratum-8745" advisory-name="RHSA-2009:1082"/><erratum last-modified="1251902372" id="rhn-erratum-8765" advisory-name="RHBA-2009:1089"/><erratum last-modified="1251898633" id="rhn-erratum-8766" advisory-name="RHBA-2009:1090"/><erratum last-modified="1244712708" id="rhn-erratum-8769" advisory-name="RHBA-2009:1092"/><erratum last-modified="1244760082" id="rhn-erratum-8772" advisory-name="RHSA-2009:1095"/><erratum last-modified="1245049997" id="rhn-erratum-8776" advisory-name="RHBA-2009:1099"/><erratum last-modified="1245098247" id="rhn-erratum-8777" advisory-name="RHSA-2009:1100"/><erratum last-modified="1245099386" id="rhn-erratum-8778" advisory-name="RHBA-2009:1088"/><erratum last-modified="1245100252" id="rhn-erratum-8780" advisory-name="RHSA-2009:1102"/><erratum last-modified="1245137587" id="rhn-erratum-8781" advisory-name="RHBA-2009:1103"/><erratum last-modified="1245157126" id="rhn-erratum-8782" advisory-name="RHBA-2009:1104"/><erratum last-modified="1245169236" id="rhn-erratum-8783" advisory-name="RHEA-2009:1105"/><erratum last-modified="1245191652" id="rhn-erratum-8784" advisory-name="RHSA-2009:1106"/><erratum last-modified="1245188970" id="rhn-erratum-8785" advisory-name="RHSA-2009:1107"/><erratum last-modified="1251898283" id="rhn-erratum-8788" advisory-name="RHBA-2009:1110"/><erratum last-modified="1251898086" id="rhn-erratum-8789" advisory-name="RHBA-2009:1111"/><erratum last-modified="1251897375" id="rhn-erratum-8790" advisory-name="RHBA-2009:1112"/><erratum last-modified="1251893281" id="rhn-erratum-8791" advisory-name="RHBA-2009:1113"/><erratum last-modified="1245345978" id="rhn-erratum-8794" advisory-name="RHSA-2009:1116"/><erratum last-modified="1251903394" id="rhn-erratum-8796" advisory-name="RHBA-2009:1117"/><erratum last-modified="1251904193" id="rhn-erratum-8797" advisory-name="RHBA-2009:1118"/><erratum last-modified="1251901978" id="rhn-erratum-8798" advisory-name="RHBA-2009:1119"/><erratum last-modified="1251897187" id="rhn-erratum-8799" advisory-name="RHBA-2009:1120"/><erratum last-modified="1251896704" id="rhn-erratum-8800" advisory-name="RHEA-2009:1121"/><erratum last-modified="1245938790" id="rhn-erratum-8816" advisory-name="RHSA-2009:1122"/><erratum last-modified="1245939212" id="rhn-erratum-8817" advisory-name="RHSA-2009:1123"/><erratum last-modified="1245948118" id="rhn-erratum-8821" advisory-name="RHSA-2009:1127"/><erratum last-modified="1246018455" id="rhn-erratum-8836" advisory-name="RHBA-2009:1131"/><erratum last-modified="1246351025" id="rhn-erratum-8838" advisory-name="RHBA-2009:1133"/><erratum last-modified="1246531095" id="rhn-erratum-8856" advisory-name="RHBA-2009:1137"/><erratum last-modified="1246546970" id="rhn-erratum-8857" advisory-name="RHSA-2009:1138"/><erratum last-modified="1246554217" id="rhn-erratum-8859" advisory-name="RHSA-2009:1140"/><erratum last-modified="1246606281" id="rhn-erratum-8861" advisory-name="RHBA-2009:1142"/><erratum last-modified="1247155814" id="rhn-erratum-8883" advisory-name="RHSA-2009:1148"/><erratum last-modified="1247238297" id="rhn-erratum-8885" advisory-name="RHBA-2009:1150"/><erratum last-modified="1247562642" id="rhn-erratum-8886" advisory-name="RHBA-2009:1151"/><erratum last-modified="1247772613" id="rhn-erratum-8895" advisory-name="RHSA-2009:1159"/><erratum last-modified="1248075024" id="rhn-erratum-8897" advisory-name="RHBA-2009:1161"/><erratum last-modified="1248209788" id="rhn-erratum-8898" advisory-name="RHSA-2009:1164"/><erratum last-modified="1248225956" id="rhn-erratum-8899" advisory-name="RHSA-2009:1162"/><erratum last-modified="1248247063" id="rhn-erratum-8901" advisory-name="RHBA-2009:1165"/><erratum last-modified="1248686569" id="rhn-erratum-8912" advisory-name="RHSA-2009:1176"/><erratum last-modified="1248908176" id="rhn-erratum-8915" advisory-name="RHSA-2009:1179"/><erratum last-modified="1248992401" id="rhn-erratum-8923" advisory-name="RHSA-2009:1186"/><erratum last-modified="1249284929" id="rhn-erratum-8927" advisory-name="RHBA-2009:1191"/><erratum last-modified="1249285235" id="rhn-erratum-8928" advisory-name="RHBA-2009:1192"/><erratum last-modified="1249391447" id="rhn-erratum-8929" advisory-name="RHSA-2009:1193"/><erratum last-modified="1249593283" id="rhn-erratum-8936" advisory-name="RHSA-2009:1201"/><erratum last-modified="1249635208" id="rhn-erratum-8938" advisory-name="RHBA-2009:1202"/><erratum last-modified="1249923570" id="rhn-erratum-8939" advisory-name="RHSA-2009:1203"/><erratum last-modified="1249924960" id="rhn-erratum-8940" advisory-name="RHSA-2009:1204"/><erratum last-modified="1249928065" id="rhn-erratum-8942" advisory-name="RHSA-2009:1206"/><erratum last-modified="1250174015" id="rhn-erratum-8946" advisory-name="RHSA-2009:1209"/><erratum last-modified="1250515305" id="rhn-erratum-8960" advisory-name="RHEA-2009:1214"/><erratum last-modified="1250587186" id="rhn-erratum-8961" advisory-name="RHBA-2009:1215"/><erratum last-modified="1250619786" id="rhn-erratum-8965" advisory-name="RHSA-2009:1219"/><erratum last-modified="1251112218" id="rhn-erratum-8968" advisory-name="RHSA-2009:1222"/><erratum last-modified="1251298026" id="rhn-erratum-8978" advisory-name="RHSA-2009:1232"/><erratum last-modified="1251764323" id="rhn-erratum-8985" advisory-name="RHSA-2009:1238"/><erratum last-modified="1251874953" id="rhn-erratum-8988" advisory-name="RHBA-2009:1240"/><erratum last-modified="1251899232" id="rhn-erratum-8989" advisory-name="RHBA-2009:1241"/><erratum last-modified="1251874953" id="rhn-erratum-8990" advisory-name="RHBA-2009:1242"/><erratum last-modified="1252518575" id="rhn-erratum-8991" advisory-name="RHSA-2009:1243"/><erratum last-modified="1251874953" id="rhn-erratum-8992" advisory-name="RHBA-2009:1244"/><erratum last-modified="1251874953" id="rhn-erratum-8993" advisory-name="RHEA-2009:1245"/><erratum last-modified="1251874953" id="rhn-erratum-8996" advisory-name="RHBA-2009:1249"/><erratum last-modified="1251899232" id="rhn-erratum-8997" advisory-name="RHBA-2009:1250"/><erratum last-modified="1251874953" id="rhn-erratum-8998" advisory-name="RHBA-2009:1251"/><erratum last-modified="1251899232" id="rhn-erratum-8999" advisory-name="RHBA-2009:1256"/><erratum last-modified="1251899232" id="rhn-erratum-9000" advisory-name="RHBA-2009:1257"/><erratum last-modified="1251874953" id="rhn-erratum-9001" advisory-name="RHBA-2009:1258"/><erratum last-modified="1251899232" id="rhn-erratum-9002" advisory-name="RHBA-2009:1259"/><erratum last-modified="1251874953" id="rhn-erratum-9004" advisory-name="RHBA-2009:1262"/><erratum last-modified="1251899232" id="rhn-erratum-9006" advisory-name="RHEA-2009:1264"/><erratum last-modified="1251874953" id="rhn-erratum-9007" advisory-name="RHBA-2009:1265"/><erratum last-modified="1251899232" id="rhn-erratum-9008" advisory-name="RHEA-2009:1266"/><erratum last-modified="1251899232" id="rhn-erratum-9009" advisory-name="RHBA-2009:1267"/><erratum last-modified="1251899232" id="rhn-erratum-9010" advisory-name="RHBA-2009:1268"/><erratum last-modified="1251899232" id="rhn-erratum-9013" advisory-name="RHBA-2009:1273"/><erratum last-modified="1251899232" id="rhn-erratum-9014" advisory-name="RHEA-2009:1274"/><erratum last-modified="1251899232" id="rhn-erratum-9017" advisory-name="RHBA-2009:1277"/><erratum last-modified="1251874953" id="rhn-erratum-9018" advisory-name="RHSA-2009:1278"/><erratum last-modified="1251899232" id="rhn-erratum-9019" advisory-name="RHEA-2009:1279"/><erratum last-modified="1251874953" id="rhn-erratum-9020" advisory-name="RHBA-2009:1280"/><erratum last-modified="1251874953" id="rhn-erratum-9021" advisory-name="RHEA-2009:1281"/><erratum last-modified="1251899232" id="rhn-erratum-9022" advisory-name="RHBA-2009:1282"/><erratum last-modified="1251899232" id="rhn-erratum-9023" advisory-name="RHBA-2009:1283"/><erratum last-modified="1251899232" id="rhn-erratum-9024" advisory-name="RHEA-2009:1284"/><erratum last-modified="1251899232" id="rhn-erratum-9026" advisory-name="RHBA-2009:1286"/><erratum last-modified="1251874953" id="rhn-erratum-9027" advisory-name="RHSA-2009:1287"/><erratum last-modified="1251899232" id="rhn-erratum-9028" advisory-name="RHBA-2009:1288"/><erratum last-modified="1251874953" id="rhn-erratum-9029" advisory-name="RHBA-2009:1290"/><erratum last-modified="1251899232" id="rhn-erratum-9030" advisory-name="RHBA-2009:1291"/><erratum last-modified="1251874953" id="rhn-erratum-9031" advisory-name="RHBA-2009:1292"/><erratum last-modified="1251874953" id="rhn-erratum-9032" advisory-name="RHEA-2009:1293"/><erratum last-modified="1251899232" id="rhn-erratum-9033" advisory-name="RHEA-2009:1294"/><erratum last-modified="1251899232" id="rhn-erratum-9034" advisory-name="RHEA-2009:1295"/><erratum last-modified="1251899232" id="rhn-erratum-9035" advisory-name="RHEA-2009:1296"/><erratum last-modified="1251874953" id="rhn-erratum-9036" advisory-name="RHEA-2009:1297"/><erratum last-modified="1251899232" id="rhn-erratum-9037" advisory-name="RHBA-2009:1298"/><erratum last-modified="1251899232" id="rhn-erratum-9039" advisory-name="RHBA-2009:1300"/><erratum last-modified="1251899232" id="rhn-erratum-9040" advisory-name="RHBA-2009:1301"/><erratum last-modified="1251899232" id="rhn-erratum-9042" advisory-name="RHEA-2009:1303"/><erratum last-modified="1251899232" id="rhn-erratum-9043" advisory-name="RHBA-2009:1304"/><erratum last-modified="1251874953" id="rhn-erratum-9045" advisory-name="RHBA-2009:1306"/><erratum last-modified="1251899232" id="rhn-erratum-9046" advisory-name="RHSA-2009:1307"/><erratum last-modified="1251874953" id="rhn-erratum-9047" advisory-name="RHEA-2009:1308"/><erratum last-modified="1251874953" id="rhn-erratum-9049" advisory-name="RHBA-2009:1310"/><erratum last-modified="1251899232" id="rhn-erratum-9051" advisory-name="RHEA-2009:1312"/><erratum last-modified="1251899232" id="rhn-erratum-9052" advisory-name="RHBA-2009:1313"/><erratum last-modified="1251899232" id="rhn-erratum-9053" advisory-name="RHEA-2009:1314"/><erratum last-modified="1251899232" id="rhn-erratum-9054" advisory-name="RHEA-2009:1315"/><erratum last-modified="1251874953" id="rhn-erratum-9055" advisory-name="RHEA-2009:1316"/><erratum last-modified="1251874953" id="rhn-erratum-9056" advisory-name="RHBA-2009:1317"/><erratum last-modified="1251874953" id="rhn-erratum-9057" advisory-name="RHEA-2009:1318"/><erratum last-modified="1251874953" id="rhn-erratum-9058" advisory-name="RHBA-2009:1319"/><erratum last-modified="1251899232" id="rhn-erratum-9059" advisory-name="RHEA-2009:1320"/><erratum last-modified="1251874953" id="rhn-erratum-9060" advisory-name="RHSA-2009:1321"/><erratum last-modified="1251899232" id="rhn-erratum-9061" advisory-name="RHBA-2009:1322"/><erratum last-modified="1251874953" id="rhn-erratum-9063" advisory-name="RHBA-2009:1324"/><erratum last-modified="1251874953" id="rhn-erratum-9066" advisory-name="RHEA-2009:1327"/><erratum last-modified="1251899263" id="rhn-erratum-9067" advisory-name="RHBA-2009:1328"/><erratum last-modified="1251874953" id="rhn-erratum-9068" advisory-name="RHBA-2009:1329"/><erratum last-modified="1251899232" id="rhn-erratum-9069" advisory-name="RHBA-2009:1330"/><erratum last-modified="1251899232" id="rhn-erratum-9070" advisory-name="RHBA-2009:1331"/><erratum last-modified="1251899232" id="rhn-erratum-9071" advisory-name="RHEA-2009:1332"/><erratum last-modified="1251899232" id="rhn-erratum-9072" advisory-name="RHBA-2009:1333"/><erratum last-modified="1251899232" id="rhn-erratum-9074" advisory-name="RHSA-2009:1335"/><erratum last-modified="1251874953" id="rhn-erratum-9076" advisory-name="RHSA-2009:1337"/><erratum last-modified="1251899232" id="rhn-erratum-9080" advisory-name="RHSA-2009:1341"/><erratum last-modified="1251874953" id="rhn-erratum-9081" advisory-name="RHEA-2009:1342"/><erratum last-modified="1251874953" id="rhn-erratum-9082" advisory-name="RHBA-2009:1343"/><erratum last-modified="1251874953" id="rhn-erratum-9083" advisory-name="RHBA-2009:1344"/><erratum last-modified="1251899232" id="rhn-erratum-9084" advisory-name="RHBA-2009:1345"/><erratum last-modified="1251899232" id="rhn-erratum-9085" advisory-name="RHBA-2009:1346"/><erratum last-modified="1251899232" id="rhn-erratum-9086" advisory-name="RHBA-2009:1347"/><erratum last-modified="1251874953" id="rhn-erratum-9087" advisory-name="RHEA-2009:1348"/><erratum last-modified="1251899232" id="rhn-erratum-9088" advisory-name="RHBA-2009:1349"/><erratum last-modified="1251874953" id="rhn-erratum-9089" advisory-name="RHEA-2009:1350"/><erratum last-modified="1251874953" id="rhn-erratum-9090" advisory-name="RHBA-2009:1351"/><erratum last-modified="1251874953" id="rhn-erratum-9091" advisory-name="RHBA-2009:1352"/><erratum last-modified="1251874953" id="rhn-erratum-9092" advisory-name="RHBA-2009:1353"/><erratum last-modified="1251874953" id="rhn-erratum-9093" advisory-name="RHBA-2009:1354"/><erratum last-modified="1251874953" id="rhn-erratum-9094" advisory-name="RHBA-2009:1355"/><erratum last-modified="1251874953" id="rhn-erratum-9095" advisory-name="RHBA-2009:1356"/><erratum last-modified="1254425146" id="rhn-erratum-9096" advisory-name="RHBA-2009:1357"/><erratum last-modified="1251899232" id="rhn-erratum-9097" advisory-name="RHBA-2009:1358"/><erratum last-modified="1251899232" id="rhn-erratum-9098" advisory-name="RHBA-2009:1359"/><erratum last-modified="1251899232" id="rhn-erratum-9099" advisory-name="RHBA-2009:1360"/><erratum last-modified="1251874953" id="rhn-erratum-9100" advisory-name="RHBA-2009:1361"/><erratum last-modified="1251874953" id="rhn-erratum-9101" advisory-name="RHBA-2009:1362"/><erratum last-modified="1251874953" id="rhn-erratum-9102" advisory-name="RHEA-2009:1363"/><erratum last-modified="1251874953" id="rhn-erratum-9103" advisory-name="RHSA-2009:1364"/><erratum last-modified="1251874953" id="rhn-erratum-9104" advisory-name="RHBA-2009:1365"/><erratum last-modified="1251899232" id="rhn-erratum-9105" advisory-name="RHBA-2009:1366"/><erratum last-modified="1251874953" id="rhn-erratum-9107" advisory-name="RHBA-2009:1368"/><erratum last-modified="1251874953" id="rhn-erratum-9108" advisory-name="RHEA-2009:1369"/><erratum last-modified="1251874953" id="rhn-erratum-9109" advisory-name="RHBA-2009:1370"/><erratum last-modified="1251899232" id="rhn-erratum-9110" advisory-name="RHBA-2009:1371"/><erratum last-modified="1251899232" id="rhn-erratum-9111" advisory-name="RHBA-2009:1372"/><erratum last-modified="1251899232" id="rhn-erratum-9112" advisory-name="RHBA-2009:1373"/><erratum last-modified="1251874953" id="rhn-erratum-9113" advisory-name="RHBA-2009:1374"/><erratum last-modified="1251899232" id="rhn-erratum-9114" advisory-name="RHBA-2009:1375"/><erratum last-modified="1251899232" id="rhn-erratum-9115" advisory-name="RHBA-2009:1376"/><erratum last-modified="1251899232" id="rhn-erratum-9116" advisory-name="RHBA-2009:1378"/><erratum last-modified="1251874953" id="rhn-erratum-9117" advisory-name="RHBA-2009:1379"/><erratum last-modified="1251899232" id="rhn-erratum-9118" advisory-name="RHBA-2009:1380"/><erratum last-modified="1251874953" id="rhn-erratum-9120" advisory-name="RHBA-2009:1382"/><erratum last-modified="1251899232" id="rhn-erratum-9121" advisory-name="RHEA-2009:1384"/><erratum last-modified="1251874953" id="rhn-erratum-9122" advisory-name="RHEA-2009:1385"/><erratum last-modified="1251874953" id="rhn-erratum-9124" advisory-name="RHBA-2009:1387"/><erratum last-modified="1251874953" id="rhn-erratum-9125" advisory-name="RHBA-2009:1388"/><erratum last-modified="1251899232" id="rhn-erratum-9126" advisory-name="RHBA-2009:1389"/><erratum last-modified="1251874953" id="rhn-erratum-9127" advisory-name="RHBA-2009:1390"/><erratum last-modified="1251899232" id="rhn-erratum-9128" advisory-name="RHBA-2009:1391"/><erratum last-modified="1251874953" id="rhn-erratum-9129" advisory-name="RHBA-2009:1392"/><erratum last-modified="1251874953" id="rhn-erratum-9130" advisory-name="RHBA-2009:1393"/><erratum last-modified="1251899232" id="rhn-erratum-9132" advisory-name="RHBA-2009:1395"/><erratum last-modified="1251874953" id="rhn-erratum-9134" advisory-name="RHBA-2009:1397"/><erratum last-modified="1251874953" id="rhn-erratum-9136" advisory-name="RHEA-2009:1400"/><erratum last-modified="1251899232" id="rhn-erratum-9138" advisory-name="RHBA-2009:1402"/><erratum last-modified="1251874953" id="rhn-erratum-9139" advisory-name="RHBA-2009:1403"/><erratum last-modified="1251874953" id="rhn-erratum-9140" advisory-name="RHBA-2009:1404"/><erratum last-modified="1251874953" id="rhn-erratum-9141" advisory-name="RHBA-2009:1405"/><erratum last-modified="1251874953" id="rhn-erratum-9142" advisory-name="RHEA-2009:1406"/><erratum last-modified="1251874953" id="rhn-erratum-9143" advisory-name="RHEA-2009:1407"/><erratum last-modified="1251874953" id="rhn-erratum-9144" advisory-name="RHEA-2009:1408"/><erratum last-modified="1251899232" id="rhn-erratum-9145" advisory-name="RHBA-2009:1409"/><erratum last-modified="1251874953" id="rhn-erratum-9146" advisory-name="RHEA-2009:1410"/><erratum last-modified="1251899232" id="rhn-erratum-9147" advisory-name="RHEA-2009:1411"/><erratum last-modified="1251874953" id="rhn-erratum-9150" advisory-name="RHEA-2009:1377"/><erratum last-modified="1251899232" id="rhn-erratum-9157" advisory-name="RHSA-2009:1289"/><erratum last-modified="1251874953" id="rhn-erratum-9158" advisory-name="RHBA-2009:1413"/><erratum last-modified="1251899232" id="rhn-erratum-9159" advisory-name="RHBA-2009:1414"/><erratum last-modified="1251874953" id="rhn-erratum-9162" advisory-name="RHBA-2009:1415"/><erratum last-modified="1251874953" id="rhn-erratum-9163" advisory-name="RHBA-2009:1416"/><erratum last-modified="1251874953" id="rhn-erratum-9164" advisory-name="RHEA-2009:1417"/><erratum last-modified="1251876580" id="rhn-erratum-9166" advisory-name="RHBA-2009:1418"/><erratum last-modified="1251876776" id="rhn-erratum-9167" advisory-name="RHBA-2009:1419"/><erratum last-modified="1251876999" id="rhn-erratum-9168" advisory-name="RHBA-2009:1420"/><erratum last-modified="1251899854" id="rhn-erratum-9170" advisory-name="RHBA-2009:1422"/><erratum last-modified="1252422602" id="rhn-erratum-9175" advisory-name="RHSA-2009:1427"/><erratum last-modified="1252424580" id="rhn-erratum-9176" advisory-name="RHSA-2009:1428"/><erratum last-modified="1252538566" id="rhn-erratum-9179" advisory-name="RHSA-2009:1430"/><erratum last-modified="1252608717" id="rhn-erratum-9184" advisory-name="RHEA-2009:1435"/><erratum last-modified="1252657598" id="rhn-erratum-9185" advisory-name="RHBA-2009:1437"/><erratum last-modified="1253294999" id="rhn-erratum-9199" advisory-name="RHBA-2009:1435"/><erratum last-modified="1253198298" id="rhn-erratum-9200" advisory-name="RHSA-2009:1451"/><erratum last-modified="1253546063" id="rhn-erratum-9203" advisory-name="RHSA-2009:1452"/><erratum last-modified="1253610836" id="rhn-erratum-9206" advisory-name="RHEA-2009:1456"/><erratum last-modified="1253719476" id="rhn-erratum-9211" advisory-name="RHSA-2009:1459"/><erratum last-modified="1253820091" id="rhn-erratum-9215" advisory-name="RHSA-2009:1463"/><erratum last-modified="1254210796" id="rhn-erratum-9216" advisory-name="RHBA-2009:1464"/><erratum last-modified="1254252620" id="rhn-erratum-9219" advisory-name="RHSA-2009:1455"/><erratum last-modified="1254300291" id="rhn-erratum-9220" advisory-name="RHEA-2009:1467"/><erratum last-modified="1254306914" id="rhn-erratum-9221" advisory-name="RHBA-2009:1468"/><erratum last-modified="1254323283" id="rhn-erratum-9223" advisory-name="RHSA-2009:1470"/><erratum last-modified="1254417983" id="rhn-erratum-9224" advisory-name="RHSA-2009:1471"/><erratum last-modified="1254419726" id="rhn-erratum-9225" advisory-name="RHSA-2009:1472"/><erratum last-modified="1254490488" id="rhn-erratum-9227" advisory-name="RHBA-2009:1474"/><erratum last-modified="1254727120" id="rhn-erratum-9229" advisory-name="RHBA-2009:1476"/><erratum last-modified="1254932561" id="rhn-erratum-9237" advisory-name="RHSA-2009:1484"/><erratum last-modified="1254931779" id="rhn-erratum-9240" advisory-name="RHBA-2009:1417"/><erratum last-modified="1254997927" id="rhn-erratum-9241" advisory-name="RHBA-2009:1487"/><erratum last-modified="1255033032" id="rhn-erratum-9244" advisory-name="RHSA-2009:1490"/><erratum last-modified="1255419221" id="rhn-erratum-9248" advisory-name="RHBA-2009:1494"/><erratum last-modified="1255421818" id="rhn-erratum-9249" advisory-name="RHBA-2009:1495"/><erratum last-modified="1255592166" id="rhn-erratum-9260" advisory-name="RHBA-2009:1511"/><erratum last-modified="1255596673" id="rhn-erratum-9265" advisory-name="RHSA-2009:1504"/><erratum last-modified="1255597236" id="rhn-erratum-9266" advisory-name="RHSA-2009:1513"/><erratum last-modified="1255609387" id="rhn-erratum-9268" advisory-name="RHBA-2009:1514"/></rhn-channel-errata><rhn-release/></rhn-channel><rhn-channel channel-arch="channel-x86_64" has-comps="False" channel-errata="rhn-erratum-9245" kickstartable-trees="" label="rhn-tools-rhel-x86_64-server-5" packages="rhn-package-368425 rhn-package-368426 rhn-package-368430 rhn-package-368431 rhn-package-368435 rhn-package-368436 rhn-package-368437 rhn-package-368438 rhn-package-397864 rhn-package-397865 rhn-package-397866 rhn-package-397867 rhn-package-397868 rhn-package-397869 rhn-package-397870 rhn-package-397871 rhn-package-397872 rhn-package-397873 rhn-package-397874 rhn-package-397875 rhn-package-397876 rhn-package-397877 rhn-package-397878 rhn-package-397879 rhn-package-397880 rhn-package-397881 rhn-package-397882 rhn-package-397883 rhn-package-397884 rhn-package-397885 rhn-package-397886 rhn-package-397887 rhn-package-397888 rhn-package-397889 rhn-package-397890 rhn-package-397891 rhn-package-397892 rhn-package-397893 rhn-package-397894 rhn-package-397895 rhn-package-397896 rhn-package-397897 rhn-package-397898 rhn-package-397899 rhn-package-397900 rhn-package-397901 rhn-package-397902 rhn-package-397903 rhn-package-397904 rhn-package-397905 rhn-package-397906 rhn-package-397907 rhn-package-397908 rhn-package-397909 rhn-package-397910 rhn-package-397911 rhn-package-397912 rhn-package-397913 rhn-package-397914 rhn-package-397915 rhn-package-397916 rhn-package-397917 rhn-package-397918 rhn-package-397919 rhn-package-397920 rhn-package-397921 rhn-package-397922 rhn-package-397923 rhn-package-397924 rhn-package-397925 rhn-package-397926 rhn-package-397927 rhn-package-397928 rhn-package-397929 rhn-package-397930 rhn-package-397931 rhn-package-397932 rhn-package-397933 rhn-package-397934 rhn-package-397935 rhn-package-397936 rhn-package-397937 rhn-package-397938 rhn-package-397939 rhn-package-397940 rhn-package-397941 rhn-package-397942 rhn-package-397943 rhn-package-397944 rhn-package-397945 rhn-package-397946 rhn-package-397947 rhn-package-397948 rhn-package-397949 rhn-package-397950 rhn-package-397951 rhn-package-397952 rhn-package-397953 rhn-package-397954 rhn-package-397955 rhn-package-397956 rhn-package-397957 rhn-package-397958 rhn-package-397959 rhn-package-397960 rhn-package-397961 rhn-package-397962 rhn-package-397963 rhn-package-397964 rhn-package-397965 rhn-package-397966 rhn-package-397967 rhn-package-397968 rhn-package-397969 rhn-package-397970 rhn-package-397971 rhn-package-397972 rhn-package-397973 rhn-package-397974 rhn-package-397975 rhn-package-397976 rhn-package-397977 rhn-package-397978 rhn-package-397979 rhn-package-397980 rhn-package-397981 rhn-package-397982 rhn-package-397983 rhn-package-397984 rhn-package-397985 rhn-package-397986 rhn-package-397987 rhn-package-397988 rhn-package-397989 rhn-package-397990 rhn-package-397991 rhn-package-397992 rhn-package-397993 rhn-package-397994 rhn-package-397995 rhn-package-397996 rhn-package-397997 rhn-package-397998 rhn-package-397999 rhn-package-398000 rhn-package-398001 rhn-package-398002 rhn-package-398003 rhn-package-398004 rhn-package-398715 rhn-package-398716 rhn-package-398717 rhn-package-398718 rhn-package-398719 rhn-package-398720 rhn-package-398721 rhn-package-398722 rhn-package-398723 rhn-package-398725 rhn-package-398726 rhn-package-398727 rhn-package-398728 rhn-package-398729 rhn-package-398730 rhn-package-398731 rhn-package-398732 rhn-package-398733 rhn-package-398734 rhn-package-398735 rhn-package-398736 rhn-package-398737 rhn-package-398738 rhn-package-398739 rhn-package-398740 rhn-package-398741 rhn-package-398742 rhn-package-398743 rhn-package-398744 rhn-package-398745 rhn-package-398746 rhn-package-398747 rhn-package-398748 rhn-package-398749 rhn-package-398750 rhn-package-398751 rhn-package-398752 rhn-package-398753 rhn-package-398754 rhn-package-398755 rhn-package-398756 rhn-package-398757 rhn-package-398758 rhn-package-398759 rhn-package-398760 rhn-package-398761 rhn-package-398762 rhn-package-398763 rhn-package-398764 rhn-package-398765 rhn-package-398767 rhn-package-398768 rhn-package-398769 rhn-package-398770 rhn-package-398771 rhn-package-398772 rhn-package-398773 rhn-package-398774 rhn-package-398775 rhn-package-398776 rhn-package-398777 rhn-package-398778 rhn-package-398779 rhn-package-398780 rhn-package-398781 rhn-package-398782 rhn-package-398783 rhn-package-398784 rhn-package-398785 rhn-package-398786 rhn-package-398787 rhn-package-398788 rhn-package-398789 rhn-package-398790 rhn-package-398791 rhn-package-398792 rhn-package-398793 rhn-package-398794 rhn-package-398795 rhn-package-398796 rhn-package-398797 rhn-package-398798 rhn-package-398799 rhn-package-398800 rhn-package-398801 rhn-package-398802 rhn-package-398803 rhn-package-398804 rhn-package-398805 rhn-package-398806 rhn-package-398807 rhn-package-398808 rhn-package-398809 rhn-package-398810 rhn-package-398811 rhn-package-398812 rhn-package-398813 rhn-package-398814 rhn-package-398815 rhn-package-398816 rhn-package-398817 rhn-package-398818 rhn-package-398819 rhn-package-398820 rhn-package-398821 rhn-package-398822 rhn-package-398823 rhn-package-398824 rhn-package-398825 rhn-package-398826 rhn-package-398827 rhn-package-398828 rhn-package-398829 rhn-package-398830 rhn-package-398831 rhn-package-398832 rhn-package-398833 rhn-package-398834 rhn-package-398835 rhn-package-398836 rhn-package-398837 rhn-package-398838 rhn-package-398839 rhn-package-398840 rhn-package-398841 rhn-package-398842 rhn-package-398843 rhn-package-398844 rhn-package-398845 rhn-package-398846 rhn-package-398847 rhn-package-398848 rhn-package-398849 rhn-package-398850 rhn-package-398851 rhn-package-398852 rhn-package-398853 rhn-package-398854 rhn-package-398855 rhn-package-398856 rhn-package-398857 rhn-package-398858 rhn-package-398859 rhn-package-398860 rhn-package-398861 rhn-package-398862 rhn-package-398863 rhn-package-398864 rhn-package-398865 rhn-package-398866 rhn-package-398867 rhn-package-398868 rhn-package-398869 rhn-package-398870 rhn-package-398871 rhn-package-398872 rhn-package-398873 rhn-package-398874 rhn-package-398875 rhn-package-398876 rhn-package-398877 rhn-package-398878 rhn-package-398879 rhn-package-398880 rhn-package-405714 rhn-package-405715 rhn-package-405716 rhn-package-405717 rhn-package-405718 rhn-package-405729 rhn-package-405746 rhn-package-405764 rhn-package-405784 rhn-package-405801 rhn-package-405805 rhn-package-408794 rhn-package-408795 rhn-package-408796 rhn-package-408797 rhn-package-408798 rhn-package-408799 rhn-package-408800 rhn-package-408801 rhn-package-408802 rhn-package-408803 rhn-package-408804 rhn-package-409061 rhn-package-409062 rhn-package-409063 rhn-package-409064 rhn-package-409065 rhn-package-409066 rhn-package-409067 rhn-package-409068 rhn-package-409069 rhn-package-409070 rhn-package-409071 rhn-package-409072 rhn-package-416479 rhn-package-428323 rhn-package-428324 rhn-package-428325 rhn-package-428326 rhn-package-428327 rhn-package-428328 rhn-package-428329 rhn-package-428330 rhn-package-428331 rhn-package-428332 rhn-package-428333 rhn-package-438335 rhn-package-438336 rhn-package-438338 rhn-package-438340 rhn-package-438342 rhn-package-438344 rhn-package-438345 rhn-package-438346 rhn-package-438347 rhn-package-438348 rhn-package-438349 rhn-package-454517 rhn-package-454518 rhn-package-454519 rhn-package-454520 rhn-package-454521 rhn-package-454522 rhn-package-454523 rhn-package-454524 rhn-package-454525 rhn-package-454526 rhn-package-454527 rhn-package-464294 rhn-package-464549 rhn-package-465238 rhn-package-467939 rhn-package-471383 rhn-package-482361 rhn-package-482362 rhn-package-482363 rhn-package-482364 rhn-package-482365 rhn-package-482366 rhn-package-482367 rhn-package-482368 rhn-package-482369 rhn-package-482370 rhn-package-482371 rhn-package-491636 rhn-package-491638 rhn-package-491639 rhn-package-491640 rhn-package-491642 rhn-package-491643 rhn-package-491645 rhn-package-491646 rhn-package-491647 rhn-package-491648 rhn-package-491649 rhn-package-491650 rhn-package-491651 rhn-package-491652 rhn-package-491751 rhn-package-491753 rhn-package-491761 rhn-package-491766 rhn-package-491968 rhn-package-491969 rhn-package-495494 rhn-package-495495" channel-id="rhn-channel-6986"><rhn-channel-parent-channel>rhel-x86_64-server-5</rhn-channel-parent-channel><rhn-channel-basedir>/</rhn-channel-basedir><rhn-channel-name>Red Hat Network Tools for RHEL Server (v.5 64-bit x86_64)</rhn-channel-name><rhn-channel-summary>Red Hat Network Tools for RHEL 5 Server (x86_64)</rhn-channel-summary><rhn-channel-description><rhn-null/></rhn-channel-description><rhn-channel-gpg-key-url>file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release</rhn-channel-gpg-key-url><rhn-channel-receiving-updates>Y</rhn-channel-receiving-updates><rhn-channel-last-modified>1255334772</rhn-channel-last-modified><rhn-channel-product-name>rhn-tools</rhn-channel-product-name><rhn-channel-product-version>5</rhn-channel-product-version><rhn-channel-product-beta>N</rhn-channel-product-beta><rhn-channel-families><rhn-channel-family virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" channel-labels="rhn-tools-rhel-3-as-i386 rhn-tools-rhel-3-es-i386 rhn-tools-rhel-3-ws-i386 rhn-tools-redhat-linux-i386-9 rhn-tools-rhel-3-desktop-i386 rhn-tools-rhel-3-as-x86_64 rhn-tools-rhel-3-es-x86_64 rhn-tools-rhel-3-ws-x86_64 rhn-tools-rhel-3-desktop-x86_64 rhn-tools-rhel-4-as-i386 rhn-tools-rhel-4-es-i386 rhn-tools-rhel-4-ws-i386 rhn-tools-rhel-4-desktop-i386 rhn-tools-rhel-4-as-x86_64 rhn-tools-rhel-4-es-x86_64 rhn-tools-rhel-4-ws-x86_64 rhn-tools-rhel-4-desktop-x86_64 rhn-tools-rhel-3-as-ia64 rhn-tools-rhel-3-es-ia64 rhn-tools-rhel-3-ws-ia64 rhn-tools-rhel-4-as-ia64 rhn-tools-rhel-4-es-ia64 rhn-tools-rhel-4-ws-ia64 rhn-tools-rhel-i386-server-5 rhn-tools-rhel-x86_64-server-5 rhn-tools-rhel-ia64-server-5 rhn-tools-rhel-i386-client-5 rhn-tools-rhel-x86_64-client-5 rhn-tools-rhel-4-as-ppc rhn-tools-rhel-4-as-s390 rhn-tools-rhel-4-as-s390x rhn-tools-rhel-ppc-server-5 rhn-tools-rhel-s390x-server-5 rhn-tools-rhel-3-as-ppc rhn-tools-rhel-3-as-s390 rhn-tools-rhel-3-as-s390x" virt-sub-level-label="virtualization_free virtualization_platform_free" id="rhn-channel-family-1729" label="rhn-tools"/></rhn-channel-families><rhn-dists/><source-packages><source-package last-modified="1233329286" id="rhn-source-package-49388" source-rpm="perl-IO-stringy-2.109-11.el5.src.rpm"/><source-package last-modified="1233330261" id="rhn-source-package-49498" source-rpm="jabberpy-0.5-0.13.el5.src.rpm"/><source-package last-modified="1252523515" id="rhn-source-package-51516" source-rpm="spacewalk-ssl-cert-check-1.7-1.el5sat.src.rpm"/><source-package last-modified="1252523515" id="rhn-source-package-51526" source-rpm="spacewalk-certs-tools-0.5.5-6.el5sat.src.rpm"/><source-package last-modified="1252596930" id="rhn-source-package-51579" source-rpm="spacewalk-utils-0.5.1-8.el5sat.src.rpm"/></source-packages><rhn-channel-errata><erratum last-modified="1255334771" id="rhn-erratum-9245" advisory-name="RHEA-2009:1491"/></rhn-channel-errata><rhn-release/></rhn-channel><rhn-channel channel-arch="channel-ia32" has-comps="False" channel-errata="rhn-erratum-9245" kickstartable-trees="" label="rhn-tools-rhel-i386-server-5" packages="rhn-package-368425 rhn-package-368426 rhn-package-368430 rhn-package-368431 rhn-package-368435 rhn-package-368436 rhn-package-368437 rhn-package-368438 rhn-package-397864 rhn-package-397865 rhn-package-397866 rhn-package-397867 rhn-package-397868 rhn-package-397869 rhn-package-397870 rhn-package-397871 rhn-package-397872 rhn-package-397873 rhn-package-397874 rhn-package-397875 rhn-package-397876 rhn-package-397877 rhn-package-397878 rhn-package-397879 rhn-package-397880 rhn-package-397881 rhn-package-397882 rhn-package-397883 rhn-package-397884 rhn-package-397885 rhn-package-397886 rhn-package-397887 rhn-package-397888 rhn-package-397889 rhn-package-397890 rhn-package-397891 rhn-package-397892 rhn-package-397893 rhn-package-397894 rhn-package-397895 rhn-package-397896 rhn-package-397897 rhn-package-397898 rhn-package-397899 rhn-package-397900 rhn-package-397901 rhn-package-397902 rhn-package-397903 rhn-package-397904 rhn-package-397905 rhn-package-397906 rhn-package-397907 rhn-package-397908 rhn-package-397909 rhn-package-397910 rhn-package-397911 rhn-package-397912 rhn-package-397913 rhn-package-397914 rhn-package-397915 rhn-package-397916 rhn-package-397917 rhn-package-397918 rhn-package-397919 rhn-package-397920 rhn-package-397921 rhn-package-397922 rhn-package-397923 rhn-package-397924 rhn-package-397925 rhn-package-397926 rhn-package-397927 rhn-package-397928 rhn-package-397929 rhn-package-397930 rhn-package-397931 rhn-package-397932 rhn-package-397933 rhn-package-397934 rhn-package-397935 rhn-package-397936 rhn-package-397937 rhn-package-397938 rhn-package-397939 rhn-package-397940 rhn-package-397941 rhn-package-397942 rhn-package-397943 rhn-package-397944 rhn-package-397945 rhn-package-397946 rhn-package-397947 rhn-package-397948 rhn-package-397949 rhn-package-397950 rhn-package-397951 rhn-package-397952 rhn-package-397953 rhn-package-397954 rhn-package-397955 rhn-package-397956 rhn-package-397957 rhn-package-397958 rhn-package-397959 rhn-package-397960 rhn-package-397961 rhn-package-397962 rhn-package-397963 rhn-package-397964 rhn-package-397965 rhn-package-397966 rhn-package-397967 rhn-package-397968 rhn-package-397969 rhn-package-397970 rhn-package-397971 rhn-package-397972 rhn-package-397973 rhn-package-397974 rhn-package-397975 rhn-package-397976 rhn-package-397977 rhn-package-397978 rhn-package-397979 rhn-package-397980 rhn-package-397981 rhn-package-397982 rhn-package-397983 rhn-package-397984 rhn-package-397985 rhn-package-397986 rhn-package-397987 rhn-package-397988 rhn-package-397989 rhn-package-397990 rhn-package-397991 rhn-package-397992 rhn-package-397993 rhn-package-397994 rhn-package-397995 rhn-package-397996 rhn-package-397997 rhn-package-397998 rhn-package-397999 rhn-package-398000 rhn-package-398001 rhn-package-398002 rhn-package-398003 rhn-package-398004 rhn-package-398715 rhn-package-398716 rhn-package-398717 rhn-package-398718 rhn-package-398719 rhn-package-398720 rhn-package-398721 rhn-package-398722 rhn-package-398723 rhn-package-398725 rhn-package-398726 rhn-package-398727 rhn-package-398728 rhn-package-398729 rhn-package-398730 rhn-package-398731 rhn-package-398732 rhn-package-398733 rhn-package-398734 rhn-package-398735 rhn-package-398736 rhn-package-398737 rhn-package-398738 rhn-package-398739 rhn-package-398740 rhn-package-398741 rhn-package-398742 rhn-package-398743 rhn-package-398744 rhn-package-398745 rhn-package-398746 rhn-package-398747 rhn-package-398748 rhn-package-398749 rhn-package-398750 rhn-package-398751 rhn-package-398752 rhn-package-398753 rhn-package-398754 rhn-package-398755 rhn-package-398756 rhn-package-398757 rhn-package-398758 rhn-package-398759 rhn-package-398760 rhn-package-398761 rhn-package-398762 rhn-package-398763 rhn-package-398764 rhn-package-398765 rhn-package-398767 rhn-package-398768 rhn-package-398769 rhn-package-398770 rhn-package-398771 rhn-package-398772 rhn-package-398773 rhn-package-398774 rhn-package-398775 rhn-package-398776 rhn-package-398777 rhn-package-398778 rhn-package-398779 rhn-package-398780 rhn-package-398781 rhn-package-398782 rhn-package-398783 rhn-package-398784 rhn-package-398785 rhn-package-398786 rhn-package-398787 rhn-package-398788 rhn-package-398789 rhn-package-398790 rhn-package-398791 rhn-package-398792 rhn-package-398793 rhn-package-398794 rhn-package-398795 rhn-package-398796 rhn-package-398797 rhn-package-398798 rhn-package-398799 rhn-package-398800 rhn-package-398801 rhn-package-398802 rhn-package-398803 rhn-package-398804 rhn-package-398805 rhn-package-398806 rhn-package-398807 rhn-package-398808 rhn-package-398809 rhn-package-398810 rhn-package-398811 rhn-package-398812 rhn-package-398813 rhn-package-398814 rhn-package-398815 rhn-package-398816 rhn-package-398817 rhn-package-398818 rhn-package-398819 rhn-package-398820 rhn-package-398821 rhn-package-398822 rhn-package-398823 rhn-package-398824 rhn-package-398825 rhn-package-398826 rhn-package-398827 rhn-package-398828 rhn-package-398829 rhn-package-398830 rhn-package-398831 rhn-package-398832 rhn-package-398833 rhn-package-398834 rhn-package-398835 rhn-package-398836 rhn-package-398837 rhn-package-398838 rhn-package-398839 rhn-package-398840 rhn-package-398841 rhn-package-398842 rhn-package-398843 rhn-package-398844 rhn-package-398845 rhn-package-398846 rhn-package-398847 rhn-package-398848 rhn-package-398849 rhn-package-398850 rhn-package-398851 rhn-package-398852 rhn-package-398853 rhn-package-398854 rhn-package-398855 rhn-package-398856 rhn-package-398857 rhn-package-398858 rhn-package-398859 rhn-package-398860 rhn-package-398861 rhn-package-398862 rhn-package-398863 rhn-package-398864 rhn-package-398865 rhn-package-398866 rhn-package-398867 rhn-package-398868 rhn-package-398869 rhn-package-398870 rhn-package-398871 rhn-package-398872 rhn-package-398873 rhn-package-398874 rhn-package-398875 rhn-package-398876 rhn-package-398877 rhn-package-398878 rhn-package-398879 rhn-package-398880 rhn-package-405714 rhn-package-405715 rhn-package-405716 rhn-package-405717 rhn-package-405718 rhn-package-405729 rhn-package-405746 rhn-package-405764 rhn-package-405784 rhn-package-405801 rhn-package-405805 rhn-package-408794 rhn-package-408795 rhn-package-408796 rhn-package-408797 rhn-package-408798 rhn-package-408799 rhn-package-408800 rhn-package-408801 rhn-package-408802 rhn-package-408803 rhn-package-408804 rhn-package-409061 rhn-package-409062 rhn-package-409063 rhn-package-409064 rhn-package-409065 rhn-package-409066 rhn-package-409067 rhn-package-409068 rhn-package-409069 rhn-package-409070 rhn-package-409071 rhn-package-409072 rhn-package-416479 rhn-package-428323 rhn-package-428324 rhn-package-428325 rhn-package-428326 rhn-package-428327 rhn-package-428328 rhn-package-428329 rhn-package-428330 rhn-package-428331 rhn-package-428332 rhn-package-428333 rhn-package-438335 rhn-package-438336 rhn-package-438338 rhn-package-438340 rhn-package-438342 rhn-package-438344 rhn-package-438345 rhn-package-438346 rhn-package-438347 rhn-package-438348 rhn-package-438349 rhn-package-454517 rhn-package-454518 rhn-package-454519 rhn-package-454520 rhn-package-454521 rhn-package-454522 rhn-package-454523 rhn-package-454524 rhn-package-454525 rhn-package-454526 rhn-package-454527 rhn-package-464294 rhn-package-464549 rhn-package-465238 rhn-package-467939 rhn-package-471383 rhn-package-482361 rhn-package-482362 rhn-package-482363 rhn-package-482364 rhn-package-482365 rhn-package-482366 rhn-package-482367 rhn-package-482368 rhn-package-482369 rhn-package-482370 rhn-package-482371 rhn-package-491636 rhn-package-491638 rhn-package-491639 rhn-package-491640 rhn-package-491642 rhn-package-491643 rhn-package-491645 rhn-package-491646 rhn-package-491647 rhn-package-491648 rhn-package-491649 rhn-package-491650 rhn-package-491651 rhn-package-491652 rhn-package-491751 rhn-package-491753 rhn-package-491761 rhn-package-491762 rhn-package-491968 rhn-package-491969 rhn-package-495494 rhn-package-495495" channel-id="rhn-channel-6985"><rhn-channel-parent-channel>rhel-i386-server-5</rhn-channel-parent-channel><rhn-channel-basedir>/</rhn-channel-basedir><rhn-channel-name>Red Hat Network Tools for RHEL Server (v.5 32-bit x86)</rhn-channel-name><rhn-channel-summary>Red Hat Network Tools for RHEL 5 Server (i386)</rhn-channel-summary><rhn-channel-description><rhn-null/></rhn-channel-description><rhn-channel-gpg-key-url>file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release</rhn-channel-gpg-key-url><rhn-channel-receiving-updates>Y</rhn-channel-receiving-updates><rhn-channel-last-modified>1255334772</rhn-channel-last-modified><rhn-channel-product-name>rhn-tools</rhn-channel-product-name><rhn-channel-product-version>5</rhn-channel-product-version><rhn-channel-product-beta>N</rhn-channel-product-beta><rhn-channel-families><rhn-channel-family virt-sub-level-name="Virtualization free content group,Virtualization Platform free content group" channel-labels="rhn-tools-rhel-3-as-i386 rhn-tools-rhel-3-es-i386 rhn-tools-rhel-3-ws-i386 rhn-tools-redhat-linux-i386-9 rhn-tools-rhel-3-desktop-i386 rhn-tools-rhel-3-as-x86_64 rhn-tools-rhel-3-es-x86_64 rhn-tools-rhel-3-ws-x86_64 rhn-tools-rhel-3-desktop-x86_64 rhn-tools-rhel-4-as-i386 rhn-tools-rhel-4-es-i386 rhn-tools-rhel-4-ws-i386 rhn-tools-rhel-4-desktop-i386 rhn-tools-rhel-4-as-x86_64 rhn-tools-rhel-4-es-x86_64 rhn-tools-rhel-4-ws-x86_64 rhn-tools-rhel-4-desktop-x86_64 rhn-tools-rhel-3-as-ia64 rhn-tools-rhel-3-es-ia64 rhn-tools-rhel-3-ws-ia64 rhn-tools-rhel-4-as-ia64 rhn-tools-rhel-4-es-ia64 rhn-tools-rhel-4-ws-ia64 rhn-tools-rhel-i386-server-5 rhn-tools-rhel-x86_64-server-5 rhn-tools-rhel-ia64-server-5 rhn-tools-rhel-i386-client-5 rhn-tools-rhel-x86_64-client-5 rhn-tools-rhel-4-as-ppc rhn-tools-rhel-4-as-s390 rhn-tools-rhel-4-as-s390x rhn-tools-rhel-ppc-server-5 rhn-tools-rhel-s390x-server-5 rhn-tools-rhel-3-as-ppc rhn-tools-rhel-3-as-s390 rhn-tools-rhel-3-as-s390x" virt-sub-level-label="virtualization_free virtualization_platform_free" id="rhn-channel-family-1729" label="rhn-tools"/></rhn-channel-families><rhn-dists/><source-packages><source-package last-modified="1233329286" id="rhn-source-package-49388" source-rpm="perl-IO-stringy-2.109-11.el5.src.rpm"/><source-package last-modified="1233330261" id="rhn-source-package-49498" source-rpm="jabberpy-0.5-0.13.el5.src.rpm"/><source-package last-modified="1252523515" id="rhn-source-package-51516" source-rpm="spacewalk-ssl-cert-check-1.7-1.el5sat.src.rpm"/><source-package last-modified="1252523515" id="rhn-source-package-51526" source-rpm="spacewalk-certs-tools-0.5.5-6.el5sat.src.rpm"/><source-package last-modified="1252596930" id="rhn-source-package-51579" source-rpm="spacewalk-utils-0.5.1-8.el5sat.src.rpm"/></source-packages><rhn-channel-errata><erratum last-modified="1255334771" id="rhn-erratum-9245" advisory-name="RHEA-2009:1491"/></rhn-channel-errata><rhn-release/></rhn-channel></rhn-channels></rhn-satellite>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.errata.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.errata.xml
deleted file mode 100644
index 7d11fe4..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.errata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><rhn-satellite generation="2" version="3.4"><rhn-errata><rhn-erratum channels="rhel-i386-client-5 rhel-x86_64-client-5 rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5 rhel-s390x-server-5" advisory="RHSA-2007:0540-3" packages="rhn-package-410949 rhn-package-410950 rhn-package-410951 rhn-package-410952 rhn-package-422137 rhn-package-422138 rhn-package-422139 rhn-package-422140 rhn-package-422141 rhn-package-422142 rhn-package-422143 rhn-package-422144 rhn-package-422145 rhn-package-422146 rhn-package-422147 rhn-package-422148 rhn-package-422149 rhn-package-422150 rhn-package-422151 rhn-package-422152" id="rhn-erratum-6184" cve-names="CVE-2006-5052 CVE-2007-3102"><rhn-erratum-advisory-name>RHSA-2007:0540</rhn-erratum-advisory-name><rhn-erratum-advisory-rel>3</rhn-erratum-advisory-rel><rhn-erratum-advisory-type>Security Advisory</rhn-erratum-advisory-type><rhn-erratum-product>Red Hat Enterprise Linux</rhn-erratum-product><rhn-erratum-description>OpenSSH is OpenBSD's SSH (Secure SHell) protocol implementation. These
-packages include the core files necessary for both the OpenSSH client and
-server.
-
-A flaw was found in the way the ssh server wrote account names to the audit
-subsystem. An attacker could inject strings containing parts of audit
-messages, which could possibly mislead or confuse audit log parsing tools.
-(CVE-2007-3102)
-
-A flaw was found in the way the OpenSSH server processes GSSAPI
-authentication requests. When GSSAPI authentication was enabled in the
-OpenSSH server, a remote attacker was potentially able to determine if a
-username is valid. (CVE-2006-5052)
-
-The following bugs in SELinux MLS (Multi-Level Security) support has also
-been fixed in this update:
-
-* It was sometimes not possible to select a SELinux role and level when
-logging in using ssh.
-
-* If the user obtained a non-default SELinux role or level, the role change
-was not recorded in the audit subsystem.
-
-* In some cases, on labeled networks, sshd allowed logins from level ranges
-it should not allow.
-
-The updated packages also contain experimental support for using private
-keys stored in PKCS#11 tokens for client authentication. The support is
-provided through the NSS (Network Security Services) library.
-
-All users of openssh should upgrade to these updated packages, which
-contain patches to correct these issues.</rhn-erratum-description><rhn-erratum-synopsis>Moderate: openssh security and bug fix update</rhn-erratum-synopsis><rhn-erratum-topic>Updated openssh packages that fix a security issue and various bugs are now
-available.
-
-This update has been rated as having moderate security impact by the Red Hat
-Security Response Team.</rhn-erratum-topic><rhn-erratum-solution>Before applying this update, make sure that all previously-released
-errata relevant to your system have been applied.
-
-This update is available via Red Hat Network. Details on how to use
-the Red Hat Network to apply this update are available at
-http://kbase.redhat.com/faq/FAQ_58_10188
-</rhn-erratum-solution><rhn-erratum-refers-to>http://www.redhat.com/security/updates/classification/#moderate</rhn-erratum-refers-to><rhn-erratum-notes></rhn-erratum-notes><rhn-erratum-issue-date>1194411600</rhn-erratum-issue-date><rhn-erratum-update-date>1194411600</rhn-erratum-update-date><rhn-erratum-last-modified>1194452355</rhn-erratum-last-modified><rhn-erratum-keywords><rhn-erratum-keyword>GSSAPI</rhn-erratum-keyword><rhn-erratum-keyword>krb5</rhn-erratum-keyword><rhn-erratum-keyword>MLS</rhn-erratum-keyword><rhn-erratum-keyword>level</rhn-erratum-keyword><rhn-erratum-keyword>role</rhn-erratum-keyword><rhn-erratum-keyword>SELinux</rhn-erratum-keyword><rhn-erratum-keyword>NSS</rhn-erratum-keyword><rhn-erratum-keyword>token</rhn-erratum-keyword><rhn-erratum-keyword>audit</rhn-erratum-keyword></rhn-erratum-keywords><rhn-erratum-bugs><rhn-erratum-bug><rhn-erratum-bug-id>227733</rhn-erratum-bug-id><rhn-erratum-bug-summary>[LSPP] unable to ssh into a system as root/auditadm_r</rhn-erratum-bug-summary></rhn-erratum-bug><rhn-erratum-bug><rhn-erratum-bug-id>229278</rhn-erratum-bug-id><rhn-erratum-bug-summary>LSPP: ssh-mls allows a level through that it should not</rhn-erratum-bug-summary></rhn-erratum-bug><rhn-erratum-bug><rhn-erratum-bug-id>231695</rhn-erratum-bug-id><rhn-erratum-bug-summary>LSPP: user unable to ssh to system with user/role/level context</rhn-erratum-bug-summary></rhn-erratum-bug><rhn-erratum-bug><rhn-erratum-bug-id>234638</rhn-erratum-bug-id><rhn-erratum-bug-summary>CVE-2006-5052 GSSAPI information leak</rhn-erratum-bug-summary></rhn-erratum-bug><rhn-erratum-bug><rhn-erratum-bug-id>234951</rhn-erratum-bug-id><rhn-erratum-bug-summary>[LSPP] openssh server fails to parse level correctly</rhn-erratum-bug-summary></rhn-erratum-bug><rhn-erratum-bug><rhn-erratum-bug-id>248059</rhn-erratum-bug-id><rhn-erratum-bug-summary>CVE-2007-3102 audit logging of failed logins</rhn-erratum-bug-summary></rhn-erratum-bug></rhn-erratum-bugs><rhn-erratum-files><rhn-erratum-file channels="rhel-i386-client-5 rhel-x86_64-client-5" md5sum="153a17e8f011bde6d984ce73b92cebff" type="SRPM" source-package="rhn-package-source-43601" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/SRPMS/openssh-4.3p2-24.el5.src.rpm"/><rhn-erratum-file channels="rhel-i386-client-5" package="rhn-package-410949" md5sum="ba4d6b70e9de7860b5ebe370ca5cdf53" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/i386/openssh-4.3p2-24.el5.i386.rpm"/><rhn-erratum-file channels="rhel-i386-client-5" package="rhn-package-410950" md5sum="d7b28f340fe82d28660876ca6bcc0a35" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/i386/openssh-askpass-4.3p2-24.el5.i386.rpm"/><rhn-erratum-file channels="rhel-i386-client-5" package="rhn-package-410951" md5sum="c4216b9a462e5f0462096f1d9b6b8d5f" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/i386/openssh-clients-4.3p2-24.el5.i386.rpm"/><rhn-erratum-file channels="rhel-i386-client-5" package="rhn-package-410952" md5sum="9f17e3dfe06fbbed05f765abd6b2509a" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/i386/openssh-server-4.3p2-24.el5.i386.rpm"/><rhn-erratum-file channels="rhel-x86_64-client-5" package="rhn-package-422138" md5sum="67538525ad7cf2f1d310a429b44890c7" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/x86_64/openssh-4.3p2-24.el5.x86_64.rpm"/><rhn-erratum-file channels="rhel-x86_64-client-5" package="rhn-package-422151" md5sum="37118e168b7a55531459b4743d3522fb" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/x86_64/openssh-askpass-4.3p2-24.el5.x86_64.rpm"/><rhn-erratum-file channels="rhel-x86_64-client-5" package="rhn-package-422137" md5sum="6ce7070b90732f3c837df5cfc9287187" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/x86_64/openssh-clients-4.3p2-24.el5.x86_64.rpm"/><rhn-erratum-file channels="rhel-x86_64-client-5" package="rhn-package-422143" md5sum="a7141781bfe5f21f2fc5b192ebf6693e" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/x86_64/openssh-server-4.3p2-24.el5.x86_64.rpm"/><rhn-erratum-file channels="rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5 rhel-s390x-server-5" md5sum="153a17e8f011bde6d984ce73b92cebff" type="SRPM" source-package="rhn-package-source-43601" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/SRPMS/openssh-4.3p2-24.el5.src.rpm"/><rhn-erratum-file channels="rhel-i386-server-5" package="rhn-package-410949" md5sum="ba4d6b70e9de7860b5ebe370ca5cdf53" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/i386/openssh-4.3p2-24.el5.i386.rpm"/><rhn-erratum-file channels="rhel-i386-server-5" package="rhn-package-410950" md5sum="d7b28f340fe82d28660876ca6bcc0a35" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/i386/openssh-askpass-4.3p2-24.el5.i386.rpm"/><rhn-erratum-file channels="rhel-i386-server-5" package="rhn-package-410951" md5sum="c4216b9a462e5f0462096f1d9b6b8d5f" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/i386/openssh-clients-4.3p2-24.el5.i386.rpm"/><rhn-erratum-file channels="rhel-i386-server-5" package="rhn-package-410952" md5sum="9f17e3dfe06fbbed05f765abd6b2509a" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/i386/openssh-server-4.3p2-24.el5.i386.rpm"/><rhn-erratum-file channels="rhel-ia64-server-5" package="rhn-package-422150" md5sum="5a4b28d5af0be02b37e02ae0aed692aa" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ia64/openssh-4.3p2-24.el5.ia64.rpm"/><rhn-erratum-file channels="rhel-ia64-server-5" package="rhn-package-422149" md5sum="b2672d6bc6fbbd29414d23523631ac03" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ia64/openssh-askpass-4.3p2-24.el5.ia64.rpm"/><rhn-erratum-file channels="rhel-ia64-server-5" package="rhn-package-422142" md5sum="2e7e42fd888d7fb1a87531e3f7a58889" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ia64/openssh-clients-4.3p2-24.el5.ia64.rpm"/><rhn-erratum-file channels="rhel-ia64-server-5" package="rhn-package-422146" md5sum="e909c8bac59183dfe6f47f1e71c5306e" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ia64/openssh-server-4.3p2-24.el5.ia64.rpm"/><rhn-erratum-file channels="rhel-ppc-server-5" package="rhn-package-422152" md5sum="7c4fbb3d8e40b083acdbd6a5186e1db3" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ppc/openssh-4.3p2-24.el5.ppc.rpm"/><rhn-erratum-file channels="rhel-ppc-server-5" package="rhn-package-422145" md5sum="4f878a818e9fd07d16becbf66e35389f" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ppc/openssh-askpass-4.3p2-24.el5.ppc.rpm"/><rhn-erratum-file channels="rhel-ppc-server-5" package="rhn-package-422148" md5sum="9c31ff09ef6ca0a20bba14fb89c3e250" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ppc/openssh-clients-4.3p2-24.el5.ppc.rpm"/><rhn-erratum-file channels="rhel-ppc-server-5" package="rhn-package-422147" md5sum="3187b878bf79dc71e226ae8096f07081" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ppc/openssh-server-4.3p2-24.el5.ppc.rpm"/><rhn-erratum-file channels="rhel-s390x-server-5" package="rhn-package-422140" md5sum="f4c3b2d6c3b170376f0e3fce0b1f38ec" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/s390x/openssh-4.3p2-24.el5.s390x.rpm"/><rhn-erratum-file channels="rhel-s390x-server-5" package="rhn-package-422139" md5sum="ab38b48be3d112c5aa333296bd9cbc3f" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/s390x/openssh-askpass-4.3p2-24.el5.s390x.rpm"/><rhn-erratum-file channels="rhel-s390x-server-5" package="rhn-package-422144" md5sum="03643d364acf47e086c913c95dae8cb2" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/s390x/openssh-clients-4.3p2-24.el5.s390x.rpm"/><rhn-erratum-file channels="rhel-s390x-server-5" package="rhn-package-422141" md5sum="0d6286527c165d1df00ece5761fcefed" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/s390x/openssh-server-4.3p2-24.el5.s390x.rpm"/><rhn-erratum-file channels="rhel-x86_64-server-5" package="rhn-package-422138" md5sum="67538525ad7cf2f1d310a429b44890c7" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/x86_64/openssh-4.3p2-24.el5.x86_64.rpm"/><rhn-erratum-file channels="rhel-x86_64-server-5" package="rhn-package-422151" md5sum="37118e168b7a55531459b4743d3522fb" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/x86_64/openssh-askpass-4.3p2-24.el5.x86_64.rpm"/><rhn-erratum-file channels="rhel-x86_64-server-5" package="rhn-package-422137" md5sum="6ce7070b90732f3c837df5cfc9287187" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/x86_64/openssh-clients-4.3p2-24.el5.x86_64.rpm"/><rhn-erratum-file channels="rhel-x86_64-server-5" package="rhn-package-422143" md5sum="a7141781bfe5f21f2fc5b192ebf6693e" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/x86_64/openssh-server-4.3p2-24.el5.x86_64.rpm"/></rhn-erratum-files></rhn-erratum><rhn-erratum channels="rhel-i386-client-5 rhel-x86_64-client-5 rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5 rhel-s390x-server-5" advisory="RHEA-2007:0653-2" packages="rhn-package-422130 rhn-package-422131 rhn-package-422132 rhn-package-422133 rhn-package-422134" id="rhn-erratum-6182" cve-names=""><rhn-erratum-advisory-name>RHEA-2007:0653</rhn-erratum-advisory-name><rhn-erratum-advisory-rel>2</rhn-erratum-advisory-rel><rhn-erratum-advisory-type>Product Enhancement Advisory</rhn-erratum-advisory-type><rhn-erratum-product>Red Hat Enterprise Linux</rhn-erratum-product><rhn-erratum-description>RHEA-2007:0643 errata update libvirt to version 0.2.3, but that
-updated version also requires dnsmasq for virtual network support
-which was added in libvirt.</rhn-erratum-description><rhn-erratum-synopsis>New package dnsmasq</rhn-erratum-synopsis><rhn-erratum-topic>This errata adds a new package which is required by libvirt
-update to version 0.2.3.</rhn-erratum-topic><rhn-erratum-solution>Before applying this update, make sure that all previously-released
-errata relevant to your system have been applied.
-
-This update is available via Red Hat Network. Details on how to use
-the Red Hat Network to apply this update are available at
-http://kbase.redhat.com/faq/FAQ_58_10188</rhn-erratum-solution><rhn-erratum-refers-to></rhn-erratum-refers-to><rhn-erratum-notes></rhn-erratum-notes><rhn-erratum-issue-date>1194449155</rhn-erratum-issue-date><rhn-erratum-update-date>1194449155</rhn-erratum-update-date><rhn-erratum-last-modified>1194449155</rhn-erratum-last-modified><rhn-erratum-keywords/><rhn-erratum-bugs><rhn-erratum-bug><rhn-erratum-bug-id>244247</rhn-erratum-bug-id><rhn-erratum-bug-summary>Add dnsmasq package to RHEL</rhn-erratum-bug-summary></rhn-erratum-bug></rhn-erratum-bugs><rhn-erratum-files><rhn-erratum-file channels="rhel-i386-client-5 rhel-x86_64-client-5" md5sum="ebf541cf1c9a5ec87e6a19568bf7ab16" type="SRPM" source-package="rhn-package-source-44247" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/SRPMS/dnsmasq-2.39-2.el5.src.rpm"/><rhn-erratum-file channels="rhel-i386-client-5" package="rhn-package-422134" md5sum="940f7604d9c6875b7ca59aeb6b2f0ada" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/i386/dnsmasq-2.39-2.el5.i386.rpm"/><rhn-erratum-file channels="rhel-x86_64-client-5" package="rhn-package-422130" md5sum="b586f231718aa47792196fb4d7fdf20b" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/x86_64/dnsmasq-2.39-2.el5.x86_64.rpm"/><rhn-erratum-file channels="rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5 rhel-s390x-server-5" md5sum="ebf541cf1c9a5ec87e6a19568bf7ab16" type="SRPM" source-package="rhn-package-source-44247" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/SRPMS/dnsmasq-2.39-2.el5.src.rpm"/><rhn-erratum-file channels="rhel-i386-server-5" package="rhn-package-422134" md5sum="940f7604d9c6875b7ca59aeb6b2f0ada" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/i386/dnsmasq-2.39-2.el5.i386.rpm"/><rhn-erratum-file channels="rhel-ia64-server-5" package="rhn-package-422133" md5sum="8fc68ea1078f33dea9fee16daf51136a" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ia64/dnsmasq-2.39-2.el5.ia64.rpm"/><rhn-erratum-file channels="rhel-ppc-server-5" package="rhn-package-422132" md5sum="af86b03762d044c780f1b4f0136be18a" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/ppc/dnsmasq-2.39-2.el5.ppc.rpm"/><rhn-erratum-file channels="rhel-s390x-server-5" package="rhn-package-422131" md5sum="4b33f1fe6e075b242c07e4935609efdd" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/s390x/dnsmasq-2.39-2.el5.s390x.rpm"/><rhn-erratum-file channels="rhel-x86_64-server-5" package="rhn-package-422130" md5sum="b586f231718aa47792196fb4d7fdf20b" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/x86_64/dnsmasq-2.39-2.el5.x86_64.rpm"/></rhn-erratum-files></rhn-erratum><rhn-erratum channels="rhel-i386-client-5 rhel-x86_64-client-5 rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5 rhel-s390x-server-5" advisory="RHBA-2007:0748-11" packages="rhn-package-422136" id="rhn-erratum-6183" cve-names=""><rhn-erratum-advisory-name>RHBA-2007:0748</rhn-erratum-advisory-name><rhn-erratum-advisory-rel>11</rhn-erratum-advisory-rel><rhn-erratum-advisory-type>Bug Fix Advisory</rhn-erratum-advisory-type><rhn-erratum-product>Red Hat Enterprise Linux</rhn-erratum-product><rhn-erratum-description>The booty package contains a python library which provides an interface for
-the creation of boot loader configuration files and the addition of stanzas
-to said configuration files. These boot loader configuration files are used
-by the anaconda installer.
-
-This updated package fixes the following bugs:
-
-* the "vmm=" line was missing in elilo.conf after installing Red Hat
-Enterprise Linux 5, with Xen virtualization packages selected, on Itanium
-architectures. This resulted in a kernel which was un-bootable. However,
-manually installing the kernel-xen RPM resolved this issue. The elilo.conf
-file is correctly created in this updated package.
-
-* in the previous package, booty incorrectly used disk names for all
-devices, causing boot failures in certain SCSI environments. In this
-updated package booty correctly uses disk names or labels depending on the
-device, which resolves this issue.
-
-All booty users should upgrade to this updated package, which resolves
-these issues.</rhn-erratum-description><rhn-erratum-synopsis>booty bug fix update</rhn-erratum-synopsis><rhn-erratum-topic>An updated booty package that fixes several bugs is now available.</rhn-erratum-topic><rhn-erratum-solution>Before applying this update, make sure that all previously-released
-errata relevant to your system have been applied.
-
-This update is available via Red Hat Network. Details on how to use
-the Red Hat Network to apply this update are available at
-http://kbase.redhat.com/faq/FAQ_58_10188</rhn-erratum-solution><rhn-erratum-refers-to></rhn-erratum-refers-to><rhn-erratum-notes></rhn-erratum-notes><rhn-erratum-issue-date>1194449155</rhn-erratum-issue-date><rhn-erratum-update-date>1194449155</rhn-erratum-update-date><rhn-erratum-last-modified>1194449155</rhn-erratum-last-modified><rhn-erratum-keywords/><rhn-erratum-bugs><rhn-erratum-bug><rhn-erratum-bug-id>250631</rhn-erratum-bug-id><rhn-erratum-bug-summary>[RHEL5.1 Beta] booty: not using LABEL for non-dm devices causes boot failure</rhn-erratum-bug-summary></rhn-erratum-bug></rhn-erratum-bugs><rhn-erratum-files><rhn-erratum-file channels="rhel-i386-client-5 rhel-x86_64-client-5" md5sum="532e2e85384916e5b35a81d54e3d29d8" type="SRPM" source-package="rhn-package-source-44248" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/SRPMS/booty-0.80.4-5.src.rpm"/><rhn-erratum-file channels="rhel-i386-client-5 rhel-x86_64-client-5" package="rhn-package-422136" md5sum="504644ee5352554dd01ec5a12d23806f" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Client/en/os/noarch/booty-0.80.4-5.noarch.rpm"/><rhn-erratum-file channels="rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5 rhel-s390x-server-5" md5sum="532e2e85384916e5b35a81d54e3d29d8" type="SRPM" source-package="rhn-package-source-44248" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/SRPMS/booty-0.80.4-5.src.rpm"/><rhn-erratum-file channels="rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5 rhel-s390x-server-5" package="rhn-package-422136" md5sum="504644ee5352554dd01ec5a12d23806f" type="RPM" filename="/ftp/pub/redhat/linux/enterprise/5Server/en/os/noarch/booty-0.80.4-5.noarch.rpm"/></rhn-erratum-files></rhn-erratum></rhn-errata></rhn-satellite>
\ No newline at end of file
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.kickstartable_trees.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.kickstartable_trees.xml
deleted file mode 100644
index 6b8cd36..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.kickstartable_trees.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><rhn-satellite generation="2" version="3.4"><rhn-kickstartable-trees><rhn-kickstartable-tree kstree-type-name="RHN managed kickstart tree" boot-image="ks-rhel-i386-server-5" kstree-type-label="rhn-managed" label="ks-rhel-i386-server-5" last-modified="1173886817" install-type-name="Red Hat Enterprise Linux 5" base-path="rhn/kickstart/ks-rhel-i386-server-5" install-type-label="rhel_5" channel="rhel-i386-server-5"><rhn-kickstart-files><rhn-kickstart-file file-size="106" md5sum="841785cfe376f4dba326bd0093c1e00d" relative-path=".discinfo" last-modified="1170972066"/><rhn-kickstart-file file-size="94015" md5sum="ec684182a5c3b825b464e807994fadcf" relative-path="Cluster/repodata/comps-rhel5-cluster.xml" last-modified="1170970869"/><rhn-kickstart-file file-size="117250" md5sum="9dd9f3bbafeecd409b36b7fd4a468c12" relative-path="Cluster/repodata/filelists.xml.gz" last-modified="1170970868"/><rhn-kickstart-file file-size="16824" md5sum="91962913bcb5b05735a5003773ab28d1" relative-path="Cluster/repodata/other.xml.gz" last-modified="1170970868"/><rhn-kickstart-file file-size="6482" md5sum="7817dd61d412ddcb94e8beae89f11d3f" relative-path="Cluster/repodata/primary.xml.gz" last-modified="1170970868"/><rhn-kickstart-file file-size="1154" md5sum="b5881c72af7e97167e0515ee07e666af" relative-path="Cluster/repodata/repomd.xml" last-modified="1170970869"/><rhn-kickstart-file file-size="101395" md5sum="747973d171ef767b4aa25711ce8dcf24" relative-path="ClusterStorage/repodata/comps-rhel5-cluster-st.xml" last-modified="1170970870"/><rhn-kickstart-file file-size="9570" md5sum="717a1b6ee267c15d1dc7d084f1d8f33b" relative-path="ClusterStorage/repodata/filelists.xml.gz" last-modified="1170970870"/><rhn-kickstart-file file-size="5600" md5sum="1e86d4bcac318222c04dad1933b58e2d" relative-path="ClusterStorage/repodata/other.xml.gz" last-modified="1170970870"/><rhn-kickstart-file file-size="4259" md5sum="66ab1dd4e02e4e0f8655d3ee2489c18a" relative-path="ClusterStorage/repodata/primary.xml.gz" last-modified="1170970870"/><rhn-kickstart-file file-size="1157" md5sum="cf7fafc1bb78728992f939ae258fb80b" relative-path="ClusterStorage/repodata/repomd.xml" last-modified="1170970870"/><rhn-kickstart-file file-size="8446" md5sum="4cb33358ca64e87f7650525747bebd67" relative-path="EULA" last-modified="1169685515"/><rhn-kickstart-file file-size="18416" md5sum="6ebd41aa30b178eacb885447b1682e2d" relative-path="GPL" last-modified="1164927216"/><rhn-kickstart-file file-size="15844" md5sum="89b8d966b6744a90fd237ba690e1ad24" relative-path="README-as.html" last-modified="1170918994"/><rhn-kickstart-file file-size="16795" md5sum="8b5efa2873fd89f16a1c26e4d488acba" relative-path="README-bn.html" last-modified="1170918994"/><rhn-kickstart-file file-size="11106" md5sum="939494cc19ae7ae44d61c7eee3bcb33c" relative-path="README-de.html" last-modified="1170918994"/><rhn-kickstart-file file-size="8223" md5sum="2474ef93cd5585f4189f147ed9e3fd9d" relative-path="README-en" last-modified="1170918994"/><rhn-kickstart-file file-size="10684" md5sum="474e41a8543be8299f901f37c5a20d65" relative-path="README-en.html" last-modified="1170918994"/><rhn-kickstart-file file-size="11068" md5sum="36b659ec60d757912670ec999759b59a" relative-path="README-es.html" last-modified="1170918994"/><rhn-kickstart-file file-size="11521" md5sum="6c5dc0507568700caee4170028796f9a" relative-path="README-fr.html" last-modified="1170918994"/><rhn-kickstart-file file-size="15918" md5sum="6d9546b44363f0ecdea6cd95e688782c" relative-path="README-gu.html" last-modified="1170918994"/><rhn-kickstart-file file-size="15874" md5sum="a92b3128cfc1aba2ffb410b5d02b7007" relative-path="README-hi.html" last-modified="1170918994"/><rhn-kickstart-file file-size="11009" md5sum="8ad52afbc7811522a98074f1802f6d95" relative-path="README-it.html" last-modified="1170918994"/><rhn-kickstart-file file-size="12138" md5sum="829aa28a21e12869d85a74c0683b96b2" relative-path="README-ja.html" last-modified="1170918994"/><rhn-kickstart-file file-size="17557" md5sum="d0072c511a0a81126106a1fe67b0f25d" relative-path="README-kn.html" last-modified="1170918994"/><rhn-kickstart-file file-size="11425" md5sum="dc0711284c7916cf20989d420a8641a1" relative-path="README-ko.html" last-modified="1170918994"/><rhn-kickstart-file file-size="19092" md5sum="15d42061d4d57c43903988fc76243ac4" relative-path="README-ml.html" last-modified="1170918994"/><rhn-kickstart-file file-size="16076" md5sum="2909dc6009780f156510e68fb602aa6b" relative-path="README-mr.html" last-modified="1170918994"/><rhn-kickstart-file file-size="15000" md5sum="cdadb39ce087dc690c977f4d2438a4c1" relative-path="README-or.html" last-modified="1170918994"/><rhn-kickstart-file file-size="15733" md5sum="62efd7be12f9d220141368727e8ec830" relative-path="README-pa.html" last-modified="1170918994"/><rhn-kickstart-file file-size="11259" md5sum="96ac843f83897013431a191da0206769" relative-path="README-pt_BR.html" last-modified="1170918994"/><rhn-kickstart-file file-size="13336" md5sum="2abbd97ba6b7e1472d83a627f3225d0b" relative-path="README-ru.html" last-modified="1170918994"/><rhn-kickstart-file file-size="17676" md5sum="5ad6c67884f3391d3e6081b8d18c9a6a" relative-path="README-si.html" last-modified="1170918994"/><rhn-kickstart-file file-size="16846" md5sum="bcd04bc5e1a56810269fb2837eef9e52" relative-path="README-ta.html" last-modified="1170918994"/><rhn-kickstart-file file-size="15975" md5sum="2bc50cace3bea7790518c7980b874587" relative-path="README-te.html" last-modified="1170918994"/><rhn-kickstart-file file-size="9877" md5sum="cf85bfa6bcdaad5d131ac504227a449f" relative-path="README-zh_CN.html" last-modified="1170918994"/><rhn-kickstart-file file-size="9509" md5sum="a9d852d48b97360ed9880638cef90eee" relative-path="README-zh_TW.html" last-modified="1170918994"/><rhn-kickstart-file file-size="165142" md5sum="92fd7b1f1ca8cd8fd11a4c25e88c61b0" relative-path="RELEASE-NOTES-as.html" last-modified="1170918995"/><rhn-kickstart-file file-size="167823" md5sum="3eb7c4c8b748df59e46269c8f1636fe5" relative-path="RELEASE-NOTES-bn.html" last-modified="1170918994"/><rhn-kickstart-file file-size="101803" md5sum="9400f2e2fffc25067a42affb25c4d4ed" relative-path="RELEASE-NOTES-de.html" last-modified="1170918994"/><rhn-kickstart-file file-size="74003" md5sum="0713100f5b125d91e515641e5542892f" relative-path="RELEASE-NOTES-en" last-modified="1170918994"/><rhn-kickstart-file file-size="90454" md5sum="6dae3d3d6fc2b67a6804b6e00aeec454" relative-path="RELEASE-NOTES-en.html" last-modified="1170918994"/><rhn-kickstart-file file-size="98730" md5sum="2ecb921b9cfa19aeaccd18608f309efb" relative-path="RELEASE-NOTES-es.html" last-modified="1170918994"/><rhn-kickstart-file file-size="101233" md5sum="609d67f1c1d26d10229e435757a954b5" relative-path="RELEASE-NOTES-fr.html" last-modified="1170918994"/><rhn-kickstart-file file-size="159985" md5sum="5b67bb368c5d4e0a235ca3dc0554d131" relative-path="RELEASE-NOTES-gu.html" last-modified="1170918994"/><rhn-kickstart-file file-size="159436" md5sum="181b364349c4b966e55d75e0b1049438" relative-path="RELEASE-NOTES-hi.html" last-modified="1170918995"/><rhn-kickstart-file file-size="99388" md5sum="db9c24c15a3857119271adf4b1b54e51" relative-path="RELEASE-NOTES-it.html" last-modified="1170918994"/><rhn-kickstart-file file-size="111276" md5sum="d7722e01fc35261c41b1e19b335ef6e0" relative-path="RELEASE-NOTES-ja.html" last-modified="1170918994"/><rhn-kickstart-file file-size="178444" md5sum="cacfbf3e7dc922863c9c6048dd7201d7" relative-path="RELEASE-NOTES-kn.html" last-modified="1170918995"/><rhn-kickstart-file file-size="103821" md5sum="ffbda6011e5729972532ebff86eda691" relative-path="RELEASE-NOTES-ko.html" last-modified="1170918994"/><rhn-kickstart-file file-size="197034" md5sum="d13ce7c7992f0314c27fc2c821333bc8" relative-path="RELEASE-NOTES-ml.html" last-modified="1170918995"/><rhn-kickstart-file file-size="158262" md5sum="8391401b592d3aa63e655c90cbe8c95f" relative-path="RELEASE-NOTES-mr.html" last-modified="1170918995"/><rhn-kickstart-file file-size="179204" md5sum="c7a6e81dc13143f99647aa9438435c5a" relative-path="RELEASE-NOTES-or.html" last-modified="1170918995"/><rhn-kickstart-file file-size="148581" md5sum="4d5aee93db57d1c718b5329356d71031" relative-path="RELEASE-NOTES-pa.html" last-modified="1170918995"/><rhn-kickstart-file file-size="98366" md5sum="8bb4c41c91876f5fe42bdceaac7f7bee" relative-path="RELEASE-NOTES-pt_BR.html" last-modified="1170918994"/><rhn-kickstart-file file-size="126621" md5sum="f3ee2715f04b3f41a0fc2bc21b569ecf" relative-path="RELEASE-NOTES-ru.html" last-modified="1170918995"/><rhn-kickstart-file file-size="162604" md5sum="fe393f24f46f035c50066af937f11144" relative-path="RELEASE-NOTES-si.html" last-modified="1170918995"/><rhn-kickstart-file file-size="171699" md5sum="9692dd09915a67b33dc7c77b5050c1c0" relative-path="RELEASE-NOTES-ta.html" last-modified="1170918995"/><rhn-kickstart-file file-size="157585" md5sum="c3cd9d8cc97c1503c3eaed0382be4c2e" relative-path="RELEASE-NOTES-te.html" last-modified="1170918995"/><rhn-kickstart-file file-size="84449" md5sum="c5999ab566efc0d98b96d717d8e9df38" relative-path="RELEASE-NOTES-zh_CN.html" last-modified="1170918994"/><rhn-kickstart-file file-size="84935" md5sum="1ef1b8eed42b11704d30e44969e39120" relative-path="RELEASE-NOTES-zh_TW.html" last-modified="1170918994"/><rhn-kickstart-file file-size="1519" md5sum="520b0c2f4facfd6ade56d8d3a1b65b54" relative-path="RPM-GPG-KEY-fedora" last-modified="1170964681"/><rhn-kickstart-file file-size="1076" md5sum="3242a0503a13c486774b351c85cd2d0f" relative-path="RPM-GPG-KEY-fedora-test" last-modified="1170964681"/><rhn-kickstart-file file-size="1175" md5sum="93fd979bd3914c8b4869341e5b3be99a" relative-path="RPM-GPG-KEY-redhat-auxiliary" last-modified="1170964681"/><rhn-kickstart-file file-size="1706" md5sum="05d14366dda35935da2b24615cf195fd" relative-path="RPM-GPG-KEY-redhat-beta" last-modified="1170964681"/><rhn-kickstart-file file-size="1990" md5sum="a2c32b687d6a0030389ad106d82e7c58" relative-path="RPM-GPG-KEY-redhat-former" last-modified="1170964682"/><rhn-kickstart-file file-size="1164" md5sum="1a302af4852763e81054e40792a3d69a" relative-path="RPM-GPG-KEY-redhat-release" last-modified="1170964682"/><rhn-kickstart-file file-size="928710" md5sum="fbf1f3f9808d0c834fd1ca01b3dab24c" relative-path="Server/repodata/comps-rhel5-server-core.xml" last-modified="1170971410"/><rhn-kickstart-file file-size="2269824" md5sum="e9fe59786398d96497cb3e16db025437" relative-path="Server/repodata/filelists.xml.gz" last-modified="1170971407"/><rhn-kickstart-file file-size="5368367" md5sum="7337e7bc990ea940673c245d48627a69" relative-path="Server/repodata/other.xml.gz" last-modified="1170971407"/><rhn-kickstart-file file-size="734715" md5sum="0148d07d87e6bf4f9ffd1cfbb29601f4" relative-path="Server/repodata/primary.xml.gz" last-modified="1170971407"/><rhn-kickstart-file file-size="1158" md5sum="5b75b4ce1bf58245dbbdd7fce4bc31e9" relative-path="Server/repodata/repomd.xml" last-modified="1170971410"/><rhn-kickstart-file file-size="96133" md5sum="08df2b8a53ac1c0c6e96e10553a8d414" relative-path="VT/repodata/comps-rhel5-vt.xml" last-modified="1170970882"/><rhn-kickstart-file file-size="21498" md5sum="9285597e5f99a4e9e94d72a36045e042" relative-path="VT/repodata/filelists.xml.gz" last-modified="1170970882"/><rhn-kickstart-file file-size="20550" md5sum="12ee18e430f4b519578e8d1540cc3791" relative-path="VT/repodata/other.xml.gz" last-modified="1170970882"/><rhn-kickstart-file file-size="6113" md5sum="707761f304079e5d85148369d838dd2e" relative-path="VT/repodata/primary.xml.gz" last-modified="1170970882"/><rhn-kickstart-file file-size="1149" md5sum="dc82742d217cd9be8eca5f245197bd95" relative-path="VT/repodata/repomd.xml" last-modified="1170970882"/><rhn-kickstart-file file-size="8446" md5sum="4cb33358ca64e87f7650525747bebd67" relative-path="eula.en_US" last-modified="1170964681"/><rhn-kickstart-file file-size="675" md5sum="4e18b254951642c3b04c4710d3c2f9c1" relative-path="images/README" last-modified="1170969892"/><rhn-kickstart-file file-size="7217152" md5sum="1d31b9b01f7f3553a9454edf6d263f5f" relative-path="images/boot.iso" last-modified="1170969909"/><rhn-kickstart-file file-size="12582912" md5sum="c844e3db1610ce313d40c0d33bd1a0c8" relative-path="images/diskboot.img" last-modified="1170969911"/><rhn-kickstart-file file-size="33239040" md5sum="a3155c2f4e506351b70006e95ac25655" relative-path="images/minstg2.img" last-modified="1170970022"/><rhn-kickstart-file file-size="290" md5sum="08318804cdaeba5f21807c934b7278ba" relative-path="images/pxeboot/README" last-modified="1170969911"/><rhn-kickstart-file file-size="4918676" md5sum="718e1ac008fad654f3db14da663a0de2" relative-path="images/pxeboot/initrd.img" last-modified="1170969906"/><rhn-kickstart-file file-size="1765460" md5sum="27eec540988a3f639872288f2a093b59" relative-path="images/pxeboot/vmlinuz" last-modified="1170969906"/><rhn-kickstart-file file-size="81727488" md5sum="73d44c9ca5aa14571c7774dbe597eaf8" relative-path="images/stage2.img" last-modified="1170970116"/><rhn-kickstart-file file-size="4953304" md5sum="367bcaf30b0a411d6b1519947b927542" relative-path="images/xen/initrd.img" last-modified="1170969922"/><rhn-kickstart-file file-size="2076303" md5sum="883f29c8de5488c80f99677247e55b01" relative-path="images/xen/vmlinuz" last-modified="1170969923"/><rhn-kickstart-file file-size="292" md5sum="f102510e5ef9241332a0b0b8bc77d27b" relative-path="isolinux/boot.msg" last-modified="1170969909"/><rhn-kickstart-file file-size="919" md5sum="ed9918e3f92726f1b2de46ff68d75fb2" relative-path="isolinux/general.msg" last-modified="1170969909"/><rhn-kickstart-file file-size="4918676" md5sum="718e1ac008fad654f3db14da663a0de2" relative-path="isolinux/initrd.img" last-modified="1170969906"/><rhn-kickstart-file file-size="10648" md5sum="74a615574666ded1dabe357d93ad3a2a" relative-path="isolinux/isolinux.bin" last-modified="1170973342"/><rhn-kickstart-file file-size="366" md5sum="b802a16ff1e63ba6fa4fa7ba1ca73136" relative-path="isolinux/isolinux.cfg" last-modified="1170969909"/><rhn-kickstart-file file-size="94600" md5sum="841ef6078b7346ed84fd82eca86c3804" relative-path="isolinux/memtest" last-modified="1170969909"/><rhn-kickstart-file file-size="817" md5sum="5818963971c3abeed2888d6416b1c50e" relative-path="isolinux/options.msg" last-modified="1170969909"/><rhn-kickstart-file file-size="517" md5sum="28a15223c7d456f22309beca1f1fec5a" relative-path="isolinux/param.msg" last-modified="1170969909"/><rhn-kickstart-file file-size="490" md5sum="e9ca42df80f26b4db565959ec8da25e5" relative-path="isolinux/rescue.msg" last-modified="1170969909"/><rhn-kickstart-file file-size="23107" md5sum="8de921af902b22579f99cbece6abe13c" relative-path="isolinux/splash.lss" last-modified="1170969909"/><rhn-kickstart-file file-size="1765460" md5sum="27eec540988a3f639872288f2a093b59" relative-path="isolinux/vmlinuz" last-modified="1170969906"/></rhn-kickstart-files></rhn-kickstartable-tree><rhn-kickstartable-tree kstree-type-name="RHN managed kickstart tree" boot-image="ks-rhel-i386-server-5-u1" kstree-type-label="rhn-managed" label="ks-rhel-i386-server-5-u1" last-modified="1195673036" install-type-name="Red Hat Enterprise Linux 5" base-path="rhn/kickstart/ks-rhel-i386-server-5-u1" install-type-label="rhel_5" channel="rhel-i386-server-5"><rhn-kickstart-files><rhn-kickstart-file file-size="106" md5sum="58a5ca2a33598e2c8c6b824bd920c58a" relative-path=".discinfo" last-modified="1192656534"/><rhn-kickstart-file file-size="97125" md5sum="e0ed57b896807eb487461558404102f4" relative-path="Cluster/repodata/comps-rhel5-cluster.xml" last-modified="1192655901"/><rhn-kickstart-file file-size="171643" md5sum="616004db323f33039067756a4afb1d17" relative-path="Cluster/repodata/filelists.xml.gz" last-modified="1192655900"/><rhn-kickstart-file file-size="17529" md5sum="ac25ecd2be016465e85d8950eaa156a6" relative-path="Cluster/repodata/other.xml.gz" last-modified="1192655900"/><rhn-kickstart-file file-size="6109" md5sum="5b0124ed79431888e9387a2f12ce9826" relative-path="Cluster/repodata/primary.xml.gz" last-modified="1192655900"/><rhn-kickstart-file file-size="1154" md5sum="8974351082752d0b0dba657f212fa375" relative-path="Cluster/repodata/repomd.xml" last-modified="1192655901"/><rhn-kickstart-file file-size="104067" md5sum="086e86cedab807ef5b058c35fc9f2dca" relative-path="ClusterStorage/repodata/comps-rhel5-cluster-st.xml" last-modified="1192655710"/><rhn-kickstart-file file-size="55407" md5sum="b8685203666bc1147919eaa8c46e0084" relative-path="ClusterStorage/repodata/filelists.xml.gz" last-modified="1192655709"/><rhn-kickstart-file file-size="6392" md5sum="a7566e13bb95fe6f73ed808ba53b9214" relative-path="ClusterStorage/repodata/other.xml.gz" last-modified="1192655709"/><rhn-kickstart-file file-size="7991" md5sum="5664b3a73589035302e084131b9c115a" relative-path="ClusterStorage/repodata/primary.xml.gz" last-modified="1192655709"/><rhn-kickstart-file file-size="1157" md5sum="c745e3900729c3e984928aca9678ea80" relative-path="ClusterStorage/repodata/repomd.xml" last-modified="1192655710"/><rhn-kickstart-file file-size="8446" md5sum="4cb33358ca64e87f7650525747bebd67" relative-path="EULA" last-modified="1169685515"/><rhn-kickstart-file file-size="18416" md5sum="6ebd41aa30b178eacb885447b1682e2d" relative-path="GPL" last-modified="1164927216"/><rhn-kickstart-file file-size="15844" md5sum="1e27ceeb8ccb1536f176ad0c8d9255eb" relative-path="README-as.html" last-modified="1190179390"/><rhn-kickstart-file file-size="16795" md5sum="6a4d236bd65e68cc85d65df935b90a8f" relative-path="README-bn.html" last-modified="1190179390"/><rhn-kickstart-file file-size="11106" md5sum="f7ec594c5136764a717b29fd5ad7af85" relative-path="README-de.html" last-modified="1190179390"/><rhn-kickstart-file file-size="8223" md5sum="2474ef93cd5585f4189f147ed9e3fd9d" relative-path="README-en" last-modified="1190179390"/><rhn-kickstart-file file-size="10684" md5sum="19a553d791a033076f812bffd18d14ba" relative-path="README-en.html" last-modified="1190179390"/><rhn-kickstart-file file-size="11068" md5sum="28ae11efadd98a34f15b23e51d1942dd" relative-path="README-es.html" last-modified="1190179390"/><rhn-kickstart-file file-size="11521" md5sum="14b40bacfffcd482afd7179fc5244a13" relative-path="README-fr.html" last-modified="1190179390"/><rhn-kickstart-file file-size="15918" md5sum="9a6d70721ef60323fc4ae43886dd613b" relative-path="README-gu.html" last-modified="1190179390"/><rhn-kickstart-file file-size="15874" md5sum="32ed019876033b754f6867e0150090de" relative-path="README-hi.html" last-modified="1190179390"/><rhn-kickstart-file file-size="11009" md5sum="4ba9239f7336c8995634a2593e3430ed" relative-path="README-it.html" last-modified="1190179390"/><rhn-kickstart-file file-size="12138" md5sum="ea6c14468ce2c24fbacedb0529bb5713" relative-path="README-ja.html" last-modified="1190179390"/><rhn-kickstart-file file-size="17557" md5sum="6f1b92e648044e48b22da338d4d2bf5a" relative-path="README-kn.html" last-modified="1190179390"/><rhn-kickstart-file file-size="11425" md5sum="18432e8660b6e287fbe1c2e6de564b61" relative-path="README-ko.html" last-modified="1190179390"/><rhn-kickstart-file file-size="19092" md5sum="458d6f742aaf726795c8ed72ae3be251" relative-path="README-ml.html" last-modified="1190179390"/><rhn-kickstart-file file-size="16076" md5sum="49d7ae9bd030a8a45fcb57cabfaf85c7" relative-path="README-mr.html" last-modified="1190179390"/><rhn-kickstart-file file-size="15000" md5sum="189dfc749cb76955b8480e2b8aba5863" relative-path="README-or.html" last-modified="1190179390"/><rhn-kickstart-file file-size="15733" md5sum="75c3b2d896e52378ccc55a500a1d5628" relative-path="README-pa.html" last-modified="1190179390"/><rhn-kickstart-file file-size="11259" md5sum="2d56aaea7ed3718aebbd16e9aba82b56" relative-path="README-pt_BR.html" last-modified="1190179390"/><rhn-kickstart-file file-size="13336" md5sum="1f299248daa6474ae90558ff1a66b29f" relative-path="README-ru.html" last-modified="1190179390"/><rhn-kickstart-file file-size="17676" md5sum="8f5e27dd0fce02edabaf3c9c981fb434" relative-path="README-si.html" last-modified="1190179390"/><rhn-kickstart-file file-size="16846" md5sum="e4987082e7fe0f6c4a7458dc2479859f" relative-path="README-ta.html" last-modified="1190179390"/><rhn-kickstart-file file-size="15975" md5sum="85997902461d99f7ea7d342fec865c79" relative-path="README-te.html" last-modified="1190179390"/><rhn-kickstart-file file-size="9877" md5sum="02eb70210445f53ad64400af03d700cf" relative-path="README-zh_CN.html" last-modified="1190179390"/><rhn-kickstart-file file-size="9509" md5sum="24cede9b5c263220d8f77e27e915654e" relative-path="README-zh_TW.html" last-modified="1190179390"/><rhn-kickstart-file file-size="126288" md5sum="70be1b50816891a1b9cfb548bc65d4db" relative-path="RELEASE-NOTES-U1-as.html" last-modified="1190179969"/><rhn-kickstart-file file-size="128381" md5sum="001bc3716b236eddf153f8d9e3f0e708" relative-path="RELEASE-NOTES-U1-bn.html" last-modified="1190179969"/><rhn-kickstart-file file-size="78456" md5sum="830695364440be30a59060a4ea5b8629" relative-path="RELEASE-NOTES-U1-de.html" last-modified="1190179969"/><rhn-kickstart-file file-size="52870" md5sum="f15effc9b25b6b655d5a6682d23ffbc1" relative-path="RELEASE-NOTES-U1-en" last-modified="1190179969"/><rhn-kickstart-file file-size="69474" md5sum="c1c1968f1d65207e6e2b5f7d077b5df5" relative-path="RELEASE-NOTES-U1-en.html" last-modified="1190179969"/><rhn-kickstart-file file-size="75997" md5sum="685a7839f5db0e343676e6c108263d2c" relative-path="RELEASE-NOTES-U1-es.html" last-modified="1190179969"/><rhn-kickstart-file file-size="79614" md5sum="ec1303e31913ea83f4042a636f981c8f" relative-path="RELEASE-NOTES-U1-fr.html" last-modified="1190179969"/><rhn-kickstart-file file-size="123731" md5sum="3c1be62d3fc7c53544cd81cb1c0f8e47" relative-path="RELEASE-NOTES-U1-gu.html" last-modified="1190179969"/><rhn-kickstart-file file-size="122328" md5sum="5aef82e96e3e2c2fb68c81f24464bcff" relative-path="RELEASE-NOTES-U1-hi.html" last-modified="1190179969"/><rhn-kickstart-file file-size="76805" md5sum="a0011f9d2f8164d5ac2778a0e6558a22" relative-path="RELEASE-NOTES-U1-it.html" last-modified="1190179969"/><rhn-kickstart-file file-size="88521" md5sum="4fc0ed644d3a8abd80ff0c896f586db0" relative-path="RELEASE-NOTES-U1-ja.html" last-modified="1190179969"/><rhn-kickstart-file file-size="136857" md5sum="e89622ac97d226d12d03aa44ffb2eaff" relative-path="RELEASE-NOTES-U1-kn.html" last-modified="1190179969"/><rhn-kickstart-file file-size="77775" md5sum="ea4905d3f40d630e8e204f505bf11127" relative-path="RELEASE-NOTES-U1-ko.html" last-modified="1190179969"/><rhn-kickstart-file file-size="153248" md5sum="5ea74c0b301fb58ec44e959f96e7d487" relative-path="RELEASE-NOTES-U1-ml.html" last-modified="1190179969"/><rhn-kickstart-file file-size="124043" md5sum="4f83b582e1956126dccce7e5b3c536db" relative-path="RELEASE-NOTES-U1-mr.html" last-modified="1190179969"/><rhn-kickstart-file file-size="137330" md5sum="19ff7e52036479eb66a5babeb864adcc" relative-path="RELEASE-NOTES-U1-or.html" last-modified="1190179969"/><rhn-kickstart-file file-size="115940" md5sum="be44345dd954086624d42667be114e52" relative-path="RELEASE-NOTES-U1-pa.html" last-modified="1190179969"/><rhn-kickstart-file file-size="75682" md5sum="1a4172938b80e72c143f6dfabff8dbcd" relative-path="RELEASE-NOTES-U1-pt_BR.html" last-modified="1190179969"/><rhn-kickstart-file file-size="97526" md5sum="3d80598ead2dcd97f6f509991f9b0567" relative-path="RELEASE-NOTES-U1-ru.html" last-modified="1190179969"/><rhn-kickstart-file file-size="118814" md5sum="389b5a1f974f5d75310cfcf50fe01544" relative-path="RELEASE-NOTES-U1-si.html" last-modified="1190179969"/><rhn-kickstart-file file-size="129737" md5sum="c7e8c212a33935566619ff8d6b6aae8a" relative-path="RELEASE-NOTES-U1-ta.html" last-modified="1190179969"/><rhn-kickstart-file file-size="120581" md5sum="a6411b0a88417d71c2aaf232c1bd14cc" relative-path="RELEASE-NOTES-U1-te.html" last-modified="1190179969"/><rhn-kickstart-file file-size="65716" md5sum="2556b7deaa18aa5eb369cfdb5a8266c5" relative-path="RELEASE-NOTES-U1-zh_CN.html" last-modified="1190179969"/><rhn-kickstart-file file-size="69307" md5sum="a7c244d2fab587fd0bf32753e28dbf05" relative-path="RELEASE-NOTES-U1-zh_TW.html" last-modified="1190179969"/><rhn-kickstart-file file-size="165043" md5sum="6af6f088d57859fd07b5974422ea3220" relative-path="RELEASE-NOTES-as.html" last-modified="1190179391"/><rhn-kickstart-file file-size="167818" md5sum="1d9bd15acdb936c123f62596fb28b379" relative-path="RELEASE-NOTES-bn.html" last-modified="1190179391"/><rhn-kickstart-file file-size="101803" md5sum="021847282eb9cdcd6dcfbf3531ed0471" relative-path="RELEASE-NOTES-de.html" last-modified="1190179390"/><rhn-kickstart-file file-size="73991" md5sum="822818907412cac0468fe0650f342502" relative-path="RELEASE-NOTES-en" last-modified="1190179390"/><rhn-kickstart-file file-size="90454" md5sum="78640a4da81852115f768d4ac9cb39a1" relative-path="RELEASE-NOTES-en.html" last-modified="1190179390"/><rhn-kickstart-file file-size="98732" md5sum="6fb33d4e20831f5d20028181f81aae67" relative-path="RELEASE-NOTES-es.html" last-modified="1190179390"/><rhn-kickstart-file file-size="101179" md5sum="04169f69a6f20890b6c405f7c7730057" relative-path="RELEASE-NOTES-fr.html" last-modified="1190179390"/><rhn-kickstart-file file-size="159985" md5sum="4c8c4cd9e0257eb3817d7b397e52424b" relative-path="RELEASE-NOTES-gu.html" last-modified="1190179391"/><rhn-kickstart-file file-size="159504" md5sum="7d2f13c6fa432c9b1c9bcaa1ae8ce5b9" relative-path="RELEASE-NOTES-hi.html" last-modified="1190179391"/><rhn-kickstart-file file-size="99309" md5sum="e9a131b457928fec1e738da615ae62e9" relative-path="RELEASE-NOTES-it.html" last-modified="1190179390"/><rhn-kickstart-file file-size="111270" md5sum="f0497058dac417fe4c458413f9970ccf" relative-path="RELEASE-NOTES-ja.html" last-modified="1190179390"/><rhn-kickstart-file file-size="178465" md5sum="28312d0e28ff31353800efa4cf28a109" relative-path="RELEASE-NOTES-kn.html" last-modified="1190179391"/><rhn-kickstart-file file-size="103896" md5sum="3127163cf8fa884d70599d80ae8021aa" relative-path="RELEASE-NOTES-ko.html" last-modified="1190179390"/><rhn-kickstart-file file-size="196919" md5sum="ca45ffb413f7b37739684029b6e3bc74" relative-path="RELEASE-NOTES-ml.html" last-modified="1190179391"/><rhn-kickstart-file file-size="158828" md5sum="564d6ef2fc4161be3d1f7da79592c31d" relative-path="RELEASE-NOTES-mr.html" last-modified="1190179391"/><rhn-kickstart-file file-size="179220" md5sum="be312fdd6735838079e65753432b386d" relative-path="RELEASE-NOTES-or.html" last-modified="1190179391"/><rhn-kickstart-file file-size="148452" md5sum="07b5f34d37dd598a21dd13e1a1f0ec01" relative-path="RELEASE-NOTES-pa.html" last-modified="1190179391"/><rhn-kickstart-file file-size="98396" md5sum="1984eebbdd278bf7143fd2d56a695881" relative-path="RELEASE-NOTES-pt_BR.html" last-modified="1190179390"/><rhn-kickstart-file file-size="126645" md5sum="6b6f3a088af93c799c423ae4bf24ee78" relative-path="RELEASE-NOTES-ru.html" last-modified="1190179391"/><rhn-kickstart-file file-size="163031" md5sum="50c7bbb1b8a3fe9722b0f41bcd8412e4" relative-path="RELEASE-NOTES-si.html" last-modified="1190179391"/><rhn-kickstart-file file-size="171699" md5sum="f84299bc2dafaed6e1af0363062533ee" relative-path="RELEASE-NOTES-ta.html" last-modified="1190179391"/><rhn-kickstart-file file-size="157572" md5sum="417cde300544bd7b041624b8cfd515d9" relative-path="RELEASE-NOTES-te.html" last-modified="1190179391"/><rhn-kickstart-file file-size="84444" md5sum="5d9ead5dd1172cb1c5293e77275e628f" relative-path="RELEASE-NOTES-zh_CN.html" last-modified="1190179390"/><rhn-kickstart-file file-size="84969" md5sum="e0f1dbfc20155ffd9e989009026a25ef" relative-path="RELEASE-NOTES-zh_TW.html" last-modified="1190179390"/><rhn-kickstart-file file-size="1706" md5sum="05d14366dda35935da2b24615cf195fd" relative-path="RPM-GPG-KEY-redhat-beta" last-modified="1187198714"/><rhn-kickstart-file file-size="1164" md5sum="1a302af4852763e81054e40792a3d69a" relative-path="RPM-GPG-KEY-redhat-release" last-modified="1187198714"/><rhn-kickstart-file file-size="944481" md5sum="029cbb9fff8b2cdadc6edea5482d6d29" relative-path="Server/repodata/comps-rhel5-server-core.xml" last-modified="1192655884"/><rhn-kickstart-file file-size="2316731" md5sum="ec2477dba4a4478d86e8f9db45f53fbd" relative-path="Server/repodata/filelists.xml.gz" last-modified="1192655883"/><rhn-kickstart-file file-size="5808041" md5sum="d600abf75e79e72f3dba9cab25e1b0c2" relative-path="Server/repodata/other.xml.gz" last-modified="1192655883"/><rhn-kickstart-file file-size="759520" md5sum="ef23594b2ab182de9f10d6631413b633" relative-path="Server/repodata/primary.xml.gz" last-modified="1192655883"/><rhn-kickstart-file file-size="1158" md5sum="9ea00d2c6ddb139a2c27016b902ba53e" relative-path="Server/repodata/repomd.xml" last-modified="1192655884"/><rhn-kickstart-file file-size="96878" md5sum="632b9db255c8c27d508fcada997f656d" relative-path="VT/repodata/comps-rhel5-vt.xml" last-modified="1192655731"/><rhn-kickstart-file file-size="25211" md5sum="9e092b029a43d649f298fd8f19ce0e4d" relative-path="VT/repodata/filelists.xml.gz" last-modified="1192655731"/><rhn-kickstart-file file-size="26606" md5sum="83c28a8c253c2c34cc3391586b2c8e70" relative-path="VT/repodata/other.xml.gz" last-modified="1192655731"/><rhn-kickstart-file file-size="9887" md5sum="35e98190a94fb1cd8d99f137aaa053a2" relative-path="VT/repodata/primary.xml.gz" last-modified="1192655731"/><rhn-kickstart-file file-size="1149" md5sum="c8459c98171450c757c4c5bea02a1993" relative-path="VT/repodata/repomd.xml" last-modified="1192655731"/><rhn-kickstart-file file-size="8446" md5sum="4cb33358ca64e87f7650525747bebd67" relative-path="eula.en_US" last-modified="1187198714"/><rhn-kickstart-file file-size="675" md5sum="4e18b254951642c3b04c4710d3c2f9c1" relative-path="images/README" last-modified="1192654577"/><rhn-kickstart-file file-size="7569408" md5sum="fea93a38bd96c71129c61b627e99b6db" relative-path="images/boot.iso" last-modified="1192654595"/><rhn-kickstart-file file-size="12582912" md5sum="2a9215af6955768971ec4f5d977154f9" relative-path="images/diskboot.img" last-modified="1192654597"/><rhn-kickstart-file file-size="37679104" md5sum="2f58e0e9b73d75f8efa47ac234734d98" relative-path="images/minstg2.img" last-modified="1192654711"/><rhn-kickstart-file file-size="290" md5sum="08318804cdaeba5f21807c934b7278ba" relative-path="images/pxeboot/README" last-modified="1192654597"/><rhn-kickstart-file file-size="5245144" md5sum="e8008b4db57c92d9d1428572aeab4167" relative-path="images/pxeboot/initrd.img" last-modified="1192654591"/><rhn-kickstart-file file-size="1791572" md5sum="5b455ea4ae9e43b48dc98a996cc28ce8" relative-path="images/pxeboot/vmlinuz" last-modified="1192654591"/><rhn-kickstart-file file-size="85213184" md5sum="dcd21daef0a3123f8d4019e118704248" relative-path="images/stage2.img" last-modified="1192654815"/><rhn-kickstart-file file-size="5288349" md5sum="8d1e325a2d3c6141fe41d3a214af0993" relative-path="images/xen/initrd.img" last-modified="1192654609"/><rhn-kickstart-file file-size="2106901" md5sum="afbe20296b52df3c962b5493d41f4d42" relative-path="images/xen/vmlinuz" last-modified="1192654609"/><rhn-kickstart-file file-size="292" md5sum="f102510e5ef9241332a0b0b8bc77d27b" relative-path="isolinux/boot.msg" last-modified="1192654594"/><rhn-kickstart-file file-size="919" md5sum="ed9918e3f92726f1b2de46ff68d75fb2" relative-path="isolinux/general.msg" last-modified="1192654594"/><rhn-kickstart-file file-size="5245144" md5sum="e8008b4db57c92d9d1428572aeab4167" relative-path="isolinux/initrd.img" last-modified="1192654591"/><rhn-kickstart-file file-size="10648" md5sum="a2019e02cf7f66435bcc3fe045457d63" relative-path="isolinux/isolinux.bin" last-modified="1192657685"/><rhn-kickstart-file file-size="366" md5sum="b802a16ff1e63ba6fa4fa7ba1ca73136" relative-path="isolinux/isolinux.cfg" last-modified="1192654594"/><rhn-kickstart-file file-size="94600" md5sum="841ef6078b7346ed84fd82eca86c3804" relative-path="isolinux/memtest" last-modified="1192654594"/><rhn-kickstart-file file-size="817" md5sum="5818963971c3abeed2888d6416b1c50e" relative-path="isolinux/options.msg" last-modified="1192654594"/><rhn-kickstart-file file-size="517" md5sum="28a15223c7d456f22309beca1f1fec5a" relative-path="isolinux/param.msg" last-modified="1192654594"/><rhn-kickstart-file file-size="490" md5sum="e9ca42df80f26b4db565959ec8da25e5" relative-path="isolinux/rescue.msg" last-modified="1192654594"/><rhn-kickstart-file file-size="23107" md5sum="8de921af902b22579f99cbece6abe13c" relative-path="isolinux/splash.lss" last-modified="1192654594"/><rhn-kickstart-file file-size="1791572" md5sum="5b455ea4ae9e43b48dc98a996cc28ce8" relative-path="isolinux/vmlinuz" last-modified="1192654591"/></rhn-kickstart-files></rhn-kickstartable-tree><rhn-kickstartable-tree kstree-type-name="RHN managed kickstart tree" boot-image="ks-rhel-i386-server-5-u2" kstree-type-label="rhn-managed" label="ks-rhel-i386-server-5-u2" last-modified="1212610374" install-type-name="Red Hat Enterprise Linux 5" base-path="rhn/kickstart/ks-rhel-i386-server-5-u2" install-type-label="rhel_5" channel="rhel-i386-server-5"><rhn-kickstart-files><rhn-kickstart-file file-size="91" md5sum="61d7169fa09fc432223a9b69e476fe1d" relative-path=".discinfo" last-modified="1212610120"/><rhn-kickstart-file file-size="436" md5sum="e9da6a971ce0080bb2d6750f14a3a19a" relative-path=".treeinfo" last-modified="1212610120"/><rhn-kickstart-file file-size="101836" md5sum="870d05b44e1d00395d6f54ef4e0b4d78" relative-path="Cluster/repodata/comps-rhel5-cluster.xml" last-modified="1212610120"/><rhn-kickstart-file file-size="171693" md5sum="16efc1ebed18be736e4b0e563924d4da" relative-path="Cluster/repodata/filelists.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="20484" md5sum="31b8fbaa30e87e170b71e7a84881db32" relative-path="Cluster/repodata/other.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="6184" md5sum="547f465404cedfcc6425cfc8eb9cb78b" relative-path="Cluster/repodata/primary.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="1154" md5sum="4f58ef04c21e67ad3357c350b9a25b26" relative-path="Cluster/repodata/repomd.xml" last-modified="1212610120"/><rhn-kickstart-file file-size="106338" md5sum="adbb3f192147ac5545acf4db364964ee" relative-path="ClusterStorage/repodata/comps-rhel5-cluster-st.xml" last-modified="1212610120"/><rhn-kickstart-file file-size="55721" md5sum="29e53e27d268d869ea6e6587cc57fe5e" relative-path="ClusterStorage/repodata/filelists.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="7146" md5sum="09c1e39b91f3cc33f21613a53cae831b" relative-path="ClusterStorage/repodata/other.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="8395" md5sum="620e61f737b9da749e72d96825b1e7c9" relative-path="ClusterStorage/repodata/primary.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="1157" md5sum="164a2dd73d5c49aebc844888747d3f7d" relative-path="ClusterStorage/repodata/repomd.xml" last-modified="1212610120"/><rhn-kickstart-file file-size="8446" md5sum="4cb33358ca64e87f7650525747bebd67" relative-path="EULA" last-modified="1212610131"/><rhn-kickstart-file file-size="18416" md5sum="6ebd41aa30b178eacb885447b1682e2d" relative-path="GPL" last-modified="1212610131"/><rhn-kickstart-file file-size="16353" md5sum="cd92ae62220e7e6ec7ace400a7b786d0" relative-path="README-as.html" last-modified="1212610131"/><rhn-kickstart-file file-size="17268" md5sum="8bdb4ca23e1413c37c85e1fc90db2368" relative-path="README-bn.html" last-modified="1212610131"/><rhn-kickstart-file file-size="11616" md5sum="1017b605642e57d00aa9b291e81c1a71" relative-path="README-de.html" last-modified="1212610131"/><rhn-kickstart-file file-size="8414" md5sum="27379a2f8e044fcf46ced155238a5903" relative-path="README-en" last-modified="1212610131"/><rhn-kickstart-file file-size="11226" md5sum="c33fabe2a3cd62d211595353acc9ccde" relative-path="README-en.html" last-modified="1212610131"/><rhn-kickstart-file file-size="11577" md5sum="b1de393423876c461b0ea872c33ad14f" relative-path="README-es.html" last-modified="1212610131"/><rhn-kickstart-file file-size="12030" md5sum="4db9227a05beca7b897f658389676459" relative-path="README-fr.html" last-modified="1212610131"/><rhn-kickstart-file file-size="16427" md5sum="320bd25afd01d0fdb6674552e60ab95c" relative-path="README-gu.html" last-modified="1212610131"/><rhn-kickstart-file file-size="16398" md5sum="73a5ed535d42a5f13c27b98592df3c37" relative-path="README-hi.html" last-modified="1212610131"/><rhn-kickstart-file file-size="11518" md5sum="0ddebf70311a5211cda3481ee256b140" relative-path="README-it.html" last-modified="1212610131"/><rhn-kickstart-file file-size="12647" md5sum="032a81162c2fea27aecd86f8aeab3b8a" relative-path="README-ja.html" last-modified="1212610131"/><rhn-kickstart-file file-size="18090" md5sum="e73b429fc014c0c1e74f14e09922165c" relative-path="README-kn.html" last-modified="1212610131"/><rhn-kickstart-file file-size="11934" md5sum="1e54dd36addbe29cbd5905ba3aa5a1fd" relative-path="README-ko.html" last-modified="1212610131"/><rhn-kickstart-file file-size="19574" md5sum="9a2f34c8376b26b353dcb9885c87901a" relative-path="README-ml.html" last-modified="1212610131"/><rhn-kickstart-file file-size="16585" md5sum="bf0fd3f73109f63a2051c34316a0a80f" relative-path="README-mr.html" last-modified="1212610131"/><rhn-kickstart-file file-size="15542" md5sum="40445a2d9986f34f267855476be5e953" relative-path="README-or.html" last-modified="1212610131"/><rhn-kickstart-file file-size="16266" md5sum="5cdf4972bb55f00c835bbb801360900a" relative-path="README-pa.html" last-modified="1212610131"/><rhn-kickstart-file file-size="11769" md5sum="05a8512827071623b4f024009afc921f" relative-path="README-pt_BR.html" last-modified="1212610131"/><rhn-kickstart-file file-size="13851" md5sum="682d89966202b8f15f04e2802ef12592" relative-path="README-ru.html" last-modified="1212610131"/><rhn-kickstart-file file-size="18163" md5sum="5871df981856a7c734284f34b5b74cef" relative-path="README-si.html" last-modified="1212610131"/><rhn-kickstart-file file-size="17376" md5sum="dd211a599da3c8554a94ff2543af1ec9" relative-path="README-ta.html" last-modified="1212610131"/><rhn-kickstart-file file-size="16484" md5sum="9d03b2cd15f0bcd5df42686ef5ea50a9" relative-path="README-te.html" last-modified="1212610131"/><rhn-kickstart-file file-size="10386" md5sum="c3991bf542cd6e9bd5898da0b7282bce" relative-path="README-zh_CN.html" last-modified="1212610131"/><rhn-kickstart-file file-size="10018" md5sum="2caff72de8a0e7571f95d932feb78eb1" relative-path="README-zh_TW.html" last-modified="1212610131"/><rhn-kickstart-file file-size="144711" md5sum="906a96ea3701c98ca8f7f509492db4b9" relative-path="RELEASE-NOTES-U1-as.html" last-modified="1212610131"/><rhn-kickstart-file file-size="146943" md5sum="0dc2e352c287212441ce7715bf7a96aa" relative-path="RELEASE-NOTES-U1-bn.html" last-modified="1212610131"/><rhn-kickstart-file file-size="89245" md5sum="0d1f455769a7d55d920eb9d11bae0723" relative-path="RELEASE-NOTES-U1-de.html" last-modified="1212610131"/><rhn-kickstart-file file-size="78974" md5sum="505d7b9dcd572df4ce1edc4f6b19550a" relative-path="RELEASE-NOTES-U1-en.html" last-modified="1212610131"/><rhn-kickstart-file file-size="86433" md5sum="0f2cdf3defc90e0602c80f19ac668c11" relative-path="RELEASE-NOTES-U1-es.html" last-modified="1212610131"/><rhn-kickstart-file file-size="88287" md5sum="23e091e76491e08cfe564fef531fd219" relative-path="RELEASE-NOTES-U1-fr.html" last-modified="1212610131"/><rhn-kickstart-file file-size="141296" md5sum="101326cbaf7a2941c367a6e6122ca50d" relative-path="RELEASE-NOTES-U1-gu.html" last-modified="1212610131"/><rhn-kickstart-file file-size="139619" md5sum="03855714e2587c741c35aca8222c198d" relative-path="RELEASE-NOTES-U1-hi.html" last-modified="1212610131"/><rhn-kickstart-file file-size="87176" md5sum="5c3e9734ce1b1b65429b93a00109c289" relative-path="RELEASE-NOTES-U1-it.html" last-modified="1212610131"/><rhn-kickstart-file file-size="100638" md5sum="483d89bab9329757ddbfb50c11d34df6" relative-path="RELEASE-NOTES-U1-ja.html" last-modified="1212610131"/><rhn-kickstart-file file-size="156388" md5sum="62e514824abc3e60c3e60a8a18bc703c" relative-path="RELEASE-NOTES-U1-kn.html" last-modified="1212610131"/><rhn-kickstart-file file-size="89046" md5sum="e77b3b69cbb1f5fa076fa1b06329944c" relative-path="RELEASE-NOTES-U1-ko.html" last-modified="1212610131"/><rhn-kickstart-file file-size="79029" md5sum="8ae9bfacfdefb0f9695622f3c0e9aff2" relative-path="RELEASE-NOTES-U1-ml.html" last-modified="1212610131"/><rhn-kickstart-file file-size="141209" md5sum="978cbb3f97830d938f3f76fe753ca9be" relative-path="RELEASE-NOTES-U1-mr.html" last-modified="1212610131"/><rhn-kickstart-file file-size="141153" md5sum="65822f14cb8a91aa0339af052051d6e4" relative-path="RELEASE-NOTES-U1-or.html" last-modified="1212610131"/><rhn-kickstart-file file-size="121279" md5sum="7ca0f97f3ab0f07ba085d86f33f245af" relative-path="RELEASE-NOTES-U1-pa.html" last-modified="1212610131"/><rhn-kickstart-file file-size="86210" md5sum="35311d215432fa4218f885fe8a034231" relative-path="RELEASE-NOTES-U1-pt_BR.html" last-modified="1212610131"/><rhn-kickstart-file file-size="110077" md5sum="0926b9ea451ad2921b1153a76af813e3" relative-path="RELEASE-NOTES-U1-ru.html" last-modified="1212610131"/><rhn-kickstart-file file-size="133781" md5sum="fea68c7a0ab778d04ea498f32965e644" relative-path="RELEASE-NOTES-U1-si.html" last-modified="1212610131"/><rhn-kickstart-file file-size="148909" md5sum="8cd7894201329152e0b767b44267cf72" relative-path="RELEASE-NOTES-U1-ta.html" last-modified="1212610131"/><rhn-kickstart-file file-size="140712" md5sum="c978ca2a48a040705cf4e917f61ab9a3" relative-path="RELEASE-NOTES-U1-te.html" last-modified="1212610131"/><rhn-kickstart-file file-size="74609" md5sum="720d00be372228fec5086e01c34d537d" relative-path="RELEASE-NOTES-U1-zh_CN.html" last-modified="1212610131"/><rhn-kickstart-file file-size="78021" md5sum="d252ea8292d20fd12f5a8f1aa8abd591" relative-path="RELEASE-NOTES-U1-zh_TW.html" last-modified="1212610131"/><rhn-kickstart-file file-size="90601" md5sum="d3ed976cc1686d4dea5590009a8ad905" relative-path="RELEASE-NOTES-U2-as.html" last-modified="1212610131"/><rhn-kickstart-file file-size="91260" md5sum="f2f765f8b37cb54c3ed34820afe5b378" relative-path="RELEASE-NOTES-U2-bn.html" last-modified="1212610132"/><rhn-kickstart-file file-size="80173" md5sum="ca1819ed960de7d5a4eb98e3a01a7e2a" relative-path="RELEASE-NOTES-U2-de.html" last-modified="1212610132"/><rhn-kickstart-file file-size="78329" md5sum="bcb413f634087c12183a79bbb58d3afa" relative-path="RELEASE-NOTES-U2-en.html" last-modified="1212610132"/><rhn-kickstart-file file-size="79514" md5sum="f41c59aa36c953e258341ae1cd4444db" relative-path="RELEASE-NOTES-U2-es.html" last-modified="1212610132"/><rhn-kickstart-file file-size="79998" md5sum="3937729d001aa995e5cfa2b2801aa407" relative-path="RELEASE-NOTES-U2-fr.html" last-modified="1212610132"/><rhn-kickstart-file file-size="90422" md5sum="0cb6274ea15a46ed952c56bd1f0520bc" relative-path="RELEASE-NOTES-U2-gu.html" last-modified="1212610132"/><rhn-kickstart-file file-size="90162" md5sum="adfd9ae13c756a9acfd4c8bacd562cab" relative-path="RELEASE-NOTES-U2-hi.html" last-modified="1212610132"/><rhn-kickstart-file file-size="79813" md5sum="a7494818db4a3c9f2ce0e3a0f2696eb6" relative-path="RELEASE-NOTES-U2-it.html" last-modified="1212610132"/><rhn-kickstart-file file-size="81997" md5sum="cb10acd2092d354d4b7eecd73999de06" relative-path="RELEASE-NOTES-U2-ja.html" last-modified="1212610132"/><rhn-kickstart-file file-size="93624" md5sum="e508f9295619846206b1df272886470c" relative-path="RELEASE-NOTES-U2-kn.html" last-modified="1212610132"/><rhn-kickstart-file file-size="80209" md5sum="02448ca28f21030449e47de8c4d81a26" relative-path="RELEASE-NOTES-U2-ko.html" last-modified="1212610132"/><rhn-kickstart-file file-size="78401" md5sum="431a6ca4cda2c2f300d09456918da0d6" relative-path="RELEASE-NOTES-U2-ml.html" last-modified="1212610132"/><rhn-kickstart-file file-size="90213" md5sum="069436f1eddba046c45e39604ba282dc" relative-path="RELEASE-NOTES-U2-mr.html" last-modified="1212610132"/><rhn-kickstart-file file-size="91498" md5sum="84fa917b9c450bb0a2f609903db58a65" relative-path="RELEASE-NOTES-U2-or.html" last-modified="1212610132"/><rhn-kickstart-file file-size="87387" md5sum="f66ce88cd5d9f18f31dcdf7706e2f7a8" relative-path="RELEASE-NOTES-U2-pa.html" last-modified="1212610132"/><rhn-kickstart-file file-size="79893" md5sum="266c4d4228f60c73d94ca2395aebabbb" relative-path="RELEASE-NOTES-U2-pt_BR.html" last-modified="1212610132"/><rhn-kickstart-file file-size="84826" md5sum="16a66bf6e7b9c4f1470a8280a67a36df" relative-path="RELEASE-NOTES-U2-ru.html" last-modified="1212610132"/><rhn-kickstart-file file-size="89480" md5sum="f4000f2eefbcdd4fef361249fe023383" relative-path="RELEASE-NOTES-U2-si.html" last-modified="1212610132"/><rhn-kickstart-file file-size="92522" md5sum="11321f859b5d0d713ef56f6e04c177f6" relative-path="RELEASE-NOTES-U2-ta.html" last-modified="1212610132"/><rhn-kickstart-file file-size="89667" md5sum="24481c3606a189c1b27857f1bedc432a" relative-path="RELEASE-NOTES-U2-te.html" last-modified="1212610132"/><rhn-kickstart-file file-size="77301" md5sum="1fbac9f449f6c73bc66e0d6c7ef1ced7" relative-path="RELEASE-NOTES-U2-zh_CN.html" last-modified="1212610132"/><rhn-kickstart-file file-size="77666" md5sum="ab9af12d0e7fe720ee9214cdbda342f1" relative-path="RELEASE-NOTES-U2-zh_TW.html" last-modified="1212610132"/><rhn-kickstart-file file-size="167447" md5sum="94874f829d9784486f24821083562564" relative-path="RELEASE-NOTES-as.html" last-modified="1212610132"/><rhn-kickstart-file file-size="170140" md5sum="5ada933d2d5a1771d11326dbaab208d8" relative-path="RELEASE-NOTES-bn.html" last-modified="1212610132"/><rhn-kickstart-file file-size="104125" md5sum="709cbb8a8a2826c387f70abfb8f834c9" relative-path="RELEASE-NOTES-de.html" last-modified="1212610132"/><rhn-kickstart-file file-size="73957" md5sum="9defbf09325bb275d8930f192d38ba8a" relative-path="RELEASE-NOTES-en" last-modified="1212610132"/><rhn-kickstart-file file-size="92776" md5sum="00ba767b8c4ec5b96462cf74cfd1c08b" relative-path="RELEASE-NOTES-en.html" last-modified="1212610132"/><rhn-kickstart-file file-size="101039" md5sum="944b1e6cce96d302280245ba30cfc112" relative-path="RELEASE-NOTES-es.html" last-modified="1212610132"/><rhn-kickstart-file file-size="103491" md5sum="76c3f6a45fc3bcaf8211e2f60df68046" relative-path="RELEASE-NOTES-fr.html" last-modified="1212610132"/><rhn-kickstart-file file-size="162307" md5sum="74070a08e8e47ef40089ab92cf9557ca" relative-path="RELEASE-NOTES-gu.html" last-modified="1212610132"/><rhn-kickstart-file file-size="161851" md5sum="d2f223c6c4e9bcd9e0146325c8b1b53a" relative-path="RELEASE-NOTES-hi.html" last-modified="1212610132"/><rhn-kickstart-file file-size="101631" md5sum="c1629d2ab94b840b0bb26169cfc46070" relative-path="RELEASE-NOTES-it.html" last-modified="1212610132"/><rhn-kickstart-file file-size="113574" md5sum="04e34dd1811a52cf63647fc4c9c8c9b1" relative-path="RELEASE-NOTES-ja.html" last-modified="1212610132"/><rhn-kickstart-file file-size="180821" md5sum="23424d0a883560c0f7760772dcec6f16" relative-path="RELEASE-NOTES-kn.html" last-modified="1212610132"/><rhn-kickstart-file file-size="106208" md5sum="e5cf19215f96c3d9b8cd65e88dcb8756" relative-path="RELEASE-NOTES-ko.html" last-modified="1212610132"/><rhn-kickstart-file file-size="92709" md5sum="7ce4d7111638b702d10805ef44544a06" relative-path="RELEASE-NOTES-ml.html" last-modified="1212610132"/><rhn-kickstart-file file-size="161117" md5sum="1abe2ca41c7257aa89491a93eee57f5f" relative-path="RELEASE-NOTES-mr.html" last-modified="1212610132"/><rhn-kickstart-file file-size="181571" md5sum="870d61d9eb7ddf1365396160134d8f8f" relative-path="RELEASE-NOTES-or.html" last-modified="1212610132"/><rhn-kickstart-file file-size="150804" md5sum="1a32866d2ba09d907831f273e52d7fea" relative-path="RELEASE-NOTES-pa.html" last-modified="1212610132"/><rhn-kickstart-file file-size="100718" md5sum="a3f2adb98c9f79bbd401ccb052b4932d" relative-path="RELEASE-NOTES-pt_BR.html" last-modified="1212610132"/><rhn-kickstart-file file-size="128995" md5sum="5c0d92770adeb44ac0fc8e32d8511aa1" relative-path="RELEASE-NOTES-ru.html" last-modified="1212610132"/><rhn-kickstart-file file-size="165377" md5sum="ef5c34a2a32c5d809d3ed6c1928ea4ba" relative-path="RELEASE-NOTES-si.html" last-modified="1212610132"/><rhn-kickstart-file file-size="174042" md5sum="e1ac847e0a1ad0d58032ed50c7c84fb1" relative-path="RELEASE-NOTES-ta.html" last-modified="1212610132"/><rhn-kickstart-file file-size="159695" md5sum="65261ff16baf5e88b4bf6bf0c53bb938" relative-path="RELEASE-NOTES-te.html" last-modified="1212610132"/><rhn-kickstart-file file-size="86766" md5sum="3a5e3d826538967ebe0ef7070bfc9fc5" relative-path="RELEASE-NOTES-zh_CN.html" last-modified="1212610132"/><rhn-kickstart-file file-size="87305" md5sum="7444e4632cb3bcb99c0bb35d3fe4d557" relative-path="RELEASE-NOTES-zh_TW.html" last-modified="1212610132"/><rhn-kickstart-file file-size="1706" md5sum="05d14366dda35935da2b24615cf195fd" relative-path="RPM-GPG-KEY-redhat-beta" last-modified="1212610132"/><rhn-kickstart-file file-size="1164" md5sum="1a302af4852763e81054e40792a3d69a" relative-path="RPM-GPG-KEY-redhat-release" last-modified="1212610132"/><rhn-kickstart-file file-size="1009127" md5sum="c08afbc263c71a75bedd847ddfe6d5ce" relative-path="Server/repodata/comps-rhel5-server-core.xml" last-modified="1212610120"/><rhn-kickstart-file file-size="2361792" md5sum="5c8ebd17a3fca841e7f275e8b3b0acca" relative-path="Server/repodata/filelists.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="6221643" md5sum="7f293256bce751cc3ee8ab22ad3d40b6" relative-path="Server/repodata/other.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="783268" md5sum="f60a7e4b6a9a70fc885608194470446e" relative-path="Server/repodata/primary.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="1158" md5sum="9d4891abbb8f474e276f61bda4216488" relative-path="Server/repodata/repomd.xml" last-modified="1212610120"/><rhn-kickstart-file file-size="103754" md5sum="290ab24010695c110529c30a9928f852" relative-path="VT/repodata/comps-rhel5-vt.xml" last-modified="1212610120"/><rhn-kickstart-file file-size="32862" md5sum="7469adc4379f8848110043a13512cbac" relative-path="VT/repodata/filelists.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="31117" md5sum="07421af692c5a446ff4006166a147d78" relative-path="VT/repodata/other.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="6695" md5sum="fa50926df217897aee3eebf657992e77" relative-path="VT/repodata/primary.xml.gz" last-modified="1212610120"/><rhn-kickstart-file file-size="1149" md5sum="56fd6c5bb3efb6f6a23c1f5ebca389da" relative-path="VT/repodata/repomd.xml" last-modified="1212610120"/><rhn-kickstart-file file-size="8446" md5sum="4cb33358ca64e87f7650525747bebd67" relative-path="eula.en_US" last-modified="1212610132"/><rhn-kickstart-file file-size="675" md5sum="4e18b254951642c3b04c4710d3c2f9c1" relative-path="images/README" last-modified="1212610121"/><rhn-kickstart-file file-size="8005632" md5sum="dc90c10faf82965289385f60abbcfa0b" relative-path="images/boot.iso" last-modified="1212610122"/><rhn-kickstart-file file-size="12582912" md5sum="d217887a72d25bc931432213ceb2d6d8" relative-path="images/diskboot.img" last-modified="1212610123"/><rhn-kickstart-file file-size="38457344" md5sum="0968a5d3898e90fdb4b22a5161bd73c8" relative-path="images/minstg2.img" last-modified="1212610125"/><rhn-kickstart-file file-size="290" md5sum="08318804cdaeba5f21807c934b7278ba" relative-path="images/pxeboot/README" last-modified="1212610121"/><rhn-kickstart-file file-size="5665249" md5sum="03734ba1fcde7a2232881ab3c75098cb" relative-path="images/pxeboot/initrd.img" last-modified="1212610121"/><rhn-kickstart-file file-size="1806388" md5sum="b3654261b1f775e81adfe33657f3b965" relative-path="images/pxeboot/vmlinuz" last-modified="1212610121"/><rhn-kickstart-file file-size="86671360" md5sum="e5118dfe4b4e035bcea0c54ada06266a" relative-path="images/stage2.img" last-modified="1212610130"/><rhn-kickstart-file file-size="5711735" md5sum="a7af2795e37e525547aa4262ff462469" relative-path="images/xen/initrd.img" last-modified="1212610121"/><rhn-kickstart-file file-size="2161407" md5sum="df1eac1c7348473eb2598fbcedfa91f6" relative-path="images/xen/vmlinuz" last-modified="1212610121"/><rhn-kickstart-file file-size="292" md5sum="f102510e5ef9241332a0b0b8bc77d27b" relative-path="isolinux/boot.msg" last-modified="1212610130"/><rhn-kickstart-file file-size="919" md5sum="ed9918e3f92726f1b2de46ff68d75fb2" relative-path="isolinux/general.msg" last-modified="1212610130"/><rhn-kickstart-file file-size="5665249" md5sum="03734ba1fcde7a2232881ab3c75098cb" relative-path="isolinux/initrd.img" last-modified="1212610131"/><rhn-kickstart-file file-size="10648" md5sum="f23a827cc847614d32217675914770ea" relative-path="isolinux/isolinux.bin" last-modified="1212610131"/><rhn-kickstart-file file-size="366" md5sum="b802a16ff1e63ba6fa4fa7ba1ca73136" relative-path="isolinux/isolinux.cfg" last-modified="1212610131"/><rhn-kickstart-file file-size="94600" md5sum="841ef6078b7346ed84fd82eca86c3804" relative-path="isolinux/memtest" last-modified="1212610131"/><rhn-kickstart-file file-size="817" md5sum="5818963971c3abeed2888d6416b1c50e" relative-path="isolinux/options.msg" last-modified="1212610131"/><rhn-kickstart-file file-size="517" md5sum="28a15223c7d456f22309beca1f1fec5a" relative-path="isolinux/param.msg" last-modified="1212610131"/><rhn-kickstart-file file-size="490" md5sum="e9ca42df80f26b4db565959ec8da25e5" relative-path="isolinux/rescue.msg" last-modified="1212610131"/><rhn-kickstart-file file-size="23107" md5sum="8de921af902b22579f99cbece6abe13c" relative-path="isolinux/splash.lss" last-modified="1212610131"/><rhn-kickstart-file file-size="1806388" md5sum="b3654261b1f775e81adfe33657f3b965" relative-path="isolinux/vmlinuz" last-modified="1212610131"/></rhn-kickstart-files></rhn-kickstartable-tree><rhn-kickstartable-tree kstree-type-name="RHN managed kickstart tree" boot-image="ks-rhel-i386-server-5-u3" kstree-type-label="rhn-managed" label="ks-rhel-i386-server-5-u3" last-modified="1233233082" install-type-name="Red Hat Enterprise Linux 5" base-path="rhn/kickstart/ks-rhel-i386-server-5-u3" install-type-label="rhel_5" channel="rhel-i386-server-5"><rhn-kickstart-files><rhn-kickstart-file file-size="108" md5sum="2ad0a0aab14758708d3707e452d196c8" relative-path=".discinfo" last-modified="1233232889"/><rhn-kickstart-file file-size="436" md5sum="044c0a4a87a385ef3ce0b5ee67c933ba" relative-path=".treeinfo" last-modified="1233232890"/><rhn-kickstart-file file-size="101836" md5sum="870d05b44e1d00395d6f54ef4e0b4d78" relative-path="Cluster/repodata/comps-rhel5-cluster.xml" last-modified="1233232889"/><rhn-kickstart-file file-size="112688" md5sum="04c27142338c767ea196b6bfd3ce336d" relative-path="Cluster/repodata/filelists.xml.gz" last-modified="1233232889"/><rhn-kickstart-file file-size="27366" md5sum="ab33b460cc4b4c9279ce7eacba0f8285" relative-path="Cluster/repodata/other.xml.gz" last-modified="1233232889"/><rhn-kickstart-file file-size="6316" md5sum="e63d65598b7a6d07721f9c34a3c15a36" relative-path="Cluster/repodata/primary.xml.gz" last-modified="1233232889"/><rhn-kickstart-file file-size="1154" md5sum="33185b801989cf46de4967ac77dd4438" relative-path="Cluster/repodata/repomd.xml" last-modified="1233232889"/><rhn-kickstart-file file-size="106395" md5sum="6f7c3a4a715b113718b37c8b0542a49c" relative-path="ClusterStorage/repodata/comps-rhel5-cluster-st.xml" last-modified="1233232889"/><rhn-kickstart-file file-size="11449" md5sum="5241290fa156bfd45f439d540a5c5152" relative-path="ClusterStorage/repodata/filelists.xml.gz" last-modified="1233232889"/><rhn-kickstart-file file-size="9614" md5sum="37ab8c1c427361f21be7f68f57b29df7" relative-path="ClusterStorage/repodata/other.xml.gz" last-modified="1233232889"/><rhn-kickstart-file file-size="8928" md5sum="ea7e006f98f365634003ed037f0c974a" relative-path="ClusterStorage/repodata/primary.xml.gz" last-modified="1233232889"/><rhn-kickstart-file file-size="1157" md5sum="77d1d751e60b671183cadfbb5b7a4fc2" relative-path="ClusterStorage/repodata/repomd.xml" last-modified="1233232889"/><rhn-kickstart-file file-size="8445" md5sum="35c17987511c72620d8918077c86e9f7" relative-path="EULA" last-modified="1233232901"/><rhn-kickstart-file file-size="18416" md5sum="6ebd41aa30b178eacb885447b1682e2d" relative-path="GPL" last-modified="1233232901"/><rhn-kickstart-file file-size="16051" md5sum="98a584648aea843844043c7b625fe824" relative-path="README-as.html" last-modified="1233232901"/><rhn-kickstart-file file-size="16896" md5sum="3cf6d919de369dfa1e684ed96f34d845" relative-path="README-bn.html" last-modified="1233232901"/><rhn-kickstart-file file-size="11562" md5sum="4bdf84ba5c7357b148c544f24998481f" relative-path="README-de.html" last-modified="1233232901"/><rhn-kickstart-file file-size="9772" md5sum="ee874eb1939b797ba48bbb40e3a15ff9" relative-path="README-en" last-modified="1233232901"/><rhn-kickstart-file file-size="11229" md5sum="7688d9922bff83f221c3937a7706b583" relative-path="README-en.html" last-modified="1233232901"/><rhn-kickstart-file file-size="11491" md5sum="89529e3be77013e6799479140a6e34d5" relative-path="README-es.html" last-modified="1233232901"/><rhn-kickstart-file file-size="11940" md5sum="21f3f56d30a85ecf87f377e5a080fc90" relative-path="README-fr.html" last-modified="1233232901"/><rhn-kickstart-file file-size="16156" md5sum="db7c3187759296c50031e7077b50b925" relative-path="README-gu.html" last-modified="1233232901"/><rhn-kickstart-file file-size="16057" md5sum="bc8b271882feda5744c96f609d831498" relative-path="README-hi.html" last-modified="1233232901"/><rhn-kickstart-file file-size="11485" md5sum="26fbe2f1e669913275bd36b80056ca4e" relative-path="README-it.html" last-modified="1233232901"/><rhn-kickstart-file file-size="12513" md5sum="4fda50c15affe82a4de5794941c26449" relative-path="README-ja.html" last-modified="1233232901"/><rhn-kickstart-file file-size="17763" md5sum="bcfb3c5a2f503dfb4deb00c2a005bf99" relative-path="README-kn.html" last-modified="1233232901"/><rhn-kickstart-file file-size="11848" md5sum="697c26c03bb1470fe8892292537e6112" relative-path="README-ko.html" last-modified="1233232901"/><rhn-kickstart-file file-size="19232" md5sum="edd27b8451f8c3dbf7f1e11258394ecb" relative-path="README-ml.html" last-modified="1233232901"/><rhn-kickstart-file file-size="16264" md5sum="f580f741b5a4f9f95785f4bc20be7c7f" relative-path="README-mr.html" last-modified="1233232901"/><rhn-kickstart-file file-size="15117" md5sum="2329580f9f5a2ffc55d044798208c00f" relative-path="README-or.html" last-modified="1233232901"/><rhn-kickstart-file file-size="16023" md5sum="57afc55873ba65736f0fbc09c01e0705" relative-path="README-pa.html" last-modified="1233232901"/><rhn-kickstart-file file-size="11679" md5sum="2d8a8c5cc2ce3f13a8330e80edc2f458" relative-path="README-pt_BR.html" last-modified="1233232901"/><rhn-kickstart-file file-size="13589" md5sum="fd44133438b43b6b7ce1d6ce55118906" relative-path="README-ru.html" last-modified="1233232901"/><rhn-kickstart-file file-size="17612" md5sum="4dd8ab8700bc731a6a6dfe4fc25c2e1e" relative-path="README-si.html" last-modified="1233232901"/><rhn-kickstart-file file-size="16910" md5sum="03132c1773a75919a00373b62dc1ee73" relative-path="README-ta.html" last-modified="1233232901"/><rhn-kickstart-file file-size="16153" md5sum="dec2e4100845d3e41e9334b79fbb1f04" relative-path="README-te.html" last-modified="1233232901"/><rhn-kickstart-file file-size="10403" md5sum="e0b17af1d1dd3c59834006475fa90f64" relative-path="README-zh_CN.html" last-modified="1233232901"/><rhn-kickstart-file file-size="10019" md5sum="200a3db6137ef24f9f3c8baf23b14c91" relative-path="README-zh_TW.html" last-modified="1233232901"/><rhn-kickstart-file file-size="260891" md5sum="ed5878f03ac02bbdfb733152fb645896" relative-path="RELEASE-NOTES-U1-as.html" last-modified="1233232901"/><rhn-kickstart-file file-size="311901" md5sum="9ffa630a274125ee552d8fa3f5ca2165" relative-path="RELEASE-NOTES-U1-bn.html" last-modified="1233232901"/><rhn-kickstart-file file-size="179395" md5sum="1bcc5226018afb91fdb9b9d456bd4eb0" relative-path="RELEASE-NOTES-U1-de.html" last-modified="1233232901"/><rhn-kickstart-file file-size="126185" md5sum="40d868767f1ea6ea87b87462cb84b3b0" relative-path="RELEASE-NOTES-U1-en" last-modified="1233232902"/><rhn-kickstart-file file-size="161604" md5sum="3be07e8fcfb0477b8ba59c9a44a7208f" relative-path="RELEASE-NOTES-U1-en.html" last-modified="1233232902"/><rhn-kickstart-file file-size="177986" md5sum="1095d9df4778cd131a2791e418587398" relative-path="RELEASE-NOTES-U1-es.html" last-modified="1233232902"/><rhn-kickstart-file file-size="183589" md5sum="1b4c7c863ee5fab91601a34497f9e1cc" relative-path="RELEASE-NOTES-U1-fr.html" last-modified="1233232902"/><rhn-kickstart-file file-size="293186" md5sum="1884c0be8790b8fe8ab5a8489aaa7352" relative-path="RELEASE-NOTES-U1-gu.html" last-modified="1233232902"/><rhn-kickstart-file file-size="288803" md5sum="26a807cbaafa4751e6ba47fadc002bde" relative-path="RELEASE-NOTES-U1-hi.html" last-modified="1233232902"/><rhn-kickstart-file file-size="178992" md5sum="d35d00ef9ccae8e4e18e3684f6db2792" relative-path="RELEASE-NOTES-U1-it.html" last-modified="1233232902"/><rhn-kickstart-file file-size="201834" md5sum="d13396e1a17844f69fc72e6de8f7db67" relative-path="RELEASE-NOTES-U1-ja.html" last-modified="1233232902"/><rhn-kickstart-file file-size="325132" md5sum="1b2902b3980889db44dd1571069ab9f0" relative-path="RELEASE-NOTES-U1-kn.html" last-modified="1233232902"/><rhn-kickstart-file file-size="183527" md5sum="38feb7215ba0fafd163c6bc16a892155" relative-path="RELEASE-NOTES-U1-ko.html" last-modified="1233232902"/><rhn-kickstart-file file-size="287290" md5sum="c410b7b9a95b7bc082da09fc7ec2a45a" relative-path="RELEASE-NOTES-U1-ml.html" last-modified="1233232902"/><rhn-kickstart-file file-size="289375" md5sum="38c699e09cac3597d5f35f282c8f1491" relative-path="RELEASE-NOTES-U1-mr.html" last-modified="1233232902"/><rhn-kickstart-file file-size="312727" md5sum="0e51cd75c97fcf8c6ab59aa962267d85" relative-path="RELEASE-NOTES-U1-or.html" last-modified="1233232902"/><rhn-kickstart-file file-size="273195" md5sum="f51cd5d9e31c48f3f6f8e5f46d356773" relative-path="RELEASE-NOTES-U1-pa.html" last-modified="1233232902"/><rhn-kickstart-file file-size="175677" md5sum="730df9e8ccae919c78b60632cee258f6" relative-path="RELEASE-NOTES-U1-pt_BR.html" last-modified="1233232901"/><rhn-kickstart-file file-size="220574" md5sum="2ac9cf0be87b792f6e90820cfcaf23d7" relative-path="RELEASE-NOTES-U1-ru.html" last-modified="1233232902"/><rhn-kickstart-file file-size="161586" md5sum="2932e93dc1bda3c4fb2b35374bf2bd25" relative-path="RELEASE-NOTES-U1-si.html" last-modified="1233232902"/><rhn-kickstart-file file-size="305111" md5sum="a9eadcb85afad875e576473acc4d06c3" relative-path="RELEASE-NOTES-U1-ta.html" last-modified="1233232902"/><rhn-kickstart-file file-size="306067" md5sum="afa99f0aa4b682405124b187a50312eb" relative-path="RELEASE-NOTES-U1-te.html" last-modified="1233232902"/><rhn-kickstart-file file-size="214751" md5sum="59bc39958e7f1d1523b9d44b65a73677" relative-path="RELEASE-NOTES-U1-zh_CN.html" last-modified="1233232902"/><rhn-kickstart-file file-size="225537" md5sum="38a9aae39198d36cd52a3c5a65096014" relative-path="RELEASE-NOTES-U1-zh_TW.html" last-modified="1233232902"/><rhn-kickstart-file file-size="260891" md5sum="ed5878f03ac02bbdfb733152fb645896" relative-path="RELEASE-NOTES-U2-as.html" last-modified="1233232902"/><rhn-kickstart-file file-size="311901" md5sum="9ffa630a274125ee552d8fa3f5ca2165" relative-path="RELEASE-NOTES-U2-bn.html" last-modified="1233232902"/><rhn-kickstart-file file-size="179395" md5sum="1bcc5226018afb91fdb9b9d456bd4eb0" relative-path="RELEASE-NOTES-U2-de.html" last-modified="1233232902"/><rhn-kickstart-file file-size="126185" md5sum="40d868767f1ea6ea87b87462cb84b3b0" relative-path="RELEASE-NOTES-U2-en" last-modified="1233232902"/><rhn-kickstart-file file-size="161604" md5sum="3be07e8fcfb0477b8ba59c9a44a7208f" relative-path="RELEASE-NOTES-U2-en.html" last-modified="1233232902"/><rhn-kickstart-file file-size="177986" md5sum="1095d9df4778cd131a2791e418587398" relative-path="RELEASE-NOTES-U2-es.html" last-modified="1233232902"/><rhn-kickstart-file file-size="183589" md5sum="1b4c7c863ee5fab91601a34497f9e1cc" relative-path="RELEASE-NOTES-U2-fr.html" last-modified="1233232902"/><rhn-kickstart-file file-size="293186" md5sum="1884c0be8790b8fe8ab5a8489aaa7352" relative-path="RELEASE-NOTES-U2-gu.html" last-modified="1233232902"/><rhn-kickstart-file file-size="288803" md5sum="26a807cbaafa4751e6ba47fadc002bde" relative-path="RELEASE-NOTES-U2-hi.html" last-modified="1233232902"/><rhn-kickstart-file file-size="178992" md5sum="d35d00ef9ccae8e4e18e3684f6db2792" relative-path="RELEASE-NOTES-U2-it.html" last-modified="1233232902"/><rhn-kickstart-file file-size="201834" md5sum="d13396e1a17844f69fc72e6de8f7db67" relative-path="RELEASE-NOTES-U2-ja.html" last-modified="1233232902"/><rhn-kickstart-file file-size="325132" md5sum="1b2902b3980889db44dd1571069ab9f0" relative-path="RELEASE-NOTES-U2-kn.html" last-modified="1233232902"/><rhn-kickstart-file file-size="183527" md5sum="38feb7215ba0fafd163c6bc16a892155" relative-path="RELEASE-NOTES-U2-ko.html" last-modified="1233232902"/><rhn-kickstart-file file-size="287290" md5sum="c410b7b9a95b7bc082da09fc7ec2a45a" relative-path="RELEASE-NOTES-U2-ml.html" last-modified="1233232902"/><rhn-kickstart-file file-size="289375" md5sum="38c699e09cac3597d5f35f282c8f1491" relative-path="RELEASE-NOTES-U2-mr.html" last-modified="1233232902"/><rhn-kickstart-file file-size="312727" md5sum="0e51cd75c97fcf8c6ab59aa962267d85" relative-path="RELEASE-NOTES-U2-or.html" last-modified="1233232903"/><rhn-kickstart-file file-size="273195" md5sum="f51cd5d9e31c48f3f6f8e5f46d356773" relative-path="RELEASE-NOTES-U2-pa.html" last-modified="1233232903"/><rhn-kickstart-file file-size="175677" md5sum="730df9e8ccae919c78b60632cee258f6" relative-path="RELEASE-NOTES-U2-pt_BR.html" last-modified="1233232903"/><rhn-kickstart-file file-size="220574" md5sum="2ac9cf0be87b792f6e90820cfcaf23d7" relative-path="RELEASE-NOTES-U2-ru.html" last-modified="1233232903"/><rhn-kickstart-file file-size="161586" md5sum="2932e93dc1bda3c4fb2b35374bf2bd25" relative-path="RELEASE-NOTES-U2-si.html" last-modified="1233232903"/><rhn-kickstart-file file-size="305111" md5sum="a9eadcb85afad875e576473acc4d06c3" relative-path="RELEASE-NOTES-U2-ta.html" last-modified="1233232903"/><rhn-kickstart-file file-size="306067" md5sum="afa99f0aa4b682405124b187a50312eb" relative-path="RELEASE-NOTES-U2-te.html" last-modified="1233232903"/><rhn-kickstart-file file-size="214751" md5sum="59bc39958e7f1d1523b9d44b65a73677" relative-path="RELEASE-NOTES-U2-zh_CN.html" last-modified="1233232903"/><rhn-kickstart-file file-size="225537" md5sum="38a9aae39198d36cd52a3c5a65096014" relative-path="RELEASE-NOTES-U2-zh_TW.html" last-modified="1233232903"/><rhn-kickstart-file file-size="260891" md5sum="ed5878f03ac02bbdfb733152fb645896" relative-path="RELEASE-NOTES-U3-as.html" last-modified="1233232903"/><rhn-kickstart-file file-size="311901" md5sum="9ffa630a274125ee552d8fa3f5ca2165" relative-path="RELEASE-NOTES-U3-bn.html" last-modified="1233232903"/><rhn-kickstart-file file-size="179395" md5sum="1bcc5226018afb91fdb9b9d456bd4eb0" relative-path="RELEASE-NOTES-U3-de.html" last-modified="1233232903"/><rhn-kickstart-file file-size="126185" md5sum="40d868767f1ea6ea87b87462cb84b3b0" relative-path="RELEASE-NOTES-U3-en" last-modified="1233232903"/><rhn-kickstart-file file-size="161604" md5sum="3be07e8fcfb0477b8ba59c9a44a7208f" relative-path="RELEASE-NOTES-U3-en.html" last-modified="1233232903"/><rhn-kickstart-file file-size="177986" md5sum="1095d9df4778cd131a2791e418587398" relative-path="RELEASE-NOTES-U3-es.html" last-modified="1233232903"/><rhn-kickstart-file file-size="183589" md5sum="1b4c7c863ee5fab91601a34497f9e1cc" relative-path="RELEASE-NOTES-U3-fr.html" last-modified="1233232903"/><rhn-kickstart-file file-size="293186" md5sum="1884c0be8790b8fe8ab5a8489aaa7352" relative-path="RELEASE-NOTES-U3-gu.html" last-modified="1233232903"/><rhn-kickstart-file file-size="288803" md5sum="26a807cbaafa4751e6ba47fadc002bde" relative-path="RELEASE-NOTES-U3-hi.html" last-modified="1233232903"/><rhn-kickstart-file file-size="178992" md5sum="d35d00ef9ccae8e4e18e3684f6db2792" relative-path="RELEASE-NOTES-U3-it.html" last-modified="1233232903"/><rhn-kickstart-file file-size="201834" md5sum="d13396e1a17844f69fc72e6de8f7db67" relative-path="RELEASE-NOTES-U3-ja.html" last-modified="1233232903"/><rhn-kickstart-file file-size="325132" md5sum="1b2902b3980889db44dd1571069ab9f0" relative-path="RELEASE-NOTES-U3-kn.html" last-modified="1233232903"/><rhn-kickstart-file file-size="183527" md5sum="38feb7215ba0fafd163c6bc16a892155" relative-path="RELEASE-NOTES-U3-ko.html" last-modified="1233232903"/><rhn-kickstart-file file-size="287290" md5sum="c410b7b9a95b7bc082da09fc7ec2a45a" relative-path="RELEASE-NOTES-U3-ml.html" last-modified="1233232903"/><rhn-kickstart-file file-size="289375" md5sum="38c699e09cac3597d5f35f282c8f1491" relative-path="RELEASE-NOTES-U3-mr.html" last-modified="1233232903"/><rhn-kickstart-file file-size="312727" md5sum="0e51cd75c97fcf8c6ab59aa962267d85" relative-path="RELEASE-NOTES-U3-or.html" last-modified="1233232903"/><rhn-kickstart-file file-size="273195" md5sum="f51cd5d9e31c48f3f6f8e5f46d356773" relative-path="RELEASE-NOTES-U3-pa.html" last-modified="1233232903"/><rhn-kickstart-file file-size="175677" md5sum="730df9e8ccae919c78b60632cee258f6" relative-path="RELEASE-NOTES-U3-pt_BR.html" last-modified="1233232903"/><rhn-kickstart-file file-size="220574" md5sum="2ac9cf0be87b792f6e90820cfcaf23d7" relative-path="RELEASE-NOTES-U3-ru.html" last-modified="1233232903"/><rhn-kickstart-file file-size="161586" md5sum="2932e93dc1bda3c4fb2b35374bf2bd25" relative-path="RELEASE-NOTES-U3-si.html" last-modified="1233232903"/><rhn-kickstart-file file-size="305111" md5sum="a9eadcb85afad875e576473acc4d06c3" relative-path="RELEASE-NOTES-U3-ta.html" last-modified="1233232903"/><rhn-kickstart-file file-size="306067" md5sum="afa99f0aa4b682405124b187a50312eb" relative-path="RELEASE-NOTES-U3-te.html" last-modified="1233232902"/><rhn-kickstart-file file-size="214751" md5sum="59bc39958e7f1d1523b9d44b65a73677" relative-path="RELEASE-NOTES-U3-zh_CN.html" last-modified="1233232903"/><rhn-kickstart-file file-size="225537" md5sum="38a9aae39198d36cd52a3c5a65096014" relative-path="RELEASE-NOTES-U3-zh_TW.html" last-modified="1233232903"/><rhn-kickstart-file file-size="260891" md5sum="ed5878f03ac02bbdfb733152fb645896" relative-path="RELEASE-NOTES-as.html" last-modified="1233232903"/><rhn-kickstart-file file-size="311901" md5sum="9ffa630a274125ee552d8fa3f5ca2165" relative-path="RELEASE-NOTES-bn.html" last-modified="1233232903"/><rhn-kickstart-file file-size="179395" md5sum="1bcc5226018afb91fdb9b9d456bd4eb0" relative-path="RELEASE-NOTES-de.html" last-modified="1233232903"/><rhn-kickstart-file file-size="126185" md5sum="40d868767f1ea6ea87b87462cb84b3b0" relative-path="RELEASE-NOTES-en" last-modified="1233232903"/><rhn-kickstart-file file-size="161604" md5sum="3be07e8fcfb0477b8ba59c9a44a7208f" relative-path="RELEASE-NOTES-en.html" last-modified="1233232903"/><rhn-kickstart-file file-size="177986" md5sum="1095d9df4778cd131a2791e418587398" relative-path="RELEASE-NOTES-es.html" last-modified="1233232903"/><rhn-kickstart-file file-size="183589" md5sum="1b4c7c863ee5fab91601a34497f9e1cc" relative-path="RELEASE-NOTES-fr.html" last-modified="1233232903"/><rhn-kickstart-file file-size="293186" md5sum="1884c0be8790b8fe8ab5a8489aaa7352" relative-path="RELEASE-NOTES-gu.html" last-modified="1233232903"/><rhn-kickstart-file file-size="288803" md5sum="26a807cbaafa4751e6ba47fadc002bde" relative-path="RELEASE-NOTES-hi.html" last-modified="1233232903"/><rhn-kickstart-file file-size="178992" md5sum="d35d00ef9ccae8e4e18e3684f6db2792" relative-path="RELEASE-NOTES-it.html" last-modified="1233232903"/><rhn-kickstart-file file-size="201834" md5sum="d13396e1a17844f69fc72e6de8f7db67" relative-path="RELEASE-NOTES-ja.html" last-modified="1233232903"/><rhn-kickstart-file file-size="325132" md5sum="1b2902b3980889db44dd1571069ab9f0" relative-path="RELEASE-NOTES-kn.html" last-modified="1233232904"/><rhn-kickstart-file file-size="183527" md5sum="38feb7215ba0fafd163c6bc16a892155" relative-path="RELEASE-NOTES-ko.html" last-modified="1233232904"/><rhn-kickstart-file file-size="287290" md5sum="c410b7b9a95b7bc082da09fc7ec2a45a" relative-path="RELEASE-NOTES-ml.html" last-modified="1233232904"/><rhn-kickstart-file file-size="289375" md5sum="38c699e09cac3597d5f35f282c8f1491" relative-path="RELEASE-NOTES-mr.html" last-modified="1233232904"/><rhn-kickstart-file file-size="312727" md5sum="0e51cd75c97fcf8c6ab59aa962267d85" relative-path="RELEASE-NOTES-or.html" last-modified="1233232904"/><rhn-kickstart-file file-size="273195" md5sum="f51cd5d9e31c48f3f6f8e5f46d356773" relative-path="RELEASE-NOTES-pa.html" last-modified="1233232904"/><rhn-kickstart-file file-size="175677" md5sum="730df9e8ccae919c78b60632cee258f6" relative-path="RELEASE-NOTES-pt_BR.html" last-modified="1233232904"/><rhn-kickstart-file file-size="220574" md5sum="2ac9cf0be87b792f6e90820cfcaf23d7" relative-path="RELEASE-NOTES-ru.html" last-modified="1233232904"/><rhn-kickstart-file file-size="161586" md5sum="2932e93dc1bda3c4fb2b35374bf2bd25" relative-path="RELEASE-NOTES-si.html" last-modified="1233232904"/><rhn-kickstart-file file-size="305111" md5sum="a9eadcb85afad875e576473acc4d06c3" relative-path="RELEASE-NOTES-ta.html" last-modified="1233232904"/><rhn-kickstart-file file-size="306067" md5sum="afa99f0aa4b682405124b187a50312eb" relative-path="RELEASE-NOTES-te.html" last-modified="1233232904"/><rhn-kickstart-file file-size="214751" md5sum="59bc39958e7f1d1523b9d44b65a73677" relative-path="RELEASE-NOTES-zh_CN.html" last-modified="1233232904"/><rhn-kickstart-file file-size="225537" md5sum="38a9aae39198d36cd52a3c5a65096014" relative-path="RELEASE-NOTES-zh_TW.html" last-modified="1233232904"/><rhn-kickstart-file file-size="1706" md5sum="05d14366dda35935da2b24615cf195fd" relative-path="RPM-GPG-KEY-redhat-beta" last-modified="1233232904"/><rhn-kickstart-file file-size="1164" md5sum="1a302af4852763e81054e40792a3d69a" relative-path="RPM-GPG-KEY-redhat-release" last-modified="1233232904"/><rhn-kickstart-file file-size="1010906" md5sum="d3fb48f4fc6bcc3cc7dd8f50193e3d15" relative-path="Server/repodata/comps-rhel5-server-core.xml" last-modified="1233232889"/><rhn-kickstart-file file-size="2474743" md5sum="7a54d7586b02dfd1b63a0c02d5a3c5c9" relative-path="Server/repodata/filelists.xml.gz" last-modified="1233232889"/><rhn-kickstart-file file-size="6890864" md5sum="19a34a59f150ece188ba6616bb910f69" relative-path="Server/repodata/other.xml.gz" last-modified="1233232890"/><rhn-kickstart-file file-size="828013" md5sum="ae2787563490c25d74089b5b0b543795" relative-path="Server/repodata/primary.xml.gz" last-modified="1233232890"/><rhn-kickstart-file file-size="1158" md5sum="6e8d7bcb43d8428d7538052b1289db1e" relative-path="Server/repodata/repomd.xml" last-modified="1233232890"/><rhn-kickstart-file file-size="103872" md5sum="37c3b8c1498501a0af086254754574f4" relative-path="VT/repodata/comps-rhel5-vt.xml" last-modified="1233232890"/><rhn-kickstart-file file-size="26588" md5sum="156564d3c19de34a66dd7ba646d3e895" relative-path="VT/repodata/filelists.xml.gz" last-modified="1233232890"/><rhn-kickstart-file file-size="32922" md5sum="bbbd14d5af7bef2b83624d2148a44e93" relative-path="VT/repodata/other.xml.gz" last-modified="1233232890"/><rhn-kickstart-file file-size="8067" md5sum="c1221bb2f0ba9a2c2a12d4a7dc62edda" relative-path="VT/repodata/primary.xml.gz" last-modified="1233232890"/><rhn-kickstart-file file-size="1149" md5sum="18f79afebf1577d2b883e5abd1104f18" relative-path="VT/repodata/repomd.xml" last-modified="1233232890"/><rhn-kickstart-file file-size="8445" md5sum="35c17987511c72620d8918077c86e9f7" relative-path="eula.en_US" last-modified="1233232904"/><rhn-kickstart-file file-size="675" md5sum="4e18b254951642c3b04c4710d3c2f9c1" relative-path="images/README" last-modified="1233232891"/><rhn-kickstart-file file-size="8658944" md5sum="07c99c7dbc9eb915499159c23409b764" relative-path="images/boot.iso" last-modified="1233232892"/><rhn-kickstart-file file-size="12582912" md5sum="920a9ef35bdcb526f215ed1a7b460988" relative-path="images/diskboot.img" last-modified="1233232892"/><rhn-kickstart-file file-size="40845312" md5sum="4694881d30b75dd603b3f3dc7889ab7b" relative-path="images/minstg2.img" last-modified="1233232895"/><rhn-kickstart-file file-size="290" md5sum="08318804cdaeba5f21807c934b7278ba" relative-path="images/pxeboot/README" last-modified="1233232890"/><rhn-kickstart-file file-size="6300177" md5sum="c30510ad66ad3f13120cbb102319c346" relative-path="images/pxeboot/initrd.img" last-modified="1233232890"/><rhn-kickstart-file file-size="1826516" md5sum="90f366479fdd2910f4934c5a291e25ea" relative-path="images/pxeboot/vmlinuz" last-modified="1233232891"/><rhn-kickstart-file file-size="90157056" md5sum="0ca3b2b1cb9a054aab0ea9f0e95ee7f8" relative-path="images/stage2.img" last-modified="1233232900"/><rhn-kickstart-file file-size="6333321" md5sum="07ab25b6779096b131d97ba168443cb3" relative-path="images/xen/initrd.img" last-modified="1233232891"/><rhn-kickstart-file file-size="2188586" md5sum="4c81580b65ac9217cb28d9ea00a7f63b" relative-path="images/xen/vmlinuz" last-modified="1233232891"/><rhn-kickstart-file file-size="292" md5sum="f102510e5ef9241332a0b0b8bc77d27b" relative-path="isolinux/boot.msg" last-modified="1233232900"/><rhn-kickstart-file file-size="919" md5sum="ed9918e3f92726f1b2de46ff68d75fb2" relative-path="isolinux/general.msg" last-modified="1233232900"/><rhn-kickstart-file file-size="6300177" md5sum="c30510ad66ad3f13120cbb102319c346" relative-path="isolinux/initrd.img" last-modified="1233232901"/><rhn-kickstart-file file-size="10648" md5sum="69fc8d28ed3bf9c36570608f250cf42b" relative-path="isolinux/isolinux.bin" last-modified="1233232901"/><rhn-kickstart-file file-size="366" md5sum="b802a16ff1e63ba6fa4fa7ba1ca73136" relative-path="isolinux/isolinux.cfg" last-modified="1233232901"/><rhn-kickstart-file file-size="94600" md5sum="841ef6078b7346ed84fd82eca86c3804" relative-path="isolinux/memtest" last-modified="1233232901"/><rhn-kickstart-file file-size="817" md5sum="5818963971c3abeed2888d6416b1c50e" relative-path="isolinux/options.msg" last-modified="1233232901"/><rhn-kickstart-file file-size="517" md5sum="28a15223c7d456f22309beca1f1fec5a" relative-path="isolinux/param.msg" last-modified="1233232901"/><rhn-kickstart-file file-size="490" md5sum="e9ca42df80f26b4db565959ec8da25e5" relative-path="isolinux/rescue.msg" last-modified="1233232901"/><rhn-kickstart-file file-size="23107" md5sum="8de921af902b22579f99cbece6abe13c" relative-path="isolinux/splash.lss" last-modified="1233232901"/><rhn-kickstart-file file-size="1826516" md5sum="90f366479fdd2910f4934c5a291e25ea" relative-path="isolinux/vmlinuz" last-modified="1233232901"/></rhn-kickstart-files></rhn-kickstartable-tree><rhn-kickstartable-tree kstree-type-name="RHN managed kickstart tree" boot-image="ks-rhel-i386-server-5-u4" kstree-type-label="rhn-managed" label="ks-rhel-i386-server-5-u4" last-modified="1253669980" install-type-name="Red Hat Enterprise Linux 5" base-path="rhn/kickstart/ks-rhel-i386-server-5-u4" install-type-label="rhel_5" channel="rhel-i386-server-5"><rhn-kickstart-files><rhn-kickstart-file file-size="108" md5sum="67d6bea0f661cdfb2b3f9258744268d6" relative-path=".discinfo" last-modified="1250663122"/><rhn-kickstart-file file-size="437" md5sum="f8efe059144e4dd18136a5d1f0bceb37" relative-path=".treeinfo" last-modified="1250661752"/><rhn-kickstart-file file-size="102997" md5sum="01a5ef63a176ba213dab0c431ed86b4a" relative-path="Cluster/repodata/comps-rhel5-cluster.xml" last-modified="1250662670"/><rhn-kickstart-file file-size="112529" md5sum="29bea6c7559ccb337a74b952bed21c86" relative-path="Cluster/repodata/filelists.xml.gz" last-modified="1250662670"/><rhn-kickstart-file file-size="29673" md5sum="cf7e6cf463b01a55b12d5c6235b9e492" relative-path="Cluster/repodata/other.xml.gz" last-modified="1250662670"/><rhn-kickstart-file file-size="6341" md5sum="88eb87dcbe8b2a2c39551ae2f04ecceb" relative-path="Cluster/repodata/primary.xml.gz" last-modified="1250662670"/><rhn-kickstart-file file-size="1154" md5sum="151cf08e9e727d2ed87ebb5f36740446" relative-path="Cluster/repodata/repomd.xml" last-modified="1250662670"/><rhn-kickstart-file file-size="107900" md5sum="2a70e20843824348ab62a1392f2f1df6" relative-path="ClusterStorage/repodata/comps-rhel5-cluster-st.xml" last-modified="1250662713"/><rhn-kickstart-file file-size="11531" md5sum="78af15841b470ce8a4076994e3e8b46d" relative-path="ClusterStorage/repodata/filelists.xml.gz" last-modified="1250662713"/><rhn-kickstart-file file-size="10947" md5sum="84fa31bc097f550ce5c02de5c42a4a4a" relative-path="ClusterStorage/repodata/other.xml.gz" last-modified="1250662713"/><rhn-kickstart-file file-size="8957" md5sum="2773ea23252e97bb8b19c3a69efbc54a" relative-path="ClusterStorage/repodata/primary.xml.gz" last-modified="1250662713"/><rhn-kickstart-file file-size="1157" md5sum="42db739998a05a701e0300efc31b7fa1" relative-path="ClusterStorage/repodata/repomd.xml" last-modified="1250662713"/><rhn-kickstart-file file-size="8445" md5sum="35c17987511c72620d8918077c86e9f7" relative-path="EULA" last-modified="1220376657"/><rhn-kickstart-file file-size="18416" md5sum="6ebd41aa30b178eacb885447b1682e2d" relative-path="GPL" last-modified="1164927216"/><rhn-kickstart-file file-size="9310" md5sum="2d3c014029f8ff19669eb6612454f08f" relative-path="README-en" last-modified="1250127330"/><rhn-kickstart-file file-size="19763" md5sum="9410631e25334089026195fedbfacda2" relative-path="README-en.html" last-modified="1250125211"/><rhn-kickstart-file file-size="137669" md5sum="c724c2da9cac51eae4c1736690979a45" relative-path="RELEASE-NOTES-U4-as.html" last-modified="1250129548"/><rhn-kickstart-file file-size="148174" md5sum="ae729ce1d3862203abde9c18d2dac6d9" relative-path="RELEASE-NOTES-U4-bn.html" last-modified="1250129548"/><rhn-kickstart-file file-size="85767" md5sum="94e079bc696d97db7febeac5bfb4b747" relative-path="RELEASE-NOTES-U4-de.html" last-modified="1250129548"/><rhn-kickstart-file file-size="61011" md5sum="68fd0e1194e6239bab4b502ab1da8ffe" relative-path="RELEASE-NOTES-U4-en" last-modified="1250125969"/><rhn-kickstart-file file-size="80344" md5sum="4ecc0ea3a2239d389956f94bac66e679" relative-path="RELEASE-NOTES-U4-en.html" last-modified="1250129548"/><rhn-kickstart-file file-size="87977" md5sum="d28489b63e6202e7d72b02fa9e2997d5" relative-path="RELEASE-NOTES-U4-es.html" last-modified="1250129548"/><rhn-kickstart-file file-size="90627" md5sum="c90263277196bcfb2547b8ad483c4dcb" relative-path="RELEASE-NOTES-U4-fr.html" last-modified="1250129548"/><rhn-kickstart-file file-size="131998" md5sum="c7ded8f6a0489f7d5ddf48169044e39f" relative-path="RELEASE-NOTES-U4-gu.html" last-modified="1250129548"/><rhn-kickstart-file file-size="132218" md5sum="ab63d774eaa48858b3776483c75ad783" relative-path="RELEASE-NOTES-U4-hi.html" last-modified="1250129548"/><rhn-kickstart-file file-size="86266" md5sum="abac82d3d738a8091fd336c8c0a698d4" relative-path="RELEASE-NOTES-U4-it.html" last-modified="1250129548"/><rhn-kickstart-file file-size="95511" md5sum="43cbc31d784977431943fd8ae46c3e95" relative-path="RELEASE-NOTES-U4-ja.html" last-modified="1250129548"/><rhn-kickstart-file file-size="148308" md5sum="f4221dde8715aba8be498b9cba52fa60" relative-path="RELEASE-NOTES-U4-kn.html" last-modified="1250129548"/><rhn-kickstart-file file-size="88701" md5sum="b6e45b126faf213a50a96b3a996362c8" relative-path="RELEASE-NOTES-U4-ko.html" last-modified="1250129548"/><rhn-kickstart-file file-size="154019" md5sum="ddb84b71f6de0c43bb8ff88d9ce817ee" relative-path="RELEASE-NOTES-U4-ml.html" last-modified="1250129548"/><rhn-kickstart-file file-size="129649" md5sum="bb591bfa006509baaec97f0120d68cf7" relative-path="RELEASE-NOTES-U4-mr.html" last-modified="1250129548"/><rhn-kickstart-file file-size="139801" md5sum="bfda961d537218d6de28987e8db4352e" relative-path="RELEASE-NOTES-U4-or.html" last-modified="1250129548"/><rhn-kickstart-file file-size="105863" md5sum="ca90c6db7221871950cd947dcc665332" relative-path="RELEASE-NOTES-U4-pa.html" last-modified="1250129548"/><rhn-kickstart-file file-size="86703" md5sum="4c3c7a641fd85c039c08c2c4b4425188" relative-path="RELEASE-NOTES-U4-pt_BR.html" last-modified="1250129548"/><rhn-kickstart-file file-size="102748" md5sum="7736ec24ee08ea9b330d9d7962dcf8e6" relative-path="RELEASE-NOTES-U4-ru.html" last-modified="1250129549"/><rhn-kickstart-file file-size="80339" md5sum="21f1e3af3b16dec925b75dad088fb4fa" relative-path="RELEASE-NOTES-U4-si.html" last-modified="1250129549"/><rhn-kickstart-file file-size="138814" md5sum="e88ee50980e17574ac30275ee5c36a1c" relative-path="RELEASE-NOTES-U4-ta.html" last-modified="1250129549"/><rhn-kickstart-file file-size="139321" md5sum="18ccbb14e574419ee8d26971d701f583" relative-path="RELEASE-NOTES-U4-te.html" last-modified="1250129549"/><rhn-kickstart-file file-size="100745" md5sum="91e9062c56b18c20f93766356b34f1ce" relative-path="RELEASE-NOTES-U4-zh_CN.html" last-modified="1250129549"/><rhn-kickstart-file file-size="105773" md5sum="7e8d8cc5af87a12043689dde9f74abf4" relative-path="RELEASE-NOTES-U4-zh_TW.html" last-modified="1250129549"/><rhn-kickstart-file file-size="137669" md5sum="c724c2da9cac51eae4c1736690979a45" relative-path="RELEASE-NOTES-as.html" last-modified="1250129549"/><rhn-kickstart-file file-size="148174" md5sum="ae729ce1d3862203abde9c18d2dac6d9" relative-path="RELEASE-NOTES-bn.html" last-modified="1250129549"/><rhn-kickstart-file file-size="85767" md5sum="94e079bc696d97db7febeac5bfb4b747" relative-path="RELEASE-NOTES-de.html" last-modified="1250129549"/><rhn-kickstart-file file-size="61011" md5sum="68fd0e1194e6239bab4b502ab1da8ffe" relative-path="RELEASE-NOTES-en" last-modified="1250128450"/><rhn-kickstart-file file-size="80344" md5sum="4ecc0ea3a2239d389956f94bac66e679" relative-path="RELEASE-NOTES-en.html" last-modified="1250129549"/><rhn-kickstart-file file-size="87977" md5sum="d28489b63e6202e7d72b02fa9e2997d5" relative-path="RELEASE-NOTES-es.html" last-modified="1250129549"/><rhn-kickstart-file file-size="90627" md5sum="c90263277196bcfb2547b8ad483c4dcb" relative-path="RELEASE-NOTES-fr.html" last-modified="1250129549"/><rhn-kickstart-file file-size="131998" md5sum="c7ded8f6a0489f7d5ddf48169044e39f" relative-path="RELEASE-NOTES-gu.html" last-modified="1250129549"/><rhn-kickstart-file file-size="132218" md5sum="ab63d774eaa48858b3776483c75ad783" relative-path="RELEASE-NOTES-hi.html" last-modified="1250129549"/><rhn-kickstart-file file-size="86266" md5sum="abac82d3d738a8091fd336c8c0a698d4" relative-path="RELEASE-NOTES-it.html" last-modified="1250129549"/><rhn-kickstart-file file-size="95511" md5sum="43cbc31d784977431943fd8ae46c3e95" relative-path="RELEASE-NOTES-ja.html" last-modified="1250129549"/><rhn-kickstart-file file-size="148308" md5sum="f4221dde8715aba8be498b9cba52fa60" relative-path="RELEASE-NOTES-kn.html" last-modified="1250129550"/><rhn-kickstart-file file-size="88701" md5sum="b6e45b126faf213a50a96b3a996362c8" relative-path="RELEASE-NOTES-ko.html" last-modified="1250129550"/><rhn-kickstart-file file-size="154019" md5sum="ddb84b71f6de0c43bb8ff88d9ce817ee" relative-path="RELEASE-NOTES-ml.html" last-modified="1250129550"/><rhn-kickstart-file file-size="129649" md5sum="bb591bfa006509baaec97f0120d68cf7" relative-path="RELEASE-NOTES-mr.html" last-modified="1250129550"/><rhn-kickstart-file file-size="139801" md5sum="bfda961d537218d6de28987e8db4352e" relative-path="RELEASE-NOTES-or.html" last-modified="1250129550"/><rhn-kickstart-file file-size="105863" md5sum="ca90c6db7221871950cd947dcc665332" relative-path="RELEASE-NOTES-pa.html" last-modified="1250129550"/><rhn-kickstart-file file-size="86703" md5sum="4c3c7a641fd85c039c08c2c4b4425188" relative-path="RELEASE-NOTES-pt_BR.html" last-modified="1250129550"/><rhn-kickstart-file file-size="102748" md5sum="7736ec24ee08ea9b330d9d7962dcf8e6" relative-path="RELEASE-NOTES-ru.html" last-modified="1250129550"/><rhn-kickstart-file file-size="80339" md5sum="21f1e3af3b16dec925b75dad088fb4fa" relative-path="RELEASE-NOTES-si.html" last-modified="1250129550"/><rhn-kickstart-file file-size="138814" md5sum="e88ee50980e17574ac30275ee5c36a1c" relative-path="RELEASE-NOTES-ta.html" last-modified="1250129550"/><rhn-kickstart-file file-size="139321" md5sum="18ccbb14e574419ee8d26971d701f583" relative-path="RELEASE-NOTES-te.html" last-modified="1250129550"/><rhn-kickstart-file file-size="100745" md5sum="91e9062c56b18c20f93766356b34f1ce" relative-path="RELEASE-NOTES-zh_CN.html" last-modified="1250129551"/><rhn-kickstart-file file-size="105773" md5sum="7e8d8cc5af87a12043689dde9f74abf4" relative-path="RELEASE-NOTES-zh_TW.html" last-modified="1250129551"/><rhn-kickstart-file file-size="1706" md5sum="05d14366dda35935da2b24615cf195fd" relative-path="RPM-GPG-KEY-redhat-beta" last-modified="1249374307"/><rhn-kickstart-file file-size="1164" md5sum="1a302af4852763e81054e40792a3d69a" relative-path="RPM-GPG-KEY-redhat-release" last-modified="1249374307"/><rhn-kickstart-file file-size="1027241" md5sum="5c69ea64e68e67344621ee706112d6ff" relative-path="Server/repodata/comps-rhel5-server-core.xml" last-modified="1250662718"/><rhn-kickstart-file file-size="2489440" md5sum="014171adfe1d182a94c658dfe993760f" relative-path="Server/repodata/filelists.xml.gz" last-modified="1250662716"/><rhn-kickstart-file file-size="7351968" md5sum="88341e31419b8e2b593bb7e4ed5be74a" relative-path="Server/repodata/other.xml.gz" last-modified="1250662717"/><rhn-kickstart-file file-size="846372" md5sum="0b086378f658f16f3e478bfa870a1d02" relative-path="Server/repodata/primary.xml.gz" last-modified="1250662716"/><rhn-kickstart-file file-size="1158" md5sum="9c76ddfa5440425cfa25b4f5a0b94584" relative-path="Server/repodata/repomd.xml" last-modified="1250662718"/><rhn-kickstart-file file-size="105200" md5sum="0be8245457e2e683c3bfe3aae8aa9af0" relative-path="VT/repodata/comps-rhel5-vt.xml" last-modified="1250662673"/><rhn-kickstart-file file-size="28501" md5sum="acc46b7b6744696494f8730e42827b02" relative-path="VT/repodata/filelists.xml.gz" last-modified="1250662673"/><rhn-kickstart-file file-size="43011" md5sum="7390061605928b43bedd15d81fe927df" relative-path="VT/repodata/other.xml.gz" last-modified="1250662673"/><rhn-kickstart-file file-size="9391" md5sum="98fb48f8b124c46099601e0a8f22b9c0" relative-path="VT/repodata/primary.xml.gz" last-modified="1250662673"/><rhn-kickstart-file file-size="1149" md5sum="bf9656263b0393a0a33c3c5764d2caa0" relative-path="VT/repodata/repomd.xml" last-modified="1250662673"/><rhn-kickstart-file file-size="8445" md5sum="35c17987511c72620d8918077c86e9f7" relative-path="eula.en_US" last-modified="1249374307"/><rhn-kickstart-file file-size="675" md5sum="4e18b254951642c3b04c4710d3c2f9c1" relative-path="images/README" last-modified="1250661495"/><rhn-kickstart-file file-size="9244672" md5sum="6b36edbe3b2e98d18620ad63edf42030" relative-path="images/boot.iso" last-modified="1250661513"/><rhn-kickstart-file file-size="12582912" md5sum="4643810f7ec82d252e27bb27d4ef5c11" relative-path="images/diskboot.img" last-modified="1250661515"/><rhn-kickstart-file file-size="40984576" md5sum="263bffc85c8123c26ae28c7f60911778" relative-path="images/minstg2.img" last-modified="1250661642"/><rhn-kickstart-file file-size="290" md5sum="08318804cdaeba5f21807c934b7278ba" relative-path="images/pxeboot/README" last-modified="1250661515"/><rhn-kickstart-file file-size="6855881" md5sum="1690e8997bbeae3035ee74ca5b7edcae" relative-path="images/pxeboot/initrd.img" last-modified="1250661509"/><rhn-kickstart-file file-size="1855956" md5sum="bbff60614587a3d2c8472ddf3ce65fdf" relative-path="images/pxeboot/vmlinuz" last-modified="1250661510"/><rhn-kickstart-file file-size="90107904" md5sum="09a58fc5d1a9abd1a9348764f69e64c8" relative-path="images/stage2.img" last-modified="1250661752"/><rhn-kickstart-file file-size="6898417" md5sum="daee1aca041aab995d0862eb3e00ffc3" relative-path="images/xen/initrd.img" last-modified="1250661529"/><rhn-kickstart-file file-size="2225811" md5sum="b0d1757050f8158ee479cb837bebc1e5" relative-path="images/xen/vmlinuz" last-modified="1250661529"/><rhn-kickstart-file file-size="292" md5sum="f102510e5ef9241332a0b0b8bc77d27b" relative-path="isolinux/boot.msg" last-modified="1250661512"/><rhn-kickstart-file file-size="919" md5sum="ed9918e3f92726f1b2de46ff68d75fb2" relative-path="isolinux/general.msg" last-modified="1250661512"/><rhn-kickstart-file file-size="6855881" md5sum="1690e8997bbeae3035ee74ca5b7edcae" relative-path="isolinux/initrd.img" last-modified="1250661510"/><rhn-kickstart-file file-size="10648" md5sum="bda65fc7fca51f761fc690349a064340" relative-path="isolinux/isolinux.bin" last-modified="1250663984"/><rhn-kickstart-file file-size="366" md5sum="b802a16ff1e63ba6fa4fa7ba1ca73136" relative-path="isolinux/isolinux.cfg" last-modified="1250661512"/><rhn-kickstart-file file-size="94600" md5sum="841ef6078b7346ed84fd82eca86c3804" relative-path="isolinux/memtest" last-modified="1250661512"/><rhn-kickstart-file file-size="817" md5sum="5818963971c3abeed2888d6416b1c50e" relative-path="isolinux/options.msg" last-modified="1250661512"/><rhn-kickstart-file file-size="517" md5sum="28a15223c7d456f22309beca1f1fec5a" relative-path="isolinux/param.msg" last-modified="1250661512"/><rhn-kickstart-file file-size="490" md5sum="e9ca42df80f26b4db565959ec8da25e5" relative-path="isolinux/rescue.msg" last-modified="1250661512"/><rhn-kickstart-file file-size="23107" md5sum="8de921af902b22579f99cbece6abe13c" relative-path="isolinux/splash.lss" last-modified="1250661512"/><rhn-kickstart-file file-size="1855956" md5sum="bbff60614587a3d2c8472ddf3ce65fdf" relative-path="isolinux/vmlinuz" last-modified="1250661510"/></rhn-kickstart-files></rhn-kickstartable-tree></rhn-kickstartable-trees></rhn-satellite>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages.xml
deleted file mode 100644
index 46d4738..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages.xml
+++ /dev/null
@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><rhn-satellite generation="2" version="3.4"><rhn-packages><rhn-package compat="0" payload-size="1516760" name="mkisofs" package-size="609556" package-group="Applications/System
-" build-time="1155730269" source-rpm="cdrtools-2.01-10.src.rpm" md5sum="12499c6be3e98d0a0624abcac6a41ac1" payload-format="cpio" package-arch="i386" rpm-version="4.4.2" last-modified="1173375440" epoch="9" version="2.01" cookie="hs20-bc1-7.build.redhat.com 1155715772" release="10" build-host="hs20-bc1-7.build.redhat.com" id="rhn-package-386984"><rhn-package-summary>Creates an image of an ISO9660 filesystem.
-</rhn-package-summary><rhn-package-description>The mkisofs program is used as a pre-mastering program; i.e., it
-generates the ISO9660 filesystem. Mkisofs takes a snapshot of
-a given directory tree and generates a binary image of the tree
-which will correspond to an ISO9660 filesystem when written to
-a block device. Mkisofs is used for writing CD-ROMs, and includes
-support for creating bootable El Torito CD-ROMs.
-
-Install the mkisofs package if you need a program for writing
-CD-ROMs.
-</rhn-package-description><rhn-package-vendor>Red Hat, Inc.</rhn-package-vendor><rhn-package-copyright>GPL</rhn-package-copyright><rhn-package-header-sig><rhn-null/></rhn-package-header-sig><rhn-package-header-start>440</rhn-package-header-start><rhn-package-header-end>16912</rhn-package-header-end><rhn-package-changelog><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bernhard Rosenkraenzer <bero(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 1.8a34</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>945054000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bernhard Rosenkraenzer <bero(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Add S/390 support</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>976417200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bernhard Rosenkraenzer <bero(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to cdrtools 1.10a19</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>987732000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bernhard Rosenkraenzer <bero(a)redhat.com> 1.10-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Add Epoch - the new cdrecord subpackage had a smaller Epoch than the
- standalone cdrecord package from 7.1, causing update problems (#49963)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>996199200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix cdda2wav on sparc, and probably other IDE drives...</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>951361200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fixes for ia64</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>960775200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- strip binaries</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>937274400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Cristian Gafton <gafton(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- move config file to a sane place (/etc/cdrecord.conf)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>936669600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Cristian Gafton <gafton(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild to fix dependencies
-- get rid of useless defines at the top of the spec file</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>949374000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Cristian Gafton <gafton(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- removed the mkisofs subpackage - we have mkisofs provided by
- a'nother package (doh!)
-- moved former mkisofs diagnostic binaries to the main package
-- get rod of the cdda2wav too; cdparanoia is now in the distribution and
- it is a whole lot better too</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>935460000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Cristian Gafton <gafton(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 1.8 final
-- man pages are compressed</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>949460400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Cristian Gafton <gafton(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 1.8a40
-- according to the author, cdda2wav and mkisofs are more recent in this
- package, so build them out of this tree too
-- add sparc patch from jakub</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>949114800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Crutcher Dunnavant <crutcher(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added a not to the changelog to indicate that the
-- graft-points option is no longer assumed.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>965786400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Crutcher Dunnavant <crutcher(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix dependacy bug</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>993520800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Crutcher Dunnavant <crutcher(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- split to a cdrtools srpm
-- itterated to 1.10
-- applied alane(a)geeksrus.net's patch to fix bug #19841</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>993520800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Crutcher Dunnavant <crutcher(a)redhat.com> 1.10-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- disabled CD-EXTRA code; #50773</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>997322400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1054778400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1076727600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1078282800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1087351200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com> 8:2.01.1-9</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix #123548</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1112839200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Florian La Roche <Florian.LaRoche(a)redhat.de></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add s390x</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>988336800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Florian La Roche <Florian.LaRoche(a)redhat.de></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- updated sparc patch from Tom "spot" Callaway <tcallawa(a)redhat.com></rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1055728800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)faro.stuttgart.redhat.com> - 8:2.01-0.a25.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 2.01a25</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1074826800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)faro.stuttgart.redhat.com> - 8:2.01-0.a25.2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added utf-8 support to mkisofs (106479)
-- added BuildRequires groff (110746)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1075431600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)faro.stuttgart.redhat.com> - 8:2.01-0.a25.3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- new iconv patch (10)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1076036400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1108004400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> </rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1109818800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01-0.a25.4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added endianness patch from cdrdao</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1077159600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01-0.a27.2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added dvd patch from http://people.mandrakesoft.com/~warly/files/cdrtools/
-- added note to manpage about configuration path change</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1081389600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01-0.a27.3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fixed command line parsing, thx to Stephen Beahm (119906)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1082685600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01-0.a27.4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- provide dvdrecord with a stub to cdrecord</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1083895200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01-0.a27.5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added privacy patch
-- added second utf8 patch
-- added type patch
-- removed silly warnings</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1086746400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.0.a27-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- changed version scheme</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1087869600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.0.a32-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- new version
-- [cdrtools changelog]: The clone option was documented in the man page.
- cdda2wav/readcd -scanbus now works correctly readcd and gives a
- summary of defective sector numbers at the end. The mkisofs
- -H/-L/-P options were marked as reserved by POSIX, and mkisofs
- was sped up for very long pathological directories
- (all filenames need to be renamed for 8.3).</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1088128800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.0.a33-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- new version
-- [cdrtools changelog]: The changes in this release are as follows:
- Cdrecord now tries to check DMA speed, and prevents users from not
- using burnproof if the system is too slow. A bug in mkisofs
- -dvd-video was fixed. A bug in NT SPTI SCSI handling was fixed.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1089770400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.0.a34-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 2.01.0.a34
-- added dma patch</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1090375200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.0.a38-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- updated to version 2.01.0.a38
-- corrected the permissions for /etc/cdrecord.conf (bug 131541)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1094263200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.0.a38-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- improved the scanbus routing (scan.patch) now using glob(3)
-- removed linuxcheck()</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1094695200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.01.0.a10-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 2.01.01a10</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149645600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- final 2.01 version</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1095127200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.1-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fixed scsi-globbing</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1095127200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.1-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- better globbing
-- readded O_EXCL opening for the direct device opening case,
- e.g. dev=/dev/cdrom
-- removed some debugging messages (bug 82089)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1095904800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.1-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- use scd? instead of sg? for scsi scanning (may only work
- with a medium inserted, see bug 134822)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1097719200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 8:2.01.1-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added missing return statements (bug 136088)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1098151200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> - 9:2.01-10</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- moved back to version 2.01 (last GPL version),
- due to incompatible license issues</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1155780000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.0-11</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- changed requires</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1056765600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.01.0.a03-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 2.01.01a03
-- DVD patch from http://crashrecovery.org/oss-dvd.html adds support
- for DVD+RW and DVD+R DL burning</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1133838000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.01.0.a03-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- removed rezero_unit, so that non-root users can burn CDs</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1137553200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.01.0.a03-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1140058800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.01.0.a09-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 2.01.01a09</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1148954400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.01.0.a09-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- corrected multilib patch (bug #193796)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149300000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.01.0.a09-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- more corrections to multilib patch (bug #193796)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149300000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.01.0.a09-6</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- more corrections to multilib patch (bug #193796)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149300000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.1-10</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fixed mkisofs #166707 for gcc4</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1125540000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.1-11</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fixed isoinfo #167437
-- fixed rscsi debug #152462</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1127959200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.com> 8:2.01.1-7</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fixed gcc4 pickieness</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1108782000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 1.10-15</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added O_EXCL Patch6
-- added ppc64</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1036810800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 2.0-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- updated to 2.0 final</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1042167600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 2.0-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- s#/etc/default/cdrecord#/etc/cdrecord.conf#g</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1042513200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 2.0-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- take out O_EXCL Patch
-- mv iso* tools to mkisofs</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1043204400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 2.0pre1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 2.0pre1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1040180400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 8:2.0-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- readded O_EXCL patch</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1046228400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 8:2.0-6</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- refined O_EXCL patch</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1046314800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 8:2.0-7</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- refined O_EXCL patch, nonroot sg handling</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1052791200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 8:2.0-8</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- refined O_EXCL patch, nonroot sg handling</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1052877600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 8:2.0-9</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added fmt patch</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1053655200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 8:2.01-0.a19.2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- converted man pages to utf-8
-- added readcd man page</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1067047200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 8:2.01-0.a19.3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- added more ATAPI devices letters to scan #111603</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1070938800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Harald Hoyer <harald(a)redhat.de> 8:2.01-0.a20.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 2.01a20</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1071630000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jakub Jelinek <jakub(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix typos so that it builds with glibc 2.2.2</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>982206000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jesse Keating <jkeating(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1134183600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jesse Keating <jkeating(a)redhat.com> - 8:2.01.01.0.a03-2.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt for new gcc4.1 snapshot and glibc changes</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1139367600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jesse Keating <jkeating(a)redhat.com> - 8:2.01.01.0.a03-2.2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- bump again for double-long bug on ppc(64)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1139626800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jesse Keating <jkeating(a)redhat.com> - 8:2.01.01.0.a10-1.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1152756000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Karsten Hopp <karsten(a)redhat.de></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild to fix permissions on /usr/share/doc</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>975726000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matt Wilson <msw(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- oops, rebuilt to fix the mkisofs mess I made</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>961380000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matt Wilson <msw(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- require serial:version</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>937879200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mike A. Harris <mharris(a)redhat.com> 1.10-10</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Quelled rpmlint warning messages by adding Provides: cdrecord-cdda2wav to
- cdda2wav subpackage and Provides: mkisofs to mkisofs subpackage</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1014692400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mike A. Harris <mharris(a)redhat.com> 1.10-11</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added cdrtools-1.11a06-silo.patch for sparc, from Tom "spot" Callaway</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1014951600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mike A. Harris <mharris(a)redhat.com> 1.10-12</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Rebuilt in new build environment</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1014951600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mike A. Harris <mharris(a)redhat.com> 1.10-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- bzip2'd the sources to save 300k</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1008730800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mike A. Harris <mharris(a)redhat.com> 1.10-7</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added -f flag to 'mv' and removed ";" from sed statement in CDEXTRA
- disabling code in spec.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1011582000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mike A. Harris <mharris(a)redhat.com> 1.10-8</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added cdrtools-1.10-mkisofs-sharing.patch to fix bug (#56304)
-- Added zisofs support patch from Hans Peter Anvin for bugzilla enhancement
- request number (#59251), which requires a Linux kernel 2.4.14 or newer in
- order to have zisofs support.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1011582000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mike A. Harris <mharris(a)redhat.com> 1.10-9</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Rebuilt in new build environment</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1014692400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Preston Brown <pbrown(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 1.8a25</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>936064800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Preston Brown <pbrown(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- a29</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>937879200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Preston Brown <pbrown(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- adopted for Red Hat Linux 6.1 from Ryan Weaver.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>935200800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Prospector <bugzilla(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automatic rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>963453600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Than Ngo <than(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- don't hard code manpath, it breaks when rebuilt it on 6.2 (Bug #20132)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>973825200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automated rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1022464800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automated rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024711200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1043290800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com> 1.10-6</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automated rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1010631600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com> 8:2.0-10.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add epoch requirement on cdrecord for cdrecord-devel
-- built for RHEL</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1055124000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- patch for %{_mandir}
-- use %{_tmppath} and %{_mandir}
-- don't use %{prefix}
-- exclude ia64</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>960516000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- upgraded to 1.8.1 - updated the redhat patch (renamed to
- "conflocation"), remove the SILO patch (it should be
- supported now...). Is the IDE-patch still necesarry?
-- upgraded source location
-- don't strip manually</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>958010400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 1.9 - redid patches, dropped the cdda2wav ioctl
- one as the code has changed
-- use epoch</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>964231200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Warren Togami <wtogami(a)redhat.com> - 8:2.01-0.a27.4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- oops, wrong version in dvdrecord Obsoletes</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1083981600</rhn-package-changelog-entry-time></rhn-package-changelog-entry></rhn-package-changelog><rhn-package-requires><rhn-package-requires-entry version="4.0-1" name="rpmlib(PayloadFilesHavePrefix)" sense="16777290"/><rhn-package-requires-entry version="3.0.4-1" name="rpmlib(CompressedFileNames)" sense="16777290"/><rhn-package-requires-entry version="" name="libc.so.6" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.0)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.1)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.2)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.2.3)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.3)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.3.4)" sense="16384"/><rhn-package-requires-entry version="" name="rtld(GNU_HASH)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.4)" sense="16384"/></rhn-package-requires><rhn-package-provides><rhn-package-provides-entry version="" name="cdrecord-mkisofs" sense="0"/><rhn-package-provides-entry version="9:2.01-10" name="mkisofs" sense="8"/></rhn-package-provides><rhn-package-conflicts/><rhn-package-obsoletes><rhn-package-obsoletes-entry version="" name="cdrecord-mkisofs" sense="0"/></rhn-package-obsoletes><rhn-package-files><rhn-package-file username="root" lang="" name="/usr/bin/isodump" verifyflags="-1" rdev="0" groupname="root" mtime="1155730268" file_size="144428" device="2305" flags="0" md5="e062281112a60dbdaddafee899a75f5f" inode="8028391" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/bin/isoinfo" verifyflags="-1" rdev="0" groupname="root" mtime="1155730268" file_size="265484" device="2305" flags="0" md5="2995e0264ed393e3c9ef09b4b86d05c2" inode="8028369" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/bin/isovfy" verifyflags="-1" rdev="0" groupname="root" mtime="1155730268" file_size="145356" device="2305" flags="0" md5="18da94d445a77be9de50485b7f551615" inode="8028372" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/share/man/man8/isoinfo.8.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1155730266" file_size="3414" device="2305" flags="2" md5="2cd075c93063d00f3fd2815b06a0dd8d" inode="8028367" linkto="" file_mode="-32476"/><rhn-package-file username="root" lang="" name="/usr/bin/mkisofs" verifyflags="-1" rdev="0" groupname="root" mtime="1155730268" file_size="476388" device="2305" flags="0" md5="def3467d41343d26a15e2ac5e4f3bb0a" inode="8028370" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/share/man/man8/mkisofs.8.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1155730265" file_size="29218" device="2305" flags="2" md5="152ca406dbbc76862395d5f461e55d89" inode="8028353" linkto="" file_mode="-32476"/><rhn-package-file username="root" lang="" name="/usr/bin/mkhybrid" verifyflags="-1" rdev="0" groupname="root" mtime="1155730265" file_size="7" device="2305" flags="0" md5="" inode="8028362" linkto="mkisofs" file_mode="-24065"/><rhn-package-file username="root" lang="" name="/usr/bin/isodebug" verifyflags="-1" rdev="0" groupname="root" mtime="1155730268" file_size="140300" device="2305" flags="0" md5="4bb964b7ff86a0eb9419433a99b0b4e4" inode="8028379" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/share/man/man8/mkhybrid.8.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1155730265" file_size="64" device="2305" flags="2" md5="50d3a781324797f79824bb54f0bc2b03" inode="8028376" linkto="" file_mode="-32476"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.eltorito" verifyflags="0" rdev="0" groupname="root" mtime="953438382" file_size="4575" device="2305" flags="2" md5="c0fd1c053373d02fbb7b3e1883b45351" inode="8028831" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.graft_dirs" verifyflags="0" rdev="0" groupname="root" mtime="947708395" file_size="4693" device="2305" flags="2" md5="5ad847586f6f022eb27b8cf37878e2a9" inode="8028832" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.macosx" verifyflags="0" rdev="0" groupname="root" mtime="1029352913" file_size="1964" device="2305" flags="2" md5="0d72a6d97891826ab9b900ec2e931279" inode="8028837" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/COPYING" verifyflags="0" rdev="0" groupname="root" mtime="748143719" file_size="18208" device="2305" flags="2" md5="d2cad9e5b4b1cff77dd677270b0e8018" inode="8028827" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.hfs_magic" verifyflags="0" rdev="0" groupname="root" mtime="898014932" file_size="2769" device="2305" flags="2" md5="8406f7da1d6e7e7de1fd82c07ed2a1b7" inode="8028834" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.mkhybrid" verifyflags="0" rdev="0" groupname="root" mtime="962069489" file_size="4174" device="2305" flags="2" md5="8ff4e27c1d4525837b84fd6222074cad" inode="8028838" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.sparcboot" verifyflags="0" rdev="0" groupname="root" mtime="945050492" file_size="3085" device="2305" flags="2" md5="3e2ee5d0fa41a3e8d207bb2572b252f5" inode="8028843" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.joliet" verifyflags="0" rdev="0" groupname="root" mtime="987108399" file_size="2180" device="2305" flags="2" md5="b9eb86d5f6e3185330226b28df0f965b" inode="8028836" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.hide" verifyflags="0" rdev="0" groupname="root" mtime="1006456917" file_size="8336" device="2305" flags="2" md5="dd4dd260e807d0db89b0fc39c2bc5f64" inode="8028835" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/ChangeLog" verifyflags="0" rdev="0" groupname="root" mtime="1155730176" file_size="127571" device="2305" flags="2" md5="02367ac0a5f982f9ef29ab19aa439f78" inode="8028828" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.sort" verifyflags="0" rdev="0" groupname="root" mtime="1006456917" file_size="3331" device="2305" flags="2" md5="8ccd399e6c11213629723f838eaf6689" inode="8028842" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01" verifyflags="0" rdev="0" groupname="root" mtime="1155730269" file_size="4096" device="2305" flags="0" md5="" inode="8028824" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.session" verifyflags="0" rdev="0" groupname="root" mtime="920366200" file_size="2306" device="2305" flags="2" md5="73decfba349445fda98a63633aeba249" inode="8028841" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.hfs_boot" verifyflags="0" rdev="0" groupname="root" mtime="964121775" file_size="2891" device="2305" flags="2" md5="5b47186a16d25878cabdf7a59f24ef81" inode="8028833" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.prep_boot" verifyflags="0" rdev="0" groupname="root" mtime="934073112" file_size="1780" device="2305" flags="2" md5="e280533584a4ac63358ab9b412503477" inode="8028839" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.compression" verifyflags="0" rdev="0" groupname="root" mtime="1017862951" file_size="704" device="2305" flags="2" md5="19d75ed0b33db723398b728f55de3255" inode="8028830" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README" verifyflags="0" rdev="0" groupname="root" mtime="943329795" file_size="5464" device="2305" flags="2" md5="4f4fcd679804d7362f77e05b7d557150" inode="8028829" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.rootinfo" verifyflags="0" rdev="0" groupname="root" mtime="956774498" file_size="2752" device="2305" flags="2" md5="f1fedff760c10e6caee9e039386e89cf" inode="8028840" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/README.sunx86boot" verifyflags="0" rdev="0" groupname="root" mtime="1072758507" file_size="2520" device="2305" flags="2" md5="2f029bf9465c1b1f57c6930b123d7062" inode="8028844" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/AN-2.0" verifyflags="0" rdev="0" groupname="root" mtime="1155730176" file_size="54774" device="2305" flags="2" md5="ad5f8bfa468d571d932543ba0ab9713b" inode="8028825" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/mkisofs-2.01/AN-2.01" verifyflags="0" rdev="0" groupname="root" mtime="1155730176" file_size="53434" device="2305" flags="2" md5="22bcc8242cb04cd6171facac1e70c2d9" inode="8028826" linkto="" file_mode="-32348"/></rhn-package-files></rhn-package><rhn-package compat="0" payload-size="30627796" name="samba" package-size="16556646" package-group="System Environment/Daemons
-" build-time="1157180359" source-rpm="samba-3.0.23c-2.src.rpm" md5sum="f28046f84ea5ac24a98cc7b6958d9b19" payload-format="cpio" package-arch="i386" rpm-version="4.4.2" last-modified="1173375414" epoch="0" version="3.0.23c" cookie="hs20-bc1-6.build.redhat.com 1157165694" release="2" build-host="hs20-bc1-6.build.redhat.com" id="rhn-package-386981"><rhn-package-summary>The Samba SMB server.
-</rhn-package-summary><rhn-package-description>
-Samba is the suite of programs by which a lot of PC-related machines
-share files, printers, and other information (such as lists of
-available files and printers). The Windows NT, OS/2, and Linux
-operating systems support this natively, and add-on packages can
-enable the same thing for DOS, Windows, VMS, UNIX of all kinds, MVS,
-and more. This package provides an SMB server that can be used to
-provide network services to SMB (sometimes called "Lan Manager")
-clients. Samba uses NetBIOS over TCP/IP (NetBT) protocols and does NOT
-need the NetBEUI (Microsoft Raw NetBIOS frame) protocol.
-</rhn-package-description><rhn-package-vendor>Red Hat, Inc.</rhn-package-vendor><rhn-package-copyright>GNU GPL Version 2</rhn-package-copyright><rhn-package-header-sig><rhn-null/></rhn-package-header-sig><rhn-package-header-start>440</rhn-package-header-start><rhn-package-header-end>111512</rhn-package-header-end><rhn-package-changelog><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add a %defattr for -common</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>941248800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add a %trigger to work around (sort of) broken scripts in
- previous releases</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>935200800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add a -common package, shuffle files around.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>933991200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add a chmod in %postun so /etc/services & inetd.conf don't become unreadable</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>932781600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add a mount.smb to make smb mounting a little easier.
-- smb filesystems apparently don't work on alpha. Oops.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>922503600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add a patch to fix dropped reconnection attempts</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>938052000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add copytruncate to logrotate file (#14360)
-- fix init script (#13708)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>964231200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add domain parsing to mount.smb</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>934250400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add i18n support, japanese patch (#26253)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>981601200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add smbspool back in (#15827)
-- fix absolute symlinks (#16125)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>966304800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- always create codepages</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>922417200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- change /var/log/samba to 0700
-- turn on mmap support</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>944103600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- configure the swat stuff usefully
-- re-integrate some specfile tweaks that got lost somewhere</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>961207200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- device-remove security fix again (<tridge(a)samba.org>)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>989287200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix bash2 breakage in post script</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>918615600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix condrestart stuff</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>964836000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix init script</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>962330400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix initscripts req (prereq /etc/init.d)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>962935200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix logrotate script (#13698)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>963367200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix one problem with mount.smb script
-- fix smbpasswd on sparc with a really ugly kludge</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>929412000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix quota support, and quotas with the 2.4 kernel (#31362, #33915)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>985921200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix swat only_from line (#18726, others)
-- fix attempt to write outside buildroot on install (#17943)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>971748000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix tempfile security problems (patch from <Marcus.Meissner(a)caldera.de>)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>986522400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix tempfile security problems, officially (<tridge(a)samba.org>)
-- update to 2.0.8</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>987818400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix trigger (#26859)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>981774000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix trigger, again.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>951534000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix trigger.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>949978800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix typo in mount.smb</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>935287200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix yp_get_default_domain in autoconf
-- only link against readline for smbclient
-- fix log rotation (#9909)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>953262000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fixes for ia64</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>957837600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- go back to stop/start for restart (-HUP didn't work in testing)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>924314400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- i18n-ize initscript
-- add a sysconfig file for daemon options (#23550)
-- clarify smbpasswd man page (#23370)
-- build with LFS support (#22388)
-- avoid extraneous pam error messages (#10666)
-- add Urban Widmark's bug fixes for smbmount (#19623)
-- fix setgid directory modes (#11911)
-- split swat into subpackage (#19706)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>979873200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- initscript munging</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>934855200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- initscript munging</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>962071200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- initscript oopsie. killproc <name> -HUP, not other way around.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>938570400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- logrotate changes</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>922244400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- mount.smb/mount.smbfs go in /sbin, *not* %{_sbindir}</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>993002400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- move initscript back
-- remove 'Using Samba' book from %doc
-- move stuff to /etc/samba (#13708)
-- default configuration tweaks (#13704)
-- some logrotate tweaks</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>963712800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- munge post scripts slightly</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>948510000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- new i18n stuff</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>980391600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- put smbpasswd in samba-common (#25429)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>980996400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>980132400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild in new environment</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>960775200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild to get rid of cups dependency</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>961120800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rename samba logs (#11606)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>962157600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- script cleanups. Again.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>938397600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- sed "s|nawk|gawk|" /usr/bin/convert_smbpasswd</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>936064800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- shift some files into -client
-- remove /home/samba from package.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>939175200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- so many releases, so little time
-- explicitly uncomment 'printing = bsd' in sample config</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>927252000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- split off clients into separate package
-- don't run samba by default</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>929757600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- swat swat</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>919134000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- switch to %configure</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>957664800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- turn of 64-bit locking on 32-bit platforms</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>927684000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- turn of SSL, kerberos</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>986781600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- turn off mmap. ;)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>944535600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- turn on mmap again. Wheee.
-- ship smbmount on alpha</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>948337200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- turn on quota support</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>949719600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.0.0</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>918270000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.0.2</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>919393200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.0.3</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>921034800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.0.4a
-- fix mount.smb arg ordering</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>927079200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.0.5
-- fix mount.smb - smbmount options changed again.........
-- fix postun. oops.
-- update some stuff from the samba team's spec file.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>932608800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.0.6</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>942375600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- updated japanese stuff (#27683)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>982206000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Bill Nottingham <notting(a)redhat.com> 2.2.7-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.2.7
-- add patch for LFS in smbclient (<tcallawa(a)redhat.com>)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1037847600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Cristian Gafton <gafton(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- make sure all binaries are stripped</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>908244000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Cristian Gafton <gafton(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild to fox dependencies
-- man pages are compressed</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>949374000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Cristian Gafton <gafton(a)redhat.com> </rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- auto rebuild in the new build environment (release 3)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>922071600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Dale Lovelace <dale(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fixed logrotate script</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>929066400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1046142000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1054778400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1076727600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1078282800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1087351200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com> 2.2.7-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix missing doc files.
-- Fix multilib issues</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1038884400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Erik Troan <ewt(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- made the %postun script a tad less agressive; no reason to remove
- the logs or lock file (after all, if the lock file is still there,
- samba is still running)
-- the %postun and %preun should only exectute if this is the final
- removal
-- migrated %triggerpostun from Red Hat's samba package to work around
- packaging problems in some Red Hat samba releases</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>897357600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Erik Troan <ewt(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- updated postun triggerscript to check $0
-- clear /etc/codepages from %preun instead of %postun</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>899863200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Felipe Alfaro Solana <felipe_alfaro(a)linuxmail.org> 3.0.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 3.0.1
-- Removed testparm patch as it's already merged
-- Removed Samba.7* man pages
-- Fixed .buildroot patch
-- Fixed .pie patch
-- Added new /usr/bin/tdbdump file</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1071716400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Florian La Roche <Florian.LaRoche(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- simplify preun</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>954126000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Florian La Roche <Florian.LaRoche(a)redhat.de></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add proper ldconfig calls</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1052964000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Florian La Roche <Florian.LaRoche(a)redhat.de> 2.2.2-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add "reload" to the usage string in the startup script</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1004842800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Florian La Roche <laroche(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add a "exit 0" to the postun of the main samba package</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1111719600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Helge Deller <hdeller(a)redhat.de> </rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- build as 2.2.0-1 release
-- skip the documentation-directories docbook, manpages and yodldocs
-- don't include *.sgml documentation in package
-- moved codepage-directory to /usr/share/samba/codepages
-- make it compile with glibc-2.2.3-10 and kernel-headers-2.4.2-2</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>991965600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Helge Deller <hdeller(a)redhat.de> </rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- updated to samba 2.2.0
-- moved codepages to /usr/share/samba/codepages
-- use all available CPUs for building rpm packages
-- use %{_xxx} defines at most places in spec-file
-- "License:" replaces "Copyright:"
-- dropped excludearch sparc
-- de-activated japanese patches 100 and 200 for now
- (they need to be fixed and tested wth 2.2.0)
-- separated swat.desktop file from spec-file and added
- german translations
-- moved /etc/sysconfig/samba to a separate source-file
-- use htmlview instead of direct call to netscape in
- swat.desktop-file</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>990496800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jason Vas Dias <jvdias(a)redhat.com> 3.0.5-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Removed '-pie' patch - 3.0.5 uses -fPIC/-PIC, and the combination
-- resulted in executables getting corrupt stacks, causing smbmnt to
-- get a SIGBUS in the mount() call (bug 127420).</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1091757600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Change all requires lines to list an explicit epoch. Closes #102715
-- Add an explicit Epoch so that 0 is defined.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1076727600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Include patch from Steven Lawrance (slawrance(a)yahoo.com) that modifies
- smbmnt to work with 32-bit uids.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1097114400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Merge from samba-3E-branch after samba-3.0.0rc1 was released</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1061258400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 2.0.21c-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1142650800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 2.2.7a-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.2.7a
-- Change default printing system to CUPS
-- Turn on pam_smbpass
-- Turn on msdfs</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1042167600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 2.2.7a-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- edited spec file to put .so files in the correct directories
- on 64-bit platforms that have 32-bit compatability issues
- (sparc64, x86_64, etc). This fixes bugzilla #83782.
-- Added samba-2.2.7a-error.patch from twaugh. This fixes
- bugzilla #82454.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1044932400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 2.2.8-0</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Upgrade to 2.2.8
-- removed commented out patches.
-- removed old patches and .md5 files from the repository.
-- remove duplicate /sbin/chkconfig --del winbind which causes
- warnings when removing samba.
-- Fixed minor bug in smbprint that causes it to fail when called with
- more than 10 parameters: the accounting file (and spool directory
- derived from it) were being set wrong due to missing {}. This closes
- bug #86473.
-- updated smb.conf patch, includes new defaults to close bug #84822.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1048561200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 2.2.8a-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- upgrade to 2.2.8a
-- remove old .md5 files
-- add "pid directory = /var/run" to the smb.conf file. Fixes #88495
-- Patch from jra(a)dp.samba.org to fix a delete-on-close regression</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1051236000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 2.2.8a-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add libsmbclient.so for gnome-vfs-extras
-- Edit specfile to specify /var/run for pid files
-- Move /tmp/.winbindd/socket to /var/run/winbindd/socket</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1054173600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.0-15</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New 3.0.0 final release
-- merge nmbd-netbiosname and testparm patches from 3E branch
-- updated the -logfiles patch to work against 3.0.0
-- updated the pie patch
-- update the VERSION file during build
-- use make -j if avaliable
-- merge the winbindd_privileged change from 3E
-- merge the "rm /usr/lib" patch that allows Samba to build on 64-bit
- platforms despite the broken Makefile</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1064541600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.0-3beta3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Merge from 3.0.0-2beta3.3E
-- (Correct log file names (#100981).)
-- (Fix pidfile directory in samab.log)
-- (Remove obsolete samba-3.0.0beta2.tar.bz2.md5 file)
-- (Move libsmbclient to the -common package (#99449))</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1059012000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.10-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream release that closes CAN-2004-1154 bz#142544
-- Include the -64bit patch from Nalin. This closes bz#142873
-- Update the -logfiles patch to work with 3.0.10
-- Create /var/run/winbindd and make it part of the -common rpm to close
- bz#142242</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1103338800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.10-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update the -man patch to fix ntlm_auth.1 too.
-- Move pam_smbpass.so to the -common package, so both the 32
- and 64-bit versions will be installed on multiarch platforms.
- This closes bz#143617
-- Added new -delim patch to fix mount.cifs so it can accept
- passwords with commas in them (via environment or credentials
- file) to close bz#144198</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1105585200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.11-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- include -smbspool patch to close bz#104136</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1107572400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.11-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add -gcc4 patch to compile with gcc 4.
-- remove the now obsolete -smbclient-kerberos.patch
-- Include four upstream patches from
- http://samba.org/~jerry/patches/post-3.0.11/
- (Slightly modified the winbind_find_dc_v2 patch to apply easily with
- rpmbuild).</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1108782000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.11-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Use the updated filter-requires-samba.sh file, so we don't accidentally
- pick up a dependency on perl(Crypt::SmbHash)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1109300400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.13-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream release
-- add my -quoting patch, to fix swat with strings that contain
- html meta-characters, and to use correct quote characters in
- lists, closing bz#134310
-- include the upstream winbindd_2k3sp1 patch
-- include the -smbclient patch.
-- include the -hang patch from upstream.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1112925600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.14a-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream release.
-- the -64bit-timestamps, -clitar, -establish_trust, user_rights_v1,
- winbind_find_dc_v2 patches are now obsolete.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1115085600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.2-1rc1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Upgrade to new upstream version</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1074567600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.2-3rc2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add %dir entries for /usr/lib/samba and /usr/lib/samba/charset
-- Upgrade to new upstream version
-- build mount.cifs for the new cifs filesystem in the 2.6 kernel.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1075777200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.2-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version: 3.0.2 final includes security fix for #114995
- (CAN-2004-0082)
-- Edit postun script for the -common package to restart winbind when
- appropriate. Fixes bugzilla #114051.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1076382000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.20-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream release
- Includes five upstream patches -bug3010_v1, -groupname_enumeration_v3,
- -regcreatekey_winxp_v1, -usrmgr_groups_v1, and -winbindd_v1
- This obsoletes the -pie and -delim patches
- the -warning and -gcc4 patches are obsolete too
- The -man, -passwd, and -smbspool patches were updated to match 3.0.20pre1
- Also, the -quoting patch was implemented differently upstream
- There is now a umount.cifs executable and manpage
- We run autogen.sh as part of the build phase
- The testprns command is now gone
- libsmbclient now has a man page
-- Include -bug106483 patch to close
- bz#106483 smbclient: -N negates the provided password, despite documentation
-- Added the -warnings patch to quiet some compiler warnings.
-- Removed many obsolete patches from CVS.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1124762400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.20b-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- turn on -DLDAP_DEPRECATED to allow access to ldap functions that have
- been depricated in 2.3.11, but which don't have well-documented
- replacements (ldap_simple_bind_s(), for example).
-- Upgrade to 3.0.20b, which includes all the previous upstream patches.
-- Updated the -warnings patch for 3.0.20a.
-- Include --with-shared-modules=idmap_ad,idmap_rid to close
- bz#156810 --with-shared-modules=idmap_ad,idmap_rid
-- Include the new samba.pamd from Tomas Mraz (tmraz(a)redhat.com) to close
- bz#170259 pam_stack is deprecated</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1131937200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.21b-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version.
-- Since the rawhide kernel has dropped support for smbfs, remove smbmount
- and smbumount. Users should use mount.cifs instead.
-- Upgrade to 3.0.21b</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1139886000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.23-0.RC3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream RC release.
-- Update the -logfiles, and -passwd patches for
- 3.0.23rc3
-- Include the change to smb.init from Bastien Nocera <bnocera(a)redhat.com>)
- to close
- bz#182560 Wrong retval for initscript when smbd is dead
-- Update this spec file to build with 3.0.23rc3
-- Remove the -install.mount.smbfs patch, since we don't install
- mount.smbfs any more.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1152237600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.23-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream release.
-- Use modified filter-requires-samba.sh from packaging/RHEL/setup/
- to get rid of bogus dependency on perl(Unicode::MapUTF8)
-- Update the -logfiles and -smb.conf patches to work with 3.0.23</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1152669600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.23a-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Upgrade to new upstream 3.0.23a
-- include upstream samr_alias patch</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1153792800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.23a-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix the -logfiles patch to close
- bz#199607 Samba compiled with wrong log path.
- bz#199206 smb.conf has incorrect log file path</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1153792800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.23b-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream release.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1155088800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.23c-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream release.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157162400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.2a-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Upgrade to 3.0.2a</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1076986800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.3-1.pre1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version.
-- Updated -pie and -logfiles patches for 3.0.3pre1
-- add krb5-devel to buildrequires, fixes #116560
-- Add patch from Miloslav Trmac (mitr(a)volny.cz) to allow non-root to run
- "service smb status". This fixes #116559</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1079406000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.3-2.pre2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version
-- Updated configure line to remove --with-fhs and to explicitly set all
- the directories that --with-fhs was setting. We were overriding most of
- them anyway. This closes #118598</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1081216800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.3-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Samba 3.0.3 released.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1083290400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.3-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Patch to allow password changes from machines patched with
- Microsoft hotfix MS04-011.
-- Include patches for https://bugzilla.samba.org/show_bug.cgi?id=1302
- and https://bugzilla.samba.org/show_bug.cgi?id=1309</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1083722400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.5-0.pre1.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Backport base64_decode patche to close CAN-2004-0500
-- Backport hash patch to close CAN-2004-0686
-- use_authtok patch from Nalin Dahyabhai <nalin(a)redhat.com>
-- smbclient-kerberos patch from Alexander Larsson <alexl(a)redhat.com>
-- passwd patch uses "*" instead of "x" for "hashed" passwords for
- accounts created by winbind. "x" means "password is in /etc/shadow" to
- brain-damaged pam_unix module.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1090375200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.5-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Upgrade to 3.0.5, which is a regression from 3.0.5pre1 for a
- security fix.
-- Include the 3.0.4-backport patch from the 3E branch. This restores
- some of the 3.0.5pre1 and 3.0.5rc1 functionality.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1091239200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.5.0pre1.0</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version
-- use % { SOURCE1 } instead of a hardcoded path
-- include -winbind patch from Gerald (Jerry) Carter (jerry(a)samba.org)
- https://bugzilla.samba.org/show_bug.cgi?id=1315
- to make winbindd work against Windows versions that do not have
- 128 bit encryption enabled.
-- Moved /usr/bin/net to the -common package, so that folks who just
- want to use winbind, etc don't have to install -client in order to
- "net join" their domain.
-- New upstream version obsoletes the patches added in 3.0.3-5
-- Remove smbgetrc.5 man page, since we don't ship smbget.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1088820000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.6-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version.
-- Include post 3.0.6 patch from "Gerald (Jerry) Carter" <jerry(a)samba.org>
- to fix a duplicate in the LDAP schema.
-- Include 64-bit timestamp patch from Ravikumar (rkumar(a)hp.com)
- to allow correct timestamp handling on 64-bit platforms and fix #126109.
-- reenable the -pie patch. Samba is too widely used, and too vulnerable
- to potential security holes to disable an important security feature
- like -pie. The correct fix is to have the toolchain not create broken
- executables when programs compiled -pie are stripped.
-- Remove obsolete patches.
-- Modify this spec file to put libsmbclient.{a,so} in the right place on
- x86_64 machines.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1092708000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.7-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Upgrade to 3.0.7, which fixes CAN-2004-0807 CAN-2004-0808
- This obsoletes the 3.0.6-schema patch.
-- Update BuildRequires line to include openldap-devel openssl-devel
- and cups-devel</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1095127200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.7-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update docs section to not carryover the docs/manpages directory
- This moved many files from /usr/share/doc/samba-3.0.7/docs/* to
- /usr/share/doc/samba-3.0.7/*
-- Modify spec file as suggested by Rex Dieter (rdieter(a)math.unl.edu)
- to correctly create libsmbclient.so.0 and to use /etc/rc.d/init.d instead
- of rolling our own. This closes #132642
-- Add patch to default "use sendfile" to no, since sendfile appears to
- be broken
-- Add patch from Volker Lendecke <vl(a)samba.org> to help make
- ldapsam_compat work again.
-- Add patch from "Vince Brimhall" <vbrimhall(a)novell.com> for ldapsam_compat
- These two patches close bugzilla #132169</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1095300000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.8-0.pre1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- new upstream release. This obsoletes the ldapsam_compat patches.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1096336800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.8-0.pre1.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Include disable-sendfile patch to default "use sendfile" to "no".
- This closes #132779</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1097719200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.8-0.pre1.2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Re-enable the x_fclose patch that was accidentally disabled
- in 3.0.8-0.pre1.1. This closes #135832
-- include Nalin's -fqdn and -salt patches.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1097892000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.8-0.pre1.3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- disable the -salt patch, because it causes undefined references in
- libsmbclient that prevent gnome-vfs from building.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1098237600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.8-0.pre2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version
-- Add Nalin's signing-shortkey patch.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1098842400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.8-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version fixes CAN-2004-0930. This obsoletes the
- disable-sendfile, salt, signing-shortkey and fqdn patches.
-- Add my <fenlason(a)redhat.com> ugly non-ascii-domain patch.
-- Updated the pie patch for 3.0.8.
-- Updated the logfiles patch for 3.0.8.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1099969200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.8-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Include the corrected docs tarball, and use it instead of the
- obsolete docs from the upstream 3.0.8 tarball.
-- Update the logfiles patch to work with the updated docs.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1100055600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.8-3.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Rescue the install.mount.smbfs patch from Juanjo Villaplana
- (villapla(a)si.uji.es) to prevent building the srpm from trashing your
- installed /usr/bin/smbmount</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1100228400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jay Fenlason <fenlason(a)redhat.com> 3.0.9-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream release. This obsoletes the -secret patch.
- Include my changetrustpw patch to make "net ads changetrustpw" stop
- aborting. This closes #134694
-- Remove obsolete triggers for ancient samba versions.
-- Move /var/log/samba to the -common rpm. This closes #76628
-- Remove the hack needed to get around the bad docs files in the
- 3.0.8 tarball.
-- Change the comment in winbind.init to point at the correct pidfile.
- This closes #76641</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1101178800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jeff Johnson <jbj(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 1.9.18p10.
-- fix %triggerpostun.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>906084000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jeff Johnson <jbj(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- use cp rather than mv to preserve /etc/services perms (#4938 et al).
-- use mktemp to generate /etc/tmp.XXXXXX file name.
-- add prereqs on sed/mktemp/killall (need to move killall to /bin).
-- fix trigger syntax (i.e. "samba < 1.9.18p7" not "samba < samba-1.9.18p7")</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>936669600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jeff Johnson <jbj(a)redhat.com> 2.2.7-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- use internal dep generator.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1041735600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jesse Keating <jkeating(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1134183600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jesse Keating <jkeating(a)redhat.com> - 0:3.0.20b-2.1.1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- bump again for double-long bug on ppc(64)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1139626800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>John H Terpstra <jht(a)samba.anu.edu.au></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Many optimisations (some suggested by Manoj Kasichainula <manojk(a)io.com>
-- Use of chkconfig in place of individual symlinks to /etc/rc.d/init/smb
-- Compounded make line
-- Updated smb.init restart mechanism
-- Use compound mkdir -p line instead of individual calls to mkdir
-- Fixed smb.conf file path for log files
-- Fixed smb.conf file path for incoming smb print spool directory
-- Added a number of options to smb.conf file
-- Added smbadduser command (missed from all previous RPMs) - Doooh!
-- Added smbuser file and smb.conf file updates for username map</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>885697200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>John H Terpstra <jht(a)samba.anu.edu.au></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Updated version and codepage info.
-- Release to test name resolve order</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>890276400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>John H Terpstra <jht(a)samba.anu.edu.au></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- minor tidy up in preparation for release of 1.9.18p5
-- added findsmb utility from SGI package</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>893642400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jonathan Blandford <jrb(a)redhat.com> 2.2.7a-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- remove swat.desktop file</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1045796400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Karsten Hopp <karsten(a)redhat.de> 3.0.2-7 </rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix ownership in -common package</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1076986800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matt Wilson <msw(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- patch configure.ing (patch11) to disable cups test
-- turn off swat by default</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>965095200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- change PAM setup to use system-auth</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>959911200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- enable Kerberos 5 and SSL support
-- patch for duplicate profile.h headers</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>962330400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild in new environment</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>983588400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- set a default CA certificate path in smb.conf (#19010)
-- require openssl >= 0.9.5a-20 to make sure we have a ca-bundle.crt file</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>972525600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- tweak logrotate configurations to use the PID file in /var/lock/samba</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>961034400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- tweak the PAM code some more to try to do a setcred() after initgroups()
-- pull in all of the optflags on i386 and sparc
-- don't explicitly enable Kerberos support -- it's only used for password
- checking, and if PAM is enabled it's a no-op anyway</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>985662000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com> 2.2.3a-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- include interfaces.o in pam_smbpass.so, which needs symbols from interfaces.o
- (patch posted to samba-list by Ilia Chipitsine)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1016161200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com> 2.2.7a-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- relink libnss_wins.so with SHLD="gcc -lnsl" to force libnss_wins.so to
- link with libnsl, avoiding unresolved symbol errors on functions in libnsl</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1045796400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com> 2.2.8a-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1056333600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nils Philippsen <nils(a)redhat.de></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- version 2.0.7</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>956800800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Philipp Knirsch <pknirsch(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- bugfix for smbadduser script (#15148)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>965613600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Preston Brown <pbrown(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- enable encypted passwords by default</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>992052000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Preston Brown <pbrown(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- updated init script to use graceful restart (not stop/start)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>921898800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Prospector <bugzilla(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automatic rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>963453600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Than Ngo <than(a)redhat.com> 3.0.8-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix unresolved symbols in libsmbclient which caused applications
- such as KDE's konqueror to fail when accessing smb:// URLs. #139894</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1101178800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Than Ngo <than(a)redhat.de></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add initdir macro to handle the initscript directory
-- add a new macro to handle /etc/pam.d/system-auth</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>962848800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automated rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1022205600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automated rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024711200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1043290800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com> 2.2.7-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- don't use rpms internal dep generator</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1039921200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Waugh <twaugh(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- exit successfully from preun script (bug #30644).</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>983847600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Waugh <twaugh(a)redhat.com> 3.0.10-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Rebuilt for new readline.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1105585200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tomas Mraz <tmraz(a)redhat.com> - 2.0.21c-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt with new gnutls</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1150336800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tomas Mraz <tmraz(a)redhat.com> 3.0.11-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild with openssl-0.9.7e</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1109818800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>(these changes are from the non-head version)
-- Don't include /usr/sbin/samba, it's the same as the initscript
-- unset TMPDIR, as samba can't write into a TMPDIR owned
- by root (#41193)
-- Add pidfile: lines for smbd and nmbd and a config: line
- in the initscript (#15343)
-- don't use make -j
-- explicitly include /usr/share/samba, not just the files in it</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>993002400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.2.0a security fix
-- Mark lograte and pam configuration files as noreplace</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>993348000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.2.1, which should work better for XP</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>994816800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.2.1a bugfix release</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>994903200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Add improvements to the smb.conf as suggested in #16931</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>993175200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Add the /etc/samba directory to samba-common</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>993261600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Don't include smbpasswd in samba, it's in samba-common (#51598)
-- Add a disabled "obey pam restrictions" statement - it's not
- active, as we use encrypted passwords, but if the admin turns
- encrypted passwords off the choice is available. (#31351)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>997754400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Tweaks of BuildRequires (#49581)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>995680800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Use /var/cache/samba instead of /var/lock/samba
-- Remove "domain controller" keyword from smb.conf, it's
- deprecated (from #13704)
-- Sync some examples with smb.conf.default
-- Fix password synchronization (#16987)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>997322400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- i18n improvements in initscript (#26537)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>981601200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.1a-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Add patch from Jeremy Allison to fix IA64 alignment problems (#51497)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1000864800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.2-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.2.2</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1003197600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.2-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Add "--with-utmp" to configure options (#55372)
-- Include winbind, pam_smbpass.so, rpcclient and smbcacls
-- start using /var/cache/samba, we need to keep state and there is
- more than just locks involved</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1005015600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.2-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix pid-file reference in logrotate script
-- include pam and nss modules for winbind</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1005188400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.2-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Teach smbadduser about "getent passwd"
-- Fix more pid-file references
-- Add (conditional) winbindd startup to the initscript, configured in
- /etc/sysconfig/samba</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1005274800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.2-6</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Move winbind files to samba-common. Add separate initscript for
- winbind
-- Fixes for winbind - protect global variables with mutex, use
- more secure getenv</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1005706800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.2-7</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Enable PAM session controll and password sync</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1006916400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.2-8</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New pam configuration file for samba</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1007089200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.3-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.2.3</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1012878000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.3a-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.2.3a</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1013137200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.3a-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1014346800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.3a-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Make the logrotate script look the correct place for the pid files</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1017198000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.3a-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Add libsmbclient.a w/headerfile for KDE (#62202)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1017975600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.3a-6</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Don't use /etc/samba.d in smbadduser, it should be /etc/samba</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1018490400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.4-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.2.4
-- Removed some zero-length and CVS internal files
-- Make it build</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1020996000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.4-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix #64804</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1021428000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.4-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix pidfile locations so it runs properly again (2.2.4
- added a new directtive - #65007)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1023242400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.4-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Move the post/preun of winbind into the -common subpackage,
- where the script is (#66128)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024106400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.2.5</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024624800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-10</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- logrotate fixes (#65007)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1030586400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Make it not depend on Net::LDAP - those are doc files and examples</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1025056800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Enable ACLs</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1025143200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-5</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- desktop file fixes (#69505)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1027476000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-6</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix the lpq parser for better handling of LPRng systems (#69352)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1027476000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-7</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Enable VFS support and compile the "recycling" module (#69796)
-- more selective includes of the examples dir</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1027735200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-8</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Initscript fix (#70720)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1028599200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Trond Eivind Glomsrød <teg(a)redhat.com> 2.2.5-9</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- /usr/lib was used in place of %{_libdir} in three locations (#72554)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1030413600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Warren Togami <wtogami(a)redhat.com> 3.0.20-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- epochs from deps, req exact release
-- rebuild against new openssl</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1131937200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>jay Fenlason <fenlason(a)redhat.com> 3.0.3-3.rc1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- New upstream version
-- updated spec file to make libsmbclient.so executable. This closes
- bugzilla #121356</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1082599200</rhn-package-changelog-entry-time></rhn-package-changelog-entry></rhn-package-changelog><rhn-package-requires><rhn-package-requires-entry version="4.0-1" name="rpmlib(PayloadFilesHavePrefix)" sense="16777290"/><rhn-package-requires-entry version="3.0.4-1" name="rpmlib(CompressedFileNames)" sense="16777290"/><rhn-package-requires-entry version="" name="libc.so.6" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.0)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.1)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.1.3)" sense="16384"/><rhn-package-requires-entry version="" name="/sbin/chkconfig" sense="64"/><rhn-package-requires-entry version="" name="/bin/sh" sense="1344"/><rhn-package-requires-entry version="" name="/bin/sh" sense="2368"/><rhn-package-requires-entry version="" name="/bin/sh" sense="4416"/><rhn-package-requires-entry version="" name="/bin/sh" sense="16384"/><rhn-package-requires-entry version="" name="libpthread.so.0" sense="16384"/><rhn-package-requires-entry version="" name="libpthread.so.0(GLIBC_2.0)" sense="16384"/><rhn-package-requires-entry version="" name="libpthread.so.0(GLIBC_2.1)" sense="16384"/><rhn-package-requires-entry version="" name="libcrypt.so.1" sense="16384"/><rhn-package-requires-entry version="" name="libnsl.so.1" sense="16384"/><rhn-package-requires-entry version="" name="libm.so.6" sense="16384"/><rhn-package-requires-entry version="" name="libz.so.1" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.2)" sense="16384"/><rhn-package-requires-entry version="" name="libpthread.so.0(GLIBC_2.2)" sense="16384"/><rhn-package-requires-entry version="" name="libdl.so.2" sense="16384"/><rhn-package-requires-entry version="" name="fileutils" sense="64"/><rhn-package-requires-entry version="" name="libk5crypto.so.3" sense="16384"/><rhn-package-requires-entry version="" name="libkrb5.so.3" sense="16384"/><rhn-package-requires-entry version="" name="libdl.so.2(GLIBC_2.0)" sense="16384"/><rhn-package-requires-entry version="" name="libdl.so.2(GLIBC_2.1)" sense="16384"/><rhn-package-requires-entry version="" name="libnsl.so.1(GLIBC_2.0)" sense="16384"/><rhn-package-requires-entry version="" name="/etc/pam.d/system-auth" sense="0"/><rhn-package-requires-entry version="" name="libpam.so.0" sense="16384"/><rhn-package-requires-entry version="" name="sed" sense="64"/><rhn-package-requires-entry version="" name="libpopt.so.0" sense="16384"/><rhn-package-requires-entry version="" name="libresolv.so.2" sense="16384"/><rhn-package-requires-entry version="" name="/etc/init.d" sense="64"/><rhn-package-requires-entry version="" name="libcom_err.so.2" sense="16384"/><rhn-package-requires-entry version="" name="libresolv.so.2(GLIBC_2.2)" sense="16384"/><rhn-package-requires-entry version="3.0.3-1" name="rpmlib(VersionedDependencies)" sense="16777290"/><rhn-package-requires-entry version="" name="/bin/mktemp" sense="64"/><rhn-package-requires-entry version="" name="libgssapi_krb5.so.2" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.1.1)" sense="16384"/><rhn-package-requires-entry version="" name="perl(Exporter)" sense="16384"/><rhn-package-requires-entry version="" name="/usr/bin/killall" sense="64"/><rhn-package-requires-entry version="" name="libcups.so.2" sense="16384"/><rhn-package-requires-entry version="" name="perl(strict)" sense="16384"/><rhn-package-requires-entry version="" name="perl(vars)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.2.3)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.2.4)" sense="16384"/><rhn-package-requires-entry version="" name="libattr.so.1" sense="16384"/><rhn-package-requires-entry version="" name="libacl.so.1" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.3)" sense="16384"/><rhn-package-requires-entry version="" name="libattr.so.1(ATTR_1.0)" sense="16384"/><rhn-package-requires-entry version="" name="libacl.so.1(ACL_1.0)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.3.4)" sense="16384"/><rhn-package-requires-entry version="0:3.4" name="logrotate" sense="12"/><rhn-package-requires-entry version="0:5.54-1" name="initscripts" sense="12"/><rhn-package-requires-entry version="0:0.64" name="pam" sense="12"/><rhn-package-requires-entry version="" name="libkrb5.so.3(krb5_3_MIT)" sense="16384"/><rhn-package-requires-entry version="" name="libk5crypto.so.3(k5crypto_3_MIT)" sense="16384"/><rhn-package-requires-entry version="" name="libgssapi_krb5.so.2(gssapi_krb5_2_MIT)" sense="16384"/><rhn-package-requires-entry version="" name="liblber-2.3.so.0" sense="16384"/><rhn-package-requires-entry version="" name="libldap-2.3.so.0" sense="16384"/><rhn-package-requires-entry version="" name="rtld(GNU_HASH)" sense="16384"/><rhn-package-requires-entry version="" name="libc.so.6(GLIBC_2.4)" sense="16384"/><rhn-package-requires-entry version="" name="libpam.so.0(LIBPAM_1.0)" sense="16384"/><rhn-package-requires-entry version="0:3.0.23c-2" name="samba-common" sense="8"/><rhn-package-requires-entry version="0:3.0.23c-2" name="config(samba)" sense="268435464"/></rhn-package-requires><rhn-package-provides><rhn-package-provides-entry version="" name="audit.so" sense="32768"/><rhn-package-provides-entry version="" name="cap.so" sense="32768"/><rhn-package-provides-entry version="0:3.0.23c-2" name="config(samba)" sense="268435464"/><rhn-package-provides-entry version="" name="default_quota.so" sense="32768"/><rhn-package-provides-entry version="" name="expand_msdfs.so" sense="32768"/><rhn-package-provides-entry version="" name="extd_audit.so" sense="32768"/><rhn-package-provides-entry version="" name="fake_perms.so" sense="32768"/><rhn-package-provides-entry version="" name="full_audit.so" sense="32768"/><rhn-package-provides-entry version="" name="netatalk.so" sense="32768"/><rhn-package-provides-entry version="1.00" name="perl(smbldap_tools)" sense="32776"/><rhn-package-provides-entry version="" name="readonly.so" sense="32768"/><rhn-package-provides-entry version="" name="recycle.so" sense="32768"/><rhn-package-provides-entry version="" name="shadow_copy.so" sense="32768"/><rhn-package-provides-entry version="0:3.0.23c-2" name="samba" sense="8"/></rhn-package-provides><rhn-package-conflicts/><rhn-package-obsoletes/><rhn-package-files><rhn-package-file username="root" lang="" name="/etc/logrotate.d/samba" verifyflags="-1" rdev="0" groupname="root" mtime="1157180346" file_size="232" device="2305" flags="17" md5="fd4c01721c608a8c3c79ed3c921c5378" inode="8569008" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/etc/pam.d/samba" verifyflags="-1" rdev="0" groupname="root" mtime="1157180346" file_size="257" device="2305" flags="17" md5="46c80cede9cabf3cb8fc3c12e803c004" inode="8569007" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/etc/rc.d/init.d/smb" verifyflags="-1" rdev="0" groupname="root" mtime="1157180346" file_size="2087" device="2305" flags="1" md5="b1c26e5292157a83cadabe851bf9b2f9" inode="8569005" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/etc/samba/smbusers" verifyflags="-1" rdev="0" groupname="root" mtime="1157180346" file_size="97" device="2305" flags="17" md5="a6a6c093b522c2c232f7ee27e83db0ed" inode="8569003" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/etc/sysconfig/samba" verifyflags="-1" rdev="0" groupname="root" mtime="1157180347" file_size="111" device="2305" flags="17" md5="074ce0175f3b5a04f0748560d390488c" inode="8585727" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/bin/mksmbpasswd.sh" verifyflags="-1" rdev="0" groupname="root" mtime="1157180346" file_size="205" device="2305" flags="0" md5="76ed226281d9b8e3f3066477ec27ab12" inode="8569002" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/bin/smbstatus" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="727968" device="2305" flags="0" md5="dc94ab68e36c95181e1413bdfd43fbd8" inode="8568957" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/sbin/nmbd" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="1106812" device="2305" flags="0" md5="320109cd6ac948e202ead5e455c2fcc9" inode="8568937" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/sbin/smbd" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="3805240" device="2305" flags="0" md5="cf34c681dc0a15d3a65d133fffe27c9e" inode="8568936" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/share/man/man1/smbstatus.1.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180344" file_size="1731" device="2305" flags="2" md5="0c71aca1c380f21b47644f643de7bbc3" inode="8585229" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/man/man5/smbpasswd.5.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180344" file_size="2559" device="2305" flags="2" md5="bd35fb6506bc8307969fdd31fc4f71a7" inode="8585239" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/man/man7/samba.7.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180344" file_size="2926" device="2305" flags="2" md5="d2005647ec0a4c44f5a991650b9511db" inode="8585243" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/man/man8/nmbd.8.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180344" file_size="3780" device="2305" flags="2" md5="4637c4f7854a03da3fa0657ffc6a474b" inode="8585256" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/man/man8/smbd.8.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180344" file_size="5096" device="2305" flags="2" md5="6c17296f1a7da98cbf8037fe79fc7de9" inode="8585258" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/var/spool/samba" verifyflags="-1" rdev="0" groupname="root" mtime="1157180344" file_size="4096" device="2305" flags="0" md5="" inode="8568920" linkto="" file_mode="17407"/><rhn-package-file username="root" lang="" name="/usr/share/man/man1/smbcontrol.1.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180344" file_size="2403" device="2305" flags="2" md5="d635fb1176445fb332ecd28b5c279b45" inode="8585227" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/bin/smbcontrol" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="748836" device="2305" flags="0" md5="4b9ed02683950bfc7c4b8ce44052e431" inode="8568999" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="4096" device="2305" flags="0" md5="" inode="8585690" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/recycle.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="15472" device="2305" flags="0" md5="123d658e71c1ce7030441ba33e5fa3f7" inode="8585698" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/share/man/man8/pdbedit.8.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180344" file_size="3857" device="2305" flags="2" md5="4d2520beab0e3d000a6480f58e1b6e9e" inode="8585250" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/bin/tdbbackup" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="31256" device="2305" flags="0" md5="3711df3889d8b4dcde7564caeb27014e" inode="8568949" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/extd_audit.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="10728" device="2305" flags="0" md5="a7ff57325d95825fd034d6a96bbcb995" inode="8585697" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/fake_perms.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="3524" device="2305" flags="0" md5="89b3dae916df4784ab5db7ef46e917de" inode="8585692" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/share/man/man8/tdbbackup.8.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180345" file_size="1225" device="2305" flags="2" md5="7d9e94d427d12452cd9d6320d344928b" inode="8585242" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/audit.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="7332" device="2305" flags="0" md5="ff459d274ce3f88ecb24a114fe11594c" inode="8585701" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/netatalk.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="8404" device="2305" flags="0" md5="5cafeebb7f4949b29ea5244fe2279827" inode="8585696" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/readonly.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="15656" device="2305" flags="0" md5="5dd6662b17112d64678bf84f36179f6d" inode="8585700" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/default_quota.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="4296" device="2305" flags="0" md5="fba337224197a0f1028969322a936346" inode="8585694" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/cap.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="12236" device="2305" flags="0" md5="3e6e0925844e8c55878e769df350662d" inode="8585695" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/bin/tdbdump" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="29604" device="2305" flags="0" md5="27ea9b1cbee176e6cfa335b8c89bbf5c" inode="8568943" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/bin/tdbtool" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="39032" device="2305" flags="0" md5="38f6b91c48f3a033f818ac2823ebd7da" inode="8568939" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/share/man/man8/tdbdump.8.gz" verifyflags="-1" rdev="0" groupname="root" mtime="1157180345" file_size="689" device="2305" flags="2" md5="4357281e853a507b67bd7e8a2d3eab17" inode="8585257" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/expand_msdfs.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="6976" device="2305" flags="0" md5="023e6c2db838e3640edcdba31c37d22c" inode="8585709" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/shadow_copy.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="7396" device="2305" flags="0" md5="4086dedbb6e54b1862c6179b24844962" inode="8585693" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/lib/samba/vfs/full_audit.so" verifyflags="-1" rdev="0" groupname="root" mtime="1157180358" file_size="28720" device="2305" flags="0" md5="fc101b3f2aea2d5191a5427b5779b6fc" inode="8585691" linkto="" file_mode="-32275"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/samba2_xs.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339394" file_size="4172" device="2305" flags="2" md5="212261aa1fedd214ecebf44aad98f10e" inode="8618204" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/WindowsXP-NullConnection.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="23120" device="2305" flags="2" md5="a6282d83d83089ec331da2fc258fe2ba" inode="8602288" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/Samba3-Developers-Guide.pdf" verifyflags="0" rdev="0" groupname="root" mtime="1154959830" file_size="609400" device="2305" flags="2" md5="dbb82ca2cb3fbc97b27e88cfd32394d6" inode="8602242" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbtar.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959397" file_size="6325" device="2305" flags="2" md5="727340f5687b8b9b95eaf30a695812da" inode="8602345" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/a_small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959507" file_size="115304" device="2305" flags="2" md5="c8b382a0052239184746044ae8ff050b" inode="8618012" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/lmhosts.5.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959365" file_size="4470" device="2305" flags="2" md5="2bd6c33a43028ad07d6ae147d7735c48" inode="8602367" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/pdftosocket.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959504" file_size="2074" device="2305" flags="2" md5="0e15b6f5bf601aacda44a01483479488" inode="8618014" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0605.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339434" file_size="14388" device="2305" flags="2" md5="451fa4102c1501cce5edbb5906df8a96" inode="8618126" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0407.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339424" file_size="24997" device="2305" flags="2" md5="a47e90832eadbf901d22f676f615209d" inode="8618158" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0508.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339432" file_size="40920" device="2305" flags="2" md5="1b382325a69f7a43eb024885e5560c06" inode="8618062" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WME002.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="6913" device="2305" flags="2" md5="931de8d523ff7d598fcb3cfdf142f6aa" inode="8617992" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_af04.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339446" file_size="57137" device="2305" flags="2" md5="ce01ef303f5965b117e7ebd655735eaa" inode="8618069" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/groupmapping.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959521" file_size="43148" device="2305" flags="2" md5="59795d699f720de56d6d6efc2856839b" inode="8602429" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-populate" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="14995" device="2305" flags="2" md5="68c62976b5c768c733b2263449041377" inode="8618270" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0811.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339439" file_size="12228" device="2305" flags="2" md5="52ce5ae9880c8c1b390e39e370928479" inode="8618092" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/gpl.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959539" file_size="25877" device="2305" flags="2" md5="e289a8c0ac60ca05ef717c4b39981652" inode="8602403" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/winbind.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959529" file_size="71525" device="2305" flags="2" md5="e31217d6a44bdfbec0027b34e0f4961c" inode="8602389" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0804.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339436" file_size="17326" device="2305" flags="2" md5="fae3bf79ade78b31c6ef593d870294fb" inode="8618066" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/WindowsTerminalServer.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="230" device="2305" flags="2" md5="901b16a407b3518b00071aa9fc791ad0" inode="8618208" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/NetCommand.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959521" file_size="90999" device="2305" flags="2" md5="6543fb1641a6e3534217a0936e8957e3" inode="8602423" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/passdb.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959520" file_size="124960" device="2305" flags="2" md5="3f3df0c9f813b7b16ceb0485eaa309e8" inode="8602422" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/modules.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="8809" device="2305" flags="2" md5="945cc76fd905d4a33594f8e8020ad614" inode="8602319" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap_tools.pm" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="28729" device="2305" flags="2" md5="19f72266d0e1dd4f7414fbcf2932f336" inode="8618272" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/ntdomain.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959492" file_size="93428" device="2305" flags="2" md5="c71863b58de4284413023b56fdd316d7" inode="8602326" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/cfgsmarts.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959534" file_size="28858" device="2305" flags="2" md5="058f42d676b65205e9ae54587c0bf79b" inode="8602427" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0334.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339410" file_size="5820" device="2305" flags="2" md5="75e8b3e5a0c527722bacc6e310449eb5" inode="8618188" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0358.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339421" file_size="24628" device="2305" flags="2" md5="63c3d277252bf2c24bc5db79a1007d9d" inode="8618149" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0603.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339433" file_size="13631" device="2305" flags="2" md5="ef5d4c839ba52603037122c67af1cea3" inode="8618087" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/samba.css" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="873" device="2305" flags="2" md5="2a0292be878c2b9a56390e99effa6402" inode="8602442" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/NetworkBrowsing.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959519" file_size="104381" device="2305" flags="2" md5="20aec1c525d553512e55f271fcf3a88e" inode="8602437" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smb.conf" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="3904" device="2305" flags="2" md5="e631985845ff5b5631688c38cb21d1f5" inode="8618241" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/smbldap-tools.pdf" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="219452" device="2305" flags="2" md5="8c2478d6c862bdaaeee6cf680c141f87" inode="8618264" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/smbldap-migrate-pwdump-accounts" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="7322" device="2305" flags="2" md5="5ba52460e75d1ae67f750f09a7991c5d" inode="8618268" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch09.html" verifyflags="0" rdev="0" groupname="root" mtime="1064602639" file_size="125503" device="2305" flags="2" md5="1d4dc5013dab22fba7bfb8f1722915ca" inode="8618052" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/imc-usermanager2.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="91149" device="2305" flags="2" md5="e5cff308173e5704ef4efedddc9e03ba" inode="8602309" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/nmblookup.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959371" file_size="10642" device="2305" flags="2" md5="0a3e05bd56958c3d13052f3009241a98" inode="8602375" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0311.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339405" file_size="11759" device="2305" flags="2" md5="adbbd1749fa31df5e52c3c062acebbdf" inode="8618120" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0325.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339408" file_size="12024" device="2305" flags="2" md5="4846a98345674f61d968d6bfe1e41281" inode="8618065" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/lam-group-members.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="82762" device="2305" flags="2" md5="ac9ac137a7dcef1fb81a7fb87b124c6f" inode="8602305" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/Win-NT-DeleteRoamingProfile.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="288" device="2305" flags="2" md5="2b8a6cc182aa2c8ec60e6cb41793d3c7" inode="8618214" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0329.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339409" file_size="14858" device="2305" flags="2" md5="bfb9f12af1bdece08d4e2c1be7c10115" inode="8618122" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch03.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339388" file_size="92841" device="2305" flags="2" md5="3b88629b18e20b8b2837b9786323dcd1" inode="8618041" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0304.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339402" file_size="10735" device="2305" flags="2" md5="59453c4707073a3341aaf25f827255dc" inode="8618164" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/SWAT.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959535" file_size="29066" device="2305" flags="2" md5="509f911bd81a7e3d6ef7ddc2608ea044" inode="8602409" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/Win98_PlainPassword.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="122" device="2305" flags="2" md5="a4f6f6d2d92a59fc67e2c3475ab3d3f4" inode="8618212" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbpasswd.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959392" file_size="16814" device="2305" flags="2" md5="de217fd09d4f705b2dae040337011469" inode="8602373" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbmount.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959390" file_size="10853" device="2305" flags="2" md5="9c03861ef1de74737fa6ab6d7478aae6" inode="8602356" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/upgrades.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959454" file_size="59455" device="2305" flags="2" md5="9f39118e6e81de6d03d2c0962430695f" inode="8602262" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/unixclients.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959453" file_size="136392" device="2305" flags="2" md5="f27d06d57de41c9da229bf9dfe238ccf" inode="8602258" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/toc.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339394" file_size="5505" device="2305" flags="2" md5="4f611653e69c668267d50eea797e1917" inode="8618042" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0105.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339395" file_size="18031" device="2305" flags="2" md5="08e580f362a2449618a80903a10be727" inode="8618128" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/samba-schema-netscapeds5.x" verifyflags="0" rdev="0" groupname="root" mtime="1135907114" file_size="8645" device="2305" flags="2" md5="e1602f9d978b4c70d7f493f2fc0d0f37" inode="8618223" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/ntlm_auth.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959372" file_size="15997" device="2305" flags="2" md5="297bef98a9183fde8bae2dcfce8ffb1a" inode="8602355" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WME003.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="6448" device="2305" flags="2" md5="8a953995ded0821de826a95060d9d3c5" inode="8618037" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/8small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="45259" device="2305" flags="2" md5="c7c4d3e76cc7e970895dbc963f54078a" inode="8618009" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/9small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="30509" device="2305" flags="2" md5="db37f5024fc16886040434bae586a881" inode="8618027" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/Makefile" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="1775" device="2305" flags="2" md5="4ceb5e361f1b36ee5af98b3723d5907c" inode="8618284" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0409.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339425" file_size="17776" device="2305" flags="2" md5="181f22f90aefa4cf641e36e87d722581" inode="8618140" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/README" verifyflags="0" rdev="0" groupname="root" mtime="1113856701" file_size="585" device="2305" flags="2" md5="768e9597d352b04988bd6d00359e0728" inode="8618292" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_1101.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339441" file_size="14447" device="2305" flags="2" md5="34697b38dc50785a942c68713993aa79" inode="8618119" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/README" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="3000" device="2305" flags="2" md5="99c7190b08e2fb2bdc93b044528a0006" inode="8618239" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/samba.css" verifyflags="0" rdev="0" groupname="root" mtime="1154959362" file_size="873" device="2305" flags="2" md5="2a0292be878c2b9a56390e99effa6402" inode="8602448" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-groupshow" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="2005" device="2305" flags="2" md5="f4cfd23219643e67f4bf8d315a702a25" inode="8618276" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools004.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="11743" device="2305" flags="2" md5="b711dfb87a0f6922223bbce6ab56b870" inode="8618251" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0108.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339396" file_size="18629" device="2305" flags="2" md5="1810055b207bf04f449f0b5e7381ff01" inode="8618174" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/smbw_stat.c" verifyflags="0" rdev="0" groupname="root" mtime="1122571194" file_size="3203" device="2305" flags="2" md5="5044d3987a2470d6cc736c15c81fb5c4" inode="8618300" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch06.html" verifyflags="0" rdev="0" groupname="root" mtime="1064602639" file_size="89217" device="2305" flags="2" md5="677721946333cb6b825584b5895063da" inode="8618048" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0104.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339395" file_size="13928" device="2305" flags="2" md5="7175e64388ee77747de572f0ad27c270" inode="8618097" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0110.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339397" file_size="4794" device="2305" flags="2" md5="9f143d8800afb95b5aa6b1f2029241da" inode="8618112" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/w2kp002.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="11966" device="2305" flags="2" md5="8d6499c88f38375788d91a0d10d45363" inode="8618038" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0808.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339437" file_size="15894" device="2305" flags="2" md5="7219fd18bc4adee193277359f240c2f1" inode="8618169" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/trusts1.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="12910" device="2305" flags="2" md5="75115a085739fb19e38757e0a120cfb1" inode="8618039" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/ch8-migration.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959442" file_size="13576" device="2305" flags="2" md5="7acfc7bcb8c8d87abb0c8722ff274a8a" inode="8602280" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/swat.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959400" file_size="10366" device="2305" flags="2" md5="2fe27ca36de04e341f725b82c9859ce0" inode="8602382" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0306.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339403" file_size="18300" device="2305" flags="2" md5="92d640dddc75f5505f3d3683bcd444c9" inode="8618131" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/wxpp006.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="12651" device="2305" flags="2" md5="00f46f40c8a77b563cb0c3a9099939af" inode="8618000" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/idmap-sid2gid.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959500" file_size="17364" device="2305" flags="2" md5="37eaaa213c04988d3099011dd70f1435" inode="8618029" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/index.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959642" file_size="2433" device="2305" flags="2" md5="2cec8d320e23bf57bace80496300f062" inode="8602447" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/WINREPRESSME-Capture2.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="50864" device="2305" flags="2" md5="c9a7ddb40fdc679fd98515bd4abeb485" inode="8602316" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/w2kp001.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="10891" device="2305" flags="2" md5="5b0388759a0725d5a92b58f7250c1535" inode="8618025" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/contents_motif.gif" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="316" device="2305" flags="2" md5="b42bd1e327e6178a59828cb20f7132e7" inode="8618262" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0339.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339412" file_size="12941" device="2305" flags="2" md5="258b9ecad3c5a35bafc0c48782176536" inode="8618152" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0413.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339427" file_size="16881" device="2305" flags="2" md5="54be2d86309a4add94077da77561ca4a" inode="8618107" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/COPYING" verifyflags="0" rdev="0" groupname="root" mtime="1109372387" file_size="17982" device="2305" flags="2" md5="8ca43cbc842c2336e835926c2166c28b" inode="8602237" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0417.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339428" file_size="18004" device="2305" flags="2" md5="11df81e5593703f0bdc082efeb63b173" inode="8618150" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/InterdomainTrusts.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959524" file_size="31356" device="2305" flags="2" md5="30402e2ad2ef141ef7880692666e066d" inode="8602399" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_1002.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339439" file_size="15746" device="2305" flags="2" md5="6bdd65be5e2cec9baa96b8b93f4ff302" inode="8618148" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0802.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339435" file_size="6906" device="2305" flags="2" md5="3181108d0117a242af837e8818e7673a" inode="8618135" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/lam-users.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="102751" device="2305" flags="2" md5="c958fb114679fd72ed6f2d3085a49f5b" inode="8602298" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/lam-hosts.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="86779" device="2305" flags="2" md5="9c1f42c08c1a07bd879741ade20936ed" inode="8602310" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/w2kp005.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="9951" device="2305" flags="2" md5="671706f816e0968939357f79da1c752c" inode="8618030" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0302.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339401" file_size="5703" device="2305" flags="2" md5="be5a8bb5a335805f3ad4444aed8dc2d6" inode="8618144" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/vfs.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="27782" device="2305" flags="2" md5="b1283101c575b3190110103a244c02cf" inode="8602318" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/type.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959517" file_size="11905" device="2305" flags="2" md5="007b0216197bdcc5c08a4e4b2918580d" inode="8602416" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-groupadd" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="5987" device="2305" flags="2" md5="7f8f12ba8612e69f4baecc474d3ad704" inode="8618237" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools007.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="11951" device="2305" flags="2" md5="acd1df77adcbe5132620d8cd12a52b1e" inode="8618256" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printer-accounting/acct-all" verifyflags="0" rdev="0" groupname="root" mtime="1109372392" file_size="114" device="2305" flags="2" md5="d3c735279d12bc6a6c081dca0e784819" inode="8618319" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printer-accounting/hp5-redir" verifyflags="0" rdev="0" groupname="root" mtime="1109372392" file_size="998" device="2305" flags="2" md5="ec0dcf9af11a7ea7773cf7b861c8e56b" inode="8618322" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0352.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339417" file_size="25568" device="2305" flags="2" md5="007e0b6fb0d68a84c7689ef6a51e7d5a" inode="8618171" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/small.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959448" file_size="59853" device="2305" flags="2" md5="d2a62b7dbddae9c6ba31a2d94858142c" inode="8602269" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0403.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339423" file_size="8500" device="2305" flags="2" md5="f3667ad84e94c68c5260a7f8d57ee583" inode="8618165" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/idmap-store-gid2sid.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959501" file_size="6703" device="2305" flags="2" md5="e8591019d08afffca4cb00f20c541d5e" inode="8618011" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap.conf" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="7785" device="2305" flags="2" md5="f8da299132029d5393c5ca7821622101" inode="8618236" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/samba-bdc.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959515" file_size="48139" device="2305" flags="2" md5="7fd0318c8dd9f1714ac6974c23dc6c21" inode="8602418" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_1001.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339439" file_size="12687" device="2305" flags="2" md5="1f39fbba87602b1de2dd92727a86145b" inode="8618167" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/problems.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959536" file_size="19026" device="2305" flags="2" md5="4282d8f4f672a47ecf8370bfa3ad7117" inode="8602408" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/samba-schema-netscapeds4.x" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="2840" device="2305" flags="2" md5="85774faabf2803dce73621298ee3a32d" inode="8618278" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/XP-screen001.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959435" file_size="14290" device="2305" flags="2" md5="4c32ffc460960ea6d8e2f2e796573509" inode="8602294" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch07.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339390" file_size="72288" device="2305" flags="2" md5="363e9e9d8e622467c071914a44ca55ff" inode="8618058" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/wxpp006.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959442" file_size="12651" device="2305" flags="2" md5="00f46f40c8a77b563cb0c3a9099939af" inode="8602295" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0356.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339419" file_size="20807" device="2305" flags="2" md5="e04e894a04b39f519684826fc52bc855" inode="8618146" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/ExNetworks.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959452" file_size="12288" device="2305" flags="2" md5="26ed499d7ea593de8056c3957aa037cf" inode="8602251" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/primer.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959459" file_size="56210" device="2305" flags="2" md5="2df779157a75f4dc205099b3f1cbbdfe" inode="8602267" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0359.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339422" file_size="24233" device="2305" flags="2" md5="6d7d26722c30b2af823afe8dd11be9c0" inode="8618199" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs" verifyflags="0" rdev="0" groupname="root" mtime="1154992904" file_size="4096" device="2305" flags="0" md5="" inode="8602247" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0410.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339425" file_size="22502" device="2305" flags="2" md5="cca05c7bce81ee30468ee711c6601f38" inode="8618166" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/appc.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339386" file_size="150859" device="2305" flags="2" md5="adc2b7d00183861c4a54f1f6b8e7e9c0" inode="8618057" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printing/readme.prtpub" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="540" device="2305" flags="2" md5="4a3c1d86fa82667b4ddaa0080893e9f7" inode="8618327" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/appb.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339386" file_size="244007" device="2305" flags="2" md5="4154846da162e4986f718bf9a13370e1" inode="8618054" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/Charity-Network.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959429" file_size="11274" device="2305" flags="2" md5="ddf4a3c483e5624ebfb8f0bfe650f199" inode="8602313" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/samba.schema.oc.IBM-DS" verifyflags="0" rdev="0" groupname="root" mtime="1138650308" file_size="2737" device="2305" flags="2" md5="0f2ade923e69b4acc05e59e231cad2fc" inode="8618224" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/ix01.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959637" file_size="478147" device="2305" flags="2" md5="4870c0bcb48bc8ff4e978cb9df09bd68" inode="8602391" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch00.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339386" file_size="13275" device="2305" flags="2" md5="50f013780badab08fcb2efedac901505" inode="8618055" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0406.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339424" file_size="10133" device="2305" flags="2" md5="44672a7d595c12f743bcf739c105c719" inode="8618078" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0204.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339401" file_size="73792" device="2305" flags="2" md5="bfea22e7f1ef3fec45cfdc5da1ae0e9e" inode="8618156" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0309.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339404" file_size="15071" device="2305" flags="2" md5="b5f8ba2b1871c00de0f68de7e8351fb5" inode="8618064" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/pt04.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="2569" device="2305" flags="2" md5="665181279a810c3a41806583d2ef3692" inode="8602330" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/cups1.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959506" file_size="38315" device="2305" flags="2" md5="40daf791211175b21c0be9ef345a426b" inode="8618016" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_af05.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339447" file_size="46773" device="2305" flags="2" md5="a12895f915beadeb0b550e2566ba471a" inode="8618110" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0333.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339410" file_size="3784" device="2305" flags="2" md5="631bf6b72b4bec23045827db81ecc89e" inode="8618136" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools001.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="661" device="2305" flags="2" md5="82389f7a64a5b5a4682750503df175b9" inode="8618253" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/Makefile" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="2874" device="2305" flags="2" md5="3f59018fc536f60e4a3732bb0432c0f9" inode="8618232" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/UserConnect.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="22583" device="2305" flags="2" md5="c5012ff945bcca4b0d8eedcdf308792c" inode="8602297" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/12small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959505" file_size="29508" device="2305" flags="2" md5="39f935fdec1810ae44ef4cd8c6979896" inode="8618032" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/Win95_PlainPassword.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="122" device="2305" flags="2" md5="a4f6f6d2d92a59fc67e2c3475ab3d3f4" inode="8618211" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0402.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339423" file_size="11721" device="2305" flags="2" md5="128467bc5841128998d3e77e38496548" inode="8618196" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/7small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="29350" device="2305" flags="2" md5="128b5f812819905767566b9a428d1551" inode="8618019" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/idmapper.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959522" file_size="54187" device="2305" flags="2" md5="15c1aca38310dcb72260ff15bdc16365" inode="8602404" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0323.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339408" file_size="10528" device="2305" flags="2" md5="6f7618678c8cff42c7d1ead740eb8ea4" inode="8618114" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0604.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339433" file_size="8752" device="2305" flags="2" md5="c9fc63897b37db4381693e2791a15734" inode="8618127" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/pr02.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959446" file_size="3650" device="2305" flags="2" md5="d2b7c878840ec1713996f857f47edd51" inode="8602249" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0602.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339433" file_size="13383" device="2305" flags="2" md5="5a43221ba8a6435ab94603ccd8cc4111" inode="8618085" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/unicode.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959532" file_size="28334" device="2305" flags="2" md5="2c609b63a64bf4377bbb1484fb159318" inode="8602384" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0338.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339411" file_size="15670" device="2305" flags="2" md5="2fbf71810ea47c64fdf86d73c9d0cb8c" inode="8618176" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/select.c" verifyflags="0" rdev="0" groupname="root" mtime="1113856701" file_size="3977" device="2305" flags="2" md5="c746f96ae7b0d26bd0068ac5fd343db8" inode="8618307" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/migration.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959535" file_size="5521" device="2305" flags="2" md5="1f9f77bfe9b7d926a511bc56051b5cab" inode="8602394" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/testread.c" verifyflags="0" rdev="0" groupname="root" mtime="1129661117" file_size="1390" device="2305" flags="2" md5="5580822e0687e0d9aa1621029cb30ece" inode="8618293" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/speed.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959538" file_size="16354" device="2305" flags="2" md5="2ea77cb4c512c90dbaeb2b32cf974ded" inode="8602411" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/HA.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959457" file_size="35030" device="2305" flags="2" md5="cc91f9d50bb701ada4be15aadea7faba" inode="8602263" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/appendix.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959458" file_size="65828" device="2305" flags="2" md5="eddac7700ea56e1d8f16f7d25843c9ab" inode="8602256" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/chap6-net.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959435" file_size="35671" device="2305" flags="2" md5="e880974861ab0513f8527059545acaf7" inode="8602291" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/testacl.c" verifyflags="0" rdev="0" groupname="root" mtime="1113856701" file_size="5697" device="2305" flags="2" md5="11df0f44880fc2ea30bd2f36089e8d92" inode="8618286" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0412.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339427" file_size="17096" device="2305" flags="2" md5="d555081c47ec69cfee93e7278feeb1dc" inode="8618067" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0349.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339415" file_size="26522" device="2305" flags="2" md5="152cda57e45f828e83d76f88d54ba8a4" inode="8618137" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch12.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339393" file_size="134140" device="2305" flags="2" md5="f6dc30c75898a3560a935bbadeae1a14" inode="8618201" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry" verifyflags="0" rdev="0" groupname="root" mtime="1131829962" file_size="4096" device="2305" flags="0" md5="" inode="8618205" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/AdvancedNetworkManagement.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959530" file_size="18715" device="2305" flags="2" md5="fb7cfaebd8782bb2c3a7b838ae435d11" inode="8602432" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/Backup.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959532" file_size="10758" device="2305" flags="2" md5="72e735905f9c0f2b29c56932054e0a35" inode="8602445" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/testbrowse.c" verifyflags="0" rdev="0" groupname="root" mtime="1145514590" file_size="8641" device="2305" flags="2" md5="151e5401f06bd6476b3371f31e8fdb9f" inode="8618309" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_af03.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339444" file_size="32704" device="2305" flags="2" md5="f303553380d225d6e73b91fb8297312f" inode="8618180" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/Manifest" verifyflags="0" rdev="0" groupname="root" mtime="1129617907" file_size="2558" device="2305" flags="2" md5="b3bc3275ae9f599b43d8a10cb4737628" inode="8602238" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/testchmod.c" verifyflags="0" rdev="0" groupname="root" mtime="1113856701" file_size="1263" device="2305" flags="2" md5="4eb57a078d6fd464d7a71c51ed838acd" inode="8618288" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printing/smbprint.sysv" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="1833" device="2305" flags="2" md5="2376eb9250809cabd02fb649e74e07e3" inode="8618328" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0111.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339397" file_size="5251" device="2305" flags="2" md5="4c1ef307d54df3e0b1d8f767d6c9fb97" inode="8618123" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/access1.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959502" file_size="11285" device="2305" flags="2" md5="3d0d76d7351fa7bafba884add03effe0" inode="8618031" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printer-accounting" verifyflags="0" rdev="0" groupname="root" mtime="1109372392" file_size="4096" device="2305" flags="0" md5="" inode="8618316" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/idmap_winbind_no_loop.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959507" file_size="9172" device="2305" flags="2" md5="89df9136764cf69449ebf9da6cb4b77d" inode="8618017" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0503.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339429" file_size="11949" device="2305" flags="2" md5="039ad6468ee24196945bc9a19d71f437" inode="8618181" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch02.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339388" file_size="73608" device="2305" flags="2" md5="9de3fdf662e66de79c1520bd972469cb" inode="8618044" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/smbw.h" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="5572" device="2305" flags="2" md5="667ba88128f9de91b56ef4f18afb9eb5" inode="8618306" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/samba.schema.at.IBM-DS" verifyflags="0" rdev="0" groupname="root" mtime="1138650307" file_size="9275" device="2305" flags="2" md5="49bef2fe461d2ac1e819388b739aba48" inode="8618222" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs" verifyflags="0" rdev="0" groupname="root" mtime="1082881528" file_size="4096" device="2305" flags="0" md5="" inode="8618061" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP" verifyflags="0" rdev="0" groupname="root" mtime="1149896061" file_size="4096" device="2305" flags="0" md5="" inode="8618221" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printer-accounting/README" verifyflags="0" rdev="0" groupname="root" mtime="1109372392" file_size="2379" device="2305" flags="2" md5="1507c531bc061ef4f2cdba4cc845498f" inode="8618321" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0805.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339436" file_size="19273" device="2305" flags="2" md5="902666bf58711f05c69b3afd90be8344" inode="8618197" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/INFRA" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="4102" device="2305" flags="2" md5="b5920647904bb97bb1d0d7724dc1467c" inode="8618234" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/WindowsXP-UserConnection.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="24505" device="2305" flags="2" md5="fab64ab911250453b4ed7112d94a5573" inode="8602278" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0901.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339439" file_size="11925" device="2305" flags="2" md5="8eba5b0fed497c17e387e6bbf379cac9" inode="8618143" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO" verifyflags="0" rdev="0" groupname="root" mtime="1154959637" file_size="4096" device="2305" flags="0" md5="" inode="8602383" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/introduction.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959514" file_size="4632" device="2305" flags="2" md5="d2bf1cf8b17d1c6631dbd3c1b428c7f1" inode="8602421" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0301.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339401" file_size="7580" device="2305" flags="2" md5="30e2033d997790108e40c5aba5584584" inode="8618100" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/ServerType.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959514" file_size="42015" device="2305" flags="2" md5="ed80e4bfa685d36472526ada8b55b7bb" inode="8602405" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/idmap-gid2sid.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959501" file_size="18635" device="2305" flags="2" md5="6af065fc32fd443acb940ddd14d84a48" inode="8618034" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printing/VampireDriversFunctions" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="57476" device="2305" flags="2" md5="0d1a8de301533fd1cc009b5174640fde" inode="8618326" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbtree.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959398" file_size="6296" device="2305" flags="2" md5="c13edd31117e49176755bcf07b08ac36" inode="8602351" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/2small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="15016" device="2305" flags="2" md5="858275d098a192ed8a6b32c742563283" inode="8617997" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/DNSDHCP.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959539" file_size="13516" device="2305" flags="2" md5="bafb1565f2bfde2b61dbc5f5dfc43aba" inode="8602387" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/history" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="10649" device="2305" flags="2" md5="5665a325c0801f05aee4f6f2aaed47bb" inode="8602246" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch05.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339389" file_size="74171" device="2305" flags="2" md5="f6ae5e65c7edd9c2641c5784effee3ca" inode="8618046" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/secure.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959449" file_size="125750" device="2305" flags="2" md5="a6be08a77c23d0748a40ff50b943e439" inode="8602252" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/internals.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="18276" device="2305" flags="2" md5="6b314e3b7cba29987ff27f666bc895ea" inode="8602336" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0408.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339425" file_size="11005" device="2305" flags="2" md5="38f4c120787f345d816639749adeeae9" inode="8618106" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbget.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959387" file_size="5157" device="2305" flags="2" md5="94175a2ec9db2c2122233b3968bd103f" inode="8602346" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/pr03.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959513" file_size="6392" device="2305" flags="2" md5="881f4bf12080483308dc8e9d587acfa2" inode="8602401" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/samba.7.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959378" file_size="14007" device="2305" flags="2" md5="bf26917a0e5405d2382c5b7c57da8c15" inode="8602353" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/StandAloneServer.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959516" file_size="20675" device="2305" flags="2" md5="6731d196193572071eb5a58a102e83a3" inode="8602395" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/teststat2.c" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="1834" device="2305" flags="2" md5="b8afc6d59418dd794fcedbe620fbb87b" inode="8618291" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="4096" device="2305" flags="0" md5="" inode="8618247" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/IntroSMB.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959513" file_size="11172" device="2305" flags="2" md5="d7815343d8f043bae5f020e79a1c18bf" inode="8602444" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/pwencrypt.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="11276" device="2305" flags="2" md5="4d5f2c0808048c805d3aaa0e2097902e" inode="8602324" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0202.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339400" file_size="35825" device="2305" flags="2" md5="778b2f712cd568c8b11996b712d4dcbe" inode="8618094" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/Big500users.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959450" file_size="90342" device="2305" flags="2" md5="eb419886480735e0681c82b32dec31df" inode="8602265" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/pr01.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959512" file_size="4088" device="2305" flags="2" md5="50f5d8c93cbb1cadf714251a4b382eca" inode="8602443" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WME014.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="5802" device="2305" flags="2" md5="9421878398ecfd54202299fb035f27c8" inode="8618020" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/pt01.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959492" file_size="6366" device="2305" flags="2" md5="3d5543912e01cbfe602a2c2609052e9c" inode="8602327" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0307.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339403" file_size="13970" device="2305" flags="2" md5="42ba9531196df19890b675e1e6688ccb" inode="8618121" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/Win-2Kx-XPP-DeleteCachedProfiles.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="794" device="2305" flags="2" md5="f5c7354025e313c994fc41a9d752f1ab" inode="8618215" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0341.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339413" file_size="9531" device="2305" flags="2" md5="ef20dfbe40edc2858b73bec42e67d268" inode="8618063" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/pt05.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="2034" device="2305" flags="2" md5="1372af4c4ba9b0d545b91a95bae6630d" inode="8602320" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0347.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339415" file_size="7563" device="2305" flags="2" md5="b0aff842188df786259c7adde7dc3f1f" inode="8618099" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/go01.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959460" file_size="9734" device="2305" flags="2" md5="8873741f1f60fe7180c922f4c826ab3d" inode="8602270" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools009.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="19200" device="2305" flags="2" md5="c7fd8a0f3d4f884acb7f1b0af47215bd" inode="8618257" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbgetrc.5.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959388" file_size="3607" device="2305" flags="2" md5="8c13f7185072c8f9f9dbebb604643fb4" inode="8602348" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0355.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339419" file_size="47008" device="2305" flags="2" md5="4bf017d2b5631f8c149e06f4ea69b625" inode="8618101" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/5small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="27857" device="2305" flags="2" md5="78bfc4a367b8425b1a72977092196808" inode="8617990" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0809.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339438" file_size="19323" device="2305" flags="2" md5="98cd4714a85ca7b93361d682bcbc3de0" inode="8618170" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/securing-samba.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959524" file_size="23871" device="2305" flags="2" md5="6008223e1181123fc60b319db037d591" inode="8602407" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0102.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339394" file_size="21795" device="2305" flags="2" md5="faecccb3c6756e5330a39defcff3038d" inode="8618074" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/README" verifyflags="0" rdev="0" groupname="root" mtime="1113856701" file_size="1467" device="2305" flags="2" md5="39adb65a891bb4fb5eacbcb55ed3cdd4" inode="8618305" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch11.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339392" file_size="50755" device="2305" flags="2" md5="10ffc71fdbedb177b9338af6440d56c5" inode="8618060" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/domain.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="35738" device="2305" flags="2" md5="70939aed9e700ce32ddd16b0a0838ff1" inode="8617999" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/pr01.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959446" file_size="3560" device="2305" flags="2" md5="aafd5111d3b93174a570775da2f41ff8" inode="8602274" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/autofs" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="4096" device="2305" flags="0" md5="" inode="8618219" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/inx.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339393" file_size="88025" device="2305" flags="2" md5="c2375c0d22cabc35669e77bb80c276a4" inode="8618050" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/Packaging.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="3008" device="2305" flags="2" md5="cf2962a1ad6b07593f5a6309e7b65a09" inode="8602338" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-passwd" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="10294" device="2305" flags="2" md5="9573c646d7ebf0718769ff6a72542dce" inode="8618235" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/wxpp007.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959442" file_size="12781" device="2305" flags="2" md5="bc35c66d0f621bd7f256f4c657f62e8b" inode="8602300" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0353.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339417" file_size="22024" device="2305" flags="2" md5="e918352bb49fbe68798e84fadcd9677f" inode="8618118" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_1006.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339441" file_size="13955" device="2305" flags="2" md5="fcc77943ed4fec28ca23069e7ff5758f" inode="8618073" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/samba.css" verifyflags="0" rdev="0" groupname="root" mtime="1154959490" file_size="873" device="2305" flags="2" md5="2a0292be878c2b9a56390e99effa6402" inode="8602337" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/architecture.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959492" file_size="8825" device="2305" flags="2" md5="f4e70cc9adfc8e755cf533007151dead" inode="8602329" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printing" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="4096" device="2305" flags="0" md5="" inode="8618323" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/ch7-dual-additive-LDAP.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959439" file_size="7307" device="2305" flags="2" md5="67468156ca2e0e460d17355e95277630" inode="8602307" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/smbldap-migrate-pwdump-groups" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="5024" device="2305" flags="2" md5="0b1b20d5fe34485bc5c8ea3bb0ae857c" inode="8618265" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/samba.schema" verifyflags="0" rdev="0" groupname="root" mtime="1145514589" file_size="19093" device="2305" flags="2" md5="6182d7798abd3da20aecdc3af18d94f3" inode="8618280" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="4096" device="2305" flags="0" md5="" inode="8618228" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/samba-nds.schema" verifyflags="0" rdev="0" groupname="root" mtime="1140488854" file_size="15618" device="2305" flags="2" md5="635dcb8ae08c0bf03845e3b78350f11b" inode="8618225" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbumount.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959399" file_size="2389" device="2305" flags="2" md5="b2d401c28d10c4a229d77cfffffff583" inode="8602378" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/NT4Migration.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959535" file_size="28589" device="2305" flags="2" md5="3f0459fcfa7c3c2ce4f5b9e77bb48229" inode="8602428" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/appf.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339386" file_size="24675" device="2305" flags="2" md5="6de4ede7f01a54b34131600fa760ef3a" inode="8618045" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient" verifyflags="0" rdev="0" groupname="root" mtime="1145514590" file_size="4096" device="2305" flags="0" md5="" inode="8618281" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="71508" device="2305" flags="2" md5="d72fa0480bdaffef6038c7b29826e83c" inode="8618261" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0903.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339439" file_size="4640" device="2305" flags="2" md5="b4801e50c2aaf06497fd5cbec7b0cf8f" inode="8618183" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch08.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339391" file_size="127097" device="2305" flags="2" md5="7318f207b1bffde0ebbb832be16faca6" inode="8618059" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/ntmigration.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959454" file_size="81523" device="2305" flags="2" md5="ba44396c3072a0a00252c9cb2f238ad6" inode="8602276" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/Makefile" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="913" device="2305" flags="2" md5="d8abfafa3f5283f2a9103644208b6743" inode="8618296" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0321.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339408" file_size="10245" device="2305" flags="2" md5="c94dff5356b8715be42335cc4436bdd9" inode="8618090" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0416.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339427" file_size="10504" device="2305" flags="2" md5="1794f42fa24db68059c74922f02aad67" inode="8618089" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/Samba3-HOWTO.pdf" verifyflags="0" rdev="0" groupname="root" mtime="1154960108" file_size="5569409" device="2305" flags="2" md5="6855b6204d415d9ac33b6621065a50bb" inode="8602244" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbcacls.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959381" file_size="10214" device="2305" flags="2" md5="b7d4452fe7f27ea58158f8ba0e9fa6fa" inode="8602354" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WME010.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="6454" device="2305" flags="2" md5="7008f96e2f69b7392c6e9406cba4a862" inode="8618013" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/idmap-sid2uid.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959498" file_size="23705" device="2305" flags="2" md5="a8f02e9abc20f6f3c2fb372191a7fbf0" inode="8618026" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/testutime.c" verifyflags="0" rdev="0" groupname="root" mtime="1122571194" file_size="1881" device="2305" flags="2" md5="0acfee1b9a3e109205a38c338924257a" inode="8618283" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0320.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339407" file_size="9507" device="2305" flags="2" md5="7d1bab32764dae0255d93bb64332939d" inode="8618195" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/appe.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339386" file_size="25247" device="2305" flags="2" md5="6d90332e8a0a4ae7fb3fde7be73670d1" inode="8618202" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/profiles.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959376" file_size="2143" device="2305" flags="2" md5="c28af79deae956ff543e8f7f75120cad" inode="8602352" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/testbrowse2.c" verifyflags="0" rdev="0" groupname="root" mtime="1135110520" file_size="5076" device="2305" flags="2" md5="6cb91f626a9148b88fe357ac120cc773" inode="8618285" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/umount.cifs.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959405" file_size="5833" device="2305" flags="2" md5="16c7f701cd6576bc0e3c2f287ae93570" inode="8602363" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0810.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339438" file_size="20065" device="2305" flags="2" md5="1226e06fb3642e2960cfbe4b3c406b47" inode="8618105" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbcontrol.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959383" file_size="9392" device="2305" flags="2" md5="4fa54772bac6613b5395f3dbb93cf4ea" inode="8602371" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/smbldap-migrate-unix-groups" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="5533" device="2305" flags="2" md5="07cb4cffee64ff16cfd957b273b63f7d" inode="8618267" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0310.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339404" file_size="11721" device="2305" flags="2" md5="1c905dd886ebbfd97b43d96a75bf3191" inode="8618079" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0328.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339409" file_size="8453" device="2305" flags="2" md5="585927ee9c585229330eb5e6f1cd7315" inode="8618177" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0505.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339430" file_size="16510" device="2305" flags="2" md5="0c861869fbcbde7f4dc8caba165074c0" inode="8618111" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/net.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959369" file_size="32719" device="2305" flags="2" md5="2c3a74ac278a06394ab82939cb288e78" inode="8602344" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/pam_winbind.7.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959373" file_size="5267" device="2305" flags="2" md5="e46df51a632d7309e32a6814779cb00c" inode="8602359" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0701.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339434" file_size="13517" device="2305" flags="2" md5="80ec619c524f8ac8eecc05cdca7bdfc7" inode="8618184" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/wrapper.h" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="9553" device="2305" flags="2" md5="9771787f7f494c48dda5b6bf62f13fbc" inode="8618303" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/classicalprinting.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959525" file_size="179297" device="2305" flags="2" md5="d13d0321ac302f819efea698cd545b11" inode="8602426" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/Appendix.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959539" file_size="8705" device="2305" flags="2" md5="c7fb4acd5025ca7d73a8e39cafc4d36a" inode="8602415" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WXPP014.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="28767" device="2305" flags="2" md5="d79243102ba32bb487be66598c5960f0" inode="8618035" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-groupmod" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="8881" device="2305" flags="2" md5="29d02aef1b4d81aeab0a6470b1f0c35b" inode="8618244" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printing/prtpub.c" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="8199" device="2305" flags="2" md5="2b8577d530841a310555b3d67e03acad" inode="8618325" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/WINREPRESSME-Capture.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="57046" device="2305" flags="2" md5="7ee2a4d5c1a02647705b5787cc25b9a8" inode="8602289" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/lam-login.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959442" file_size="86345" device="2305" flags="2" md5="2cd928698bd0aff7ff0f56ce3f15474f" inode="8602306" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/pdbedit.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959375" file_size="14765" device="2305" flags="2" md5="a43c72fd3322566bbeb97bdbea23177c" inode="8602376" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/wxpp008.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="19550" device="2305" flags="2" md5="599a3e83d746c09ece9922e8f7474beb" inode="8618003" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/14small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959505" file_size="56042" device="2305" flags="2" md5="121a96a838428fafe4545d18463b004f" inode="8617986" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0335.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339411" file_size="5928" device="2305" flags="2" md5="e454b0eb1ef2cb009c984cefe7efaae9" inode="8618075" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WME001.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="8576" device="2305" flags="2" md5="1d54aa2060b4edb92a6aa6619a615fa1" inode="8618006" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/13small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959505" file_size="30506" device="2305" flags="2" md5="6338caffc0819bd115373c2c1ddcccd2" inode="8618028" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/devprinting.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="15261" device="2305" flags="2" md5="6a5a00b90025a1074a22e295af5c41de" inode="8602328" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample" verifyflags="0" rdev="0" groupname="root" mtime="1154959489" file_size="4096" device="2305" flags="0" md5="" inode="8602248" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-groupdel" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="2473" device="2305" flags="2" md5="92ee3150a4ac45c3bb15d374c10773b0" inode="8618245" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/Portability.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959537" file_size="11265" device="2305" flags="2" md5="15c6f59035d6bb6fe905b323cff79f59" inode="8602413" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0107.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339396" file_size="11492" device="2305" flags="2" md5="f9b88c27f92f190dc7e8c458a42cac7f" inode="8618182" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0112.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339397" file_size="7330" device="2305" flags="2" md5="7fb670745ee3d6d7db38a1cf18a0dc21" inode="8618163" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools005.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="21726" device="2305" flags="2" md5="0a408523e4bf5a72182e8ae776676657" inode="8618259" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/pt03.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="4574" device="2305" flags="2" md5="abd185d4dafe2232e8a07dc222ee41e8" inode="8602339" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbclient.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959382" file_size="41238" device="2305" flags="2" md5="091a99f2a715fc79f7b7f648e3fc98b3" inode="8602350" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/integrate-ms-networks.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959532" file_size="35383" device="2305" flags="2" md5="fa00818daa251778b4eed6cb5482ec3d" inode="8602392" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/Win2000_PlainPassword.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="303" device="2305" flags="2" md5="3f56cb596171377ae64259d5b42b0785" inode="8618216" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/next_motif.gif" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="317" device="2305" flags="2" md5="123968e8e915e9df119373e38b2fb2f8" inode="8618255" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/DMSMig.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959455" file_size="7462" device="2305" flags="2" md5="a94a0b9aedbfc83383dbf518986ffe0a" inode="8602253" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/Roadmap" verifyflags="0" rdev="0" groupname="root" mtime="1122571193" file_size="1357" device="2305" flags="2" md5="4741cb90be3b7d2068a532205f0f132a" inode="8602240" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/previous_motif.gif" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="317" device="2305" flags="2" md5="c50d069541334f2d3f17e0fbd0c119d4" inode="8618258" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0354.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339418" file_size="18138" device="2305" flags="2" md5="905bffc150fbf9938f61dc71c3a80342" inode="8618132" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/teststat.c" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="1724" device="2305" flags="2" md5="0745238daa4999923a251c2cf5bf82df" inode="8618289" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images" verifyflags="0" rdev="0" groupname="root" mtime="1154959507" file_size="4096" device="2305" flags="0" md5="" inode="8617985" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0201.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339398" file_size="8734" device="2305" flags="2" md5="b97eff90a02ed4fd92bd595c01caf602" inode="8618160" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/Other-Clients.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959538" file_size="20965" device="2305" flags="2" md5="0f713092416df490561740dabe0ee467" inode="8602400" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0114.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339398" file_size="22017" device="2305" flags="2" md5="cf3b3687d0d6e0e2d4c5be8b1cbd547a" inode="8618155" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/chap4-net.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959432" file_size="21054" device="2305" flags="2" md5="98e75f8dad6b41ab5225e827baf30b48" inode="8602315" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/samba-pdc.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959515" file_size="78670" device="2305" flags="2" md5="5f8375da39031720136dea08b5d5a32a" inode="8602430" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/happy.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959451" file_size="213682" device="2305" flags="2" md5="2e2fed216438ec09d57f68837aa22855" inode="8602259" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/winbindd.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959408" file_size="20637" device="2305" flags="2" md5="4430888eb94459d9131d35d2dfba383d" inode="8602343" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0350.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339416" file_size="35358" device="2305" flags="2" md5="ed19f4dc1d57937275ce7d1bf06c46db" inode="8618142" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/VFS.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959529" file_size="39310" device="2305" flags="2" md5="81c4dd03e0e4b184c3104bba22250831" inode="8602393" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_af02.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339444" file_size="42621" device="2305" flags="2" md5="e7bb2f92f78b60547e79d9bb09667776" inode="8618192" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_af01.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339443" file_size="54745" device="2305" flags="2" md5="3958d2c1a02b95b117860865732689dd" inode="8618098" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/6small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="32612" device="2305" flags="2" md5="e9895fd069887779308d65fa8e953b37" inode="8618033" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/pr03.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959446" file_size="6403" device="2305" flags="2" md5="5ef0393e0a0649ca1ec168dc0f9b62dd" inode="8602260" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0106.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339395" file_size="17191" device="2305" flags="2" md5="57e449863943c57f77f451945d07ec36" inode="8618091" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/NullConnect.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="21931" device="2305" flags="2" md5="272d21d27751fbb24ee1d2625dc73def" inode="8602290" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/ch46.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959539" file_size="9808" device="2305" flags="2" md5="2b3befcfd2add72eec4815b47860b868" inode="8602431" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/WHATSNEW.txt" verifyflags="0" rdev="0" groupname="root" mtime="1157064868" file_size="277519" device="2305" flags="2" md5="858733883bb7425b82446cfd05558aef" inode="8602239" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0504.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339429" file_size="16743" device="2305" flags="2" md5="bf206c6a9421048c38ecf336770c83e7" inode="8618084" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WME009.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="8863" device="2305" flags="2" md5="417a9fc554171c49f965c04a107ebf50" inode="8617996" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/simple.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959448" file_size="77641" device="2305" flags="2" md5="3982af92450f3e81a77a4dd7c2615927" inode="8602266" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools002.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="3073" device="2305" flags="2" md5="8b3a1a00eded0adc4c495b62a791fcbb" inode="8618249" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/tdbbackup.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959401" file_size="3785" device="2305" flags="2" md5="b91dd9552c833da4e7779ad4cf826753" inode="8602349" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_af06.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339449" file_size="53929" device="2305" flags="2" md5="acd07eafdc0b720e95a140b173451f6a" inode="8618187" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/appa.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339384" file_size="9603" device="2305" flags="2" md5="01242865f419a954b307609c41e1347e" inode="8618053" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0312.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339405" file_size="17058" device="2305" flags="2" md5="6fd84cb55680744a3cf32f10cbfe14a7" inode="8618077" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch01.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339388" file_size="110637" device="2305" flags="2" md5="622615523b347bc2a9ddcf8cbd7cf1df" inode="8618051" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WXPP002.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="25711" device="2305" flags="2" md5="eb1d5a4f9f7d2f84e896e2d686588a60" inode="8617993" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbstatus.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959396" file_size="5403" device="2305" flags="2" md5="c8fc4f5fe32057fda0c5bc1cf7367695" inode="8602381" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_1005.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339441" file_size="11687" device="2305" flags="2" md5="edab423963b27baccc50e16eecfc8e74" inode="8618133" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="4096" device="2305" flags="0" md5="" inode="8618248" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0404.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339423" file_size="10769" device="2305" flags="2" md5="0f855390c11b2d4693b861a9bcbef05b" inode="8618068" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0315.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339406" file_size="15011" device="2305" flags="2" md5="4757b31cb1a1c86bb62909bb75535db6" inode="8618157" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba" verifyflags="0" rdev="0" groupname="root" mtime="1154960120" file_size="4096" device="2305" flags="0" md5="" inode="8618040" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/INSTALL" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="5476" device="2305" flags="2" md5="286caaa2b254fedcc7bac5587161b7a7" inode="8618273" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools006.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="2960" device="2305" flags="2" md5="99b3e0034cac31e58be0d9686bd3a032" inode="8618252" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0332.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339410" file_size="7011" device="2305" flags="2" md5="bf4a32a12d9f92a907da51aff53bbde7" inode="8618154" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0316.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339406" file_size="20310" device="2305" flags="2" md5="939935b13faa8e86293f20c6f25d1f1e" inode="8618124" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/opendir_smbsh.c" verifyflags="0" rdev="0" groupname="root" mtime="1113856701" file_size="1083" device="2305" flags="2" md5="b7250f5b1182afa4fc4d00081a05827a" inode="8618308" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smb.conf.5.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959380" file_size="403144" device="2305" flags="2" md5="c63e62ab296df390427e16559a32c6bc" inode="8602362" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/chap9-ADSDC.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959441" file_size="27426" device="2305" flags="2" md5="911edd780a216fb80103c39ea3ac1ea7" inode="8602284" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/TOSHpreface.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959513" file_size="5148" device="2305" flags="2" md5="3fcad2c9493f1a4c787638845978f241" inode="8602398" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/ch-ldap-tls.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959538" file_size="18468" device="2305" flags="2" md5="7d886abc9f9ec7b04c914359df4e50cc" inode="8602439" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0803.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339435" file_size="17604" device="2305" flags="2" md5="87fa5343da4bf76a798c445f87cd3a58" inode="8618103" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/install.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959513" file_size="36935" device="2305" flags="2" md5="0b85a2a256c8192039955340ae6cbca6" inode="8602412" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/chap5-net.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959433" file_size="33507" device="2305" flags="2" md5="aeca14f7191aa36721fd39d230bb016f" inode="8602302" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/NT4_PlainPassword.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="303" device="2305" flags="2" md5="69f317abd5a711636b88eb60f17e68ad" inode="8618207" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0326.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339408" file_size="13686" device="2305" flags="2" md5="69c9f3845c377962a65a30ca08dc1be9" inode="8618088" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/wxpp007.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="12781" device="2305" flags="2" md5="bc35c66d0f621bd7f256f4c657f62e8b" inode="8618008" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbsh.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959393" file_size="9731" device="2305" flags="2" md5="e806b6517d70c7704ce3917781f07f9f" inode="8602360" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/compiling.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959537" file_size="26474" device="2305" flags="2" md5="5abb9957abc48a07c7afd55bd3250912" inode="8602402" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0203.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339400" file_size="35921" device="2305" flags="2" md5="288ea3266c273527077c33a0d1bfef86" inode="8618153" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/contributing.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="5552" device="2305" flags="2" md5="4d86edf429804baa18708d7f764e3677" inode="8602321" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/upgrading-to-3.0.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959534" file_size="33649" device="2305" flags="2" md5="599da8fd619471e2f5fd0dcd55e27d1a" inode="8602425" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0414.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339427" file_size="7370" device="2305" flags="2" md5="514fc114cae91fbda9370caabfd947cc" inode="8618116" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0806.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339436" file_size="14242" device="2305" flags="2" md5="88554e9343b56e12e7fe8e4b65b8fe3e" inode="8618070" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0317.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339406" file_size="15084" device="2305" flags="2" md5="9e83d7f2ea818c36411785f3c0beb3e6" inode="8618134" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/index.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959489" file_size="45356" device="2305" flags="2" md5="72f8a60a3bdbd714f7290657a5935f7b" inode="8602272" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/10small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959504" file_size="46666" device="2305" flags="2" md5="ab81a62e9ffc4e5954969d43431853fa" inode="8617991" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/preface.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959447" file_size="30149" device="2305" flags="2" md5="6e6e151e7f9ba3750d3e1dfda648a55a" inode="8602268" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/tdbdump.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959402" file_size="1732" device="2305" flags="2" md5="15a17ff7aad369a12f3c78e89c860d98" inode="8602358" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/WinME_PlainPassword.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="122" device="2305" flags="2" md5="a4f6f6d2d92a59fc67e2c3475ab3d3f4" inode="8618209" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/ClientConfig.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959517" file_size="32751" device="2305" flags="2" md5="cc9a9a7fce678c30d1e30819aa90bb11" inode="8602424" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/gpl.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959459" file_size="25873" device="2305" flags="2" md5="51371cf73c081cf3b22740ea5cc141cc" inode="8602261" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/chap7-net-Ar.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959439" file_size="97993" device="2305" flags="2" md5="4e07d1e64a0769e02c4e600aab9fc7c8" inode="8602311" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/wins.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="4471" device="2305" flags="2" md5="5ad38ba3e78130d54874a3cdee87efe0" inode="8602323" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/COPYING" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="17980" device="2305" flags="2" md5="83ec97bb06c77808afecd91eb0e8364b" inode="8618269" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0327.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339409" file_size="16603" device="2305" flags="2" md5="245245607e57381aa8cc5a830397a368" inode="8618185" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0601.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339432" file_size="6044" device="2305" flags="2" md5="29de29a71b7621f06ac099ddb79c2c97" inode="8618129" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/index.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959637" file_size="101450" device="2305" flags="2" md5="f35e52ebc1a52fe931d6385bc6d08acf" inode="8602440" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/debug.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959492" file_size="11810" device="2305" flags="2" md5="f822f1cc7ccea354c72cdd9b10fbc1dd" inode="8602332" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/samba-schema.IBMSecureWay" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="3145" device="2305" flags="2" md5="2f07c7a0b3018890360e7c8574d9deb3" inode="8618279" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages" verifyflags="0" rdev="0" groupname="root" mtime="1154959423" file_size="4096" device="2305" flags="0" md5="" inode="8602341" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_1004.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339440" file_size="8851" device="2305" flags="2" md5="791b2d65368a9384b0902fea48de69ac" inode="8618175" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/configure.pl" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="21150" device="2305" flags="2" md5="e9f502027adfd387629fee31243df786" inode="8618229" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbd.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959385" file_size="18211" device="2305" flags="2" md5="c15ef8262471ce3cb23400b53987c46c" inode="8602369" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/ChangeNotes.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959518" file_size="11314" device="2305" flags="2" md5="e9d8fec94a0268b6c0264ffd021d26bf" inode="8602420" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/tree.c" verifyflags="0" rdev="0" groupname="root" mtime="1113856701" file_size="21950" device="2305" flags="2" md5="eda43f6cb81f14b29f9956220be465d1" inode="8618290" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959434" file_size="19853" device="2305" flags="2" md5="000b66113df66115e6e0b418820a6c25" inode="8602303" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/testsmbc.c" verifyflags="0" rdev="0" groupname="root" mtime="1113856701" file_size="6868" device="2305" flags="2" md5="885bab6d2e43d917c2516e8cfc300e0e" inode="8618287" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/bsd-strlcpy.c" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="2385" device="2305" flags="2" md5="cac0b14bfdd335b7fc0d63f636474104" inode="8618295" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/nw4migration.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959455" file_size="80620" device="2305" flags="2" md5="3ec95f24d3eb4f669850dbf95f539123" inode="8602264" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/unix-smb.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959491" file_size="14728" device="2305" flags="2" md5="32383fea2ce260ba4cb32f06fe3d3ca5" inode="8602340" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="4096" device="2305" flags="0" md5="" inode="8602277" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/msdfs.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959524" file_size="10697" device="2305" flags="2" md5="a99b462cb145baf52b3eaa3e8e5906cc" inode="8602433" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/wxpp008.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959442" file_size="19550" device="2305" flags="2" md5="599a3e83d746c09ece9922e8f7474beb" inode="8602296" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/Win-2Kx-XPP-ForceLocalProfile.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="452" device="2305" flags="2" md5="bfbdae2a71abdc0dab531de9c448dcdf" inode="8618206" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0801.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339434" file_size="35667" device="2305" flags="2" md5="2ffce079b0e27f1938d32bae03bebf70" inode="8618113" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/chap9-SambaDC.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959440" file_size="25697" device="2305" flags="2" md5="8a50e1687daa02c76858b40823a62a5f" inode="8602281" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/testparm.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959403" file_size="6985" device="2305" flags="2" md5="d88c2d50dc5213eb18f2764e35800f92" inode="8602342" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0319.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339407" file_size="15653" device="2305" flags="2" md5="4048e701d4767551c517cd5d94e92238" inode="8618194" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printer-accounting/lp-acct" verifyflags="0" rdev="0" groupname="root" mtime="1109372392" file_size="746" device="2305" flags="2" md5="5a03d442b2e470eed8d2a9ab43005738" inode="8618320" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/DomApps.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959456" file_size="41753" device="2305" flags="2" md5="9f7635c73a3ead6c62bef07fc202fdd2" inode="8602254" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/TODO" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="1045" device="2305" flags="2" md5="2d4cdbad760eabb3dcf322a03f800fdf" inode="8618233" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/index.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="4660" device="2305" flags="2" md5="d09ec343f46bbb9b6518e62b96c70050" inode="8618263" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/tracing.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="6290" device="2305" flags="2" md5="1eede9014a479404b94c27e0ac268a98" inode="8602331" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/ch7-singleLDAP.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959437" file_size="2459" device="2305" flags="2" md5="4243f14f0f233eda9d8e258d16709993" inode="8602314" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/rpc-plugin.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="4979" device="2305" flags="2" md5="e33fea37e8488bf46acc6a029b785133" inode="8602333" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/mount.cifs.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959368" file_size="20222" device="2305" flags="2" md5="59b248b8346405a34b99f83f8dbe4664" inode="8602357" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0345.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339414" file_size="19423" device="2305" flags="2" md5="05dc586acba14fd64cff6cd0928e6d00" inode="8618190" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/log2pcap.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959367" file_size="3839" device="2305" flags="2" md5="9133f220811ce3d94dda034a349a9a28" inode="8602364" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/index.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959423" file_size="6615" device="2305" flags="2" md5="c2b88fd7a68dd2e9e165c2b6172b8f2f" inode="8602377" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/misc/check_multiple_LDAP_entries.pl" verifyflags="0" rdev="0" groupname="root" mtime="1111175802" file_size="4818" device="2305" flags="2" md5="1151f4cfe8d059a382490f2b3f0e7ef3" inode="8618311" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/appd.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339386" file_size="4700" device="2305" flags="2" md5="16d3d8d777985556ae37bc1e6cb83f23" inode="8618043" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/wxpp001.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="31712" device="2305" flags="2" md5="46493100f6721a90a09ae06188693e53" inode="8618015" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/PolicyMgmt.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959530" file_size="32370" device="2305" flags="2" md5="ed304260e4c11e090f7f6eb36a85a99c" inode="8602435" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/FolderRedir.adm" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="1433" device="2305" flags="2" md5="f7803d5010c64c743d1de60dd691f4a5" inode="8618218" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbmnt.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959389" file_size="3344" device="2305" flags="2" md5="9849c426e3ed25657aedf9301f84e365" inode="8602379" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-usermod" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="18968" device="2305" flags="2" md5="0ddf2bd485150298f63f85273ff0b52e" inode="8618242" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0343.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339413" file_size="17796" device="2305" flags="2" md5="3ff7aa1eb48e5a4a487465a894bc274d" inode="8618159" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0109.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339397" file_size="18727" device="2305" flags="2" md5="6d1a5bfceb0015d0996c35b102be42d2" inode="8618200" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/bsd-strlcat.c" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="2496" device="2305" flags="2" md5="a3fea3489ba665363aa17252768ec938" inode="8618304" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0346.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339414" file_size="15320" device="2305" flags="2" md5="f9e6a62e5d283d74836b75efcc972fe7" inode="8618130" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/parsing.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="8469" device="2305" flags="2" md5="fee540707d2dec9e8e99490f97103fc4" inode="8602335" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0314.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339405" file_size="12776" device="2305" flags="2" md5="ca882a6ac99c772fa29928ec3cb717cf" inode="8618178" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0351.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339416" file_size="29480" device="2305" flags="2" md5="7753bddcb4643d47f7a57c0a191f51e5" inode="8618186" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/w2kp004.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="12127" device="2305" flags="2" md5="9178f28c006bba3e901ab6843d45616f" inode="8618023" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/misc/extra_smbstatus" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="2391" device="2305" flags="2" md5="222084189c8a89b102fcbd7788d4f5c4" inode="8618314" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/acct2net.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959431" file_size="11544" device="2305" flags="2" md5="4661001fd020df5a5bc5ae4daffbb5d3" inode="8602308" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/WinXP_PlainPassword.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="1026" device="2305" flags="2" md5="d4e0275778910c1bb33de49573234984" inode="8618213" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/CodingSuggestions.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="8890" device="2305" flags="2" md5="77cfa5bda455c750eacb50a3ba516b2c" inode="8602325" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/ch7-fail-overLDAP.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959438" file_size="5585" device="2305" flags="2" md5="fd305ef5b35ff2993031e9700ac2ad27" inode="8602283" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/2000users.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959452" file_size="84587" device="2305" flags="2" md5="eb4fbd6f890ed36c7b8f12a9ddea47a3" inode="8602257" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/get_auth_data_fn.h" verifyflags="0" rdev="0" groupname="root" mtime="1145514590" file_size="1231" device="2305" flags="2" md5="2f1ad061192739e397ca0025a0996c34" inode="8618282" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0103.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339394" file_size="10700" device="2305" flags="2" md5="812cabafdf6722c8e6c750dd984c7828" inode="8618151" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/wrapper.c" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="46013" device="2305" flags="2" md5="5b9807d258751a9f4c36984575896d1f" inode="8618301" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/3small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="15785" device="2305" flags="2" md5="4f2a73690fa87816d3fe289d51cc7d6b" inode="8618036" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/CONTRIBUTORS" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="1371" device="2305" flags="2" md5="880bc581e26c35989830aad87d53333c" inode="8618271" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0361.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339422" file_size="13356" device="2305" flags="2" md5="a4fd1764adf1305f64af70b2599cf0c6" inode="8618141" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0401.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339422" file_size="24274" device="2305" flags="2" md5="baf410ef310f7c0346024e3e9847706b" inode="8618109" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959439" file_size="6633" device="2305" flags="2" md5="1ac8a099d3b0980829071a3e380da072" inode="8602285" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/ethereal2.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959507" file_size="38069" device="2305" flags="2" md5="f63f9d9863cf1fe333f41c2e7a287083" inode="8617987" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/cups2.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959507" file_size="40511" device="2305" flags="2" md5="80c6f9868b9e21c77dc90b0a56e2b078" inode="8618002" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0303.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339402" file_size="14966" device="2305" flags="2" md5="d49e83f8055956825b92fd962b1000cf" inode="8618072" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0113.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339397" file_size="10850" device="2305" flags="2" md5="ed71915bc8eec00eeca647ee6ede3bde" inode="8618104" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/lam-config.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="73791" device="2305" flags="2" md5="b4ec3fc904ea7c6093f0a6cb36725046" inode="8602287" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/AccessControls.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959523" file_size="82434" device="2305" flags="2" md5="b2e92550cf521dcd62f13344e63fc5f7" inode="8602410" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools008.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="1650" device="2305" flags="2" md5="0c765ed3e9bf3f1ad1d4447dc81ec095" inode="8618260" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/bsd-strlfunc.h" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="189" device="2305" flags="2" md5="8f3d91a69cd115d90c4fded7ffa64c01" inode="8618298" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0501.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339428" file_size="11580" device="2305" flags="2" md5="972cb3255b46298fa4ae318a3a119058" inode="8618191" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/w2kp003.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="8892" device="2305" flags="2" md5="63c3214607e07f9c13ed3122b327ff06" inode="8617995" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbspool.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959394" file_size="4597" device="2305" flags="2" md5="2743e321af534b562602010586269500" inode="8602366" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbcquotas.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959384" file_size="8355" device="2305" flags="2" md5="05991ddcef2383735fee107f5b0f1841" inode="8602347" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0330.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339410" file_size="17140" device="2305" flags="2" md5="76a61e0e360b2c26a621cf80b8d25410" inode="8618172" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0502.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339428" file_size="12753" device="2305" flags="2" md5="aa2af1016785f7f98f69c4b6ce4c2a5a" inode="8618125" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/lam-groups.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="94035" device="2305" flags="2" md5="e420af24dcee744a6f5bbdaacd352520" inode="8602286" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/openmag.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959440" file_size="18146" device="2305" flags="2" md5="042de566bad5e592bfd5027cb3427641" inode="8602293" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0411.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339427" file_size="28112" device="2305" flags="2" md5="d6fc0eb1f89261d2909d00a0a7d5cd4e" inode="8618071" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/wbinfo.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959407" file_size="11399" device="2305" flags="2" md5="69ac1a0810004f4efa20b5316d3aab41" inode="8602361" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/wxpp001.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959442" file_size="31712" device="2305" flags="2" md5="46493100f6721a90a09ae06188693e53" inode="8602301" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/wxpp004.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="29694" device="2305" flags="2" md5="742782ded8c2de0b50d2ea5302f6d53d" inode="8618007" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WXPP005.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="15378" device="2305" flags="2" md5="27e4db608d37bbc4c122a931a5324e72" inode="8618022" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/domain-member.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959516" file_size="69021" device="2305" flags="2" md5="b331582606bf6ea7943d14c2f49fad75" inode="8602406" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/1small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="20739" device="2305" flags="2" md5="e3f7d79bbf27a06499791e8e5c82e7b8" inode="8618010" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/ProfileMgmt.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959531" file_size="67904" device="2305" flags="2" md5="3104a267226ff96892cd2c5f201f113b" inode="8602436" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0348.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339415" file_size="7634" device="2305" flags="2" md5="7d56e40ea56d83af3aacd8bdc995927c" inode="8618086" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0357.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339420" file_size="33800" device="2305" flags="2" md5="381336385c10716baa6babdf5b9f9c0e" inode="8618168" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/UserMgrNT4.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959442" file_size="31074" device="2305" flags="2" md5="f7cffc3565d0edab78a16625d3aae30b" inode="8602292" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="4096" device="2305" flags="0" md5="" inode="8618294" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_1003.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339440" file_size="26173" device="2305" flags="2" md5="34b76c9998015d1d6ca4c3b5b11a25ce" inode="8618138" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/misc/wall.perl" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="1939" device="2305" flags="2" md5="508b47c93ad5b2dbcf68f36eda718fa7" inode="8618315" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_af07.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339449" file_size="50762" device="2305" flags="2" md5="ed2df7e34ee30f8400d0a6ba798d9153" inode="8618139" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printer-accounting/acct-sum" verifyflags="0" rdev="0" groupname="root" mtime="1109372392" file_size="695" device="2305" flags="2" md5="662ab0fe36cf0677e322dac44c308b78" inode="8618318" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0507.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339431" file_size="25309" device="2305" flags="2" md5="be2616298cda024692224875f7a1ca3a" inode="8618076" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/convertSambaAccount" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="5820" device="2305" flags="2" md5="436cb6448b3d6fbae61393396601d5e9" inode="8618227" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/CUPS-printing.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959528" file_size="287546" device="2305" flags="2" md5="cecadef9e8445dfda98a190422a3c42a" inode="8602390" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/NT4-Locking.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="871" device="2305" flags="2" md5="2258740996cd30b0a544ded52e9fe85b" inode="8618210" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/FastStart.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959514" file_size="73562" device="2305" flags="2" md5="bca40815edfc141a712eea85e1f09f5b" inode="8602414" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0101.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339394" file_size="7665" device="2305" flags="2" md5="950df8b9459fa94c2ef645404295e54a" inode="8618189" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch04.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339389" file_size="117236" device="2305" flags="2" md5="a006aecb3509ec9a10eedfac654147e8" inode="8618049" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/optional.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959534" file_size="60176" device="2305" flags="2" md5="8cdf2c0044212a3adcb1a1febd05e246" inode="8602441" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/chap7-idresol.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959436" file_size="19415" device="2305" flags="2" md5="dcc9f33a70e4d3a23a1b108b6efa51dc" inode="8602312" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0344.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339413" file_size="20926" device="2305" flags="2" md5="f2b26cb4f2cb1c42515531579faf0074" inode="8618093" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0902.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339439" file_size="6760" device="2305" flags="2" md5="9e881ce77ba240e6ca9146a5a8455187" inode="8618117" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/ChangeLog" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="17928" device="2305" flags="2" md5="bf7e472444cd3aee1437f602b0668450" inode="8618230" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/ix01.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959489" file_size="200698" device="2305" flags="2" md5="98f0b1df3e49876128ffc7d4c5c07b23" inode="8602255" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/smbw.c" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="23066" device="2305" flags="2" md5="43040e9d23fc1eff8ab53b9ec4cc2d8c" inode="8618299" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WXPP009.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="18976" device="2305" flags="2" md5="fa2ba494c0dfc470b7b0b1ce2c4fc5c3" inode="8617988" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/Samba3-ByExample.pdf" verifyflags="0" rdev="0" groupname="root" mtime="1154959803" file_size="3773193" device="2305" flags="2" md5="1a6d6bb534f06e13d7b6807bfa6ce58e" inode="8602243" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0342.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339413" file_size="16674" device="2305" flags="2" md5="6a45c0002c0eedeaf0a80682b57bf103" inode="8618108" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/pdftoepsonusb.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959505" file_size="4166" device="2305" flags="2" md5="789e3c0df0bebed78f84d900305667fb" inode="8618001" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/smbw_dir.c" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="9990" device="2305" flags="2" md5="a6be22d6f8655252be0052b31067b600" inode="8618302" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap_bind.conf" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="428" device="2305" flags="2" md5="33954fb7c87ebd12b102655aae55354e" inode="8618238" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/bugreport.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959536" file_size="15968" device="2305" flags="2" md5="2551208ff42ce9def10fa69dc1289bc0" inode="8602388" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/registry/Win9X-CacheHandling.reg" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="190" device="2305" flags="2" md5="4d62b63d8644130319b109de0068ad23" inode="8618217" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/README" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="1779" device="2305" flags="2" md5="55f571ed30af636e074885a531e73139" inode="8618277" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/REVISION" verifyflags="0" rdev="0" groupname="root" mtime="1154959216" file_size="353" device="2305" flags="2" md5="6003a123fc00b48dfd110b479991928d" inode="8602241" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-userinfo" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="7633" device="2305" flags="2" md5="4c690516556d4105ebf348dd525662c8" inode="8618275" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0506.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339430" file_size="32191" device="2305" flags="2" md5="d353f5d83de32af2d665d0b05ad1ed0c" inode="8618082" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WME005.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="6421" device="2305" flags="2" md5="fcfde15ca4a797065f14fa023e5573b2" inode="8618005" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/misc/swat.pl" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="3270" device="2305" flags="2" md5="7d1c15ac6f1361fefb88c70d6c17f6c1" inode="8618312" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/vfstest.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959406" file_size="8059" device="2305" flags="2" md5="6f481ad29d7ae815a666dc1b902712a2" inode="8602372" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0337.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339411" file_size="17157" device="2305" flags="2" md5="73b841872f7a682509c4db9437a256cb" inode="8618083" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/misc" verifyflags="0" rdev="0" groupname="root" mtime="1152563278" file_size="4096" device="2305" flags="0" md5="" inode="8618310" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/README" verifyflags="0" rdev="0" groupname="root" mtime="1140488854" file_size="8577" device="2305" flags="2" md5="a79e5c16c62fa44da941e2f30c5fa8b0" inode="8602236" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/samba2_s.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339394" file_size="9733" device="2305" flags="2" md5="a03e3f46d6f5b6a115512c56f8662274" inode="8618047" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/rpcclient.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959377" file_size="23103" device="2305" flags="2" md5="d105be24237622177047f461d9167b75" inode="8602365" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0331.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339410" file_size="10450" device="2305" flags="2" md5="2cf6818c1a2ac031baf4e076a6972379" inode="8618102" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/nmbd.8.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959370" file_size="14380" device="2305" flags="2" md5="f9bab6c873767e9b9a9bdf53fa99f674" inode="8602368" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/smbldap-migrate-unix-accounts" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="11640" device="2305" flags="2" md5="1eee8dbc93cd91634c0053954f09e7fc" inode="8618266" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WXPP003.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959495" file_size="18079" device="2305" flags="2" md5="efa967759263099aa75ed5ae68a36418" inode="8617998" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-userdel" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="3244" device="2305" flags="2" md5="88dc87d47e8df65de28d661163f9ba64" inode="8618231" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/ethereal1.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959507" file_size="18517" device="2305" flags="2" md5="6f06d82b436242550462562daecba62e" inode="8617994" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/ch14.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959457" file_size="9776" device="2305" flags="2" md5="2b53beda57e75b01ff3f6513d3306736" inode="8602275" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0322.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339408" file_size="11067" device="2305" flags="2" md5="ad744801a2b92615cddee8cb4bd7321d" inode="8618145" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-usershow" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="1958" device="2305" flags="2" md5="1b8f2f30dfdb39e272e0452095ebae6e" inode="8618243" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/findsmb.1.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959363" file_size="6264" device="2305" flags="2" md5="6f5def7dbb4ac50dca97b97967b50ede" inode="8602370" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/diagnosis.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959536" file_size="28828" device="2305" flags="2" md5="2ae5aa800affbc40da262cf483642656" inode="8602417" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/pr02.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959512" file_size="22625" device="2305" flags="2" md5="f2fd2087193235157e8187e78225290e" inode="8602385" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/11small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959505" file_size="27817" device="2305" flags="2" md5="3fe1261eea89ad8160b7fdfa0b3e57ab" inode="8618018" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/idmap-uid2sid.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959499" file_size="21259" device="2305" flags="2" md5="d62ed523fc46d22114e3dfa73d5ae379" inode="8617989" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/HostAnnouncment.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959443" file_size="38156" device="2305" flags="2" md5="5d0d5a6d364f981fd909c5a1bffc26c0" inode="8602279" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0324.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339408" file_size="13707" device="2305" flags="2" md5="ba082eee26ddedd29c3d0794eb513d1d" inode="8618162" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/FILES" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="1638" device="2305" flags="2" md5="09ce2fe261465ac51e5ec0bfa76a8755" inode="8618274" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/index.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="16963" device="2305" flags="2" md5="66e9a67471fbec27e554ada9518b21ea" inode="8602334" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0308.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339403" file_size="14879" device="2305" flags="2" md5="dd89a30d20e4b68ce951a663ec0fa656" inode="8618081" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/ch10.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339392" file_size="58292" device="2305" flags="2" md5="fc65c9a08b89dc7962b960ad798e4b7f" inode="8618203" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/RefSection.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959459" file_size="10943" device="2305" flags="2" md5="dccd6f79e1759997fd881a2d788ff2f6" inode="8602250" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-tools.spec" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="3988" device="2305" flags="2" md5="cfe640a822d8b2bc2d3db2a08c36487e" inode="8618240" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/chap7-net2-Br.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959440" file_size="99789" device="2305" flags="2" md5="f95d7d0007ebe534109d8a3c8a41a5f6" inode="8602304" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c" verifyflags="0" rdev="0" groupname="root" mtime="1157180358" file_size="4096" device="2305" flags="0" md5="" inode="8602235" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/libsmbclient/smbwrapper/smbsh.c" verifyflags="0" rdev="0" groupname="root" mtime="1138164402" file_size="4735" device="2305" flags="2" md5="d56692c0acecde8601694e4ef32c2850" inode="8618297" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/AccountingNetwork.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959430" file_size="10253" device="2305" flags="2" md5="0140e31ed6dd6d0454c3a7fb3f1d481c" inode="8602282" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0305.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339402" file_size="14728" device="2305" flags="2" md5="3f1affd85d37d5af883880e24b2b2b03" inode="8618161" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/rights.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959522" file_size="30261" device="2305" flags="2" md5="e01422a0266b587c1231a9d271a0ee63" inode="8602397" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/go01.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959540" file_size="9765" device="2305" flags="2" md5="86e6d12a674c8b505919ac836e97b8eb" inode="8602438" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0405.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339423" file_size="14430" device="2305" flags="2" md5="b4b4d07404a4404e0292690c07401e52" inode="8618179" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0313.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339405" file_size="8350" device="2305" flags="2" md5="0b6aaf3393ae4dd953031c8884efb0e9" inode="8618193" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/images/wxpp004.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959442" file_size="29694" device="2305" flags="2" md5="742782ded8c2de0b50d2ea5302f6d53d" inode="8602299" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/troubleshooting.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959536" file_size="3860" device="2305" flags="2" md5="cd587d040eae9ae87299dc8d843f5de2" inode="8602446" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printing/smbprint" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="3987" device="2305" flags="2" md5="3d1b474024f0843b25caf3f5fb74ae90" inode="8618324" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/THANKS" verifyflags="0" rdev="0" groupname="root" mtime="1116017999" file_size="5780" device="2305" flags="2" md5="44ffc198d5e4b5656995926f3258b4e3" inode="8602245" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/SambaHA.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959533" file_size="21688" device="2305" flags="2" md5="3c3129ef546a47e70fd191a63ebe52d7" inode="8602386" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/4small.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959503" file_size="22370" device="2305" flags="2" md5="f44b3f4654a859a5c09b25f04c7385ae" inode="8618021" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/smbldap-useradd" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="20969" device="2305" flags="2" md5="158c04e38d30b29534440db588cabe11" inode="8618246" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/samba.css" verifyflags="0" rdev="0" groupname="root" mtime="1154959424" file_size="873" device="2305" flags="2" md5="2a0292be878c2b9a56390e99effa6402" inode="8602273" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/locking.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959524" file_size="51731" device="2305" flags="2" md5="a928cce1a320fa11d4226a0d4f843ac5" inode="8602434" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/autofs/auto.smb" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="467" device="2305" flags="2" md5="9fe7a067ae1745bd132dd22890f93abd" inode="8618220" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/libsmbclient.7.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959364" file_size="5136" device="2305" flags="2" md5="d7776198df41a78d9a0b3c0aaed15d7e" inode="8602374" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools010.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="438" device="2305" flags="2" md5="71437bb98e8cb7fa036f644658a44f48" inode="8618254" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0415.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339427" file_size="15906" device="2305" flags="2" md5="62a8844345c245a1bc448a584c4b9140" inode="8618115" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/manpages/smbpasswd.5.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959391" file_size="8556" device="2305" flags="2" md5="d3281ec580fdb14118004053a8187602" inode="8602380" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0807.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339437" file_size="15799" device="2305" flags="2" md5="69d46205f2054ea5091cb7114d22e8fb" inode="8618096" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/browsing1.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959497" file_size="19564" device="2305" flags="2" md5="042619b4b417eda9cc7ed20c9e079834" inode="8618004" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0336.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339411" file_size="16622" device="2305" flags="2" md5="0ab44d9c3de1036f25e24401d1ed1f5d" inode="8618147" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/misc/adssearch.pl" verifyflags="0" rdev="0" groupname="root" mtime="1152563278" file_size="43027" device="2305" flags="2" md5="ff143ccbad078ba13ef6c1735fa15b4b" inode="8618313" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0340.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339412" file_size="10493" device="2305" flags="2" md5="0899c6a66e7c78c19bd7ddb822c9d31c" inode="8618173" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/largefile.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959533" file_size="7060" device="2305" flags="2" md5="174a2f2851dc4f2bc55f2969fcab4a22" inode="8602419" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide/pt02.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959493" file_size="6141" device="2305" flags="2" md5="c9816799b05b2d50c1d8177097b4750b" inode="8602322" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools003.html" verifyflags="0" rdev="0" groupname="root" mtime="1136303861" file_size="3645" device="2305" flags="2" md5="138fe85135dceb878fe2c08b8efe3025" inode="8618250" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_1102.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339441" file_size="5408" device="2305" flags="2" md5="eacbb0bb7afc2a8186a779702d90a09e" inode="8618198" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-Developers-Guide" verifyflags="0" rdev="0" groupname="root" mtime="1154959494" file_size="4096" device="2305" flags="0" md5="" inode="8602317" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/LDAP/get_next_oid" verifyflags="0" rdev="0" groupname="root" mtime="1109372391" file_size="483" device="2305" flags="2" md5="9f44e69539f5478f467ab9ba0f67d9b6" inode="8618226" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0318.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339406" file_size="17269" device="2305" flags="2" md5="203249c5df5a37f52acb0795697f10ad" inode="8618080" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/figs/sam2_0360.gif" verifyflags="0" rdev="0" groupname="root" mtime="1061339422" file_size="13343" device="2305" flags="2" md5="bfc1e0cb28e0417aaae2ced53358f381" inode="8618095" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/pam.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959531" file_size="50093" device="2305" flags="2" md5="dfdba485793a09de0d8bc18e925afaf4" inode="8602396" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/using_samba/appg.html" verifyflags="0" rdev="0" groupname="root" mtime="1061339386" file_size="21387" device="2305" flags="2" md5="46723ed7ac7f203eefecf041ea4709fd" inode="8618056" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-HOWTO/images/WME013.png" verifyflags="0" rdev="0" groupname="root" mtime="1154959496" file_size="5844" device="2305" flags="2" md5="7b59ba3815008c1d26dc8bd1bdb31453" inode="8618024" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/printer-accounting/printcap" verifyflags="0" rdev="0" groupname="root" mtime="1109372392" file_size="560" device="2305" flags="2" md5="54c946049e6e7f8d0a7e3799377151ca" inode="8618317" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/doc/samba-3.0.23c/htmldocs/Samba3-ByExample/kerberos.html" verifyflags="0" rdev="0" groupname="root" mtime="1154959456" file_size="81893" device="2305" flags="2" md5="80f3d59017bad2a100c5de779920d1fb" inode="8602271" linkto="" file_mode="-32348"/></rhn-package-files></rhn-package><rhn-package compat="0" payload-size="11416" name="m17n-db-telugu" package-size="14650" package-group="System Environment/Libraries
-" build-time="1167761102" source-rpm="m17n-db-1.3.3-46.el5.src.rpm" md5sum="e0aa989ee53868b9e730563cbcc99e5a" payload-format="cpio" package-arch="noarch" rpm-version="4.4.2" last-modified="1173375423" epoch="" version="1.3.3" cookie="ls20-bc1-14.build.redhat.com 1167743091" release="46.el5" build-host="ls20-bc1-14.build.redhat.com" id="rhn-package-386982"><rhn-package-summary>m17n-db input table for Telugu
-</rhn-package-summary><rhn-package-description>m17n-db Telugu input map.
-</rhn-package-description><rhn-package-vendor>Red Hat, Inc.</rhn-package-vendor><rhn-package-copyright>LGPL</rhn-package-copyright><rhn-package-header-sig><rhn-null/></rhn-package-header-sig><rhn-package-header-start>440</rhn-package-header-start><rhn-package-header-end>9072</rhn-package-header-end><rhn-package-changelog><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix language names in Indic .mim file headers (Naoto Takahashi)
-- add make-dist script to m17n-db-indic</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1143082800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- initial packaging for Fedora Extras</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1128564000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- split .mim input tables into separate subpackages per language</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1127613600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com> - 1.2.0-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- separate output datafiles to datafiles subpackage.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1131591600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com> - 1.2.0-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- import to Fedora Core</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1134788400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com> - 1.3.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 1.3.1 release
- - add new icons to language subpackages
- - new common-cjk subpackage for CJK common files
- - new Swedish subpackage
- - exclude new pkgconfig file</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1138935600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com> - 1.3.2-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 1.3.2 bugfix release
-- do not include ja-anthy.mim input map</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1139626800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com> - 1.3.2-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add Indian input maps ported from scim-tables
-- add Nepali subpackage</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1139972400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com> - 1.3.3-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 1.3.3 bugfix release
-- fixes to Bengali, Hindi, and Punjabi maps (runab, aalam)
-- Tamil phonetic map now works
-- new Tamil99 Government Standard map (I Felix)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1141354800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com> - 1.3.3-14</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- move bopomofo to chinese subpackage</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1153879200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jens Petersen <petersen(a)redhat.com> - 1.3.3-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Bengali input maps fixes (runab)
- - map Probhat '*' key to an alternate sequence since glyph missing (#179821)
- - more itrans cleanup (#182227)
-- add icon for Tamil99 (aalam)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1141959600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added 09CE mapped to z in as-inscript (213410)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1162436400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added ZWNJ to ml-inscript, fixes 214975</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1163473200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added as-*.png icons.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149559200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added few more key combinations for ta-typewriter keymap - bug 209088
-- Added ZWJ for hi-inscript and hi-phonetic keymaps - bug 211576
-- Corrected kn-kgp and kn-inscript keymaps for keymapping of X - bug 209963</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1161396000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added following keymaps
- - as-inscript.mim
- - as-phonetic.mim
- - mr-inscript.mim
- - ta-tamil99.mim</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1147917600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added halant to (t) in bn-itrans.mim in m17n-indic tarball, resolves bug 217140</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1164682800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added hi-remington keymap - <rranjan(a)redhat.com>
-- Added hi-remington.png - <aalam(a)redhat.com></rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1151632800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added hi-typewriter keymap.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149818400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added icon for marathi inscript - thanks to <aalam(a)redhat.com></rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1148954400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added key summaries in various keymaps</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1152237600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added key summaries to pa-inscript/jhelum
-- Fixed 204755</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157421600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added key summary for si-wijesekera keymap</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1160445600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added key summary to te-inscript keymap</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1158112800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added modified as-phonetic.mim keymap, modified by <runab(a)redhat.com> for RH bz #193849</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149300000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added or-*.png icons.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149732000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added or-inscript keymap to the tarball
-- Commented out as-*.png and or-*.png from the directives as respective .png files are missing from tarball.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149300000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added ta-typewriter keymap & its icon</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1161050400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added ta-typewriter.mim keymap</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1152842400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Added ur-phonetic icon
-- Updated spec file to incorporate the icon</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157076000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Bumped release number to 30 to fix some versioning issues
-- Decreased m17n-db's version from 1.3.4 to 1.3.3</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1161050400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Corrected bn-probhat.mim file, RH bz #200890, added U+09CE</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1154484000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Corrected ml-inscript.mim file, RH bz #200876</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1154484000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Corrected the previous fix for 211576</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1163127600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Edited our own bn-itrans-t-182227.patch to resolve bug 217140</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1164682800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix for bug 213633</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1162609200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix for re-opened bug 211576</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1162522800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fixed Bug 177371: mapping of X and x in kn-kgp
-- Fixed Bug 215486: Mapped 0x0964 to shift(.) instead of . in as-inscript
-- Fixed Bug 215489: Mapped 0x0964 to shift(.) instead of . in bn-inscript</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1163559600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Removed errernous entries from ta-tamil99 keymap</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1160013600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Replaced si-wijesekera (surrounding text) with si-wijesekera preedit keymap (208820)
-- Added fixes to ka-kgp keymap (209963)</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1161050400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Resolved: 218008</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1165028400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Resolved: 218254 - Fixed ta-typewriter keymap.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1165546800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Resolves: Bug 221130: [hi_IN-remington] vowels in hi-remington are not typed correctly</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1167793200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Retained mapping of (.) to (.) in as-inscript as per bug 215486
-- Fixed an error in ta-tamil99 key summary.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1164078000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Reverted back to upstream's tarball for m17n-db
-- Added si-wijesekera-with-preedit as a patch to m17n-db tarball
-- Updated license header in hi-remington, as-inscript, or-inscript, ta-typewriter
-- Resolved: 217322</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1164769200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Updated as-phonetic with key summary</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157508000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Updated bn-probhat & as-phonetic keymaps with *=>à§
-- Corrected date type in changelog</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157594400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Updated bn-probhat.mim for RH bz #200890 ...weird... that previous update didnt showed up!
-- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200890#c4</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1155088800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Updated bn-{inscript,probhat,itrans} for RH bug #204275
-- Added ur-phonetic.mim file for RH bug #177372
-- Updated m17n-db.spec file to incorporate Urdu keymap.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157076000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Updated keymaps for typo errors, updated copyright header in all keymaps with "This file is part of the m17n contrib; a sub-part of the m17n library"
-- Added key summary for ta-tamil99 keymap
-- updated key summary for bn-itrans.mim</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157680800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Updated or-inscript.mim for bug 204726</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157594400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mayank Jain <majain(a)redhat.com> - 1.3.3-13</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Removed ta-typewriter.mim keymap as its not working
-- Added ml-inscript.png
-- Added hi-inscript.png
-- added hi-remington.png</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1153188000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>UTUMI Hirosi <utuhiro78(a)yahoo.co.jp></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- modify spec for fedora</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1105844400</rhn-package-changelog-entry-time></rhn-package-changelog-entry></rhn-package-changelog><rhn-package-requires><rhn-package-requires-entry version="4.0-1" name="rpmlib(PayloadFilesHavePrefix)" sense="16777290"/><rhn-package-requires-entry version="3.0.4-1" name="rpmlib(CompressedFileNames)" sense="16777290"/></rhn-package-requires><rhn-package-provides><rhn-package-provides-entry version="1.3.3-46.el5" name="m17n-db-telugu" sense="8"/></rhn-package-provides><rhn-package-conflicts/><rhn-package-obsoletes/><rhn-package-files><rhn-package-file username="root" lang="" name="/usr/share/m17n" verifyflags="-1" rdev="0" groupname="root" mtime="1167761101" file_size="12288" device="2305" flags="0" md5="" inode="1720876" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/m17n/icons/te-itrans.png" verifyflags="-1" rdev="0" groupname="root" mtime="1167761101" file_size="1509" device="2305" flags="0" md5="510cf0b08cedf5279258c19a3b380daa" inode="1720921" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/m17n/te-inscript.mim" verifyflags="-1" rdev="0" groupname="root" mtime="1158068317" file_size="3159" device="2305" flags="0" md5="f3cb04e97200cc1b885c2d9b89d6ab20" inode="1721194" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/m17n/icons/te-inscript.png" verifyflags="-1" rdev="0" groupname="root" mtime="1126895381" file_size="1193" device="2305" flags="0" md5="66e7df8bcea89cd42ae6ba02a1ed7e36" inode="1721220" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/m17n/te-itrans.mim" verifyflags="-1" rdev="0" groupname="root" mtime="1167761101" file_size="4707" device="2305" flags="0" md5="ece7056f9d8611e507957870bb0697e2" inode="1721131" linkto="" file_mode="-32348"/></rhn-package-files></rhn-package><rhn-package compat="0" payload-size="11858600" name="gnome-user-docs" package-size="6549456" package-group="Documentation
-" build-time="1157750823" source-rpm="gnome-user-docs-2.16.0-2.fc6.src.rpm" md5sum="4e7d379301407b4c79f211596b802a13" payload-format="cpio" package-arch="noarch" rpm-version="4.4.2" last-modified="1173375434" epoch="" version="2.16.0" cookie="altix2.build.redhat.com 1157733399" release="2.fc6" build-host="altix2.build.redhat.com" id="rhn-package-386983"><rhn-package-summary>GNOME User Documentation
-</rhn-package-summary><rhn-package-description>This package contains end user documentation for the GNOME desktop
-environment.
-</rhn-package-description><rhn-package-vendor>Red Hat, Inc.</rhn-package-vendor><rhn-package-copyright>FDL</rhn-package-copyright><rhn-package-header-sig><rhn-null/></rhn-package-header-sig><rhn-package-header-start>440</rhn-package-header-start><rhn-package-header-end>97656</rhn-package-header-end><rhn-package-changelog><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Alex Larsson <alexl(a)redhat.com> 2.5.90-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.5.90</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1079406000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Alexander Larsson <alexl(a)redhat.com> 2.4.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.4.1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1075518000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Alexander Larsson <alexl(a)redhat.com> 2.5.0-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.5.0</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1077850800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Christopher Aillon <caillon(a)redhat.com> 2.8.0.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.8.0-1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1095904800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Christopher Aillon <caillon(a)redhat.com> 2.8.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.8.1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1098756000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Elliot Lee <sopwith(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1076727600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Gregory Leblanc <gleblanc(a)cu-portland.edu></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- de-uglification, and fixed the macros.</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>982897200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Havoc Pennington <hp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- 2.0.0 stable release
-- clean up uninstalled file warnings
-- blow build root at start of install</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1028858400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Havoc Pennington <hp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- add introduction-to-gnome.xml from CVS so the XML won't be broken</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1040094000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Havoc Pennington <hp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- prereq scrollkeeper</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024624800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Havoc Pennington <hp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- upgrade to gnome 2 docs
-- clean up the spec file a bit</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024365600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jesse Keating <jkeating(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1134183600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Jonathan Blandford <jrb(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Moved to red hat build system</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>987559200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Kenny Graunke <kwg(a)teleport.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Initial cut</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>975380400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Marco Pesenti Gritti <mpg(a)redhat.com> 2.8.1-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Remove the section about menu editing. Fix 134119</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1099796400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Mark McLoughlin <markmc(a)redhat.com> 2.6.0.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.6.0.1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1080961200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> - 2.15.1-1.fc6</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.15.1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1155520800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-1.fc6</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.16.0</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157508000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix directory ownership issues</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1157767200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> 2.13.1.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.13.1.1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1140577200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> 2.14.0-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.14.0</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1142305200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> 2.14.1-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.14.1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1144720800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> 2.14.2-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Update to 2.14.2</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1144807200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> 2.14.2-3</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Fix BuildRequires</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149559200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Matthias Clasen <mclasen(a)redhat.com> 2.14.2-4</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Add more BuildRequires</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1149904800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- fix a scrollkeeper validation bug</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024020000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Nalin Dahyabhai <nalin(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuild in different environment</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024020000</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Owen Taylor <otaylor(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- Version 1.93, should fix #67207</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024970400</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Ray Strode <rstrode(a)redhat.com> 2.13.1.1-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- PreReq instead of Requires scrollkeeper. Reported by
- Bill Nottingham</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1141873200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automated rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1010631600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automated rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1022205600</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- automated rebuild</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1024711200</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com></rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- rebuilt</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1043290800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Tim Powers <timp(a)redhat.com> 2.0.1-1</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- update to 2.0.1</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1039834800</rhn-package-changelog-entry-time></rhn-package-changelog-entry><rhn-package-changelog-entry><rhn-package-changelog-entry-name>Warren Togami <wtogami(a)redhat.com> 2.6.0.1-2</rhn-package-changelog-entry-name><rhn-package-changelog-entry-text>- BR scrollkeeper</rhn-package-changelog-entry-text><rhn-package-changelog-entry-time>1081908000</rhn-package-changelog-entry-time></rhn-package-changelog-entry></rhn-package-changelog><rhn-package-requires><rhn-package-requires-entry version="4.0-1" name="rpmlib(PayloadFilesHavePrefix)" sense="16777290"/><rhn-package-requires-entry version="3.0.4-1" name="rpmlib(CompressedFileNames)" sense="16777290"/><rhn-package-requires-entry version="" name="/bin/sh" sense="1344"/><rhn-package-requires-entry version="" name="/bin/sh" sense="4416"/><rhn-package-requires-entry version="3.0.3-1" name="rpmlib(VersionedDependencies)" sense="16777290"/><rhn-package-requires-entry version="0.3.11" name="scrollkeeper" sense="76"/></rhn-package-requires><rhn-package-provides><rhn-package-provides-entry version="2.16.0-2.fc6" name="gnome-user-docs" sense="8"/></rhn-package-provides><rhn-package-conflicts/><rhn-package-obsoletes><rhn-package-obsoletes-entry version="" name="gnome-users-guide" sense="0"/></rhn-package-obsoletes><rhn-package-files><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/goseditmainmenu.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8242" device="2051" flags="0" md5="6a8bf8bb1011dc4bad7dd251de53a66f" inode="4079977" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/user-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8234" device="2051" flags="0" md5="77373a9bbcaf5bec95d9d926a5a8ac6b" inode="4079985" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080600" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/sample_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="6294" device="2051" flags="0" md5="84228717d2f8b951a5e2b06725fe0fd6" inode="4080487" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/menu_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="6539" device="2051" flags="0" md5="a6b41293f26fdca45e9b81c54ccb0dc8" inode="4080183" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/gospanel.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="79886" device="2051" flags="0" md5="5f82a3e5efac25166b05099cf75f8a89" inode="4079980" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/titlebar_anno_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6004" device="2051" flags="0" md5="32f7de38d309ac7c18359e7ef9dcc0f2" inode="4080519" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/openwindows_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="3842" device="2051" flags="0" md5="ceea4df4bf13d1ec8da9bce679bfc1c8" inode="4080455" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/gosoverview.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="43031" device="2051" flags="0" md5="0aa15bea2b5d94a1f4091fa21ffb703c" inode="4079979" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/move_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="194" device="2051" flags="0" md5="1a4e4a188a0132fc783c465d42c52426" inode="4080199" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/normal_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="305" device="2051" flags="0" md5="47960823c1883b50400d4fb7be857c72" inode="4080423" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/window_list_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2989" device="2051" flags="0" md5="6a903b5e02d1d7dd736c825b25a3f429" inode="4080543" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/open_drawer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="8054" device="2051" flags="0" md5="48758235f704d288f6b6ef5f135dd61b" inode="4080447" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_samplesymlink_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3889" device="2051" flags="0" md5="a56b9913c84da5b1407ad8b9618a41ff" inode="4080327" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="7685" device="2051" flags="0" md5="5ee85f3b48ffdf45eb5ff686902c15dd" inode="4079984" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_zoom_out_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="228" device="2051" flags="0" md5="d0377c2da0f43df1f8ec6bf9c04eeeaf" inode="4080407" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_noread_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1008" device="2051" flags="0" md5="e54419d1a042a072d0a56effcc13278a" inode="4080263" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_starthere_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4511" device="2051" flags="0" md5="ee62efa332bc6450f92cabf3be245a9a" inode="4080383" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/panel_object_popup_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2974" device="2051" flags="0" md5="35135b4653e42312c3e83f399ec6d406" inode="4080463" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/window_list_group_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4455" device="2051" flags="0" md5="6b703d3f2da3c6206d433f554ac11726" inode="4080551" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080063" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/gosbasic.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="39285" device="2051" flags="0" md5="25f4ee2b79daf0f2ab28dcce1ff34d7a" inode="4079975" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_sampleemblem2_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="2209" device="2051" flags="0" md5="1fda0a7e76eb9dd57911acfaa89f267e" inode="4080303" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="4096" device="2051" flags="0" md5="" inode="4079966" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/typical_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6470" device="2051" flags="0" md5="8e55f5be14a2e5d22a12dcc4463ba06e" inode="4080535" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_nowrite_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1068" device="2051" flags="0" md5="06a5b7050d82e38d2f54048a1f698092" inode="4080279" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_sampleemblem_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4376" device="2051" flags="0" md5="109056cd83393c232751c95803c09150" inode="4080319" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_trash_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3466" device="2051" flags="0" md5="828874302ebc9332260361a0e2ac83a5" inode="4080391" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/lockscreen_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3137" device="2051" flags="0" md5="75daebe4720b40eeaedfe8f4874bc8c0" inode="4080159" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/not_available_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="161" device="2051" flags="0" md5="19601aaf360da25b8a0d1d18b45ed99e" inode="4080431" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/copy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="181" device="2051" flags="0" md5="228984e885befffd71ae4eadd7ee790e" inode="4080095" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_sampleemblem1_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="886" device="2051" flags="0" md5="c47a771208c38c0529d254ffb12b13b0" inode="4080295" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/gedit_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="19819" device="2051" flags="0" md5="dae728f1901939647a3669cb4eb52cb4" inode="4080119" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/logout_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2278" device="2051" flags="0" md5="b695adb45b2eaed0d80203635a70a5bb" inode="4080167" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/ask_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="235" device="2051" flags="0" md5="bd23edcf2659006110ce30a14f0abb35" inode="4080064" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/legal.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="3672" device="2051" flags="0" md5="079f9049bec3c1866c67e3312d563eed" inode="4079974" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_zoom_in_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="313" device="2051" flags="0" md5="fdd5dadc0daa1dc7ed3a1455676482e9" inode="4080399" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/goscustdesk.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="143820" device="2051" flags="0" md5="e0a03228ffcbedaba09d121fb9a797c4" inode="4079976" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/gosnautilus.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="196873" device="2051" flags="0" md5="07225de9c737aba312d03e5475a30a30" inode="4079978" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_normal_size_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1206" device="2051" flags="0" md5="7f2457eb51218cdfcd08a6e1e8aa9903" inode="4080271" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/four_hide_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1193" device="2051" flags="0" md5="386e1e73333296fc0da22cef5ff7fc25" inode="4080111" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/gosstartsession.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="14937" device="2051" flags="0" md5="a3e64f2455f08bd6fbe0fe1acc9cf804" inode="4079981" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_sampleemblem3_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="1944" device="2051" flags="0" md5="5f63009887a3f3abc5fc251f1fca9688" inode="4080311" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/move_panel_object_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="225" device="2051" flags="0" md5="e4244fb77b0df2b0c451328dce6fa175" inode="4080191" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="4096" device="2051" flags="0" md5="" inode="4079965" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/link_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="292" device="2051" flags="0" md5="8fb4e2d2fcaea8b59a653a3d8fc85b5a" inode="4080151" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_link_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="974" device="2051" flags="0" md5="3f0fd31faeaee25ae5c272219ae84d80" inode="4080255" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="509" device="2051" flags="0" md5="9a42c99bb7ad5f288f8177966d12289c" inode="4080559" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/gnome_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3558" device="2051" flags="0" md5="3fafcbfa605a345c87fc4dec2f82f89a" inode="4080127" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/system-admin-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4520" device="2051" flags="0" md5="169dd1398444b708f0cf020b54e4e395" inode="4080727" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/performance.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="25198" device="2051" flags="0" md5="1028492390a5fe9dfc7821495610d18a" inode="4080722" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/move_object_push.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1257" device="2051" flags="0" md5="810dfbd14b4259ce732963a0b72b1ed9" inode="4080657" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/appendixa.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="8322" device="2051" flags="0" md5="81e8d877f4556003d121fd073c4e0448" inode="4080713" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080709" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/accessintro.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1318" device="2051" flags="0" md5="6ce626da765e578bd98991786730b317" inode="4080613" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/slider.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1240" device="2051" flags="0" md5="d0b6e9e5a9625576006828967a3813a9" inode="4080663" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/run_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2163" device="2051" flags="0" md5="c2b6a8fa1735f34172fcd255091de1d4" inode="4080479" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/mimetypes.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="37811" device="2051" flags="0" md5="b5a5dbec2a39065608e0810c8bc37509" inode="4080721" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/legal.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="3672" device="2051" flags="0" md5="079f9049bec3c1866c67e3312d563eed" inode="4080726" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/gnome-access-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="5893" device="2051" flags="0" md5="34b4a7cf0a2ebd77ae5ba1f8c06faebe" inode="4080621" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/move_object_jump.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1773" device="2051" flags="0" md5="424967c951eb27a96ebce26711e62cc2" inode="4080654" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/themes.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="17338" device="2051" flags="0" md5="92426f0799620e2469a2d6649d8df760" inode="4080725" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/notification_area_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="945" device="2051" flags="0" md5="973b76c720b51d9495208ab2d62ecdec" inode="4080439" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/searchtool_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2634" device="2051" flags="0" md5="e6210d7a387eccba73a76c215f078611" inode="4080503" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/force_quit.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1255" device="2051" flags="0" md5="a59d7a99b4a6ed57873f4bc4c4398cbb" inode="4080103" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/sessions.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="3533" device="2051" flags="0" md5="16a67096795cb0bd203828558ff0f87e" inode="4080724" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/spin_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1199" device="2051" flags="0" md5="a413f3913e3456411482c3663a1c3248" inode="4080669" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/move_object_before.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1776" device="2051" flags="0" md5="db85522123cc18d15a87b71ed2856fd3" inode="4080651" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/show_desktop_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2320" device="2051" flags="0" md5="d334534760b6b1c7bc2615f6fa514477" inode="4080511" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/text_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1052" device="2051" flags="0" md5="7f69292d1ab4162d95791e37355244b4" inode="4080699" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="9428" device="2051" flags="0" md5="635e7158265f3a6138b6075197395bf8" inode="4080717" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/screensavers.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4625" device="2051" flags="0" md5="6101b23ba9c335665e9e081dd810fa42" inode="4080723" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080710" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/dropdown_combination_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1146" device="2051" flags="0" md5="c28106adee3335e7c4c7daeaa0469c59" inode="4080639" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/screenshot_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2866" device="2051" flags="0" md5="87de8a33a8e6058c0ba95b7f8c75fc5a" inode="4080495" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/dropdown_list_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1271" device="2051" flags="0" md5="942d41fc508f23362d8c9c1a92988c45" inode="4080642" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080624" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/tree.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1697" device="2051" flags="0" md5="0bb1b6f07b3fab52dddfa4bab9f1e5d4" inode="4080702" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/keynav.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="93146" device="2051" flags="0" md5="5719c3518396baa252f14ddd3ede91b9" inode="4080616" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/dtconfig.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="34616" device="2051" flags="0" md5="845da17bd678cf9b350b2211068b99b6" inode="4080615" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/themes.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="27226" device="2051" flags="0" md5="65e854674089abb7140bbc6b0873af73" inode="4080619" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080610" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1099" device="2051" flags="0" md5="53cd1fd7b179068753b4c6d2eb4d3261" inode="4080633" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/radio_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1509" device="2051" flags="0" md5="c0ba3100eedc9b36635032e1432bda0b" inode="4080660" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/help.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4975" device="2051" flags="0" md5="a8a8697e0c7037328f43ed39aeb42fb2" inode="4080718" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/move_object_arrows.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1778" device="2051" flags="0" md5="14708f1edd48a84a861819b5fc16820b" inode="4080648" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/menu_bar_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2523" device="2051" flags="0" md5="dd0eee59732d5d03d0f90299ef9fa1bd" inode="4080175" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/check_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1092" device="2051" flags="0" md5="4ee0fe6be90e8084499476dbe7d42eca" inode="4080636" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/gconf.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="58736" device="2051" flags="0" md5="b4019bbd098fe4957f80c2ffb671de24" inode="4080716" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/menustructure.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="38836" device="2051" flags="0" md5="1c2cf1529b618099e5909a449e542f80" inode="4080720" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/preface.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2354" device="2051" flags="0" md5="42e1b2949b5f48bb7dd5e37c8b05971e" inode="4080617" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/tabbed_section.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="8856" device="2051" flags="0" md5="c64b36d9e27b0cd69caaff98c24c1c4d" inode="4080696" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/legal.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3672" device="2051" flags="0" md5="079f9049bec3c1866c67e3312d563eed" inode="4080620" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080609" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide/user-guide-C.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1488" device="2051" flags="0" md5="bf549180dd80cde6dd70cdae6a1cbdeb" inode="4080601" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/com_file_manager_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="5352" device="2051" flags="0" md5="806597a020ec5a27615fd7330425047f" inode="4080087" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_computer_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="3235" device="2051" flags="0" md5="b6ba701515f5e9862aa30f0230745644" inode="4080231" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/lockdown.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="18243" device="2051" flags="0" md5="2a693b583793e27a58eba1830756a60e" inode="4080719" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/appendixb.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1375" device="2051" flags="0" md5="47851d7c0b38c1c19df3fc494de007b3" inode="4080714" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/C/fontconfig.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4899" device="2051" flags="0" md5="2068d21a0778486de9cb4641013c314f" inode="4080715" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_computer_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="3235" device="2051" flags="0" md5="b6ba701515f5e9862aa30f0230745644" inode="4080235" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/bouncekeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="557" device="2051" flags="0" md5="cff25b6e1db7bfedc2517abc34444706" inode="4080630" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_computer_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="3235" device="2051" flags="0" md5="b6ba701515f5e9862aa30f0230745644" inode="4080233" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/nautilus_restore_saved_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="113179" device="2051" flags="0" md5="1b7dbb7d82639abe4d9f8cc75bc2c80f" inode="4080415" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/ats.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="5026" device="2051" flags="0" md5="ec437db4cc7118955261dd6d1b3751d7" inode="4080614" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/dropdown_combination_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1840" device="2051" flags="0" md5="facfe97578422ddd957a58ecad5b1a79" inode="4080641" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/window_list_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2989" device="2051" flags="0" md5="6a903b5e02d1d7dd736c825b25a3f429" inode="4080547" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_sampleemblem_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4376" device="2051" flags="0" md5="109056cd83393c232751c95803c09150" inode="4080323" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/hyperlink_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="248" device="2051" flags="0" md5="41030ede726c6f3d9f1bd1f05456f3f6" inode="4080139" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/logout_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2278" device="2051" flags="0" md5="b695adb45b2eaed0d80203635a70a5bb" inode="4080169" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/workspace_switcher_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="509" device="2051" flags="0" md5="9a42c99bb7ad5f288f8177966d12289c" inode="4080561" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/copy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="181" device="2051" flags="0" md5="228984e885befffd71ae4eadd7ee790e" inode="4080097" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/yelp_add_bookmark.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="8645" device="2051" flags="0" md5="562a62662f47655337c9bf341ef69f6e" inode="4080567" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/yelp_add_bookmark.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="8645" device="2051" flags="0" md5="562a62662f47655337c9bf341ef69f6e" inode="4080571" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_starthere_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4511" device="2051" flags="0" md5="ee62efa332bc6450f92cabf3be245a9a" inode="4080385" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_samplesymlink_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3889" device="2051" flags="0" md5="a56b9913c84da5b1407ad8b9618a41ff" inode="4080329" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/bouncekeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="557" device="2051" flags="0" md5="cff25b6e1db7bfedc2517abc34444706" inode="4080632" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/gosstartsession.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="15625" device="2051" flags="0" md5="774b2cb2f646dd9364be834c3600107b" inode="4080009" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/show_desktop_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2320" device="2051" flags="0" md5="d334534760b6b1c7bc2615f6fa514477" inode="4080515" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_search_results.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="41790" device="2051" flags="0" md5="cdb07b97b638c6157d40d57373fcc5d4" inode="4080345" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/panel_object_popup_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2974" device="2051" flags="0" md5="35135b4653e42312c3e83f399ec6d406" inode="4080465" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/lockscreen_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3137" device="2051" flags="0" md5="75daebe4720b40eeaedfe8f4874bc8c0" inode="4080163" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/menu_bar_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="2523" device="2051" flags="0" md5="dd0eee59732d5d03d0f90299ef9fa1bd" inode="4080179" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/goseditmainmenu.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8295" device="2051" flags="0" md5="e4d050739799ce611a3f86745a351cb8" inode="4080025" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/stickyshiftlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="470" device="2051" flags="0" md5="c88cab16d9c86d9ee102fe04d8278d6b" inode="4080686" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/gnome-access-guide/gnome-access-guide-it.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1432" device="2051" flags="0" md5="d286d0c11f8364a8e9dd958fcf16ed9a" inode="4080708" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/slowkeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="672" device="2051" flags="0" md5="8714235e4f0faae5d914b19436596233" inode="4080666" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_sampleemblem1_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="886" device="2051" flags="0" md5="c47a771208c38c0529d254ffb12b13b0" inode="4080299" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/gnome-access-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="223396" device="2051" flags="0" md5="00e80e59c4d096d860ec5492a9ba3a6c" inode="4080623" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/move_panel_object_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="225" device="2051" flags="0" md5="e4244fb77b0df2b0c451328dce6fa175" inode="4080195" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/sample_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="6294" device="2051" flags="0" md5="84228717d2f8b951a5e2b06725fe0fd6" inode="4080489" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/gospanel.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="85184" device="2051" flags="0" md5="e1e654c18c5ca061d3d276eec8f51d12" inode="4080008" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_spatial_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="33975" device="2051" flags="0" md5="c96778d8953fd40f65095da8b8b92066" inode="4080377" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8615" device="2051" flags="0" md5="a7ddacd0e3b0d27ed95a028efd481e12" inode="4080012" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/nautilus_restore_saved_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="113179" device="2051" flags="0" md5="1b7dbb7d82639abe4d9f8cc75bc2c80f" inode="4080419" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/nautilus_restore_saved_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="113179" device="2051" flags="0" md5="1b7dbb7d82639abe4d9f8cc75bc2c80f" inode="4080417" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/gostools.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="36105" device="2051" flags="0" md5="d63190f56d2f7496c426fdfc454301e6" inode="4080010" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8350" device="2051" flags="0" md5="d06129ea70fc9d44197a4816554eea3e" inode="4080032" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/titlebar_anno_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6004" device="2051" flags="0" md5="32f7de38d309ac7c18359e7ef9dcc0f2" inode="4080521" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/stickyctrllatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="414" device="2051" flags="0" md5="f85ce888003a0f875496d42a9f19c508" inode="4080680" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_normal_size_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1206" device="2051" flags="0" md5="7f2457eb51218cdfcd08a6e1e8aa9903" inode="4080275" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_button_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7712" device="2051" flags="0" md5="447c19259a84de017f4431ea205bed03" inode="4080223" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/open_drawer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="8054" device="2051" flags="0" md5="48758235f704d288f6b6ef5f135dd61b" inode="4080449" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_search_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3992" device="2051" flags="0" md5="60a9a159dee2d7ad5c035ed794845798" inode="4080339" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/move_object_arrows.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1778" device="2051" flags="0" md5="14708f1edd48a84a861819b5fc16820b" inode="4080650" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_browser_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="56931" device="2051" flags="0" md5="44b92e32cdc342cd5624b1be5626386d" inode="4080215" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/hyperlink_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="248" device="2051" flags="0" md5="41030ede726c6f3d9f1bd1f05456f3f6" inode="4080135" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/stickywindowlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="405" device="2051" flags="0" md5="cdfb5e24d83b7264647136c9c8efef08" inode="4080692" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/goscustdesk.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="154100" device="2051" flags="0" md5="2d65b5efb48fc31e37eabf81c6bec154" inode="4080004" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/four_hide_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1193" device="2051" flags="0" md5="386e1e73333296fc0da22cef5ff7fc25" inode="4080113" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="4096" device="2051" flags="0" md5="" inode="4079968" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="4096" device="2051" flags="0" md5="" inode="4079970" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/ibeam_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="197" device="2051" flags="0" md5="77aa93e74d640173c96801747bf564d1" inode="4080143" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_browser_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="56931" device="2051" flags="0" md5="44b92e32cdc342cd5624b1be5626386d" inode="4080219" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/copy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="181" device="2051" flags="0" md5="228984e885befffd71ae4eadd7ee790e" inode="4080099" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/screenshot_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2866" device="2051" flags="0" md5="87de8a33a8e6058c0ba95b7f8c75fc5a" inode="4080499" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_spatial_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="74023" device="2051" flags="0" md5="f2f8e037d14274ac04e1df45664f2103" inode="4080371" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_spatial_list_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="50568" device="2051" flags="0" md5="99693c429ea6f6889793a85b0c8fb099" inode="4080359" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/force_quit.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1255" device="2051" flags="0" md5="a59d7a99b4a6ed57873f4bc4c4398cbb" inode="4080107" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide/user-guide-it.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1549" device="2051" flags="0" md5="534f9e34ecf9a326142d3776726898e7" inode="4080605" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/logout_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2278" device="2051" flags="0" md5="b695adb45b2eaed0d80203635a70a5bb" inode="4080171" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/system-admin-guide" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080730" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/menu_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="6539" device="2051" flags="0" md5="a6b41293f26fdca45e9b81c54ccb0dc8" inode="4080187" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/gnome_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3558" device="2051" flags="0" md5="3fafcbfa605a345c87fc4dec2f82f89a" inode="4080131" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/gospanel.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="82220" device="2051" flags="0" md5="04122098c01d0e566ce4c5bb07df9bf5" inode="4080028" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/movewindow_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="152" device="2051" flags="0" md5="8496a1d62cbfbe5272f8f5fa6f173c4c" inode="4080209" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/run_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2163" device="2051" flags="0" md5="c2b6a8fa1735f34172fcd255091de1d4" inode="4080483" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_browser_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="56931" device="2051" flags="0" md5="44b92e32cdc342cd5624b1be5626386d" inode="4080217" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/spin_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="2117" device="2051" flags="0" md5="a1cc5d3e92aa255aedc078e9e519d7f1" inode="4080671" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/yelp_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="41402" device="2051" flags="0" md5="c7138987ae131fe2c57846a281245d31" inode="4080593" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/move_object_jump.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1773" device="2051" flags="0" md5="424967c951eb27a96ebce26711e62cc2" inode="4080656" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/resize_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="205" device="2051" flags="0" md5="43e8186584e1879ba078caedf0a9f33f" inode="4080473" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/busy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="233" device="2051" flags="0" md5="99db6994613731ca7687bd700c471b2d" inode="4080081" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/not_available_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="161" device="2051" flags="0" md5="19601aaf360da25b8a0d1d18b45ed99e" inode="4080433" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_refine_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="12837" device="2051" flags="0" md5="c3d58f408fd7ec2f6965a0f06e05c43e" inode="4080287" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080071" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/gostools.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="36620" device="2051" flags="0" md5="0887fe71f498648e394b7e107815414d" inode="4080030" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/gosbasic.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="39634" device="2051" flags="0" md5="57f7484198e00dde57403ea6eb086c6c" inode="4080003" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_sampleemblem3_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="1944" device="2051" flags="0" md5="5f63009887a3f3abc5fc251f1fca9688" inode="4080315" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/yelp_edit_bookmarks.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16073" device="2051" flags="0" md5="6fb478c10bb9df68dc8d82f3ed4ac89b" inode="4080577" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/hyperlink_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="248" device="2051" flags="0" md5="41030ede726c6f3d9f1bd1f05456f3f6" inode="4080137" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_spatial_icon_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="45566" device="2051" flags="0" md5="c2dd3a38476c26a924c2673c6bb6de93" inode="4080351" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_normal_size_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1206" device="2051" flags="0" md5="7f2457eb51218cdfcd08a6e1e8aa9903" inode="4080273" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/ibeam_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="197" device="2051" flags="0" md5="77aa93e74d640173c96801747bf564d1" inode="4080147" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/gosnautilus.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="209841" device="2051" flags="0" md5="157ba4827d2a07dd1c6b0f5abe537ef1" inode="4080006" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080628" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_search_results.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="41790" device="2051" flags="0" md5="cdb07b97b638c6157d40d57373fcc5d4" inode="4080343" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_zoom_in_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="313" device="2051" flags="0" md5="fdd5dadc0daa1dc7ed3a1455676482e9" inode="4080401" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/sample_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="6294" device="2051" flags="0" md5="84228717d2f8b951a5e2b06725fe0fd6" inode="4080491" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/gosnautilus.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="197920" device="2051" flags="0" md5="6ef8295b964473f704a1caa77750938b" inode="4080026" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/gnome_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3558" device="2051" flags="0" md5="3fafcbfa605a345c87fc4dec2f82f89a" inode="4080129" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/gosstartsession.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="16176" device="2051" flags="0" md5="80a0baac8d4b360c9d13174f3da1e58d" inode="4080029" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/openwindows_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="3842" device="2051" flags="0" md5="ceea4df4bf13d1ec8da9bce679bfc1c8" inode="4080459" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/menu_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="6539" device="2051" flags="0" md5="a6b41293f26fdca45e9b81c54ccb0dc8" inode="4080185" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_sampleemblem2_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="2209" device="2051" flags="0" md5="1fda0a7e76eb9dd57911acfaa89f267e" inode="4080307" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/gedit_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="19819" device="2051" flags="0" md5="dae728f1901939647a3669cb4eb52cb4" inode="4080121" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/user-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="11720" device="2051" flags="0" md5="dc88145be4085bd1e4c0931e032ed913" inode="4079989" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_noread_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1008" device="2051" flags="0" md5="e54419d1a042a072d0a56effcc13278a" inode="4080265" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/gnome-access-guide" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080705" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/check_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="3263" device="2051" flags="0" md5="f5904ad5e4f70d0f30325ba85f2dfb5c" inode="4080638" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/gostools.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="36521" device="2051" flags="0" md5="999ecdaabc1321b9a509cceb37528b85" inode="4079982" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_sampleemblem3_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="1944" device="2051" flags="0" md5="5f63009887a3f3abc5fc251f1fca9688" inode="4080313" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/open_drawer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="8054" device="2051" flags="0" md5="48758235f704d288f6b6ef5f135dd61b" inode="4080451" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_refine_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="12837" device="2051" flags="0" md5="c3d58f408fd7ec2f6965a0f06e05c43e" inode="4080289" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide/user-guide-es.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1553" device="2051" flags="0" md5="8a6d334b6bd2711528a5ab70f13d7f9a" inode="4080603" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/stickyctrllock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="436" device="2051" flags="0" md5="58d0972c476a9c1e9f077d343fda6ab4" inode="4080683" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/show_desktop_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2320" device="2051" flags="0" md5="d334534760b6b1c7bc2615f6fa514477" inode="4080513" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/busy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="233" device="2051" flags="0" md5="99db6994613731ca7687bd700c471b2d" inode="4080079" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/stickywindowlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="405" device="2051" flags="0" md5="cdfb5e24d83b7264647136c9c8efef08" inode="4080690" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_go_to_location.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="4094" device="2051" flags="0" md5="f5731ef77db819a54be69cab8806529a" inode="4080247" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/tabbed_section.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="8856" device="2051" flags="0" md5="c64b36d9e27b0cd69caaff98c24c1c4d" inode="4080698" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/not_available_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="161" device="2051" flags="0" md5="19601aaf360da25b8a0d1d18b45ed99e" inode="4080435" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_search_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3992" device="2051" flags="0" md5="60a9a159dee2d7ad5c035ed794845798" inode="4080335" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_spatial_icon_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="45566" device="2051" flags="0" md5="c2dd3a38476c26a924c2673c6bb6de93" inode="4080355" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/stickyshiftlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="508" device="2051" flags="0" md5="bae566b7fe0b61c44ecae952880e0db3" inode="4080689" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/stickywindowlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="460" device="2051" flags="0" md5="8fe5f82535f7aeb54dacc2d05b777299" inode="4080695" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/gosoverview.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="46684" device="2051" flags="0" md5="5e6cfd0229fab93dcc28c650c23261d1" inode="4080007" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080067" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/it/system-admin-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="248883" device="2051" flags="0" md5="f23e047d0cbc55fd111b938654d8738f" inode="4080729" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_button_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7712" device="2051" flags="0" md5="447c19259a84de017f4431ea205bed03" inode="4080227" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/stickyaltlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="320" device="2051" flags="0" md5="77f5fd818a89aebd05f56d8bedef7d11" inode="4080674" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_spatial_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="74023" device="2051" flags="0" md5="f2f8e037d14274ac04e1df45664f2103" inode="4080367" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/force_quit.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1255" device="2051" flags="0" md5="a59d7a99b4a6ed57873f4bc4c4398cbb" inode="4080105" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/goscustdesk.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="143887" device="2051" flags="0" md5="466a5e56ccc856598e5c8fb95bf9f84f" inode="4080024" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/titlebar_anno_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6004" device="2051" flags="0" md5="32f7de38d309ac7c18359e7ef9dcc0f2" inode="4080523" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7777" device="2051" flags="0" md5="24a8df13cff91ef8bac8d24cd299dfe0" inode="4080241" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_spatial_list_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="51639" device="2051" flags="0" md5="cf111bc1622be75cbfe2305dbcc01c32" inode="4080361" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/openwindows_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="3842" device="2051" flags="0" md5="ceea4df4bf13d1ec8da9bce679bfc1c8" inode="4080457" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/stickyaltlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="346" device="2051" flags="0" md5="23cbf9498b55526e2dc0e80b2d409628" inode="4080677" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/four_hide_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1193" device="2051" flags="0" md5="386e1e73333296fc0da22cef5ff7fc25" inode="4080115" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/move_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="194" device="2051" flags="0" md5="1a4e4a188a0132fc783c465d42c52426" inode="4080203" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/typical_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6470" device="2051" flags="0" md5="8e55f5be14a2e5d22a12dcc4463ba06e" inode="4080539" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/sysadmin.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="35454" device="2051" flags="0" md5="8da0a2b918f92085c325b7b53650157b" inode="4080618" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_trash_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3466" device="2051" flags="0" md5="828874302ebc9332260361a0e2ac83a5" inode="4080393" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/move_object_before.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1776" device="2051" flags="0" md5="db85522123cc18d15a87b71ed2856fd3" inode="4080653" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/yelp_preferences.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16781" device="2051" flags="0" md5="b8beb6c866957938b5e39bc7f72611ec" inode="4080585" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7777" device="2051" flags="0" md5="24a8df13cff91ef8bac8d24cd299dfe0" inode="4080239" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/yelp_edit_bookmarks.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16073" device="2051" flags="0" md5="6fb478c10bb9df68dc8d82f3ed4ac89b" inode="4080575" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/stickyshiftlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="508" device="2051" flags="0" md5="bae566b7fe0b61c44ecae952880e0db3" inode="4080687" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/mousekeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="948" device="2051" flags="0" md5="2d6989b948f744f949c344b0cf96136b" inode="4080645" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/move_panel_object_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="225" device="2051" flags="0" md5="e4244fb77b0df2b0c451328dce6fa175" inode="4080193" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/notification_area_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="945" device="2051" flags="0" md5="973b76c720b51d9495208ab2d62ecdec" inode="4080441" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/run_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2163" device="2051" flags="0" md5="c2b6a8fa1735f34172fcd255091de1d4" inode="4080481" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/tree.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1697" device="2051" flags="0" md5="0bb1b6f07b3fab52dddfa4bab9f1e5d4" inode="4080704" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/stickyaltlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="320" device="2051" flags="0" md5="77f5fd818a89aebd05f56d8bedef7d11" inode="4080672" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/dropdown_list_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="3262" device="2051" flags="0" md5="55596f4caf1e41d358a9af356ace9c2c" inode="4080644" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_spatial_icon_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="60679" device="2051" flags="0" md5="ad3de4d93dbc52df7c3241b4c74a20bb" inode="4080353" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/com_file_manager_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="5352" device="2051" flags="0" md5="806597a020ec5a27615fd7330425047f" inode="4080089" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_samplesymlink_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3889" device="2051" flags="0" md5="a56b9913c84da5b1407ad8b9618a41ff" inode="4080331" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/system-admin-guide/system-admin-guide-it.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1099" device="2051" flags="0" md5="0b4fb92feaf50503869b35a251ece63c" inode="4080733" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_link_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="974" device="2051" flags="0" md5="3f0fd31faeaee25ae5c272219ae84d80" inode="4080259" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_zoom_in_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="313" device="2051" flags="0" md5="fdd5dadc0daa1dc7ed3a1455676482e9" inode="4080403" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/com_file_manager_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="5352" device="2051" flags="0" md5="806597a020ec5a27615fd7330425047f" inode="4080091" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/stickyctrllock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="436" device="2051" flags="0" md5="58d0972c476a9c1e9f077d343fda6ab4" inode="4080681" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/ask_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="235" device="2051" flags="0" md5="bd23edcf2659006110ce30a14f0abb35" inode="4080068" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_nowrite_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1068" device="2051" flags="0" md5="06a5b7050d82e38d2f54048a1f698092" inode="4080283" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/screenshot_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2866" device="2051" flags="0" md5="87de8a33a8e6058c0ba95b7f8c75fc5a" inode="4080497" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/window_list_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2989" device="2051" flags="0" md5="6a903b5e02d1d7dd736c825b25a3f429" inode="4080545" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_spatial_list_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="50568" device="2051" flags="0" md5="99693c429ea6f6889793a85b0c8fb099" inode="4080363" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/searchtool_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2634" device="2051" flags="0" md5="e6210d7a387eccba73a76c215f078611" inode="4080505" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/resize_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="205" device="2051" flags="0" md5="43e8186584e1879ba078caedf0a9f33f" inode="4080475" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/panel_object_popup_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2974" device="2051" flags="0" md5="35135b4653e42312c3e83f399ec6d406" inode="4080467" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/stickyaltlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="346" device="2051" flags="0" md5="23cbf9498b55526e2dc0e80b2d409628" inode="4080675" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/radio_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4534" device="2051" flags="0" md5="b00d2a7378d165fb5f92c07b9b7dc6ad" inode="4080662" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/stickywindowlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="460" device="2051" flags="0" md5="8fe5f82535f7aeb54dacc2d05b777299" inode="4080693" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/window_list_group_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4455" device="2051" flags="0" md5="6b703d3f2da3c6206d433f554ac11726" inode="4080555" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/normal_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="305" device="2051" flags="0" md5="47960823c1883b50400d4fb7be857c72" inode="4080427" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1417" device="2051" flags="0" md5="0b3842b556a4ea0eca8fbd6269cd0c2c" inode="4080635" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080612" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/omf/system-admin-guide/system-admin-guide-C.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1044" device="2051" flags="0" md5="3f70293e2231741877f007dd7e9313d6" inode="4080731" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/typical_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6470" device="2051" flags="0" md5="8e55f5be14a2e5d22a12dcc4463ba06e" inode="4080537" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/workspace_switcher_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="509" device="2051" flags="0" md5="9a42c99bb7ad5f288f8177966d12289c" inode="4080563" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/it" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080712" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/searchtool_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2634" device="2051" flags="0" md5="e6210d7a387eccba73a76c215f078611" inode="4080507" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/notification_area_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="945" device="2051" flags="0" md5="973b76c720b51d9495208ab2d62ecdec" inode="4080443" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/busy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="233" device="2051" flags="0" md5="99db6994613731ca7687bd700c471b2d" inode="4080083" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_sampleemblem_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4376" device="2051" flags="0" md5="109056cd83393c232751c95803c09150" inode="4080321" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_trash_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3466" device="2051" flags="0" md5="828874302ebc9332260361a0e2ac83a5" inode="4080395" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_search_results.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="41790" device="2051" flags="0" md5="cdb07b97b638c6157d40d57373fcc5d4" inode="4080347" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/stickyctrllatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="414" device="2051" flags="0" md5="f85ce888003a0f875496d42a9f19c508" inode="4080678" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_noread_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1008" device="2051" flags="0" md5="e54419d1a042a072d0a56effcc13278a" inode="4080267" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/slider.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="2319" device="2051" flags="0" md5="8beb4b855518de23befb92933b4cb3a9" inode="4080665" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_nowrite_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1068" device="2051" flags="0" md5="06a5b7050d82e38d2f54048a1f698092" inode="4080281" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_spatial_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="33054" device="2051" flags="0" md5="08673c38f4b4327f94f298c73b0d270b" inode="4080379" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_spatial_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="74023" device="2051" flags="0" md5="f2f8e037d14274ac04e1df45664f2103" inode="4080369" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/move_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="194" device="2051" flags="0" md5="1a4e4a188a0132fc783c465d42c52426" inode="4080201" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/mousekeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="948" device="2051" flags="0" md5="2d6989b948f744f949c344b0cf96136b" inode="4080647" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_link_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="974" device="2051" flags="0" md5="3f0fd31faeaee25ae5c272219ae84d80" inode="4080257" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/link_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="292" device="2051" flags="0" md5="8fb4e2d2fcaea8b59a653a3d8fc85b5a" inode="4080155" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/normal_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="305" device="2051" flags="0" md5="47960823c1883b50400d4fb7be857c72" inode="4080425" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/user-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="11826" device="2051" flags="0" md5="dff9909c58c59b31f5b76ebf9896abd7" inode="4079987" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/lockscreen_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3137" device="2051" flags="0" md5="75daebe4720b40eeaedfe8f4874bc8c0" inode="4080161" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/yelp_preferences.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16781" device="2051" flags="0" md5="b8beb6c866957938b5e39bc7f72611ec" inode="4080583" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/text_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="936" device="2051" flags="0" md5="855c6ee7c5ce5d9fc51a3251f9c571c4" inode="4080701" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/slowkeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="672" device="2051" flags="0" md5="8714235e4f0faae5d914b19436596233" inode="4080668" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/naut_spatial_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="33054" device="2051" flags="0" md5="08673c38f4b4327f94f298c73b0d270b" inode="4080375" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/accessx.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1413" device="2051" flags="0" md5="0ff78dfbc2101b109b64eb3672c11a4b" inode="4080629" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_starthere_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4511" device="2051" flags="0" md5="ee62efa332bc6450f92cabf3be245a9a" inode="4080387" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/yelp_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="41402" device="2051" flags="0" md5="c7138987ae131fe2c57846a281245d31" inode="4080595" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/window_list_group_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4455" device="2051" flags="0" md5="6b703d3f2da3c6206d433f554ac11726" inode="4080553" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/it/figures/move_object_push.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1257" device="2051" flags="0" md5="810dfbd14b4259ce732963a0b72b1ed9" inode="4080659" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/gedit_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="19819" device="2051" flags="0" md5="dae728f1901939647a3669cb4eb52cb4" inode="4080123" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7777" device="2051" flags="0" md5="24a8df13cff91ef8bac8d24cd299dfe0" inode="4080243" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/yelp_edit_bookmarks.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16073" device="2051" flags="0" md5="6fb478c10bb9df68dc8d82f3ed4ac89b" inode="4080579" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_button_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7712" device="2051" flags="0" md5="447c19259a84de017f4431ea205bed03" inode="4080225" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/link_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="292" device="2051" flags="0" md5="8fb4e2d2fcaea8b59a653a3d8fc85b5a" inode="4080153" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/yelp_preferences.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16781" device="2051" flags="0" md5="b8beb6c866957938b5e39bc7f72611ec" inode="4080587" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_refine_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="12837" device="2051" flags="0" md5="c3d58f408fd7ec2f6965a0f06e05c43e" inode="4080291" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/movewindow_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="152" device="2051" flags="0" md5="8496a1d62cbfbe5272f8f5fa6f173c4c" inode="4080207" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_sampleemblem2_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="2209" device="2051" flags="0" md5="1fda0a7e76eb9dd57911acfaa89f267e" inode="4080305" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/yelp_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="41402" device="2051" flags="0" md5="c7138987ae131fe2c57846a281245d31" inode="4080591" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/ask_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="235" device="2051" flags="0" md5="bd23edcf2659006110ce30a14f0abb35" inode="4080072" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/yelp_add_bookmark.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="8645" device="2051" flags="0" md5="562a62662f47655337c9bf341ef69f6e" inode="4080569" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/movewindow_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="152" device="2051" flags="0" md5="8496a1d62cbfbe5272f8f5fa6f173c4c" inode="4080211" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_go_to_location.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="4094" device="2051" flags="0" md5="f5731ef77db819a54be69cab8806529a" inode="4080249" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_search_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3992" device="2051" flags="0" md5="60a9a159dee2d7ad5c035ed794845798" inode="4080337" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/stickyshiftlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="470" device="2051" flags="0" md5="c88cab16d9c86d9ee102fe04d8278d6b" inode="4080684" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/ibeam_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="197" device="2051" flags="0" md5="77aa93e74d640173c96801747bf564d1" inode="4080145" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/gosbasic.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="39338" device="2051" flags="0" md5="da6d6b30ad4c777579f2185904d00baf" inode="4080023" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/C/figures/accessx.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1413" device="2051" flags="0" md5="0ff78dfbc2101b109b64eb3672c11a4b" inode="4080625" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/goseditmainmenu.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8715" device="2051" flags="0" md5="5510a1159ad07b39ba8c910ce8876880" inode="4080005" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/resize_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="205" device="2051" flags="0" md5="43e8186584e1879ba078caedf0a9f33f" inode="4080471" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/menu_bar_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2523" device="2051" flags="0" md5="dd0eee59732d5d03d0f90299ef9fa1bd" inode="4080177" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_sampleemblem1_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="886" device="2051" flags="0" md5="c47a771208c38c0529d254ffb12b13b0" inode="4080297" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/gosoverview.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="43221" device="2051" flags="0" md5="08ef9d7eb1a8c5cf3ba03c7436b7af98" inode="4080027" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/gnome-access-guide/gnome-access-guide-C.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1220" device="2051" flags="0" md5="ad547da9d93ca4c1deccf5c1dd20062a" inode="4080706" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_zoom_out_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="228" device="2051" flags="0" md5="d0377c2da0f43df1f8ec6bf9c04eeeaf" inode="4080411" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/naut_zoom_out_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="228" device="2051" flags="0" md5="d0377c2da0f43df1f8ec6bf9c04eeeaf" inode="4080409" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/naut_go_to_location.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="4094" device="2051" flags="0" md5="f5731ef77db819a54be69cab8806529a" inode="4080251" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/sample_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="6294" device="2051" flags="0" md5="84228717d2f8b951a5e2b06725fe0fd6" inode="4080488" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/gosfeedback.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="5692" device="2051" flags="0" md5="3c49d8844d40e59a1dc70648930d21c5" inode="4080011" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/gnome_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3558" device="2051" flags="0" md5="3fafcbfa605a345c87fc4dec2f82f89a" inode="4080132" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/nautilus_restore_saved_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="113179" device="2051" flags="0" md5="1b7dbb7d82639abe4d9f8cc75bc2c80f" inode="4080420" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/gnome-access-guide/gnome-access-guide-es.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1280" device="2051" flags="0" md5="cc804fba89afbd670dfcac21bd85a207" inode="4080707" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_normal_size_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1206" device="2051" flags="0" md5="7f2457eb51218cdfcd08a6e1e8aa9903" inode="4080272" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_noread_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1008" device="2051" flags="0" md5="e54419d1a042a072d0a56effcc13278a" inode="4080269" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/window_list_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2989" device="2051" flags="0" md5="6a903b5e02d1d7dd736c825b25a3f429" inode="4080550" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_zoom_out_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="228" device="2051" flags="0" md5="d0377c2da0f43df1f8ec6bf9c04eeeaf" inode="4080410" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/gosfeedback.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="5312" device="2051" flags="0" md5="1776ec859928948382ca94e34c05b970" inode="4080031" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/gosbasic.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="48161" device="2051" flags="0" md5="74c63acf8ad362c40e1136ef64f471c7" inode="4080043" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/goseditmainmenu.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8955" device="2051" flags="0" md5="8b33a889710ef3b3afed860ca8c98336" inode="4080045" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/goscustdesk.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="145773" device="2051" flags="0" md5="6d04823f1ca4828718f268126ea51173" inode="4080034" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080077" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_refine_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="12837" device="2051" flags="0" md5="c3d58f408fd7ec2f6965a0f06e05c43e" inode="4080294" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/logout_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2278" device="2051" flags="0" md5="b695adb45b2eaed0d80203635a70a5bb" inode="4080170" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="11232" device="2051" flags="0" md5="ff63a3156751b8149ad8780e348eb4da" inode="4080002" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/titlebar_anno_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6004" device="2051" flags="0" md5="32f7de38d309ac7c18359e7ef9dcc0f2" inode="4080526" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_zoom_in_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="313" device="2051" flags="0" md5="fdd5dadc0daa1dc7ed3a1455676482e9" inode="4080404" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/panel_object_popup_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2974" device="2051" flags="0" md5="35135b4653e42312c3e83f399ec6d406" inode="4080469" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/sample_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="6294" device="2051" flags="0" md5="84228717d2f8b951a5e2b06725fe0fd6" inode="4080493" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/menu_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="6539" device="2051" flags="0" md5="a6b41293f26fdca45e9b81c54ccb0dc8" inode="4080189" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1099" device="2051" flags="0" md5="53cd1fd7b179068753b4c6d2eb4d3261" inode="4080634" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/run_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2163" device="2051" flags="0" md5="c2b6a8fa1735f34172fcd255091de1d4" inode="4080480" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_browser_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="56931" device="2051" flags="0" md5="44b92e32cdc342cd5624b1be5626386d" inode="4080220" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_noread_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1008" device="2051" flags="0" md5="e54419d1a042a072d0a56effcc13278a" inode="4080266" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_computer_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="3235" device="2051" flags="0" md5="b6ba701515f5e9862aa30f0230745644" inode="4080237" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/move_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="194" device="2051" flags="0" md5="1a4e4a188a0132fc783c465d42c52426" inode="4080206" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/hyperlink_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="248" device="2051" flags="0" md5="41030ede726c6f3d9f1bd1f05456f3f6" inode="4080142" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/lockscreen_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3137" device="2051" flags="0" md5="75daebe4720b40eeaedfe8f4874bc8c0" inode="4080166" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/menu_bar_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="2523" device="2051" flags="0" md5="dd0eee59732d5d03d0f90299ef9fa1bd" inode="4080181" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/yelp_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="41402" device="2051" flags="0" md5="c7138987ae131fe2c57846a281245d31" inode="4080594" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/open_drawer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="8054" device="2051" flags="0" md5="48758235f704d288f6b6ef5f135dd61b" inode="4080453" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/hyperlink_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="248" device="2051" flags="0" md5="41030ede726c6f3d9f1bd1f05456f3f6" inode="4080140" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/movewindow_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="152" device="2051" flags="0" md5="8496a1d62cbfbe5272f8f5fa6f173c4c" inode="4080210" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/titlebar_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3144" device="2051" flags="0" md5="b3624c3e2eeb934a16ff5689c8163f44" inode="4080533" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/lockscreen_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3137" device="2051" flags="0" md5="75daebe4720b40eeaedfe8f4874bc8c0" inode="4080162" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_sampleemblem2_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="2209" device="2051" flags="0" md5="1fda0a7e76eb9dd57911acfaa89f267e" inode="4080309" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/accessx.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1413" device="2051" flags="0" md5="0ff78dfbc2101b109b64eb3672c11a4b" inode="4080627" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/sample_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="6294" device="2051" flags="0" md5="84228717d2f8b951a5e2b06725fe0fd6" inode="4080490" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_spatial_icon_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="45566" device="2051" flags="0" md5="c2dd3a38476c26a924c2673c6bb6de93" inode="4080356" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_sampleemblem2_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="2209" device="2051" flags="0" md5="1fda0a7e76eb9dd57911acfaa89f267e" inode="4080304" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide/user-guide-ru.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1779" device="2051" flags="0" md5="19bdd6b9b1347c50b4ca8af5cdfefc09" inode="4080607" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/gnome_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3558" device="2051" flags="0" md5="3fafcbfa605a345c87fc4dec2f82f89a" inode="4080128" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="4096" device="2051" flags="0" md5="" inode="4079971" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/panel_object_popup_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2974" device="2051" flags="0" md5="35135b4653e42312c3e83f399ec6d406" inode="4080468" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="7294" device="2051" flags="0" md5="9e785bd289e265ddfda7998e4c2ea4f1" inode="4080062" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/notification_area_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="945" device="2051" flags="0" md5="973b76c720b51d9495208ab2d62ecdec" inode="4080444" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/not_available_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="161" device="2051" flags="0" md5="19601aaf360da25b8a0d1d18b45ed99e" inode="4080438" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/gostools.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="36172" device="2051" flags="0" md5="39872bb75c7acf45631cd527bc4f15b3" inode="4080060" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/yelp_add_bookmark.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="8645" device="2051" flags="0" md5="562a62662f47655337c9bf341ef69f6e" inode="4080570" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_normal_size_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1206" device="2051" flags="0" md5="7f2457eb51218cdfcd08a6e1e8aa9903" inode="4080274" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_spatial_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="33054" device="2051" flags="0" md5="08673c38f4b4327f94f298c73b0d270b" inode="4080378" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/searchtool_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2634" device="2051" flags="0" md5="e6210d7a387eccba73a76c215f078611" inode="4080508" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/busy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="233" device="2051" flags="0" md5="99db6994613731ca7687bd700c471b2d" inode="4080082" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/slowkeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="672" device="2051" flags="0" md5="8714235e4f0faae5d914b19436596233" inode="4080667" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/busy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="233" device="2051" flags="0" md5="99db6994613731ca7687bd700c471b2d" inode="4080084" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/menu_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="6539" device="2051" flags="0" md5="a6b41293f26fdca45e9b81c54ccb0dc8" inode="4080190" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/stickyaltlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="320" device="2051" flags="0" md5="77f5fd818a89aebd05f56d8bedef7d11" inode="4080673" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_spatial_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="74023" device="2051" flags="0" md5="f2f8e037d14274ac04e1df45664f2103" inode="4080373" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/yelp_add_bookmark.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="8645" device="2051" flags="0" md5="562a62662f47655337c9bf341ef69f6e" inode="4080568" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/copy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="181" device="2051" flags="0" md5="228984e885befffd71ae4eadd7ee790e" inode="4080098" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/copy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="181" device="2051" flags="0" md5="228984e885befffd71ae4eadd7ee790e" inode="4080100" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/panel_object_popup_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2974" device="2051" flags="0" md5="35135b4653e42312c3e83f399ec6d406" inode="4080470" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/gnome_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3558" device="2051" flags="0" md5="3fafcbfa605a345c87fc4dec2f82f89a" inode="4080130" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/show_desktop_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2320" device="2051" flags="0" md5="d334534760b6b1c7bc2615f6fa514477" inode="4080518" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/gosoverview.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="45420" device="2051" flags="0" md5="c6fbdd49b614fa8e105d268d711a2d2d" inode="4080037" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/normal_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="305" device="2051" flags="0" md5="47960823c1883b50400d4fb7be857c72" inode="4080429" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_spatial_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="74023" device="2051" flags="0" md5="f2f8e037d14274ac04e1df45664f2103" inode="4080372" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/goseditmainmenu.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8281" device="2051" flags="0" md5="9cc25c520324768ee5fa70b8b967420c" inode="4080055" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/stickyshiftlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="508" device="2051" flags="0" md5="bae566b7fe0b61c44ecae952880e0db3" inode="4080688" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7777" device="2051" flags="0" md5="24a8df13cff91ef8bac8d24cd299dfe0" inode="4080246" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/gosoverview.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="43246" device="2051" flags="0" md5="fe212e247187fc2e2e2a82aafabe8e78" inode="4080047" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/yelp_preferences.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16781" device="2051" flags="0" md5="b8beb6c866957938b5e39bc7f72611ec" inode="4080586" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide/user-guide-pt_BR.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1558" device="2051" flags="0" md5="8545c976ecc30d915937f34bb04a4ebe" inode="4080606" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/busy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="233" device="2051" flags="0" md5="99db6994613731ca7687bd700c471b2d" inode="4080086" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_browser_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="56931" device="2051" flags="0" md5="44b92e32cdc342cd5624b1be5626386d" inode="4080221" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/com_file_manager_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="5352" device="2051" flags="0" md5="806597a020ec5a27615fd7330425047f" inode="4080088" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/user-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="12276" device="2051" flags="0" md5="e73bd5d50738ea16acd9afb29e007137" inode="4079986" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/gosnautilus.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="210694" device="2051" flags="0" md5="005075ae95fdcdd2bc7d58ae527e888a" inode="4080046" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_spatial_list_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="50568" device="2051" flags="0" md5="99693c429ea6f6889793a85b0c8fb099" inode="4080366" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/es/figures/titlebar_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3144" device="2051" flags="0" md5="b3624c3e2eeb934a16ff5689c8163f44" inode="4080529" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_computer_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="3235" device="2051" flags="0" md5="b6ba701515f5e9862aa30f0230745644" inode="4080232" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_refine_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="12837" device="2051" flags="0" md5="c3d58f408fd7ec2f6965a0f06e05c43e" inode="4080292" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_link_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="974" device="2051" flags="0" md5="3f0fd31faeaee25ae5c272219ae84d80" inode="4080260" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/move_panel_object_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="225" device="2051" flags="0" md5="e4244fb77b0df2b0c451328dce6fa175" inode="4080198" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/panel_object_popup_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2974" device="2051" flags="0" md5="35135b4653e42312c3e83f399ec6d406" inode="4080466" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/gosbasic.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="41076" device="2051" flags="0" md5="6398d9a85ff56a49994235da0a90a5be" inode="4080033" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7777" device="2051" flags="0" md5="24a8df13cff91ef8bac8d24cd299dfe0" inode="4080242" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/not_available_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="161" device="2051" flags="0" md5="19601aaf360da25b8a0d1d18b45ed99e" inode="4080437" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_starthere_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4511" device="2051" flags="0" md5="ee62efa332bc6450f92cabf3be245a9a" inode="4080389" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_spatial_icon_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="45566" device="2051" flags="0" md5="c2dd3a38476c26a924c2673c6bb6de93" inode="4080358" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/titlebar_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3144" device="2051" flags="0" md5="b3624c3e2eeb934a16ff5689c8163f44" inode="4080532" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/ibeam_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="197" device="2051" flags="0" md5="77aa93e74d640173c96801747bf564d1" inode="4080146" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/screenshot_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2866" device="2051" flags="0" md5="87de8a33a8e6058c0ba95b7f8c75fc5a" inode="4080498" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_search_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3992" device="2051" flags="0" md5="60a9a159dee2d7ad5c035ed794845798" inode="4080342" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/titlebar_anno_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6004" device="2051" flags="0" md5="32f7de38d309ac7c18359e7ef9dcc0f2" inode="4080524" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_noread_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1008" device="2051" flags="0" md5="e54419d1a042a072d0a56effcc13278a" inode="4080270" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_sampleemblem3_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="1944" device="2051" flags="0" md5="5f63009887a3f3abc5fc251f1fca9688" inode="4080312" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/logout_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2278" device="2051" flags="0" md5="b695adb45b2eaed0d80203635a70a5bb" inode="4080168" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/move_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="194" device="2051" flags="0" md5="1a4e4a188a0132fc783c465d42c52426" inode="4080204" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/ask_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="235" device="2051" flags="0" md5="bd23edcf2659006110ce30a14f0abb35" inode="4080070" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/yelp_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="41402" device="2051" flags="0" md5="c7138987ae131fe2c57846a281245d31" inode="4080596" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/gosoverview.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="43011" device="2051" flags="0" md5="bb35dc1ade336d3b422cc80026b01b44" inode="4080017" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/gosbasic.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="46643" device="2051" flags="0" md5="52e063c2e119d44c480a722af3a5c7de" inode="4079993" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_button_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7712" device="2051" flags="0" md5="447c19259a84de017f4431ea205bed03" inode="4080226" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/nautilus_restore_saved_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="113179" device="2051" flags="0" md5="1b7dbb7d82639abe4d9f8cc75bc2c80f" inode="4080421" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/gosnautilus.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="197521" device="2051" flags="0" md5="2d42abf261b57def760872a5e32aca90" inode="4080016" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/menu_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="6539" device="2051" flags="0" md5="a6b41293f26fdca45e9b81c54ccb0dc8" inode="4080184" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="4096" device="2051" flags="0" md5="" inode="4079973" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_spatial_list_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="50568" device="2051" flags="0" md5="99693c429ea6f6889793a85b0c8fb099" inode="4080364" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_go_to_location.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="4094" device="2051" flags="0" md5="f5731ef77db819a54be69cab8806529a" inode="4080248" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/nautilus_restore_saved_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="113179" device="2051" flags="0" md5="1b7dbb7d82639abe4d9f8cc75bc2c80f" inode="4080416" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/gosbasic.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="38963" device="2051" flags="0" md5="593de31a7d6ac865719cf9e26fef999c" inode="4080053" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/gedit_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="19819" device="2051" flags="0" md5="dae728f1901939647a3669cb4eb52cb4" inode="4080124" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_go_to_location.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="4094" device="2051" flags="0" md5="f5731ef77db819a54be69cab8806529a" inode="4080250" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/show_desktop_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2320" device="2051" flags="0" md5="d334534760b6b1c7bc2615f6fa514477" inode="4080512" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/force_quit.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1255" device="2051" flags="0" md5="a59d7a99b4a6ed57873f4bc4c4398cbb" inode="4080104" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/gosfeedback.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="5340" device="2051" flags="0" md5="50518d8ac77384f0dac2896a73e22863" inode="4080061" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/searchtool_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2634" device="2051" flags="0" md5="e6210d7a387eccba73a76c215f078611" inode="4080504" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/gosstartsession.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="14801" device="2051" flags="0" md5="1f008fa91160125353e9df88a61cdb98" inode="4080059" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/open_drawer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="8054" device="2051" flags="0" md5="48758235f704d288f6b6ef5f135dd61b" inode="4080452" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/ask_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="235" device="2051" flags="0" md5="bd23edcf2659006110ce30a14f0abb35" inode="4080076" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_trash_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3466" device="2051" flags="0" md5="828874302ebc9332260361a0e2ac83a5" inode="4080398" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/logout_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2278" device="2051" flags="0" md5="b695adb45b2eaed0d80203635a70a5bb" inode="4080174" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_computer_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="3235" device="2051" flags="0" md5="b6ba701515f5e9862aa30f0230745644" inode="4080234" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/ibeam_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="197" device="2051" flags="0" md5="77aa93e74d640173c96801747bf564d1" inode="4080144" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_starthere_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4511" device="2051" flags="0" md5="ee62efa332bc6450f92cabf3be245a9a" inode="4080386" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_sampleemblem_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4376" device="2051" flags="0" md5="109056cd83393c232751c95803c09150" inode="4080324" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_samplesymlink_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3889" device="2051" flags="0" md5="a56b9913c84da5b1407ad8b9618a41ff" inode="4080328" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/typical_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6470" device="2051" flags="0" md5="8e55f5be14a2e5d22a12dcc4463ba06e" inode="4080536" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_refine_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="12837" device="2051" flags="0" md5="c3d58f408fd7ec2f6965a0f06e05c43e" inode="4080293" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/stickyaltlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="346" device="2051" flags="0" md5="23cbf9498b55526e2dc0e80b2d409628" inode="4080676" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/screenshot_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2866" device="2051" flags="0" md5="87de8a33a8e6058c0ba95b7f8c75fc5a" inode="4080500" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/gospanel.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="79722" device="2051" flags="0" md5="a3d39f3e4eeee1b55505eff6d0f8ec2b" inode="4080058" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/typical_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6470" device="2051" flags="0" md5="8e55f5be14a2e5d22a12dcc4463ba06e" inode="4080542" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/menu_bar_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2523" device="2051" flags="0" md5="dd0eee59732d5d03d0f90299ef9fa1bd" inode="4080178" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/es" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080711" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_sampleemblem2_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="2209" device="2051" flags="0" md5="1fda0a7e76eb9dd57911acfaa89f267e" inode="4080306" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/gosfeedback.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="5393" device="2051" flags="0" md5="32222327b8308974b9d7c785bbca3cd5" inode="4080041" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/gedit_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="19819" device="2051" flags="0" md5="dae728f1901939647a3669cb4eb52cb4" inode="4080125" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/link_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="292" device="2051" flags="0" md5="8fb4e2d2fcaea8b59a653a3d8fc85b5a" inode="4080154" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/workspace_switcher_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="509" device="2051" flags="0" md5="9a42c99bb7ad5f288f8177966d12289c" inode="4080562" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="10722" device="2051" flags="0" md5="84b1be070b37ef1a6926ab7b223f5614" inode="4080052" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/com_file_manager_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="5352" device="2051" flags="0" md5="806597a020ec5a27615fd7330425047f" inode="4080092" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/titlebar_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3144" device="2051" flags="0" md5="b3624c3e2eeb934a16ff5689c8163f44" inode="4080530" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_browser_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="56931" device="2051" flags="0" md5="44b92e32cdc342cd5624b1be5626386d" inode="4080216" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_search_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3992" device="2051" flags="0" md5="60a9a159dee2d7ad5c035ed794845798" inode="4080340" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/show_desktop_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2320" device="2051" flags="0" md5="d334534760b6b1c7bc2615f6fa514477" inode="4080516" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_button_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7712" device="2051" flags="0" md5="447c19259a84de017f4431ea205bed03" inode="4080224" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/typical_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6470" device="2051" flags="0" md5="8e55f5be14a2e5d22a12dcc4463ba06e" inode="4080538" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/resize_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="205" device="2051" flags="0" md5="43e8186584e1879ba078caedf0a9f33f" inode="4080478" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_search_results.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="41790" device="2051" flags="0" md5="cdb07b97b638c6157d40d57373fcc5d4" inode="4080348" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_link_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="974" device="2051" flags="0" md5="3f0fd31faeaee25ae5c272219ae84d80" inode="4080256" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/typical_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6470" device="2051" flags="0" md5="8e55f5be14a2e5d22a12dcc4463ba06e" inode="4080540" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/gostools.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="36563" device="2051" flags="0" md5="c981da55df5599e03852ec36e3698287" inode="4080020" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/logout_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2278" device="2051" flags="0" md5="b695adb45b2eaed0d80203635a70a5bb" inode="4080172" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/window_list_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2989" device="2051" flags="0" md5="6a903b5e02d1d7dd736c825b25a3f429" inode="4080544" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/user-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="12204" device="2051" flags="0" md5="c04420fc860e28e69ccff00efeea8f10" inode="4079990" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/check_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1092" device="2051" flags="0" md5="4ee0fe6be90e8084499476dbe7d42eca" inode="4080637" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/gosfeedback.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="5680" device="2051" flags="0" md5="c225afcb7a00194680f33ad1ebad8310" inode="4080021" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/run_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2163" device="2051" flags="0" md5="c2b6a8fa1735f34172fcd255091de1d4" inode="4080486" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_sampleemblem3_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="1944" device="2051" flags="0" md5="5f63009887a3f3abc5fc251f1fca9688" inode="4080317" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_trash_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3466" device="2051" flags="0" md5="828874302ebc9332260361a0e2ac83a5" inode="4080392" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/searchtool_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2634" device="2051" flags="0" md5="e6210d7a387eccba73a76c215f078611" inode="4080506" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/ibeam_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="197" device="2051" flags="0" md5="77aa93e74d640173c96801747bf564d1" inode="4080149" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/titlebar_anno_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6004" device="2051" flags="0" md5="32f7de38d309ac7c18359e7ef9dcc0f2" inode="4080525" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_nowrite_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1068" device="2051" flags="0" md5="06a5b7050d82e38d2f54048a1f698092" inode="4080280" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_trash_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3466" device="2051" flags="0" md5="828874302ebc9332260361a0e2ac83a5" inode="4080397" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/yelp_edit_bookmarks.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16073" device="2051" flags="0" md5="6fb478c10bb9df68dc8d82f3ed4ac89b" inode="4080578" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/openwindows_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="3842" device="2051" flags="0" md5="ceea4df4bf13d1ec8da9bce679bfc1c8" inode="4080461" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_search_results.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="41790" device="2051" flags="0" md5="cdb07b97b638c6157d40d57373fcc5d4" inode="4080344" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_samplesymlink_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3889" device="2051" flags="0" md5="a56b9913c84da5b1407ad8b9618a41ff" inode="4080330" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/user-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="14142" device="2051" flags="0" md5="664c4ed36709451d5df07968ea797c12" inode="4079991" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/searchtool_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2634" device="2051" flags="0" md5="e6210d7a387eccba73a76c215f078611" inode="4080509" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_button_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7712" device="2051" flags="0" md5="447c19259a84de017f4431ea205bed03" inode="4080228" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/yelp_edit_bookmarks.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16073" device="2051" flags="0" md5="6fb478c10bb9df68dc8d82f3ed4ac89b" inode="4080580" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/window_list_group_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4455" device="2051" flags="0" md5="6b703d3f2da3c6206d433f554ac11726" inode="4080552" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_zoom_in_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="313" device="2051" flags="0" md5="fdd5dadc0daa1dc7ed3a1455676482e9" inode="4080402" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/show_desktop_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2320" device="2051" flags="0" md5="d334534760b6b1c7bc2615f6fa514477" inode="4080517" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/yelp_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="41402" device="2051" flags="0" md5="c7138987ae131fe2c57846a281245d31" inode="4080597" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/yelp_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="41402" device="2051" flags="0" md5="c7138987ae131fe2c57846a281245d31" inode="4080592" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_search_results.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="41790" device="2051" flags="0" md5="cdb07b97b638c6157d40d57373fcc5d4" inode="4080346" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/link_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="292" device="2051" flags="0" md5="8fb4e2d2fcaea8b59a653a3d8fc85b5a" inode="4080157" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_zoom_in_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="313" device="2051" flags="0" md5="fdd5dadc0daa1dc7ed3a1455676482e9" inode="4080400" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/goseditmainmenu.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8491" device="2051" flags="0" md5="00668c04ef6022afae69a0b87a502d8b" inode="4080035" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_sampleemblem1_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="886" device="2051" flags="0" md5="c47a771208c38c0529d254ffb12b13b0" inode="4080302" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/dropdown_combination_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1146" device="2051" flags="0" md5="c28106adee3335e7c4c7daeaa0469c59" inode="4080640" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_spatial_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="33054" device="2051" flags="0" md5="08673c38f4b4327f94f298c73b0d270b" inode="4080376" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/yelp_preferences.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16781" device="2051" flags="0" md5="b8beb6c866957938b5e39bc7f72611ec" inode="4080589" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide/user-guide-bg.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1490" device="2051" flags="0" md5="e309d10238797b138d05921a826d755b" inode="4080602" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/ibeam_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="197" device="2051" flags="0" md5="77aa93e74d640173c96801747bf564d1" inode="4080148" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/ask_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="235" device="2051" flags="0" md5="bd23edcf2659006110ce30a14f0abb35" inode="4080074" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/nautilus_restore_saved_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="113179" device="2051" flags="0" md5="1b7dbb7d82639abe4d9f8cc75bc2c80f" inode="4080422" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/goscustdesk.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="154230" device="2051" flags="0" md5="26e4c1ad7d73bef3b5607840244a97f7" inode="4080014" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/it/figures/titlebar_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3144" device="2051" flags="0" md5="b3624c3e2eeb934a16ff5689c8163f44" inode="4080531" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/resize_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="205" device="2051" flags="0" md5="43e8186584e1879ba078caedf0a9f33f" inode="4080472" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080626" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_sampleemblem1_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="886" device="2051" flags="0" md5="c47a771208c38c0529d254ffb12b13b0" inode="4080296" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/link_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="292" device="2051" flags="0" md5="8fb4e2d2fcaea8b59a653a3d8fc85b5a" inode="4080158" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_spatial_icon_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="45566" device="2051" flags="0" md5="c2dd3a38476c26a924c2673c6bb6de93" inode="4080352" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/move_panel_object_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="225" device="2051" flags="0" md5="e4244fb77b0df2b0c451328dce6fa175" inode="4080196" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/resize_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="205" device="2051" flags="0" md5="43e8186584e1879ba078caedf0a9f33f" inode="4080477" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_nowrite_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1068" device="2051" flags="0" md5="06a5b7050d82e38d2f54048a1f698092" inode="4080286" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/link_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="292" device="2051" flags="0" md5="8fb4e2d2fcaea8b59a653a3d8fc85b5a" inode="4080152" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_sampleemblem2_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="2209" device="2051" flags="0" md5="1fda0a7e76eb9dd57911acfaa89f267e" inode="4080308" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_search_results.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="41790" device="2051" flags="0" md5="cdb07b97b638c6157d40d57373fcc5d4" inode="4080350" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_sampleemblem3_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="1944" device="2051" flags="0" md5="5f63009887a3f3abc5fc251f1fca9688" inode="4080316" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_sampleemblem_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4376" device="2051" flags="0" md5="109056cd83393c232751c95803c09150" inode="4080320" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="4096" device="2051" flags="0" md5="" inode="4080611" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_link_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="974" device="2051" flags="0" md5="3f0fd31faeaee25ae5c272219ae84d80" inode="4080262" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/yelp_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="41402" device="2051" flags="0" md5="c7138987ae131fe2c57846a281245d31" inode="4080598" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_search_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3992" device="2051" flags="0" md5="60a9a159dee2d7ad5c035ed794845798" inode="4080341" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/searchtool_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2634" device="2051" flags="0" md5="e6210d7a387eccba73a76c215f078611" inode="4080510" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/window_list_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2989" device="2051" flags="0" md5="6a903b5e02d1d7dd736c825b25a3f429" inode="4080549" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_trash_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3466" device="2051" flags="0" md5="828874302ebc9332260361a0e2ac83a5" inode="4080396" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/gosstartsession.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="14801" device="2051" flags="0" md5="1f008fa91160125353e9df88a61cdb98" inode="4079999" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/window_list_group_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4455" device="2051" flags="0" md5="6b703d3f2da3c6206d433f554ac11726" inode="4080557" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_nowrite_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1068" device="2051" flags="0" md5="06a5b7050d82e38d2f54048a1f698092" inode="4080285" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/yelp_add_bookmark.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="8645" device="2051" flags="0" md5="562a62662f47655337c9bf341ef69f6e" inode="4080572" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/sample_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="6294" device="2051" flags="0" md5="84228717d2f8b951a5e2b06725fe0fd6" inode="4080494" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/typical_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6470" device="2051" flags="0" md5="8e55f5be14a2e5d22a12dcc4463ba06e" inode="4080541" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/workspace_switcher_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="509" device="2051" flags="0" md5="9a42c99bb7ad5f288f8177966d12289c" inode="4080560" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7777" device="2051" flags="0" md5="24a8df13cff91ef8bac8d24cd299dfe0" inode="4080240" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/gospanel.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="80340" device="2051" flags="0" md5="17d6906a03a21f9ddcfc4f32bd7b7401" inode="4080038" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/menu_bar_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="2523" device="2051" flags="0" md5="dd0eee59732d5d03d0f90299ef9fa1bd" inode="4080180" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/user-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="12024" device="2051" flags="0" md5="805239f7b5f1c51e2a7199d0005291a9" inode="4079988" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/force_quit.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1255" device="2051" flags="0" md5="a59d7a99b4a6ed57873f4bc4c4398cbb" inode="4080110" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_spatial_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="74023" device="2051" flags="0" md5="f2f8e037d14274ac04e1df45664f2103" inode="4080374" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/yelp_preferences.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16781" device="2051" flags="0" md5="b8beb6c866957938b5e39bc7f72611ec" inode="4080584" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_spatial_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="33054" device="2051" flags="0" md5="08673c38f4b4327f94f298c73b0d270b" inode="4080380" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/notification_area_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="945" device="2051" flags="0" md5="973b76c720b51d9495208ab2d62ecdec" inode="4080442" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/move_object_push.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1257" device="2051" flags="0" md5="810dfbd14b4259ce732963a0b72b1ed9" inode="4080658" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/openwindows_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="3842" device="2051" flags="0" md5="ceea4df4bf13d1ec8da9bce679bfc1c8" inode="4080462" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_zoom_in_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="313" device="2051" flags="0" md5="fdd5dadc0daa1dc7ed3a1455676482e9" inode="4080405" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_spatial_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="74023" device="2051" flags="0" md5="f2f8e037d14274ac04e1df45664f2103" inode="4080368" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/yelp_add_bookmark.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="8645" device="2051" flags="0" md5="562a62662f47655337c9bf341ef69f6e" inode="4080573" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/normal_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="305" device="2051" flags="0" md5="47960823c1883b50400d4fb7be857c72" inode="4080426" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_computer_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="3235" device="2051" flags="0" md5="b6ba701515f5e9862aa30f0230745644" inode="4080238" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/window_list_group_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4455" device="2051" flags="0" md5="6b703d3f2da3c6206d433f554ac11726" inode="4080554" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/gosstartsession.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="15166" device="2051" flags="0" md5="b4659f2d9cda90c3e27a8b1a82e87809" inode="4080039" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/lockscreen_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3137" device="2051" flags="0" md5="75daebe4720b40eeaedfe8f4874bc8c0" inode="4080164" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_search_results.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="41790" device="2051" flags="0" md5="cdb07b97b638c6157d40d57373fcc5d4" inode="4080349" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/menu_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="6539" device="2051" flags="0" md5="a6b41293f26fdca45e9b81c54ccb0dc8" inode="4080188" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/system-admin-guide/system-admin-guide-es.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1058" device="2051" flags="0" md5="367c6b84561aa7ca1ad48e72b0687f5f" inode="4080732" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/goseditmainmenu.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="9162" device="2051" flags="0" md5="ca482a75889bf231b7d89d534d30b616" inode="4080015" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/user-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="10625" device="2051" flags="0" md5="cc9498619b07a16b5c9e4d017c216124" inode="4079992" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/window_list_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2989" device="2051" flags="0" md5="6a903b5e02d1d7dd736c825b25a3f429" inode="4080546" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/ask_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="235" device="2051" flags="0" md5="bd23edcf2659006110ce30a14f0abb35" inode="4080078" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/openwindows_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="3842" device="2051" flags="0" md5="ceea4df4bf13d1ec8da9bce679bfc1c8" inode="4080458" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/hyperlink_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="248" device="2051" flags="0" md5="41030ede726c6f3d9f1bd1f05456f3f6" inode="4080138" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/goscustdesk.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="143654" device="2051" flags="0" md5="92448a2f22f02ea0d8939bdc63aa934b" inode="4080054" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8507" device="2051" flags="0" md5="80bd0d230592849068365e603a3c14ff" inode="4080022" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_samplesymlink_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3889" device="2051" flags="0" md5="a56b9913c84da5b1407ad8b9618a41ff" inode="4080332" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/goscustdesk.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="167194" device="2051" flags="0" md5="e0cb2fea0e70fcc32652da71300c3748" inode="4080044" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_spatial_list_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="50568" device="2051" flags="0" md5="99693c429ea6f6889793a85b0c8fb099" inode="4080360" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/gostools.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="34896" device="2051" flags="0" md5="e3bf3508059bebe9fa049288ff206147" inode="4080040" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_starthere_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4511" device="2051" flags="0" md5="ee62efa332bc6450f92cabf3be245a9a" inode="4080384" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/link_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="292" device="2051" flags="0" md5="8fb4e2d2fcaea8b59a653a3d8fc85b5a" inode="4080156" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/move_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="194" device="2051" flags="0" md5="1a4e4a188a0132fc783c465d42c52426" inode="4080205" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_starthere_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4511" device="2051" flags="0" md5="ee62efa332bc6450f92cabf3be245a9a" inode="4080388" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/busy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="233" device="2051" flags="0" md5="99db6994613731ca7687bd700c471b2d" inode="4080080" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080075" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/system-admin-guide/es/system-admin-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="240873" device="2051" flags="0" md5="c6cd6daa8dd450c1e8dee5c6ab957b8b" inode="4080728" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/move_object_before.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1776" device="2051" flags="0" md5="db85522123cc18d15a87b71ed2856fd3" inode="4080652" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/tabbed_section.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="8856" device="2051" flags="0" md5="c64b36d9e27b0cd69caaff98c24c1c4d" inode="4080697" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_go_to_location.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="4094" device="2051" flags="0" md5="f5731ef77db819a54be69cab8806529a" inode="4080252" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/gostools.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="36500" device="2051" flags="0" md5="c73b8cf98bdfcc1733ddcd5196f01e7f" inode="4080000" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_browser_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="56931" device="2051" flags="0" md5="44b92e32cdc342cd5624b1be5626386d" inode="4080222" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/force_quit.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1255" device="2051" flags="0" md5="a59d7a99b4a6ed57873f4bc4c4398cbb" inode="4080108" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/stickywindowlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="405" device="2051" flags="0" md5="cdfb5e24d83b7264647136c9c8efef08" inode="4080691" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/move_object_jump.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1773" device="2051" flags="0" md5="424967c951eb27a96ebce26711e62cc2" inode="4080655" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/not_available_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="161" device="2051" flags="0" md5="19601aaf360da25b8a0d1d18b45ed99e" inode="4080432" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_sampleemblem1_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="886" device="2051" flags="0" md5="c47a771208c38c0529d254ffb12b13b0" inode="4080301" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/yelp_add_bookmark.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="8645" device="2051" flags="0" md5="562a62662f47655337c9bf341ef69f6e" inode="4080574" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/not_available_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="161" device="2051" flags="0" md5="19601aaf360da25b8a0d1d18b45ed99e" inode="4080436" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_sampleemblem_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4376" device="2051" flags="0" md5="109056cd83393c232751c95803c09150" inode="4080322" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/gedit_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="19819" device="2051" flags="0" md5="dae728f1901939647a3669cb4eb52cb4" inode="4080126" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_nowrite_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1068" device="2051" flags="0" md5="06a5b7050d82e38d2f54048a1f698092" inode="4080284" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/tree.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1697" device="2051" flags="0" md5="0bb1b6f07b3fab52dddfa4bab9f1e5d4" inode="4080703" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/goscustdesk.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="143750" device="2051" flags="0" md5="a74e176c098789e8f99b9169c969db8c" inode="4079994" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/run_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2163" device="2051" flags="0" md5="c2b6a8fa1735f34172fcd255091de1d4" inode="4080485" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/sample_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="6294" device="2051" flags="0" md5="84228717d2f8b951a5e2b06725fe0fd6" inode="4080492" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_spatial_icon_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="45566" device="2051" flags="0" md5="c2dd3a38476c26a924c2673c6bb6de93" inode="4080354" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/move_panel_object_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="225" device="2051" flags="0" md5="e4244fb77b0df2b0c451328dce6fa175" inode="4080192" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/screenshot_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2866" device="2051" flags="0" md5="87de8a33a8e6058c0ba95b7f8c75fc5a" inode="4080501" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/radio_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1509" device="2051" flags="0" md5="c0ba3100eedc9b36635032e1432bda0b" inode="4080661" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/titlebar_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3144" device="2051" flags="0" md5="b3624c3e2eeb934a16ff5689c8163f44" inode="4080534" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_sampleemblem1_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="886" device="2051" flags="0" md5="c47a771208c38c0529d254ffb12b13b0" inode="4080300" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/move_panel_object_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="225" device="2051" flags="0" md5="e4244fb77b0df2b0c451328dce6fa175" inode="4080197" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/four_hide_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1193" device="2051" flags="0" md5="386e1e73333296fc0da22cef5ff7fc25" inode="4080114" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/normal_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="305" device="2051" flags="0" md5="47960823c1883b50400d4fb7be857c72" inode="4080424" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/four_hide_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1193" device="2051" flags="0" md5="386e1e73333296fc0da22cef5ff7fc25" inode="4080112" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/force_quit.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1255" device="2051" flags="0" md5="a59d7a99b4a6ed57873f4bc4c4398cbb" inode="4080106" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/notification_area_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="945" device="2051" flags="0" md5="973b76c720b51d9495208ab2d62ecdec" inode="4080440" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/not_available_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="161" device="2051" flags="0" md5="19601aaf360da25b8a0d1d18b45ed99e" inode="4080434" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/gosoverview.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="43001" device="2051" flags="0" md5="f5218d20bdbb8c9cd5458bc187b3f476" inode="4079997" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_button_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7712" device="2051" flags="0" md5="447c19259a84de017f4431ea205bed03" inode="4080230" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_sampleemblem3_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="1944" device="2051" flags="0" md5="5f63009887a3f3abc5fc251f1fca9688" inode="4080318" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_zoom_out_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="228" device="2051" flags="0" md5="d0377c2da0f43df1f8ec6bf9c04eeeaf" inode="4080413" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_refine_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="12837" device="2051" flags="0" md5="c3d58f408fd7ec2f6965a0f06e05c43e" inode="4080290" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_starthere_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4511" device="2051" flags="0" md5="ee62efa332bc6450f92cabf3be245a9a" inode="4080390" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_samplesymlink_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3889" device="2051" flags="0" md5="a56b9913c84da5b1407ad8b9618a41ff" inode="4080333" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/figures/titlebar_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3144" device="2051" flags="0" md5="b3624c3e2eeb934a16ff5689c8163f44" inode="4080527" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide/user-guide-zh_CN.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1487" device="2051" flags="0" md5="752f36e64bcaa696404dac36658decf6" inode="4080608" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_zoom_out_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="228" device="2051" flags="0" md5="d0377c2da0f43df1f8ec6bf9c04eeeaf" inode="4080408" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/gospanel.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="96512" device="2051" flags="0" md5="534f47486bf31c9f996d482f998327a7" inode="4080048" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/gosnautilus.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="204375" device="2051" flags="0" md5="afd08d0eb30695f325cbe6cec05f8f3a" inode="4080036" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_zoom_out_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="228" device="2051" flags="0" md5="d0377c2da0f43df1f8ec6bf9c04eeeaf" inode="4080412" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/menu_bar_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2523" device="2051" flags="0" md5="dd0eee59732d5d03d0f90299ef9fa1bd" inode="4080176" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/copy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="181" device="2051" flags="0" md5="228984e885befffd71ae4eadd7ee790e" inode="4080096" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="4096" device="2051" flags="0" md5="" inode="4079972" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_normal_size_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1206" device="2051" flags="0" md5="7f2457eb51218cdfcd08a6e1e8aa9903" inode="4080278" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080069" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/normal_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="305" device="2051" flags="0" md5="47960823c1883b50400d4fb7be857c72" inode="4080430" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/gostools.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="43710" device="2051" flags="0" md5="0f67029a89300df675078a1badd61500" inode="4080050" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/stickywindowlock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="460" device="2051" flags="0" md5="8fe5f82535f7aeb54dacc2d05b777299" inode="4080694" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/gnome_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3558" device="2051" flags="0" md5="3fafcbfa605a345c87fc4dec2f82f89a" inode="4080133" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_spatial_list_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="50568" device="2051" flags="0" md5="99693c429ea6f6889793a85b0c8fb099" inode="4080362" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/stickyshiftlatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="470" device="2051" flags="0" md5="c88cab16d9c86d9ee102fe04d8278d6b" inode="4080685" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/window_list_group_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4455" device="2051" flags="0" md5="6b703d3f2da3c6206d433f554ac11726" inode="4080556" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_spatial_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="33054" device="2051" flags="0" md5="08673c38f4b4327f94f298c73b0d270b" inode="4080381" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/workspace_switcher_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="509" device="2051" flags="0" md5="9a42c99bb7ad5f288f8177966d12289c" inode="4080564" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_sampleemblem_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4376" device="2051" flags="0" md5="109056cd83393c232751c95803c09150" inode="4080326" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/copy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="181" device="2051" flags="0" md5="228984e885befffd71ae4eadd7ee790e" inode="4080102" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/four_hide_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1193" device="2051" flags="0" md5="386e1e73333296fc0da22cef5ff7fc25" inode="4080118" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="4096" device="2051" flags="0" md5="" inode="4079969" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_trash_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3466" device="2051" flags="0" md5="828874302ebc9332260361a0e2ac83a5" inode="4080394" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/titlebar_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="3144" device="2051" flags="0" md5="b3624c3e2eeb934a16ff5689c8163f44" inode="4080528" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/lockscreen_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3137" device="2051" flags="0" md5="75daebe4720b40eeaedfe8f4874bc8c0" inode="4080165" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/mousekeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="948" device="2051" flags="0" md5="2d6989b948f744f949c344b0cf96136b" inode="4080646" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_search_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3992" device="2051" flags="0" md5="60a9a159dee2d7ad5c035ed794845798" inode="4080338" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/logout_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="2278" device="2051" flags="0" md5="b695adb45b2eaed0d80203635a70a5bb" inode="4080173" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_spatial_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="33054" device="2051" flags="0" md5="08673c38f4b4327f94f298c73b0d270b" inode="4080382" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/text_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1052" device="2051" flags="0" md5="7f69292d1ab4162d95791e37355244b4" inode="4080700" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/nautilus_restore_saved_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="113179" device="2051" flags="0" md5="1b7dbb7d82639abe4d9f8cc75bc2c80f" inode="4080418" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/yelp_edit_bookmarks.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16073" device="2051" flags="0" md5="6fb478c10bb9df68dc8d82f3ed4ac89b" inode="4080581" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/window_list_group_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4455" device="2051" flags="0" md5="6b703d3f2da3c6206d433f554ac11726" inode="4080558" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_browser_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="56931" device="2051" flags="0" md5="44b92e32cdc342cd5624b1be5626386d" inode="4080218" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/four_hide_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1193" device="2051" flags="0" md5="386e1e73333296fc0da22cef5ff7fc25" inode="4080116" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/titlebar_anno_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6004" device="2051" flags="0" md5="32f7de38d309ac7c18359e7ef9dcc0f2" inode="4080520" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7777" device="2051" flags="0" md5="24a8df13cff91ef8bac8d24cd299dfe0" inode="4080245" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_normal_size_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1206" device="2051" flags="0" md5="7f2457eb51218cdfcd08a6e1e8aa9903" inode="4080276" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_search_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3992" device="2051" flags="0" md5="60a9a159dee2d7ad5c035ed794845798" inode="4080336" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/open_drawer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="8054" device="2051" flags="0" md5="48758235f704d288f6b6ef5f135dd61b" inode="4080448" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/notification_area_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="945" device="2051" flags="0" md5="973b76c720b51d9495208ab2d62ecdec" inode="4080445" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/resize_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="205" device="2051" flags="0" md5="43e8186584e1879ba078caedf0a9f33f" inode="4080474" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/spin_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1199" device="2051" flags="0" md5="a413f3913e3456411482c3663a1c3248" inode="4080670" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/openwindows_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="3842" device="2051" flags="0" md5="ceea4df4bf13d1ec8da9bce679bfc1c8" inode="4080456" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/C/gosfeedback.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="5282" device="2051" flags="0" md5="fabb0f6ff2ad9d61f0ae04caf2cdcbd1" inode="4079983" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/gosoverview.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="42995" device="2051" flags="0" md5="5652f440aa42b58455985c3426595718" inode="4080057" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_go_to_location.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="4094" device="2051" flags="0" md5="f5731ef77db819a54be69cab8806529a" inode="4080254" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/ibeam_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="197" device="2051" flags="0" md5="77aa93e74d640173c96801747bf564d1" inode="4080150" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_button_bar.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7712" device="2051" flags="0" md5="447c19259a84de017f4431ea205bed03" inode="4080229" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_spatial_icon_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="45566" device="2051" flags="0" md5="c2dd3a38476c26a924c2673c6bb6de93" inode="4080357" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_sampleemblem1_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="886" device="2051" flags="0" md5="c47a771208c38c0529d254ffb12b13b0" inode="4080298" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_zoom_in_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="313" device="2051" flags="0" md5="fdd5dadc0daa1dc7ed3a1455676482e9" inode="4080406" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_samplesymlink_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="3889" device="2051" flags="0" md5="a56b9913c84da5b1407ad8b9618a41ff" inode="4080334" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/gedit_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="19819" device="2051" flags="0" md5="dae728f1901939647a3669cb4eb52cb4" inode="4080122" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/slider.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1240" device="2051" flags="0" md5="d0b6e9e5a9625576006828967a3813a9" inode="4080664" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/gosnautilus.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="196802" device="2051" flags="0" md5="a7840b7cb5965484be6a79012cdd9348" inode="4080056" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/resize_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="205" device="2051" flags="0" md5="43e8186584e1879ba078caedf0a9f33f" inode="4080476" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/gedit_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="19819" device="2051" flags="0" md5="dae728f1901939647a3669cb4eb52cb4" inode="4080120" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/four_hide_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1193" device="2051" flags="0" md5="386e1e73333296fc0da22cef5ff7fc25" inode="4080117" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/panel_object_popup_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2974" device="2051" flags="0" md5="35135b4653e42312c3e83f399ec6d406" inode="4080464" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/gnome-access-guide.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="210188" device="2051" flags="0" md5="6cde9bd7a053d69fc6b05f496965104f" inode="4080622" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_sampleemblem3_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="1944" device="2051" flags="0" md5="5f63009887a3f3abc5fc251f1fca9688" inode="4080314" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/move_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="194" device="2051" flags="0" md5="1a4e4a188a0132fc783c465d42c52426" inode="4080200" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_noread_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1008" device="2051" flags="0" md5="e54419d1a042a072d0a56effcc13278a" inode="4080268" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/stickyctrllatch.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="414" device="2051" flags="0" md5="f85ce888003a0f875496d42a9f19c508" inode="4080679" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/glossary.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8892" device="2051" flags="0" md5="428652d2ed52b2343c4026fbbaa5f78b" inode="4080042" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="4096" device="2051" flags="0" md5="" inode="4079967" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/stickyctrllock.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="436" device="2051" flags="0" md5="58d0972c476a9c1e9f077d343fda6ab4" inode="4080682" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/hyperlink_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="248" device="2051" flags="0" md5="41030ede726c6f3d9f1bd1f05456f3f6" inode="4080136" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_link_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="974" device="2051" flags="0" md5="3f0fd31faeaee25ae5c272219ae84d80" inode="4080261" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="7777" device="2051" flags="0" md5="24a8df13cff91ef8bac8d24cd299dfe0" inode="4080244" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/move_object_arrows.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1778" device="2051" flags="0" md5="14708f1edd48a84a861819b5fc16820b" inode="4080649" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/bouncekeys.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="557" device="2051" flags="0" md5="cff25b6e1db7bfedc2517abc34444706" inode="4080631" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/workspace_switcher_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="509" device="2051" flags="0" md5="9a42c99bb7ad5f288f8177966d12289c" inode="4080566" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/ask_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="235" device="2051" flags="0" md5="bd23edcf2659006110ce30a14f0abb35" inode="4080066" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/movewindow_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="152" device="2051" flags="0" md5="8496a1d62cbfbe5272f8f5fa6f173c4c" inode="4080208" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/com_file_manager_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="5352" device="2051" flags="0" md5="806597a020ec5a27615fd7330425047f" inode="4080094" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/copy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="181" device="2051" flags="0" md5="228984e885befffd71ae4eadd7ee790e" inode="4080101" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_normal_size_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1206" device="2051" flags="0" md5="7f2457eb51218cdfcd08a6e1e8aa9903" inode="4080277" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/notification_area_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="945" device="2051" flags="0" md5="973b76c720b51d9495208ab2d62ecdec" inode="4080446" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/menu_bar_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="2523" device="2051" flags="0" md5="dd0eee59732d5d03d0f90299ef9fa1bd" inode="4080182" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/gospanel.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="79710" device="2051" flags="0" md5="d82f51189530b512a9f669b3b974b0df" inode="4080018" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_spatial_mode.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="74023" device="2051" flags="0" md5="f2f8e037d14274ac04e1df45664f2103" inode="4080370" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/gosstartsession.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="14818" device="2051" flags="0" md5="d5676a9b1b7d70cab32c17942770ca01" inode="4080019" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/movewindow_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="152" device="2051" flags="0" md5="8496a1d62cbfbe5272f8f5fa6f173c4c" inode="4080214" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/com_file_manager_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="5352" device="2051" flags="0" md5="806597a020ec5a27615fd7330425047f" inode="4080093" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/gosstartsession.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="20879" device="2051" flags="0" md5="8101979f432f13cbee90f4bb8fead871" inode="4080049" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_go_to_location.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="4094" device="2051" flags="0" md5="f5731ef77db819a54be69cab8806529a" inode="4080253" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_sampleemblem_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="4376" device="2051" flags="0" md5="109056cd83393c232751c95803c09150" inode="4080325" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/yelp_edit_bookmarks.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16073" device="2051" flags="0" md5="6fb478c10bb9df68dc8d82f3ed4ac89b" inode="4080576" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_noread_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1008" device="2051" flags="0" md5="e54419d1a042a072d0a56effcc13278a" inode="4080264" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/gnome_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3558" device="2051" flags="0" md5="3fafcbfa605a345c87fc4dec2f82f89a" inode="4080134" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_link_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="974" device="2051" flags="0" md5="3f0fd31faeaee25ae5c272219ae84d80" inode="4080258" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080065" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/open_drawer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="8054" device="2051" flags="0" md5="48758235f704d288f6b6ef5f135dd61b" inode="4080450" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/gospanel.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="79728" device="2051" flags="0" md5="c9c762f555c40ee2be4a5e97f18c8d39" inode="4079998" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/gosfeedback.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="5312" device="2051" flags="0" md5="d8b21b39a7363dfce741413a41fa2556" inode="4080001" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/menu_panel.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="6539" device="2051" flags="0" md5="a6b41293f26fdca45e9b81c54ccb0dc8" inode="4080186" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/gosbasic.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="39952" device="2051" flags="0" md5="a50c70a9786e18ace0cab831cead9084" inode="4080013" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/normal_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="305" device="2051" flags="0" md5="47960823c1883b50400d4fb7be857c72" inode="4080428" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/gosnautilus.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="196819" device="2051" flags="0" md5="a226eda58af3bfe3faf0c5562e3ffed7" inode="4079996" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/naut_computer_launcher.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="3235" device="2051" flags="0" md5="b6ba701515f5e9862aa30f0230745644" inode="4080236" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/run_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2163" device="2051" flags="0" md5="c2b6a8fa1735f34172fcd255091de1d4" inode="4080484" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/hyperlink_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="248" device="2051" flags="0" md5="41030ede726c6f3d9f1bd1f05456f3f6" inode="4080141" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/yelp_preferences.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16781" device="2051" flags="0" md5="b8beb6c866957938b5e39bc7f72611ec" inode="4080588" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/gosfeedback.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="6114" device="2051" flags="0" md5="85b387306b935b128975032b10785330" inode="4080051" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/screenshot_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2866" device="2051" flags="0" md5="87de8a33a8e6058c0ba95b7f8c75fc5a" inode="4080502" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/workspace_switcher_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="509" device="2051" flags="0" md5="9a42c99bb7ad5f288f8177966d12289c" inode="4080565" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/run_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2163" device="2051" flags="0" md5="c2b6a8fa1735f34172fcd255091de1d4" inode="4080482" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_sampleemblem2_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="2209" device="2051" flags="0" md5="1fda0a7e76eb9dd57911acfaa89f267e" inode="4080310" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/open_drawer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="8054" device="2051" flags="0" md5="48758235f704d288f6b6ef5f135dd61b" inode="4080454" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/naut_refine_search.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="12837" device="2051" flags="0" md5="c3d58f408fd7ec2f6965a0f06e05c43e" inode="4080288" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/naut_nowrite_emblem.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="1068" device="2051" flags="0" md5="06a5b7050d82e38d2f54048a1f698092" inode="4080282" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/show_desktop_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2320" device="2051" flags="0" md5="d334534760b6b1c7bc2615f6fa514477" inode="4080514" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/naut_spatial_list_view.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750817" file_size="50568" device="2051" flags="0" md5="99693c429ea6f6889793a85b0c8fb099" inode="4080365" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/lockscreen_icon.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="3137" device="2051" flags="0" md5="75daebe4720b40eeaedfe8f4874bc8c0" inode="4080160" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/omf/user-guide/user-guide-fr.omf" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="1585" device="2051" flags="0" md5="e57a71b4b182c69b9529d58c41b74b91" inode="4080604" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/yelp_preferences.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16781" device="2051" flags="0" md5="b8beb6c866957938b5e39bc7f72611ec" inode="4080590" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/naut_zoom_out_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="228" device="2051" flags="0" md5="d0377c2da0f43df1f8ec6bf9c04eeeaf" inode="4080414" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/com_file_manager_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="5352" device="2051" flags="0" md5="806597a020ec5a27615fd7330425047f" inode="4080090" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/zh_CN/figures/yelp_edit_bookmarks.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="16073" device="2051" flags="0" md5="6fb478c10bb9df68dc8d82f3ed4ac89b" inode="4080582" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/move_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="194" device="2051" flags="0" md5="1a4e4a188a0132fc783c465d42c52426" inode="4080202" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="4096" device="2051" flags="0" md5="" inode="4080073" linkto="" file_mode="16877"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/force_quit.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="1255" device="2051" flags="0" md5="a59d7a99b4a6ed57873f4bc4c4398cbb" inode="4080109" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/titlebar_anno_window.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="6004" device="2051" flags="0" md5="32f7de38d309ac7c18359e7ef9dcc0f2" inode="4080522" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/figures/screenshot_button.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="2866" device="2051" flags="0" md5="87de8a33a8e6058c0ba95b7f8c75fc5a" inode="4080496" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/busy_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750815" file_size="233" device="2051" flags="0" md5="99db6994613731ca7687bd700c471b2d" inode="4080085" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/bg/goseditmainmenu.xml" verifyflags="-1" rdev="0" groupname="root" mtime="1157750814" file_size="8281" device="2051" flags="0" md5="9cc25c520324768ee5fa70b8b967420c" inode="4079995" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/movewindow_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="152" device="2051" flags="0" md5="8496a1d62cbfbe5272f8f5fa6f173c4c" inode="4080212" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/window_list_applet.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750819" file_size="2989" device="2051" flags="0" md5="6a903b5e02d1d7dd736c825b25a3f429" inode="4080548" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/ru/figures/movewindow_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="152" device="2051" flags="0" md5="8496a1d62cbfbe5272f8f5fa6f173c4c" inode="4080213" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/pt_BR/figures/openwindows_menu.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750818" file_size="3842" device="2051" flags="0" md5="ceea4df4bf13d1ec8da9bce679bfc1c8" inode="4080460" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/gnome-access-guide/es/figures/dropdown_list_box.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750820" file_size="1271" device="2051" flags="0" md5="942d41fc508f23362d8c9c1a92988c45" inode="4080643" linkto="" file_mode="-32348"/><rhn-package-file username="root" lang="" name="/usr/share/gnome/help/user-guide/fr/figures/move_panel_object_pointer.png" verifyflags="-1" rdev="0" groupname="root" mtime="1157750816" file_size="225" device="2051" flags="0" md5="e4244fb77b0df2b0c451328dce6fa175" inode="4080194" linkto="" file_mode="-32348"/></rhn-package-files></rhn-package></rhn-packages></rhn-satellite>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages_short.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages_short.xml
deleted file mode 100644
index 0ed6e5c..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages_short.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><rhn-satellite generation="2" version="3.4"><rhn-packages-short><rhn-package-short name="mkisofs" package-size="609556" md5sum="12499c6be3e98d0a0624abcac6a41ac1" package-arch="i386" last-modified="1173375440" epoch="9" version="2.01" release="10" id="rhn-package-386984"/><rhn-package-short name="samba" package-size="16556646" md5sum="f28046f84ea5ac24a98cc7b6958d9b19" package-arch="i386" last-modified="1173375414" epoch="0" version="3.0.23c" release="2" id="rhn-package-386981"/><rhn-package-short name="m17n-db-telugu" package-size="14650" md5sum="e0aa989ee53868b9e730563cbcc99e5a" package-arch="noarch" last-modified="1173375423" epoch="" version="1.3.3" release="46.el5" id="rhn-package-386982"/><rhn-package-short name="gnome-user-docs" package-size="6549456" md5sum="4e7d379301407b4c79f211596b802a13" package-arch="noarch" last-modified="1173375434" epoch="" version="2.16.0" release="2.fc6" id="rhn-package-386983"/></rhn-packages-short></rhn-satellite>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.product_names.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.product_names.xml
deleted file mode 100644
index 9b5300f..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.product_names.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><rhn-satellite generation="2" version="3.4"><rhn-product-names><rhn-product-name name="Global Desktop" label="rhgd"/><rhn-product-name name="iDeveloper Studio" label="rhdevstudio"/><rhn-product-name name="Command Center" label="rhcc"/><rhn-product-name name="Command Center Scout" label="rhcc-scout"/><rhn-product-name name="Solaris" label="solaris"/><rhn-product-name name="Cluster Storage" label="cluster-storage"/><rhn-product-name name="Reporting Pack" label="pentaho-report-pack-rhx"/><rhn-product-name name="Global File System" label="gfs"/><rhn-product-name name="Supplementary" label="supplementary"/><rhn-product-name name="Cluster Suite" label="cluster"/><rhn-product-name name="Interim Updates" label="interim"/><rhn-product-name name="Virtualization" label="vt"/><rhn-product-name name="Hardware Certification" label="hts"/><rhn-product-name name="CentricCRM" label="centriccrm"/><rhn-product-name name="SugarCRM" label="sugar-open-source"/><rhn-product-name name="Enterprise 2.6" label="compiere-enterprise"/><rhn-product-name name="Enterprise Linux Desktop" label="rhel-desktop"/><rhn-product-name name="Productivity Apps" label="productivity"/><rhn-product-name name="FasTrack" label="fastrack"/><rhn-product-name name="Desktop" label="desktop"/><rhn-product-name name="Embedded Linux Developer Suite" label="elds"/><rhn-product-name name="Linux (Enterprise Edition)" label="linux-ee"/><rhn-product-name name="Advanced Server" label="enterprisedb-adv-svr"/><rhn-product-name name="Linux" label="redhat-linux"/><rhn-product-name name="Enterprise Linux" label="rhel"/><rhn-product-name name="Enterprise" label="alfresco-enterprise"/><rhn-product-name name="Network Tools" label="rhn-tools"/><rhn-product-name name="Collaboration Applications" label="collab-suite"/><rhn-product-name name="Beta Errata" label="beta-errata"/><rhn-product-name name="Directory Server" label="rhdirserv"/><rhn-product-name name="OpenFire Enterprise" label="openfire-enterprise"/><rhn-product-name name="AS" label="advanced-server"/><rhn-product-name name="Network Satellite" label="satellite"/><rhn-product-name name="Linux (Phoebe Beta)" label="linux-phoebe"/><rhn-product-name name="Desktop Multi-OS" label="vt-multi"/><rhn-product-name name="Compatibility Libraries" label="ia32supp"/><rhn-product-name name="Application Stack" label="appstk"/><rhn-product-name name="Application Server" label="appserver"/><rhn-product-name name="Developer Edition" label="de"/><rhn-product-name name="MySQL Enterprise" label="mysql-enterprise"/><rhn-product-name name="Linux Terminal Server Project" label="k12ltsp"/><rhn-product-name name="Database" label="database"/><rhn-product-name name="Network Proxy" label="proxy"/><rhn-product-name name="Certificate System" label="rhcmsys"/><rhn-product-name name="JasperServer Pro" label="jasperserverpro-rhx-edition"/><rhn-product-name name="SDK" label="sdk"/><rhn-product-name name="Stronghold" label="stronghold"/><rhn-product-name name="Web Application Framework" label="ccm-core"/><rhn-product-name name="Desktop Workstation" label="workstation"/><rhn-product-name name="Advanced Workstation" label="rhel-aw"/><rhn-product-name name="Zenoss Enterprise" label="zenoss-enterprise"/><rhn-product-name name="Developer Suite" label="devsuite"/><rhn-product-name name="UNKNOWN" label="UNKNOWN"/><rhn-product-name name="GCC3.1" label="gcc3.1"/><rhn-product-name name="Portal Server" label="portal-server"/><rhn-product-name name="MLS Policies" label="mls"/><rhn-product-name name="Powertools" label="powertools"/><rhn-product-name name="Extras" label="extras"/><rhn-product-name name="Enterprise Application Platform" label="jbappplatform"/><rhn-product-name name="Monitor" label="groundwork-monitor-for-rhx"/><rhn-product-name name="Network Professional Edition" label="zimbra-network-professional"/><rhn-product-name name="Severn" label="severn"/><rhn-product-name name="Content Management System" label="cms"/><rhn-product-name name="Enterprise Backup" label="amanda-enterprise-backup"/><rhn-product-name name="Test System Tools" label="rhts-tools"/><rhn-product-name name="Developer Studio" label="jbdevstudio"/><rhn-product-name name="HPC Solution" label="hpc"/><rhn-product-name name="Enterprise IPA" label="ipa"/><rhn-product-name name="MRG Messaging (for non-Linux)" label="mrg-messaging-nonlinux"/><rhn-product-name name="MRG Grid (for non-Linux)" label="mrg-grid-nonlinux"/><rhn-product-name name="MRG Messaging Base (for RHEL-5 Server)" label="mrg-messaging-base-rhel5-server"/><rhn-product-name name="MRG Messaging (for RHEL-5 Server)" label="mrg-messaging-rhel5-server"/><rhn-product-name name="MRG Realtime (for RHEL-5 Server)" label="mrg-realtime-rhel5-server"/><rhn-product-name name="MRG Grid (for RHEL-5 Server)" label="mrg-grid-rhel5-server"/><rhn-product-name name="MRG Management (for RHEL-5 Server)" label="mrg-management-rhel5-server"/><rhn-product-name name="MRG Messaging Base (for RHEL-4 AS)" label="mrg-messaging-base-rhel4-as"/><rhn-product-name name="MRG Messaging (for RHEL-4 AS)" label="mrg-messaging-rhel4-as"/><rhn-product-name name="MRG Grid (for RHEL-4 AS)" label="mrg-grid-rhel4-as"/><rhn-product-name name="MRG Management (for RHEL-4 AS)" label="mrg-management-rhel4-as"/><rhn-product-name name="MRG Messaging Base (for RHEL-4 ES)" label="mrg-messaging-base-rhel4-es"/><rhn-product-name name="MRG Messaging (for RHEL-4 ES)" label="mrg-messaging-rhel4-es"/><rhn-product-name name="MRG Grid (for RHEL-4 ES)" label="mrg-grid-rhel4-es"/><rhn-product-name name="MRG Management (for RHEL-4 ES)" label="mrg-management-rhel4-es"/><rhn-product-name name="Enterprise Middleware" label="jbmiddleware"/><rhn-product-name name="Desktop Multimedia" label="desktop-multimedia"/><rhn-product-name name="Enterprise Application Platform Feature Pack" label="jbappplatformfp"/><rhn-product-name name="Enterprise Linux Long Life" label="rhel-53-ll"/><rhn-product-name name="Enterprise Web Server" label="jbews"/><rhn-product-name name="Enterprise Virtualization Hypervisor" label="rhev-h"/><rhn-product-name name="XFS" label="xfs"/><rhn-product-name name="MRG Grid Execute Node (for RHEL-5 Server)" label="mrg-grid-execute-rhel5-server"/><rhn-product-name name="MRG Grid Execute Node (for RHEL-4 ES)" label="mrg-grid-execute-rhel4-es"/><rhn-product-name name="SAP" label="sap"/><rhn-product-name name="Software Test Suite" label="sts"/><rhn-product-name name="Web Framework Kit" label="jbwfk"/><rhn-product-name name="Enterprise Virtualization Manager for Desktops" label="rhev-m-d"/><rhn-product-name name="Enterprise Virtualization Hypervisor Development Kit" label="rhev-hdk"/><rhn-product-name name="Enterprise Virtualization Management Agent" label="rhev-agent"/><rhn-product-name name="MRG Grid Execute Node (for RHEL-4 AS)" label="mrg-grid-execute-rhel4-as"/><rhn-product-name name="Developer Studio - Portfolio Edition" label="jbdevstudio-pe"/><rhn-product-name name="Enterprise Virtualization" label="rhev"/><rhn-product-name name="Enterprise Virtualization Manager for Servers" label="rhev-m-s"/></rhn-product-names></rhn-satellite>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.source_packages.xml b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.source_packages.xml
deleted file mode 100644
index 750b892..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.source_packages.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><rhn-satellite generation="2" version="3.4"><rhn-source-packages><rhn-source-package md5sum="0624afebe004f1ce52d33b0c189cb852" payload-size="361828" package-size="365847" package-group="System Environment/Base
-" build-time="1172717909" sigmd5="91b11c6ae7ba148b7fc4ec6511813ef3" source-rpm="tzdata-2007c-1.el5.src.rpm" rpm-version="4.4.2" build-host="js20-bc1-12.build.redhat.com" cookie="js20-bc1-12.build.redhat.com 1172699909" vendor="Red Hat, Inc." last-modified="1173831886" id="rhn-source-package-41217"/><rhn-source-package md5sum="4712968376cd4f0ee96b82ef67d7e15d" payload-size="27824680" package-size="27322182" package-group="Applications/Editors
-" build-time="1173482852" sigmd5="9a839aece47b284a0f1c69ce3cbcbfc4" source-rpm="emacs-21.4-18.1.el5.src.rpm" rpm-version="4.4.2" build-host="js20-bc2-11.build.redhat.com" cookie="js20-bc2-11.build.redhat.com 1173464852" vendor="Red Hat, Inc." last-modified="1173831901" id="rhn-source-package-41218"/><rhn-source-package md5sum="21c113a6005f92e634de2e81e75d8f8b" payload-size="7205452" package-size="6937083" package-group="Development/Libraries
-" build-time="1173389538" sigmd5="4bf862e1aeb5d19882aaa59d1724f6a3" source-rpm="xen-3.0.3-25.0.3.el5.src.rpm" rpm-version="4.4.2" build-host="ia64-1.build.redhat.com" cookie="ia64-1.build.redhat.com 1173371538" vendor="Red Hat, Inc." last-modified="1173848750" id="rhn-source-package-41228"/><rhn-source-package md5sum="88df873d2b167bdfbb313f3a1ec2ea63" payload-size="3122360" package-size="3121118" package-group="Applications/System
-" build-time="1172771408" sigmd5="62bd283dbb91cd120a5af0d42c0ae8ba" source-rpm="gnupg-1.4.5-13.src.rpm" rpm-version="4.4.2" build-host="js20-bc2-9.build.redhat.com" cookie="js20-bc2-9.build.redhat.com 1172753408" vendor="Red Hat, Inc." last-modified="1173831490" id="rhn-source-package-41215"/></rhn-source-packages></rhn-satellite>
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/schema0.xsd b/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/schema0.xsd
deleted file mode 100644
index 0e87f84..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/xsd/schema0.xsd
+++ /dev/null
@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="rhn-satellite" type="rhn-satelliteType"/>
- <xs:complexType name="rhn-packageType">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-package-summary"/>
- <xs:element type="xs:string" name="rhn-package-description"/>
- <xs:element type="xs:string" name="rhn-package-vendor"/>
- <xs:element type="xs:string" name="rhn-package-copyright"/>
- <xs:element type="rhn-package-header-sigType" name="rhn-package-header-sig"/>
- <xs:element type="xs:string" name="rhn-package-header-start"/>
- <xs:element type="xs:string" name="rhn-package-header-end"/>
- <xs:element type="rhn-package-changelogType" name="rhn-package-changelog"/>
- <xs:element type="rhn-package-requiresType" name="rhn-package-requires"/>
- <xs:element type="rhn-package-providesType" name="rhn-package-provides"/>
- <xs:element type="xs:string" name="rhn-package-conflicts"/>
- <xs:element type="rhn-package-obsoletesType" name="rhn-package-obsoletes"/>
- <xs:element type="rhn-package-filesType" name="rhn-package-files"/>
- </xs:sequence>
- <xs:attribute type="xs:string" name="compat" use="optional"/>
- <xs:attribute type="xs:string" name="payload-size" use="optional"/>
- <xs:attribute type="xs:string" name="name" use="optional"/>
- <xs:attribute type="xs:string" name="package-size" use="optional"/>
- <xs:attribute type="xs:string" name="package-group" use="optional"/>
- <xs:attribute type="xs:string" name="build-time" use="optional"/>
- <xs:attribute type="xs:string" name="source-rpm" use="optional"/>
- <xs:attribute type="xs:string" name="md5sum" use="optional"/>
- <xs:attribute type="xs:string" name="payload-format" use="optional"/>
- <xs:attribute type="xs:string" name="package-arch" use="optional"/>
- <xs:attribute type="xs:string" name="rpm-version" use="optional"/>
- <xs:attribute type="xs:string" name="last-modified" use="optional"/>
- <xs:attribute type="xs:string" name="epoch" use="optional"/>
- <xs:attribute type="xs:string" name="version" use="optional"/>
- <xs:attribute type="xs:string" name="cookie" use="optional"/>
- <xs:attribute type="xs:string" name="release" use="optional"/>
- <xs:attribute type="xs:string" name="build-host" use="optional"/>
- <xs:attribute type="xs:string" name="id" use="optional"/>
- </xs:complexType>
- <xs:complexType name="rhn-package-obsoletesType" mixed="true">
- <xs:sequence>
- <xs:element type="rhn-package-obsoletes-entryType" name="rhn-package-obsoletes-entry" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-distsType" mixed="true">
- <xs:sequence>
- <xs:element type="rhn-distType" name="rhn-dist" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-channel-familiesType">
- <xs:sequence>
- <xs:element type="rhn-channel-familyType" name="rhn-channel-family" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-package-provides-entryType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="version" use="optional"/>
- <xs:attribute type="xs:string" name="name" use="optional"/>
- <xs:attribute type="xs:string" name="sense" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-packages-shortType">
- <xs:sequence>
- <xs:element type="rhn-package-shortType" name="rhn-package-short" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-product-namesType">
- <xs:sequence>
- <xs:element type="rhn-product-nameType" name="rhn-product-name" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-package-filesType">
- <xs:sequence>
- <xs:element type="rhn-package-fileType" name="rhn-package-file" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="erratumType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="last-modified" use="optional"/>
- <xs:attribute type="xs:string" name="id" use="optional"/>
- <xs:attribute type="xs:string" name="advisory-name" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-satelliteType">
- <xs:sequence>
- <xs:element type="rhn-channel-familiesType" name="rhn-channel-families" minOccurs="0"/>
- <xs:element type="rhn-channelsType" name="rhn-channels" minOccurs="0"/>
- <xs:element type="rhn-errataType" name="rhn-errata" minOccurs="0"/>
- <xs:element type="rhn-kickstartable-treesType" name="rhn-kickstartable-trees" minOccurs="0"/>
- <xs:element type="rhn-packages-shortType" name="rhn-packages-short" minOccurs="0"/>
- <xs:element type="rhn-packagesType" name="rhn-packages" minOccurs="0"/>
- <xs:element type="rhn-product-namesType" name="rhn-product-names" minOccurs="0"/>
- <xs:element type="rhn-source-packagesType" name="rhn-source-packages" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute type="xs:string" name="generation" use="optional"/>
- <xs:attribute type="xs:string" name="version" use="optional"/>
- </xs:complexType>
- <xs:complexType name="source-packageType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="last-modified" use="optional"/>
- <xs:attribute type="xs:string" name="id" use="optional"/>
- <xs:attribute type="xs:string" name="source-rpm" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-distType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="release" use="optional"/>
- <xs:attribute type="xs:string" name="channel-arch" use="optional"/>
- <xs:attribute type="xs:string" name="os" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-erratum-filesType">
- <xs:sequence>
- <xs:element type="rhn-erratum-fileType" name="rhn-erratum-file" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-product-nameType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="name" use="optional"/>
- <xs:attribute type="xs:string" name="label" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-package-changelogType">
- <xs:sequence>
- <xs:element type="rhn-package-changelog-entryType" name="rhn-package-changelog-entry" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-package-changelog-entryType">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-package-changelog-entry-name"/>
- <xs:element type="xs:string" name="rhn-package-changelog-entry-text"/>
- <xs:element type="xs:string" name="rhn-package-changelog-entry-time"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-package-shortType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="name" use="optional"/>
- <xs:attribute type="xs:string" name="package-size" use="optional"/>
- <xs:attribute type="xs:string" name="md5sum" use="optional"/>
- <xs:attribute type="xs:string" name="package-arch" use="optional"/>
- <xs:attribute type="xs:string" name="last-modified" use="optional"/>
- <xs:attribute type="xs:string" name="epoch" use="optional"/>
- <xs:attribute type="xs:string" name="version" use="optional"/>
- <xs:attribute type="xs:string" name="release" use="optional"/>
- <xs:attribute type="xs:string" name="id" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-package-providesType">
- <xs:sequence>
- <xs:element type="rhn-package-provides-entryType" name="rhn-package-provides-entry" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-package-fileType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="username" use="optional"/>
- <xs:attribute type="xs:string" name="lang" use="optional"/>
- <xs:attribute type="xs:string" name="name" use="optional"/>
- <xs:attribute type="xs:string" name="verifyflags" use="optional"/>
- <xs:attribute type="xs:string" name="rdev" use="optional"/>
- <xs:attribute type="xs:string" name="groupname" use="optional"/>
- <xs:attribute type="xs:string" name="mtime" use="optional"/>
- <xs:attribute type="xs:string" name="file_size" use="optional"/>
- <xs:attribute type="xs:string" name="device" use="optional"/>
- <xs:attribute type="xs:string" name="flags" use="optional"/>
- <xs:attribute type="xs:string" name="md5" use="optional"/>
- <xs:attribute type="xs:string" name="inode" use="optional"/>
- <xs:attribute type="xs:string" name="linkto" use="optional"/>
- <xs:attribute type="xs:string" name="file_mode" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-channel-parent-channelType" mixed="true">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-null" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-source-packageType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="md5sum" use="optional"/>
- <xs:attribute type="xs:string" name="payload-size" use="optional"/>
- <xs:attribute type="xs:string" name="package-size" use="optional"/>
- <xs:attribute type="xs:string" name="package-group" use="optional"/>
- <xs:attribute type="xs:string" name="build-time" use="optional"/>
- <xs:attribute type="xs:string" name="sigmd5" use="optional"/>
- <xs:attribute type="xs:string" name="source-rpm" use="optional"/>
- <xs:attribute type="xs:string" name="rpm-version" use="optional"/>
- <xs:attribute type="xs:string" name="build-host" use="optional"/>
- <xs:attribute type="xs:string" name="cookie" use="optional"/>
- <xs:attribute type="xs:string" name="vendor" use="optional"/>
- <xs:attribute type="xs:string" name="last-modified" use="optional"/>
- <xs:attribute type="xs:string" name="id" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-channel-familyType" mixed="true">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-channel-family-name" minOccurs="0"/>
- <xs:element type="xs:string" name="rhn-channel-family-product-url" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute type="xs:string" name="channel-labels" use="optional"/>
- <xs:attribute type="xs:string" name="id" use="optional"/>
- <xs:attribute type="xs:string" name="label" use="optional"/>
- <xs:attribute type="xs:string" name="max-members" use="optional"/>
- <xs:attribute type="xs:string" name="virt-sub-level-label" use="optional"/>
- <xs:attribute type="xs:string" name="virt-sub-level-name" use="optional"/>
- </xs:complexType>
- <xs:complexType name="rhn-erratumType">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-erratum-advisory-name"/>
- <xs:element type="xs:string" name="rhn-erratum-advisory-rel"/>
- <xs:element type="xs:string" name="rhn-erratum-advisory-type"/>
- <xs:element type="xs:string" name="rhn-erratum-product"/>
- <xs:element type="xs:string" name="rhn-erratum-description"/>
- <xs:element type="xs:string" name="rhn-erratum-synopsis"/>
- <xs:element type="xs:string" name="rhn-erratum-topic"/>
- <xs:element type="xs:string" name="rhn-erratum-solution"/>
- <xs:element type="xs:string" name="rhn-erratum-refers-to"/>
- <xs:element type="xs:string" name="rhn-erratum-notes"/>
- <xs:element type="xs:string" name="rhn-erratum-issue-date"/>
- <xs:element type="xs:string" name="rhn-erratum-update-date"/>
- <xs:element type="xs:string" name="rhn-erratum-last-modified"/>
- <xs:element type="rhn-erratum-keywordsType" name="rhn-erratum-keywords"/>
- <xs:element type="rhn-erratum-bugsType" name="rhn-erratum-bugs"/>
- <xs:element type="rhn-erratum-filesType" name="rhn-erratum-files"/>
- </xs:sequence>
- <xs:attribute type="xs:string" name="channels" use="optional"/>
- <xs:attribute type="xs:string" name="advisory" use="optional"/>
- <xs:attribute type="xs:string" name="packages" use="optional"/>
- <xs:attribute type="xs:string" name="id" use="optional"/>
- <xs:attribute type="xs:string" name="cve-names" use="optional"/>
- </xs:complexType>
- <xs:complexType name="rhn-kickstart-fileType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="file-size" use="optional"/>
- <xs:attribute type="xs:string" name="md5sum" use="optional"/>
- <xs:attribute type="xs:string" name="relative-path" use="optional"/>
- <xs:attribute type="xs:string" name="last-modified" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-packagesType">
- <xs:sequence>
- <xs:element type="rhn-packageType" name="rhn-package" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-package-obsoletes-entryType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="version" use="optional"/>
- <xs:attribute type="xs:string" name="name" use="optional"/>
- <xs:attribute type="xs:string" name="sense" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-package-header-sigType">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-null"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-erratum-bugsType">
- <xs:sequence>
- <xs:element type="rhn-erratum-bugType" name="rhn-erratum-bug" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-source-packagesType">
- <xs:sequence>
- <xs:element type="rhn-source-packageType" name="rhn-source-package" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-kickstart-filesType">
- <xs:sequence>
- <xs:element type="rhn-kickstart-fileType" name="rhn-kickstart-file" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-errataType">
- <xs:sequence>
- <xs:element type="rhn-erratumType" name="rhn-erratum" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-channel-descriptionType">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-null" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-kickstartable-treeType">
- <xs:sequence>
- <xs:element type="rhn-kickstart-filesType" name="rhn-kickstart-files"/>
- </xs:sequence>
- <xs:attribute type="xs:string" name="kstree-type-name" use="optional"/>
- <xs:attribute type="xs:string" name="boot-image" use="optional"/>
- <xs:attribute type="xs:string" name="kstree-type-label" use="optional"/>
- <xs:attribute type="xs:string" name="label" use="optional"/>
- <xs:attribute type="xs:string" name="last-modified" use="optional"/>
- <xs:attribute type="xs:string" name="install-type-name" use="optional"/>
- <xs:attribute type="xs:string" name="base-path" use="optional"/>
- <xs:attribute type="xs:string" name="install-type-label" use="optional"/>
- <xs:attribute type="xs:string" name="channel" use="optional"/>
- </xs:complexType>
- <xs:complexType name="rhn-channel-errataType">
- <xs:sequence>
- <xs:element type="erratumType" name="erratum" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-kickstartable-treesType">
- <xs:sequence>
- <xs:element type="rhn-kickstartable-treeType" name="rhn-kickstartable-tree" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-erratum-bugType">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-erratum-bug-id"/>
- <xs:element type="xs:string" name="rhn-erratum-bug-summary"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-channelsType">
- <xs:sequence>
- <xs:element type="rhn-channelType" name="rhn-channel" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-channelType">
- <xs:sequence>
- <xs:element type="rhn-channel-parent-channelType" name="rhn-channel-parent-channel"/>
- <xs:element type="xs:string" name="rhn-channel-basedir"/>
- <xs:element type="xs:string" name="rhn-channel-name"/>
- <xs:element type="xs:string" name="rhn-channel-summary"/>
- <xs:element name="rhn-channel-description">
- <xs:complexType mixed="true">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-null" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element type="xs:string" name="rhn-channel-gpg-key-url"/>
- <xs:element type="xs:string" name="rhn-channel-receiving-updates"/>
- <xs:element type="xs:string" name="rhn-channel-last-modified"/>
- <xs:element type="xs:string" name="rhn-channel-product-name"/>
- <xs:element type="xs:string" name="rhn-channel-product-version"/>
- <xs:element type="xs:string" name="rhn-channel-product-beta"/>
- <xs:element type="rhn-channel-familiesType" name="rhn-channel-families"/>
- <xs:element type="rhn-distsType" name="rhn-dists"/>
- <xs:element type="source-packagesType" name="source-packages"/>
- <xs:element type="rhn-channel-errataType" name="rhn-channel-errata"/>
- <xs:element type="xs:string" name="rhn-release"/>
- </xs:sequence>
- <xs:attribute type="xs:string" name="channel-arch" use="optional"/>
- <xs:attribute type="xs:string" name="has-comps" use="optional"/>
- <xs:attribute type="xs:string" name="channel-errata" use="optional"/>
- <xs:attribute type="xs:string" name="kickstartable-trees" use="optional"/>
- <xs:attribute type="xs:string" name="label" use="optional"/>
- <xs:attribute type="xs:string" name="packages" use="optional"/>
- <xs:attribute type="xs:string" name="channel-id" use="optional"/>
- </xs:complexType>
- <xs:complexType name="rhn-erratum-keywordsType" mixed="true">
- <xs:sequence>
- <xs:element type="xs:string" name="rhn-erratum-keyword" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="rhn-package-requires-entryType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="version" use="optional"/>
- <xs:attribute type="xs:string" name="name" use="optional"/>
- <xs:attribute type="xs:string" name="sense" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-erratum-fileType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="channels" use="optional"/>
- <xs:attribute type="xs:string" name="md5sum" use="optional"/>
- <xs:attribute type="xs:string" name="type" use="optional"/>
- <xs:attribute type="xs:string" name="source-package" use="optional"/>
- <xs:attribute type="xs:string" name="filename" use="optional"/>
- <xs:attribute type="xs:string" name="package" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="rhn-package-requiresType">
- <xs:sequence>
- <xs:element type="rhn-package-requires-entryType" name="rhn-package-requires-entry" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="source-packagesType">
- <xs:sequence>
- <xs:element type="source-packageType" name="source-package" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/BaseRHNTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/BaseRHNTest.java
deleted file mode 100644
index 7939df7..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/BaseRHNTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import junit.framework.TestCase;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.ApacheXmlRpcExecutor;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.MockRhnHttpURLConnection;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.MockRhnXmlRpcExecutor;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.RhnHttpURLConnectionFactory;
-
-public class BaseRHNTest extends TestCase {
-
- protected static final String TEST_SERVER_URL = "http://satellite.rhn.redhat.com/rpc/api";
-
- // protected static final String TEST_SYSTEM_ID = RHNConstants.DEFAULT_SYSTEM_ID;
-
- public void setUp() throws Exception {
- super.setUp();
- /* OVERRIDE THE XMLRPC CLIENT WITH A MOCK OBJECT */
- System.setProperty(ApacheXmlRpcExecutor.class.getName(), MockRhnXmlRpcExecutor.class.getName());
- System.setProperty(RhnHttpURLConnectionFactory.RHN_MOCK_HTTP_URL_CONNECTION, MockRhnHttpURLConnection.class
- .getName());
-
- }
-
- public static String ENT_CERT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<rhn-cert version=\"0.1\">"
- + " <rhn-cert-field name=\"product\">RHN-SATELLITE-001</rhn-cert-field>"
- + " <rhn-cert-field name=\"owner\">Test Lab - Base Organization</rhn-cert-field>"
- + " <rhn-cert-field name=\"issued\">2009-08-17 00:00:00</rhn-cert-field>"
- + " <rhn-cert-field name=\"expires\">2010-08-17 00:00:00</rhn-cert-field>"
- + " <rhn-cert-field name=\"slots\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"monitoring-slots\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"provisioning-slots\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"virtualization_host\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"virtualization_host_platform\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"channel-families\" quantity=\"10\" family=\"rhel-server\"/>"
- + " <rhn-cert-field name=\"channel-families\" quantity=\"10\" family=\"rhel-server-vt\"/>"
- + " <rhn-cert-field name=\"channel-families\" quantity=\"10\" family=\"rhn-tools\"/>"
- + " <rhn-cert-field name=\"satellite-version\">5.3</rhn-cert-field>"
- + " <rhn-cert-field name=\"generation\">2</rhn-cert-field>" + " <rhn-cert-signature>"
- + "-----BEGIN PGP SIGNATURE-----" + "-----END PGP SIGNATURE-----" + "</rhn-cert-signature>" + "</rhn-cert>";
-
- public static String SYSTEM_ID = "<?xml version=\"1.0\"?>" + "<params>\n" + "<param>\n" + "<value><struct>\n"
- + "<member>\n" + "<name>username</name>\n" + "<value><string>unknown</string></value>\n" + "</member>\n"
- + "<member>\n" + "<name>operating_system</name>\n" + "<value><string>redhat-release</string></value>\n"
- + "</member>\n" + "<member>\n" + "<name>description</name>\n"
- + "<value><string>Initial Registration Parameters:\n" + "OS: redhat-release\n" + "Release: 5Server\n"
- + "CPU Arch: athlon-redhat-linux</string></value>\n" + "</member>\n" + "<member>\n" + "<name>checksum</name>\n"
- + "<value><string>b57e3b8f0ffe10807b041905197068a7</string></value>\n" + "</member>\n" + "<member>\n"
- + "<name>profile_name</name>\n" + "<value><string>unknown</string></value>\n" + "</member>\n" + "<member>\n"
- + "<name>system_id</name>\n" + "<value><string>ID-1234</string></value>\n" + "</member>\n" + "<member>\n"
- + "<name>architecture</name>\n" + "<value><string>athlon-redhat-linux</string></value>\n" + "</member>\n"
- + "<member>\n" + "<name>os_release</name>\n" + "<value><string>5Server</string></value>\n" + "</member>\n"
- + "<member>\n" + "<name>fields</name>\n" + "<value><array><data>\n"
- + "<value><string>system_id</string></value>\n" + "<value><string>os_release</string></value>\n"
- + "<value><string>operating_system</string></value>\n" + "<value><string>architecture</string></value>\n"
- + "<value><string>username</string></value>\n" + "<value><string>type</string></value>\n"
- + "</data></array></value>\n" + "</member>\n" + "<member>\n" + "<name>type</name>\n"
- + "<value><string>REAL</string></value>\n" + "</member>\n" + "</struct></value>\n" + "</param>\n"
- + "</params>\n";
-
- public static String SYSTEM_ID_BAD = "<?xml version=\"1.0\"?>" + "<params>\n" + "<param>\n" + "<value><struct>\n"
- + "<member>\n" + "<name>username</name>\n" + "<value><string>unknown</string></value>\n" + "</member>\n"
- + "<member>\n" + "<name>operating_system</name>\n" + "<value><string>redhat-release</string></value>\n"
- + "</member>\n" + "<member>\n" + "<name>description</name>\n"
- + "<value><string>Initial Registration Parameters:\n" + "OS: redhat-release\n" + "Release: 5Server\n"
- + "CPU Arch: athlon-redhat-linux</string></value>\n" + "</member>\n" + "<member>\n" + "<name>checksum</name>\n"
- + "<value><string>b57e3b8f0ffe10807b041905197068a7</string></value>\n" + "</member>\n" + "<member>\n"
- + "<name>profile_name</name>\n" + "<value><string>unknown</string></value>\n" + "</member>\n" + "<member>\n"
- + "<name>system_id</name>\n" + "<value><string>ID-0000000000</string></value>\n" + "</member>\n" + "<member>\n"
- + "<name>architecture</name>\n" + "<value><string>athlon-redhat-linux</string></value>\n" + "</member>\n"
- + "<member>\n" + "<name>os_release</name>\n" + "<value><string>5Server</string></value>\n" + "</member>\n"
- + "<member>\n" + "<name>fields</name>\n" + "<value><array><data>\n"
- + "<value><string>system_id</string></value>\n" + "<value><string>os_release</string></value>\n"
- + "<value><string>operating_system</string></value>\n" + "<value><string>architecture</string></value>\n"
- + "<value><string>username</string></value>\n" + "<value><string>type</string></value>\n"
- + "</data></array></value>\n" + "</member>\n" + "<member>\n" + "<name>type</name>\n"
- + "<value><string>REAL</string></value>\n" + "</member>\n" + "</struct></value>\n" + "</param>\n"
- + "</params>\n";
-
- /**
- * Adding this empty test method to make command line tests execute from maven.
- * The lack of a test method in this class, was causing an exception to be thrown
- * @throws Exception
- */
- public void testDoNothing() throws Exception {
- assertTrue(true);
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXMLTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXMLTest.java
deleted file mode 100644
index e979545..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXMLTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.io.ByteArrayInputStream;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.lang.StringUtils;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageProvidesEntryType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageProvidesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageRequiresEntryType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageRequiresType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageType;
-
-/**
- * @author John Matthews
- */
-public class PrimaryXMLTest extends TestCase {
- protected RhnPackageType getTestRhnPackage() {
- RhnPackageType pkg = new RhnPackageType();
- pkg.setName("gnome-user-docs");
- pkg.setPackageArch("noarch");
- pkg.setVersion("2.16.0");
- pkg.setRelease("2.6fc6");
- pkg.setEpoch("0");
- pkg.setMd5Sum("4e7d379301407b4c79f211596b802a13");
- pkg.setRhnPackageSummary("GNOME User Documentation");
- pkg.setRhnPackageDescription("This package contains end user documentation for the GNOME desktop environment.");
- pkg.setLastModified("1157750823");
- pkg.setBuildTime("1157750823");
- pkg.setPackageSize("6549456");
- pkg.setPayloadSize("11858600");
- pkg.setRhnPackageCopyright("FDL");
- pkg.setRhnPackageVendor("Red Hat, Inc.");
- pkg.setPackageGroup("Documentation");
- pkg.setBuildHost("altix2.build.redhat.com");
- pkg.setSourceRpm("gnome-user-docs-2.16.0-2.fc6.src.rpm");
- pkg.setRhnPackageHeaderStart("440");
- pkg.setRhnPackageHeaderEnd("97656");
-
- RhnPackageProvidesType provides_type = new RhnPackageProvidesType();
- List<RhnPackageProvidesEntryType> provides = provides_type.getRhnPackageProvidesEntry();
- RhnPackageProvidesEntryType prov = new RhnPackageProvidesEntryType();
- prov.setName("gnome-user-docs");
- prov.setSense("8");
- prov.setVersion("2.16.0-2.fc6");
- provides.add(prov);
- pkg.setRhnPackageProvides(provides_type);
-
- RhnPackageRequiresType requires_type = new RhnPackageRequiresType();
- List<RhnPackageRequiresEntryType> requires = requires_type.getRhnPackageRequiresEntry();
- RhnPackageRequiresEntryType req = new RhnPackageRequiresEntryType();
- req.setName("rpmlib(CompressedFileNames)");
- req.setSense("10");
- req.setVersion("2:3.0.4-1");
- requires.add(req);
- pkg.setRhnPackageRequires(requires_type);
-
- pkg.setRhnPackageConflicts("entry1, entry2");
- return pkg;
- }
-
- public void testGetFlags() {
- String value = PrimaryXML.getFlags("8");
- assert StringUtils.equals(value, "EQ");
-
- value = PrimaryXML.getFlags("2");
- assert StringUtils.equals(value, "LT");
-
- value = PrimaryXML.getFlags("4");
- assert StringUtils.equals(value, "GT");
-
- value = PrimaryXML.getFlags("10");
- assert StringUtils.equals(value, "LE");
-
- value = PrimaryXML.getFlags("12");
- assert StringUtils.equals(value, "GE");
-
- }
-
- public void testGetEpoch() {
- String value = PrimaryXML.getEpoch("4:98.9-4");
- assert StringUtils.equals(value, "4");
-
- value = PrimaryXML.getEpoch("98.9-4");
- assert StringUtils.equals(value, "0");
-
- value = PrimaryXML.getEpoch("");
- assert StringUtils.equals(value, "0");
-
- value = PrimaryXML.getEpoch("98.9-45:3.f");
- assert StringUtils.equals(value, "0");
- }
-
- public void testGetVersion() {
- String value = PrimaryXML.getVersion("4:98.9-4");
- assert StringUtils.equals(value, "98.9");
-
- value = PrimaryXML.getVersion("98.9-4");
- assert StringUtils.equals(value, "98.9");
-
- value = PrimaryXML.getVersion("");
- assert StringUtils.equals(value, "");
-
- }
-
- public void testGetRelease() {
- String value = PrimaryXML.getRelease("4:98.9-4");
- assert StringUtils.equals(value, "4");
-
- value = PrimaryXML.getRelease("98.9-4");
- assert StringUtils.equals(value, "4");
-
- value = PrimaryXML.getRelease("");
- assert StringUtils.equals(value, "");
-
- value = PrimaryXML.getRelease("98.9");
- assert StringUtils.equals(value, "");
- }
-
- public void testCreatePackageXML() throws Exception {
- RhnPackageType pkg = getTestRhnPackage();
- String xml = PrimaryXML.createPackageXML(pkg);
- System.out.println(xml);
-
- ByteArrayInputStream inStream = new ByteArrayInputStream(xml.getBytes());
- SAXBuilder builder = new SAXBuilder();
- Document doc = builder.build(inStream);
- Element root = doc.getRootElement();
- assert StringUtils.equals(root.getName(), "package");
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivatorTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivatorTest.java
deleted file mode 100644
index 762018d..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivatorTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-public class RHNActivatorTest extends BaseRHNTest {
-
- private static final String TEST_SERVER_URL = "http://satellite.rhn.redhat.com/rpc/api";
-
- private RHNActivator rhnObject;
-
- public void setUp() throws Exception {
- super.setUp();
- rhnObject = new RHNActivator(SYSTEM_ID, ENT_CERT, TEST_SERVER_URL);
-
- assertNotNull(rhnObject);
-
- }
-
- public final void testActivate() throws Exception {
- boolean success = true;
- try {
- rhnObject.processActivation();
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertEquals(true, success);
- }
-
- public final void testDeActivate() throws Exception {
- boolean success = true;
- try {
- rhnObject.processDeActivation();
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertEquals(true, success);
- }
-
- private static String ENT_CERT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<rhn-cert version=\"0.1\">"
- + " <rhn-cert-field name=\"product\">RHN-SATELLITE-001</rhn-cert-field>"
- + " <rhn-cert-field name=\"owner\">Test Lab - Base Organization</rhn-cert-field>"
- + " <rhn-cert-field name=\"issued\">2009-08-17 00:00:00</rhn-cert-field>"
- + " <rhn-cert-field name=\"expires\">2010-08-17 00:00:00</rhn-cert-field>"
- + " <rhn-cert-field name=\"slots\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"monitoring-slots\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"provisioning-slots\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"virtualization_host\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"virtualization_host_platform\">10</rhn-cert-field>"
- + " <rhn-cert-field name=\"channel-families\" quantity=\"10\" family=\"rhel-server\"/>"
- + " <rhn-cert-field name=\"channel-families\" quantity=\"10\" family=\"rhel-server-vt\"/>"
- + " <rhn-cert-field name=\"channel-families\" quantity=\"10\" family=\"rhn-tools\"/>"
- + " <rhn-cert-field name=\"satellite-version\">5.3</rhn-cert-field>"
- + " <rhn-cert-field name=\"generation\">2</rhn-cert-field>" + " <rhn-cert-signature>"
- + "-----BEGIN PGP SIGNATURE-----" + "-----END PGP SIGNATURE-----" + "</rhn-cert-signature>" + "</rhn-cert>";
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelperTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelperTest.java
deleted file mode 100644
index a12aa0b..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelperTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-
-import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.ApacheXmlRpcExecutor;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.MockRhnHttpURLConnection;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.MockRhnXmlRpcExecutor;
-import org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.RhnHttpURLConnectionFactory;
-
-/**
- * RHNHelper Tester.
- *
- * @author pkilambi
- */
-public class RHNHelperTest extends BaseRHNTest {
-
- private static final String REPO_LABEL = "rhel-i386-server-vt-5";
-
- private RHNHelper helper;
-
- public void setUp() throws Exception {
- super.setUp();
- System.setProperty(ApacheXmlRpcExecutor.class.getName(), MockRhnXmlRpcExecutor.class.getName());
- System.setProperty(RhnHttpURLConnectionFactory.RHN_MOCK_HTTP_URL_CONNECTION, MockRhnHttpURLConnection.class
- .getName());
- helper = new RHNHelper(TEST_SERVER_URL, SYSTEM_ID);
- }
-
- public void testGetPackageDetails() throws Exception {
- boolean success;
-
- try {
- List pids = helper.getChannelPackages(REPO_LABEL);
- List<ContentProviderPackageDetails> pkgdetails = helper.getPackageDetails(pids, REPO_LABEL);
- for (ContentProviderPackageDetails pkg : pkgdetails) {
- assertFalse(StringUtils.isBlank(pkg.getDisplayName()));
- assertFalse(StringUtils.isBlank(pkg.getArchitectureName()));
- assertFalse(StringUtils.isBlank(pkg.getPackageTypeName()));
- assertFalse(StringUtils.isBlank(pkg.getName()));
- assertFalse(StringUtils.isBlank(pkg.getFileName()));
- assertFalse(StringUtils.isBlank(pkg.getLongDescription()));
- assertFalse(StringUtils.isBlank(pkg.getMD5()));
-
- }
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
-
- assertTrue(success);
- }
-
- public void testGetChannelPackages() throws Exception {
- boolean success = true;
- try {
- List<String> pkgIds = helper.getChannelPackages(REPO_LABEL);
- assertTrue(pkgIds.size() > 0);
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
-
- assertTrue(success);
- }
-
- public void testGetSyncableKickstartTrees() throws Exception {
- boolean success = true;
- try {
- List<String> ksLabels = helper.getSyncableKickstartLabels(REPO_LABEL);
- assertTrue(ksLabels.size() > 0);
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProviderTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProviderTest.java
deleted file mode 100644
index bb67e61..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProviderTest.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.util.MessageDigestGenerator;
-import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails;
-import org.rhq.enterprise.server.plugin.pc.content.DistributionDetails;
-import org.rhq.enterprise.server.plugin.pc.content.DistributionFileDetails;
-import org.rhq.enterprise.server.plugin.pc.content.DistributionSyncReport;
-import org.rhq.enterprise.server.plugin.pc.content.PackageSyncReport;
-
-/**
- * @author John Matthews
- */
-public class RHNProviderTest {
- // By Default the tests in this class will be skipped. This class is intended as a simple integration test
- // desire is for it to only run against RHN Hosted, other tests in this package will execute against a mocked RHN
- // connection. This test is a means for us to manually check that Plugin->RHN Hosted communication is behaving as
- // we expect.
- //
- // If you want to run these tests, then set the java property "RunRHNProviderTest"
- //
- private final Log log = LogFactory.getLog(RHNProviderTest.class);
-
- String PROP_NAME_TO_TRIGGER_TEST = "RunRHNProviderTest";
- String PROP_NAME_TO_CHECK_MD5SUMS = "RunRHNMD5SumTests";
- String rhnURL = "http://satellite.rhn.redhat.com";
- String certLoc = "./entitlement-cert.xml";
- boolean isTesting = false;
- boolean isMD5SumTesting = false;
-
- RHNProvider provider = new RHNProvider();
-
- @BeforeTest
- public void setUp() throws Exception {
- String value = System.getProperty(PROP_NAME_TO_TRIGGER_TEST);
- if (!StringUtils.isBlank(value)) {
- isTesting = Boolean.parseBoolean(value);
- }
- value = System.getProperty(PROP_NAME_TO_CHECK_MD5SUMS);
- if (!StringUtils.isBlank(value)) {
- isMD5SumTesting = Boolean.parseBoolean(value);
- }
- }
-
- @AfterTest
- public void tearDown() {
- }
-
- public Configuration getConfiguration() {
- String certData = "";
- try {
- certData = FileUtils.readFileToString(new File(certLoc));
- } catch (Exception e) {
- e.printStackTrace();
- assert false;
- }
- return getConfiguration(rhnURL, certData);
- }
-
- public Configuration getConfiguration(String location, String certData) {
- Configuration config = new Configuration();
- PropertySimple locProp = new PropertySimple();
- locProp.setName("location");
- locProp.setStringValue(location);
- config.put(locProp);
- PropertySimple certProp = new PropertySimple();
- certProp.setName("certificate");
- certProp.setStringValue(certData);
- config.put(certProp);
- return config;
- }
-
- @Test
- public void testGetInputStream() {
- if (!isTesting) {
- System.out
- .println("Intentionally skipping test, since property is missing: -D" + PROP_NAME_TO_TRIGGER_TEST);
- return;
- }
-
- System.out.println("testGetInputStream invoked");
- //
- // systemid used for this test needs to be entitled so the channel/package selected
- //
- String cName = "rhel-x86_64-server-5";
- String rName = "openhpi-2.4.1-6.el5.1.x86_64.rpm";
- RHNProvider provider = new RHNProvider();
- Configuration config = getConfiguration();
- try {
- provider.initialize(config);
- String loc = RHNHelper.constructPackageUrl(rhnURL, cName, rName);
- InputStream in = provider.getInputStream(loc);
- assert (in != null);
- } catch (Exception e) {
- e.printStackTrace();
- assert false;
- }
- System.out.println("testGetInputStream finished.");
- provider.shutdown();
- }
-
- @Test
- public void testSynchronizePackages() {
- if (!isTesting) {
- System.out
- .println("Intentionally skipping test, since property is missing: -D" + PROP_NAME_TO_TRIGGER_TEST);
- return;
- }
-
- String channelName = "rhn-tools-rhel-i386-server-5";
- //String channelName = "rhel-i386-server-5";
- Configuration config = getConfiguration();
- RHNProvider provider = new RHNProvider();
-
- log.info("testSynchronizePackages invoked");
- PackageSyncReport report = new PackageSyncReport();
- List<ContentProviderPackageDetails> existingPackages = new ArrayList<ContentProviderPackageDetails>();
- try {
- provider.initialize(config);
- provider.synchronizePackages(channelName, report, existingPackages);
- Set<ContentProviderPackageDetails> newPkgs = report.getNewPackages();
- log.info(newPkgs.size() + " packages are noted as 'NEW'");
- assert (newPkgs.size() > 0);
- if (isMD5SumTesting) {
- for (ContentProviderPackageDetails pkg : newPkgs) {
- String url = RHNHelper.constructPackageUrl(rhnURL, channelName, pkg.getFileName());
- log.info("Attempting fetch of rpm: " + pkg.getFileName() + " size = " + pkg.getFileSize());
- log.info("URL to use is: " + url);
- InputStream in = provider.getInputStream(url);
- assert (in != null);
- String actualMd5sum = MessageDigestGenerator.getDigestString(in);
- String expectedMd5sum = pkg.getMD5();
- log.info("MD5SUMs actual = " + actualMd5sum + ", expected = " + expectedMd5sum);
- assert (StringUtils.equalsIgnoreCase(actualMd5sum, expectedMd5sum));
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- assert false;
- }
- log.info("testSynchronizePackages() we have package metadata for " + report.getNewPackages().size()
- + " new packages");
- System.out.println("testSynchronizePackages finished.");
- }
-
- @Test
- public void testSynchronizeDistribution() {
- if (true) {
- return;
- }
- if (!isTesting) {
- System.out
- .println("Intentionally skipping test, since property is missing: -D" + PROP_NAME_TO_TRIGGER_TEST);
- return;
- }
- System.out.println("testSynchronizeDistribution invoked");
- String channelName = "rhel-x86_64-server-5";
- int dummyValueContentSourceId = -1;
- DistributionSyncReport report = new DistributionSyncReport(dummyValueContentSourceId);
- List<DistributionDetails> existingDistro = new ArrayList<DistributionDetails>();
- RHNProvider provider = new RHNProvider();
- Configuration config = getConfiguration();
- try {
- provider.initialize(config);
- provider.synchronizeDistribution(channelName, report, existingDistro);
- } catch (Exception e) {
- e.printStackTrace();
- assert false;
- }
- List<DistributionDetails> details = report.getDistributions();
- System.out.println("RHNProviderTest details.size() = " + details.size());
- for (DistributionDetails d : details) {
- System.out.println("Label = " + d.getLabel());
- System.out.println("Path = " + d.getDistributionPath());
- List<DistributionFileDetails> files = d.getFiles();
- for (DistributionFileDetails f : files) {
- System.out.println(d.getLabel() + ", " + d.getDistributionPath() + ", " + f.getRelativeFilename()
- + " , " + f.getMd5sum() + ", lastModified = " + f.getLastModified() + ", fileSize = "
- + f.getFileSize());
- try {
- String url = RHNHelper.constructKickstartFileUrl(rhnURL, channelName, d.getLabel(), f
- .getRelativeFilename());
- InputStream in = provider.getInputStream(url);
- assert (in != null);
- if (isMD5SumTesting) {
- String actualMd5sum = MessageDigestGenerator.getDigestString(in);
- String expectedMd5sum = f.getMd5sum();
- System.out.println("MD5SUMs actual = " + actualMd5sum + ", expected = " + expectedMd5sum);
- assert (StringUtils.equalsIgnoreCase(actualMd5sum, expectedMd5sum));
- }
- } catch (Exception e) {
- e.printStackTrace();
- assert false;
- }
-
- }
- }
- System.out.println("testSynchronizeDistribution finished.");
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReaderTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReaderTest.java
deleted file mode 100644
index 8316c3d..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReaderTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.security.KeyStore;
-import java.io.FileInputStream;
-import java.io.PrintStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import java.security.cert.X509Certificate;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLServerSocketFactory;
-
-public class RHNSSLCertReaderTest
-{
-
- String cert1Data = RHNSSLCertReader.BEGIN_CERT + "blahblahblah12345\nblahblah\nblah\n" +
- RHNSSLCertReader.END_CERT;
- String cert2Data = RHNSSLCertReader.BEGIN_CERT + "blahblahblah98765434\nblahblah2\nblah3\n" +
- RHNSSLCertReader.END_CERT;
-
- String dummyData = "Dummy Data\n" +
- "Dummy Data 1\n" +
- cert1Data +
- "Dummy Data 2\n" +
- cert2Data;
-
- String sampleSSLCert = RHNSSLCertReader.BEGIN_CERT +
- "MIIDODCCAvWgAwIBAgIESuiB4TALBgcqhkjOOAQDBQAwfzELMAkGA1UEBhMCTkMxDjAMBgNVBAgT\n" +
- "BVN0YXRlMQ0wCwYDVQQHEwRDaXR5MRkwFwYDVQQKExBPcmdhbml6YXRpb25OYW1lMRkwFwYDVQQL\n" +
- "ExBPcmdhbml6YXRpb25Vbml0MRswGQYDVQQDExJGaXJzdE5hbWUgTGFzdE5hbWUwHhcNMDkxMDI4\n" +
- "MTczOTQ1WhcNMTAwMTI2MTczOTQ1WjB/MQswCQYDVQQGEwJOQzEOMAwGA1UECBMFU3RhdGUxDTAL\n" +
- "BgNVBAcTBENpdHkxGTAXBgNVBAoTEE9yZ2FuaXphdGlvbk5hbWUxGTAXBgNVBAsTEE9yZ2FuaXph\n" +
- "dGlvblVuaXQxGzAZBgNVBAMTEkZpcnN0TmFtZSBMYXN0TmFtZTCCAbcwggEsBgcqhkjOOAQBMIIB\n" +
- "HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV\n" +
- "bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR\n" +
- "MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr\n" +
- "XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL\n" +
- "VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+\n" +
- "z0kqA4GEAAKBgG+MiW74SeEG8J79c6gzjQZ6ViFvA4oEYIMUNReZ6V3EX5Z5s99qJPIdXb/hICov\n" +
- "T05z3Ug89ARkCsTWEEFwLx+VjnP2qejeTR8VUkkYNujL2ZFHJk7TBfTrpuatUbEINI1drdV6Br0/\n" +
- "iI7wyP6VW/B2HhvW1dQy1Bq7+GuCNg9DMAsGByqGSM44BAMFAAMwADAtAhQA1HJVck/E2v6va473\n" +
- "V0UxRsKp3QIVAIqj+Do5FKdXxTpQETJleh6Y/uSi\n" +
- RHNSSLCertReader.END_CERT;
-
- @Test
- public void testGetCertText() throws Exception {
- List<String> certs = RHNSSLCertReader.getCertText(dummyData);
- assert certs.size() == 2;
- String parsedCert1 = certs.get(0);
- String parsedCert2 = certs.get(1);
- assert cert1Data.compareTo(parsedCert1) == 0;
- assert cert2Data.compareTo(parsedCert2) == 0;
- }
-
- @Test
- public void testGetSSLCertificates() throws Exception {
- List<X509Certificate> certs = RHNSSLCertReader.getSSLCertificates(sampleSSLCert);
- System.err.println("cert = " + certs.get(0));
- assert certs.size() == 1;
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactoryTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactoryTest.java
deleted file mode 100644
index dc17f15..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactoryTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.plugins.rhnhosted;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.testng.annotations.Test;
-
-public class RHNSSLSocketFactoryTest {
- String goodUrl = "https://satellite.rhn.redhat.com/rpc/api";
- String badUrl = "https://bankofamerica.com";
- String certPath = RHNConstants.DEFAULT_SSL_CERT_PATH;
-
- protected boolean checkCertPathExists() {
- File f = new File(RHNConstants.DEFAULT_SSL_CERT_PATH);
- if (f.exists() && f.canRead()) {
- return true;
- }
- return false;
- }
-
- @Test
- public void testBasicConnectionNoCert() {
- try {
- if (!checkCertPathExists()) {
- System.out.println("Skipping testBasicConnectionNoCert() since can't find the SSL cert at: "
- + RHNConstants.DEFAULT_SSL_CERT_PATH);
- return;
- }
- HttpsURLConnection conn = (HttpsURLConnection) new URL(goodUrl).openConnection();
- conn.connect();
- // On a clean system, this will not execute, a SSLHandshakeException will be thrown
- // if the below line does execute, then it means that the keystore already has the
- // certs loaded.
- System.out.println("Looks like ssl cert is already loaded into keystore.");
- } catch (SSLHandshakeException e) {
- System.out.println("Caught SSLHandshake exception from connecting with no cert info as expected.");
- } catch (Exception e) {
- e.printStackTrace();
- assert false;
- }
- }
-
- @Test
- public void testGetSSLSocketFactoryFromFile() {
- try {
- if (!checkCertPathExists()) {
- System.out.println("Skipping testBasicConnectionNoCert() since can't find the SSL cert at: "
- + RHNConstants.DEFAULT_SSL_CERT_PATH);
- return;
- }
- SSLSocketFactory sslf = RHNSSLSocketFactory.getSSLSocketFactory(certPath);
- HttpsURLConnection conn = (HttpsURLConnection) new URL(goodUrl).openConnection();
- conn.setSSLSocketFactory(sslf);
- conn.connect();
- System.out.println("Successful Connection");
- } catch (Exception e) {
- e.printStackTrace();
- assert false;
- }
- }
-
- @Test
- public void testGetSSLSocketFactoryFromFileBadURL() {
- try {
- if (!checkCertPathExists()) {
- System.out.println("Skipping testBasicConnectionNoCert() since can't find the SSL cert at: "
- + RHNConstants.DEFAULT_SSL_CERT_PATH);
- return;
- }
- SSLSocketFactory sslf = RHNSSLSocketFactory.getSSLSocketFactory(certPath);
- HttpsURLConnection conn = (HttpsURLConnection) new URL(badUrl).openConnection();
- conn.setSSLSocketFactory(sslf);
- conn.connect();
- assert false;
- } catch (SSLHandshakeException e) {
- System.out.println("Caught cert validation exception as we wanted.");
- } catch (Exception e) {
- e.printStackTrace();
- assert false;
- }
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/BasicRHNTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/BasicRHNTest.java
deleted file mode 100644
index 7ad8701..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/BasicRHNTest.java
+++ /dev/null
@@ -1,627 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBElement;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelFamilyType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnErratumType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartableTreeType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageShortType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnProductNameType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnSatelliteType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnSourcePackageType;
-
-/**
- * Unit test for checking xmlrpc communication with RHN hosted
- */
-public class BasicRHNTest extends TestCase {
- public String systemIdPath = "./src/test/resources/systemid";
- public String badSystemIdPath = "./src/test/resources/systemid-BAD-ID";
-
- protected String serverUrl = "http://satellite.rhn.redhat.com";
- protected boolean debugDumpFile = true;
-
- protected Map getRequestProperties() {
- Map reqProps = new HashMap();
- reqProps.put("X-RHN-Satellite-XML-Dump-Version", "3.3");
- return reqProps;
- }
-
- protected String getSystemId() throws Exception {
- return getSystemId(systemIdPath);
- }
-
- protected String getSystemId(String path) throws Exception {
- if (new File(path).exists() == false) {
- return "";
- }
- return FileUtils.readFileToString(new File(path));
- }
-
- /**
- * Tests get version
- * */
- public void testGetVersion() throws Exception {
- boolean success = true;
-
- try {
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/rpc/api"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- String version = (String) client.execute("api.getVersion", new Object[] {});
- assertTrue(version.length() > 0);
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testAuthenticationLogin() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- CustomReqPropTransportFactory transportFactory = new CustomReqPropTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- client.setTransportFactory(transportFactory);
-
- Object[] params = new Object[] { systemid };
- Map result = (Map) client.execute("authentication.login", params);
- for (Object key : result.keySet()) {
- System.err.println("Header: " + key + " = " + result.get(key));
- }
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testAuth() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- CustomReqPropTransportFactory transportFactory = new CustomReqPropTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- client.setTransportFactory(transportFactory);
-
- Object[] params = new Object[] { systemid };
- Integer result = (Integer) client.execute("authentication.check", params);
- assertTrue(result.intValue() == 1);
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testAuth_BadSystemId() throws Exception {
- boolean success = false;
-
- try {
- String systemid = getSystemId(badSystemIdPath);
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- CustomReqPropTransportFactory transportFactory = new CustomReqPropTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- client.setTransportFactory(transportFactory);
-
- Object[] params = new Object[] { systemid };
- Integer result = (Integer) client.execute("authentication.check", params);
- assertTrue(false); // We shouldn't reach here, as an exception should be thrown
- } catch (XmlRpcException e) {
- success = true;
- assertTrue(e.getMessage().contains("Invalid System Credentials"));
- assertTrue(e.code == -9);
- }
- assertTrue(success);
- }
-
- public void testDumpProductNames() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.product_names.xml");
- client.setTransportFactory(transportFactory);
-
- Object[] params = new Object[] { systemid };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.product_names", params);
- RhnSatelliteType sat = result.getValue();
- List<RhnProductNameType> names = sat.getRhnProductNames().getRhnProductName();
- assertTrue(names.size() > 0);
- for (RhnProductNameType name : names) {
- assertFalse(StringUtils.isBlank(name.getName()));
- assertFalse(StringUtils.isBlank(name.getLabel()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testJaxbCallWithBadSystemId() throws Exception {
- // Point of this test is to use a systemid which is not valid
- // We want to see an exception thrown from the xmlrpc code with a proper
- // message and error code
- boolean success = false;
-
- try {
- String systemid = getSystemId(badSystemIdPath);
- //String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.product_names.xml");
- client.setTransportFactory(transportFactory);
-
- Object[] params = new Object[] { systemid };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.product_names", params);
- assertTrue(false); //We should never get here, an exception should be thrown
- } catch (XmlRpcException e) {
- assertTrue(e.getMessage().contains("Invalid System Credentials"));
- assertTrue(e.code == -9);
- success = true;
- }
- assertTrue(success);
- }
-
- public void testDumpChannelFamilies() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.channel_families.xml");
- client.setTransportFactory(transportFactory);
-
- Object[] params = new Object[] { systemid };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.channel_families", params);
- RhnSatelliteType sat = result.getValue();
- List<RhnChannelFamilyType> families = sat.getRhnChannelFamilies().getRhnChannelFamily();
- for (RhnChannelFamilyType family : families) {
- /* Note that MaxMembers, VirtSubLevelLabel, and VirtSubLevelName may be null */
- assertFalse(StringUtils.isBlank(family.getChannelLabels()));
- assertFalse(StringUtils.isBlank(family.getId()));
- assertFalse(StringUtils.isBlank(family.getLabel()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testDumpChannels() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.channels.xml");
- client.setTransportFactory(transportFactory);
-
- List<String> channel_labels = new ArrayList<String>();
- channel_labels.add("rhel-i386-server-5");
- channel_labels.add("rhn-tools-rhel-i386-server-5");
- channel_labels.add("rhel-x86_64-server-5");
- channel_labels.add("rhn-tools-rhel-x86_64-server-5");
- Object[] params = new Object[] { systemid, channel_labels };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.channels", params);
- RhnSatelliteType sat = result.getValue();
-
- List<RhnChannelType> channels = sat.getRhnChannels().getRhnChannel();
- for (RhnChannelType channel : channels) {
- assertFalse(StringUtils.isBlank(channel.getRhnChannelName()));
- assertFalse(StringUtils.isBlank(channel.getRhnChannelSummary()));
- String packages = channel.getPackages();
- assertFalse(StringUtils.isBlank(packages));
- String[] pkgIds = packages.split(" ");
- assertTrue(pkgIds.length > 1);
- }
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testDumpPackageShort() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.packages_short.xml");
- client.setTransportFactory(transportFactory);
- List<String> reqPackages = new ArrayList<String>();
- reqPackages.add("rhn-package-386981");
- reqPackages.add("rhn-package-386982");
- reqPackages.add("rhn-package-386983");
- reqPackages.add("rhn-package-386984");
- Object[] params = new Object[] { systemid, reqPackages };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.packages_short", params);
- RhnSatelliteType sat = result.getValue();
- List<RhnPackageShortType> pkgs = sat.getRhnPackagesShort().getRhnPackageShort();
- assertTrue(pkgs.size() == reqPackages.size());
-
- for (RhnPackageShortType pkgShort : pkgs) {
- assertFalse(StringUtils.isBlank(pkgShort.getId()));
- assertFalse(StringUtils.isBlank(pkgShort.getName()));
- assertFalse(StringUtils.isBlank(pkgShort.getVersion()));
- assertFalse(StringUtils.isBlank(pkgShort.getRelease()));
- assertFalse(StringUtils.isBlank(pkgShort.getPackageSize()));
- assertFalse(StringUtils.isBlank(pkgShort.getMd5Sum()));
- assertFalse(StringUtils.isBlank(pkgShort.getLastModified()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testDumpPackages() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.packages.xml");
- client.setTransportFactory(transportFactory);
-
- List<String> reqPackages = new ArrayList<String>();
- reqPackages.add("rhn-package-386981");
- reqPackages.add("rhn-package-386982");
- reqPackages.add("rhn-package-386983");
- reqPackages.add("rhn-package-386984");
- Object[] params = new Object[] { systemid, reqPackages };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.packages", params);
- RhnSatelliteType sat = result.getValue();
-
- List<RhnPackageType> pkgs = sat.getRhnPackages().getRhnPackage();
- assertTrue(pkgs.size() == reqPackages.size());
-
- for (RhnPackageType pkg : pkgs) {
- assertFalse(StringUtils.isBlank(pkg.getRhnPackageSummary()));
- assertFalse(StringUtils.isBlank(pkg.getRhnPackageDescription()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testDumpSourcePackages() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.source_packages.xml");
- client.setTransportFactory(transportFactory);
-
- List<String> reqPackages = new ArrayList<String>();
- // To get data for this call, look at channels <source-packages>
- reqPackages.add("rhn-source-package-41215");
- reqPackages.add("rhn-source-package-41217");
- reqPackages.add("rhn-source-package-41218");
- reqPackages.add("rhn-source-package-41228");
- Object[] params = new Object[] { systemid, reqPackages };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.source_packages", params);
- RhnSatelliteType sat = result.getValue();
-
- List<RhnSourcePackageType> pkgs = sat.getRhnSourcePackages().getRhnSourcePackage();
- assertTrue(pkgs.size() == reqPackages.size());
-
- for (RhnSourcePackageType pkg : pkgs) {
- assertFalse(StringUtils.isBlank(pkg.getBuildTime()));
- assertFalse(StringUtils.isBlank(pkg.getId()));
- assertFalse(StringUtils.isBlank(pkg.getLastModified()));
- assertFalse(StringUtils.isBlank(pkg.getLastModified()));
- assertFalse(StringUtils.isBlank(pkg.getMd5Sum()));
- assertFalse(StringUtils.isBlank(pkg.getPackageSize()));
- assertFalse(StringUtils.isBlank(pkg.getPayloadSize()));
- assertFalse(StringUtils.isBlank(pkg.getRpmVersion()));
- assertFalse(StringUtils.isBlank(pkg.getSourceRpm()));
- System.err.println("SourceRPM = " + pkg.getSourceRpm());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testDumpKickstartableTrees() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.kickstartable_trees.xml");
- client.setTransportFactory(transportFactory);
-
- List<String> reqLabels = new ArrayList<String>();
- // To get data for this call, look at channels kickstartable-trees=""
- reqLabels.add("ks-rhel-i386-server-5");
- reqLabels.add("ks-rhel-i386-server-5-u1");
- reqLabels.add("ks-rhel-i386-server-5-u2");
- reqLabels.add("ks-rhel-i386-server-5-u3");
- reqLabels.add("ks-rhel-i386-server-5-u4");
- Object[] params = new Object[] { systemid, reqLabels };
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.kickstartable_trees", params);
- RhnSatelliteType sat = result.getValue();
-
- List<RhnKickstartableTreeType> trees = sat.getRhnKickstartableTrees().getRhnKickstartableTree();
-
- for (RhnKickstartableTreeType t : trees) {
- assertFalse(StringUtils.isBlank(t.getBasePath()));
- assertFalse(StringUtils.isBlank(t.getBootImage()));
- assertFalse(StringUtils.isBlank(t.getChannel()));
- assertFalse(StringUtils.isBlank(t.getInstallTypeLabel()));
- assertFalse(StringUtils.isBlank(t.getInstallTypeName()));
- assertFalse(StringUtils.isBlank(t.getKstreeTypeLabel()));
- assertFalse(StringUtils.isBlank(t.getKstreeTypeName()));
- assertFalse(StringUtils.isBlank(t.getLabel()));
- assertFalse(StringUtils.isBlank(t.getLastModified()));
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- public void testDumpErrata() throws Exception {
- boolean success = true;
-
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(serverUrl + "/SAT-DUMP"));
- XmlRpcClient client = new XmlRpcClient();
- client.setConfig(config);
-
- RhnJaxbTransportFactory transportFactory = new RhnJaxbTransportFactory(client);
- transportFactory.setRequestProperties(getRequestProperties());
- transportFactory.setJaxbDomain("org.rhq.enterprise.server.plugins.rhnhosted.xml");
- transportFactory.setDumpMessageToFile(debugDumpFile);
- transportFactory.setDumpFilePath("/tmp/sample-rhnhosted-dump.errata.xml");
- client.setTransportFactory(transportFactory);
-
- List<String> errataIds = new ArrayList<String>();
-
- errataIds.add("rhn-erratum-6183");
- errataIds.add("rhn-erratum-6184");
- errataIds.add("rhn-erratum-6182");
- Object[] params = new Object[] { systemid, errataIds };
-
- JAXBElement<RhnSatelliteType> result = (JAXBElement) client.execute("dump.errata", params);
- RhnSatelliteType sat = result.getValue();
-
- List<RhnErratumType> errata = sat.getRhnErrata().getRhnErratum();
-
- for (RhnErratumType e : errata) {
- assertFalse(StringUtils.isBlank(e.getAdvisory()));
- assertFalse(StringUtils.isBlank(e.getChannels()));
- assertFalse(StringUtils.isBlank(e.getPackages()));
- assertFalse(StringUtils.isBlank(e.getRhnErratumAdvisoryName()));
- assertFalse(StringUtils.isBlank(e.getRhnErratumAdvisoryType()));
- assertFalse(StringUtils.isBlank(e.getRhnErratumDescription()));
- assertFalse(StringUtils.isBlank(e.getRhnErratumSynopsis()));
- assertTrue(e.getRhnErratumBugs().getRhnErratumBug().size() > 0);
-
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
- }
-
- /**
- Sample info
- handler = /SAT/$RHN/rhel-x86_64-server-5/getPackage/ipsec-tools-0.6.5-6.x86_64.rpm
- header: X-RHN-Auth-Server-Time = 1255722893.21
- header: X-Client-Version = 1
- header: X-RHN-Transport-Capability = ['follow-redirects=2']
- header: X-RHN-Server-Id = XXXXXXXXXX
- header: X-RHN-Auth = zVS7ood7Vg4I+xb2yZ6PJA==
- header: X-RHN-Auth-User-Id =
- header: X-RHN-Auth-Expire-Offset = 7200.0
- header: X-Info = ['RPC Processor (C) Red Hat, Inc (version 135431)']
- */
- public void REQUIRES_AUTHtestGetPackageHTTPClient() throws Exception {
- boolean success = true;
- try {
- String systemid = getSystemId();
- if (StringUtils.isBlank(systemid)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- String extra = "/SAT/$RHN/rhel-x86_64-server-5/getPackage/openhpi-2.4.1-6.el5.1.x86_64.rpm";
- URL url = new URL(serverUrl + extra);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setRequestProperty("X-Client-Version", "1");
- conn.setRequestProperty("X-RHN-Server-Id", "XXXXXXXXXX");
- conn.setRequestProperty("X-RHN-Auth", "zVS7ood7Vg4I+xb2yZ6PJA==");
- conn.setRequestProperty("X-RHN-Auth-User-Id", "");
- conn.setRequestProperty("X-RHN-Auth-Expire-Offset", "7200.0");
- conn.setRequestProperty("X-RHN-Auth-Server-Time", "1255722893.21");
-
- conn.setRequestMethod("GET");
- conn.connect();
- InputStream in = conn.getInputStream();
-
- String rpmFileName = "/tmp/getPackage-rpmFile.rpm";
- OutputStream out = new FileOutputStream(rpmFileName);
-
- // Transfer bytes from in to out
- byte[] buf = new byte[1024];
- int len;
- while ((len = in.read(buf)) > 0) {
- out.write(buf, 0, len);
- }
- in.close();
- out.close();
- conn.disconnect();
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- assertTrue(success);
-
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnHttpURLConnection.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnHttpURLConnection.java
deleted file mode 100644
index a355d3a..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnHttpURLConnection.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.util.Map;
-import java.util.HashMap;
-
-
-public class MockRhnHttpURLConnection extends HttpURLConnection {
-
- protected Map props;
- protected URL url;
-
- public MockRhnHttpURLConnection(URL u) {
- super(u);
- props = new HashMap();
- }
-
- @Override
- public void setRequestProperty(String key, String value) {
- props.put(key, value);
- }
-
-
- @Override
- public String getRequestProperty(String key) {
- return (String)props.get(key);
- }
-
- public void disconnect() {
-
- }
-
- public boolean usingProxy() {
- return false;
- }
-
-
- public void connect() throws IOException {
-
- }
-
- @Override
- public InputStream getInputStream() throws IOException {
- return new ByteArrayInputStream("Test Data".getBytes());
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnXmlRpcExecutor.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnXmlRpcExecutor.java
deleted file mode 100644
index 6c18fb4..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnXmlRpcExecutor.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.lang.reflect.Field;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelFamiliesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelFamilyType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelsType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnErrataType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnErratumType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartFileType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartFilesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartableTreeType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartableTreesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageShortType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackagesShortType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackagesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnProductNameType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnProductNamesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnSatelliteType;
-
-/**
- * @author mmccune
- *
- */
-public class MockRhnXmlRpcExecutor implements XmlRpcExecutor {
-
- private URL serverUrl;
-
- /**
- * Constructor
- * @param client to ignore
- */
- public MockRhnXmlRpcExecutor(XmlRpcClient client) {
- XmlRpcClientConfigImpl config = (XmlRpcClientConfigImpl) client.getClientConfig();
- this.serverUrl = config.getServerURL();
- }
-
- /* (non-Javadoc)
- * @see org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc.XmlRpcExecutor#execute(java.lang.String, java.lang.Object[])
- */
- public Object execute(String methodName, Object[] params) throws XmlRpcException {
- //for (Object object : params) {
- // System.out.println("parm: " + object);
- //}
-
- // Check auth
- String systemid = (String) params[0];
- // Check URL
- URLConnection conn;
- try {
- conn = serverUrl.openConnection();
- conn.connect();
- } catch (Exception e) {
- System.out.println("serverUrl: " + serverUrl);
- throw new XmlRpcException(0, "Failed to read server's response");
- }
- if (!systemid.contains("<name>system_id</name>")) {
- throw new XmlRpcException(-9, "Invalid System Credentials");
- }
- if (methodName.equals("authentication.check")) {
- if (systemid.contains("<value><string>ID-0000000000</string></value>")) {
- throw new XmlRpcException(-9, "Invalid System Credentials");
- }
- return new Integer(1);
- } else if (methodName.equals("authentication.login")) {
- Map retval = new HashMap();
- retval.put("foo", "bar");
- return retval;
- } else if (methodName.equals("dump.packages_short")) {
- JAXBElement element = getRhnSatelliteType();
- RhnSatelliteType retval = (RhnSatelliteType) element.getValue();
- List<String> pids = (List<String>) params[1];
- List<RhnPackageShortType> rhnPackageShort = new LinkedList<RhnPackageShortType>();
- for (String pid : pids) {
- // PackageInfoShort
- RhnPackageShortType pstype = new RhnPackageShortType();
- pstype.setId("1");
- pstype.setName("foo");
- pstype.setEpoch("0");
- pstype.setVersion("1");
- pstype.setRelease("1");
- pstype.setPackageSize("999");
- pstype.setMd5Sum("ABCDE");
- pstype.setLastModified("Wed Oct 21 16:03:26 PDT 2009");
- rhnPackageShort.add(pstype);
-
- RhnPackagesShortType pshortypes = new RhnPackagesShortType();
- setPrivateList("rhnPackageShort", pshortypes, rhnPackageShort);
- retval.setRhnPackagesShort(pshortypes);
-
- }
- return element;
- } else if (methodName.equals("dump.kickstartable_trees")) {
- JAXBElement element = getRhnSatelliteType();
- RhnSatelliteType retval = (RhnSatelliteType) element.getValue();
- RhnKickstartableTreesType parentKSTree = new RhnKickstartableTreesType();
- List<RhnKickstartableTreeType> ksTreeList = parentKSTree.getRhnKickstartableTree();
- List<String> kstids = (List<String>) params[1];
- for (String kid : kstids) {
- RhnKickstartableTreeType kstype = new RhnKickstartableTreeType();
- kstype.setBasePath("basepath");
- kstype.setBootImage("boot");
- kstype.setChannel("channel");
- kstype.setInstallTypeLabel("type");
- kstype.setInstallTypeName("name");
- kstype.setKstreeTypeLabel("label");
- kstype.setKstreeTypeName("type");
- kstype.setLabel("label");
- kstype.setLastModified("lastmod");
- // Need to add ks file
- RhnKickstartFilesType parentFiles = new RhnKickstartFilesType();
- List<RhnKickstartFileType> files = parentFiles.getRhnKickstartFile();
- RhnKickstartFileType f = new RhnKickstartFileType();
- f.setFileSize("192");
- f.setLastModified("tbd");
- f.setMd5Sum("tbd");
- f.setRelativePath("path");
- files.add(f);
- kstype.setRhnKickstartFiles(parentFiles);
-
- ksTreeList.add(kstype);
- }
- retval.setRhnKickstartableTrees(parentKSTree);
- return element;
- } else if (methodName.equals("dump.packages")) {
- if (systemid.contains("<value><string>ID-0000000000</string></value>")) {
- throw new XmlRpcException(-9, "Invalid System Credentials");
- }
- JAXBElement element = getRhnSatelliteType();
- RhnSatelliteType retval = (RhnSatelliteType) element.getValue();
- List<String> pids = (List<String>) params[1];
- List<RhnPackageType> rhnPackage = new LinkedList<RhnPackageType>();
- for (String pid : pids) {
- RhnPackageType ptype = new RhnPackageType();
- ptype.setId(pid);
- ptype.setLastModified("lastmod");
- ptype.setRhnPackageSummary("summary");
- ptype.setRhnPackageDescription("desc");
- rhnPackage.add(ptype);
-
- RhnPackagesType ptypes = new RhnPackagesType();
- setPrivateList("rhnPackage", ptypes, rhnPackage);
- retval.setRhnPackages(ptypes);
- }
- return element;
-
- } else if (methodName.equals("dump.errata")) {
- if (systemid.contains("<value><string>ID-0000000000</string></value>")) {
- throw new XmlRpcException(-9, "Invalid System Credentials");
- }
- JAXBElement element = getRhnSatelliteType();
- RhnSatelliteType retval = (RhnSatelliteType) element.getValue();
- RhnErrataType errata = new RhnErrataType();
- List<RhnErratumType> erratum = errata.getRhnErratum();
- List<String> erratumIds = (List<String>) params[1];
- List<RhnErratumType> rhnErrata = new LinkedList<RhnErratumType>();
- for (String eid : erratumIds) {
- RhnErratumType ptype = new RhnErratumType();
- ptype.setAdvisory("RHSA-2007:0540");
- ptype.setChannels("rhel-i386-server-5 rhel-x86_64-server-5 rhel-ia64-server-5 rhel-ppc-server-5");
- ptype.setPackages("rhn-package-410949 rhn-package-410950");
- ptype.setRhnErratumAdvisoryName("RHSA-2007:0540");
- ptype.setRhnErratumAdvisoryType("Security Advisory");
- ptype.setRhnErratumDescription("test errata description");
- ptype.setRhnErratumSynopsis("New package test");
- erratum.add(ptype);
-
- retval.setRhnErrata(errata);
- }
- return element;
-
- } else {
- return getRhnSatelliteType();
- }
-
- }
-
- private JAXBElement getRhnSatelliteType() {
- RhnSatelliteType sattype = new RhnSatelliteType();
-
- // ProductNames
- RhnProductNameType type = new RhnProductNameType();
- type.setLabel("some-prod-label");
- type.setName("some product name");
- List<RhnProductNameType> rhnProductName = new LinkedList<RhnProductNameType>();
- rhnProductName.add(type);
-
- RhnProductNamesType prodNamesType = new RhnProductNamesType();
- setPrivateList("rhnProductName", prodNamesType, rhnProductName);
- sattype.setRhnProductNames(prodNamesType);
-
- // ChannelFamilies
- List<RhnChannelFamilyType> rhnChannelFamily = new LinkedList<RhnChannelFamilyType>();
- RhnChannelFamilyType ctype = new RhnChannelFamilyType();
- ctype.setLabel("channel-fam-label");
- ctype.setMaxMembers("2112");
- ctype.setChannelLabels("foo,bar,baz");
- ctype.setId("1");
- rhnChannelFamily.add(ctype);
-
- RhnChannelFamiliesType cfamtypes = new RhnChannelFamiliesType();
- setPrivateList("rhnChannelFamily", cfamtypes, rhnChannelFamily);
- sattype.setRhnChannelFamilies(cfamtypes);
-
- // Channels
- List<RhnChannelType> rhnChannel = new LinkedList<RhnChannelType>();
- RhnChannelType chantype = new RhnChannelType();
- chantype.setLabel("channel-fam-label");
- chantype.setRhnChannelName("channel name");
- chantype.setRhnChannelSummary("channel summary");
- chantype.setPackages("1 2 3 4");
- chantype.setKickstartableTrees("ks-rhel-i386-server-5 ks-rhel-i386-server-5-u1 ks-rhel-i386-server-5-u2");
- rhnChannel.add(chantype);
-
- RhnChannelsType chantypes = new RhnChannelsType();
- setPrivateList("rhnChannel", chantypes, rhnChannel);
- sattype.setRhnChannels(chantypes);
-
- JAXBElement<RhnSatelliteType> element = new JAXBElement<RhnSatelliteType>(new QName(""),
- RhnSatelliteType.class, sattype);
- element.setValue(sattype);
- return element;
-
- }
-
- private void setPrivateList(String fieldName, Object oIn, List listIn) {
- try {
- Field privateListField = oIn.getClass().getDeclaredField(fieldName);
- privateListField.setAccessible(true);
- privateListField.set(oIn, listIn);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- }
-
- public Object execute(String pMethodName, List pParams) throws XmlRpcException {
- return execute(pMethodName, pParams.toArray());
- }
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnCommTest.java b/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnCommTest.java
deleted file mode 100644
index b5477d3..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnCommTest.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.plugins.rhnhosted.xmlrpc;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.xmlrpc.XmlRpcException;
-
-import org.rhq.enterprise.server.plugins.rhnhosted.BaseRHNTest;
-import org.rhq.enterprise.server.plugins.rhnhosted.RHNHelper;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelFamilyType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnChannelType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnErratumType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartFileType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartFilesType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnKickstartableTreeType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageShortType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnPackageType;
-import org.rhq.enterprise.server.plugins.rhnhosted.xml.RhnProductNameType;
-
-public class RhnCommTest extends BaseRHNTest {
-
- public String serverUrl = "http://satellite.rhn.redhat.com";
-
- public static Test suite() {
- return new TestSuite(RhnCommTest.class);
- }
-
- protected RhnComm getRhnComm() {
- RhnComm comm = new RhnComm(serverUrl);
- return comm;
- }
-
- /**
- * method to find a file relative to the calling class. primarily
- * useful when writing tests that need access to external data.
- * this lets you put the data relative to the test class file.
- *
- * @param path the path, relative to caller's location
- * @return URL a URL referencing the file
- * @throws ClassNotFoundException if the calling class can not be found
- * (i.e., should not happen)
- */
- public static URL findTestData(String path) throws ClassNotFoundException {
- Throwable t = new Throwable();
- StackTraceElement[] ste = t.getStackTrace();
-
- String className = ste[1].getClassName();
- Class clazz = Class.forName(className);
-
- URL ret = clazz.getResource(path);
- return ret;
- }
-
- public void testCheckAuth() throws Exception {
- URL f = findTestData("RhnCommTest.class");
- System.out.println("foo: " + f);
- RhnDownloader downloader = new RhnDownloader(serverUrl);
- assertTrue(downloader.checkAuth(SYSTEM_ID));
- }
-
- public void testCheckAuth_withBadSystemId() throws Exception {
- boolean success = false;
- RhnDownloader downloader = new RhnDownloader(serverUrl);
- try {
- boolean result = downloader.checkAuth(SYSTEM_ID_BAD);
- assertTrue(false);
- } catch (XmlRpcException e) {
- assertTrue(e.getMessage().contains("Invalid System Credentials"));
- assertTrue(e.code == -9);
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- assertTrue(success);
- }
-
- public void testCheckAuth_withBadURL() throws Exception {
- boolean success = false;
- RhnDownloader downloader = new RhnDownloader("http://badurl.example.com/BAD");
- try {
- boolean result = downloader.checkAuth(SYSTEM_ID);
- assertTrue(false);
- } catch (XmlRpcException e) {
- assertTrue(e.getMessage().contains("Failed to read server's response"));
- assertTrue(e.code == 0);
- success = true;
- }
- assertTrue(success);
- }
-
- public void testGetProductNames() throws Exception {
- boolean success = false;
- if (StringUtils.isBlank(SYSTEM_ID)) {
- System.out.println("Skipping test since systemid is not readable");
- return;
- }
-
- RhnComm comm = getRhnComm();
- List<RhnProductNameType> names = comm.getProductNames(SYSTEM_ID);
- assertTrue(names != null);
- assertTrue(names.size() > 0);
- for (RhnProductNameType name : names) {
- assertFalse(StringUtils.isBlank(name.getName()));
- assertFalse(StringUtils.isBlank(name.getLabel()));
- }
- success = true;
- assertTrue(success);
- }
-
- public void testGetChannelFamilies() throws Exception {
- boolean success = false;
- try {
- RhnComm comm = getRhnComm();
- List<RhnChannelFamilyType> families = comm.getChannelFamilies(SYSTEM_ID);
- assertTrue(families != null);
- assertTrue(families.size() > 0);
- for (RhnChannelFamilyType family : families) {
- /* Note that MaxMembers, VirtSubLevelLabel, and VirtSubLevelName may be null */
- assertFalse(StringUtils.isBlank(family.getChannelLabels()));
- assertFalse(StringUtils.isBlank(family.getId()));
- assertFalse(StringUtils.isBlank(family.getLabel()));
- }
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- throw (e);
- }
- assertTrue(success);
- }
-
- public void testGetChannels() throws Exception {
- boolean success = false;
- try {
- RhnComm comm = getRhnComm();
- List<String> channel_labels = new ArrayList<String>();
- channel_labels.add("rhel-i386-server-5");
- channel_labels.add("rhn-tools-rhel-i386-server-5");
- channel_labels.add("rhel-x86_64-server-5");
- channel_labels.add("rhn-tools-rhel-x86_64-server-5");
- List<RhnChannelType> channels = comm.getChannels(SYSTEM_ID, channel_labels);
- assertTrue(channels != null);
- assertTrue(channels.size() > 0);
- for (RhnChannelType channel : channels) {
- assertFalse(StringUtils.isBlank(channel.getRhnChannelName()));
- assertFalse(StringUtils.isBlank(channel.getRhnChannelSummary()));
- String packages = channel.getPackages();
- assertFalse(StringUtils.isBlank(packages));
- String[] pkgIds = packages.split(" ");
- assertTrue(pkgIds.length > 1);
- System.err.println("testGetChannels: number of packages " + pkgIds.length);
- System.err.println("testGetChannels: " + pkgIds[0]);
- }
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- throw (e);
- }
- assertTrue(success);
- }
-
- public void testGetPackageShortInfo() throws Exception {
- boolean success = false;
- try {
- RhnComm comm = getRhnComm();
- List<String> reqPackages = new ArrayList<String>();
- reqPackages.add("rhn-package-386981");
- reqPackages.add("rhn-package-386982");
- reqPackages.add("rhn-package-386983");
- reqPackages.add("rhn-package-386984");
- List<RhnPackageShortType> pkgs = comm.getPackageShortInfo(SYSTEM_ID, reqPackages);
- assertTrue(pkgs.size() == reqPackages.size());
- for (RhnPackageShortType pkgShort : pkgs) {
- assertFalse(StringUtils.isBlank(pkgShort.getId()));
- assertFalse(StringUtils.isBlank(pkgShort.getName()));
- assertFalse(StringUtils.isBlank(pkgShort.getVersion()));
- assertFalse(StringUtils.isBlank(pkgShort.getRelease()));
- assertFalse(StringUtils.isBlank(pkgShort.getPackageSize()));
- assertFalse(StringUtils.isBlank(pkgShort.getMd5Sum()));
- assertFalse(StringUtils.isBlank(pkgShort.getLastModified()));
- }
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- throw (e);
- }
- assertTrue(success);
- }
-
- public void testGetKickstartTreeMetadata() throws Exception {
- boolean success = false;
- try {
- RhnComm comm = getRhnComm();
- List<String> reqLabels = new ArrayList<String>();
- // To get data for this call, look at channels kickstartable-trees=""
- reqLabels.add("ks-rhel-i386-server-5");
- reqLabels.add("ks-rhel-i386-server-5-u1");
- reqLabels.add("ks-rhel-i386-server-5-u2");
- reqLabels.add("ks-rhel-i386-server-5-u3");
- reqLabels.add("ks-rhel-i386-server-5-u4");
-
- List<RhnKickstartableTreeType> ksTrees = comm.getKickstartTreeMetadata(SYSTEM_ID, reqLabels);
- assertTrue(reqLabels.size() == ksTrees.size());
- for (RhnKickstartableTreeType tree : ksTrees) {
- assertFalse(StringUtils.isBlank(tree.getBasePath()));
- assertFalse(StringUtils.isBlank(tree.getBootImage()));
- assertFalse(StringUtils.isBlank(tree.getChannel()));
- assertFalse(StringUtils.isBlank(tree.getInstallTypeLabel()));
- assertFalse(StringUtils.isBlank(tree.getInstallTypeName()));
- assertFalse(StringUtils.isBlank(tree.getKstreeTypeLabel()));
- assertFalse(StringUtils.isBlank(tree.getKstreeTypeName()));
- assertFalse(StringUtils.isBlank(tree.getLabel()));
- assertFalse(StringUtils.isBlank(tree.getLastModified()));
- }
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- throw (e);
- }
- assertTrue(success);
- }
-
- public void testGetPackageMetada() throws Exception {
- boolean success = false;
- try {
- RhnComm comm = getRhnComm();
- List<String> reqPackages = new ArrayList<String>();
- reqPackages.add("rhn-package-386981");
- reqPackages.add("rhn-package-386982");
- reqPackages.add("rhn-package-386983");
- reqPackages.add("rhn-package-386984");
- List<RhnPackageType> pkgs = comm.getPackageMetadata(SYSTEM_ID, reqPackages);
- assertTrue(pkgs.size() == reqPackages.size());
- for (RhnPackageType pkg : pkgs) {
- assertFalse(StringUtils.isBlank(pkg.getRhnPackageSummary()));
- assertFalse(StringUtils.isBlank(pkg.getRhnPackageDescription()));
- }
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- assertTrue(success);
- }
-
- public void testGetPackageMetada_withBadSystemId() throws Exception {
- boolean success = false;
- try {
- RhnComm comm = getRhnComm();
- List<String> reqPackages = new ArrayList<String>();
- reqPackages.add("rhn-package-386981");
- reqPackages.add("rhn-package-386982");
- reqPackages.add("rhn-package-386983");
- reqPackages.add("rhn-package-386984");
- List<RhnPackageType> pkgs = comm.getPackageMetadata(SYSTEM_ID_BAD, reqPackages);
- assertTrue(false);
- } catch (XmlRpcException e) {
- assertTrue(e.getMessage().contains("Invalid System Credentials"));
- assertTrue(e.code == -9);
- success = true;
- }
- assertTrue(success);
- }
-
- public void testLogin() throws Exception {
- RhnDownloader comm = new RhnDownloader(serverUrl);
- Map credentials = comm.login(SYSTEM_ID);
- assertNotNull(credentials);
- }
-
- public void testGetRPM() throws Exception {
- boolean success = false;
- try {
- RhnDownloader comm = new RhnDownloader(serverUrl);
- String channelName = "rhel-x86_64-server-5";
- String rpmName = "openhpi-2.4.1-6.el5.1.x86_64.rpm";
- String saveFilePath = "./target/" + rpmName;
- String locationUrl = RHNHelper.constructPackageUrl(serverUrl, channelName, rpmName);
- InputStream is = comm.getFileStream(SYSTEM_ID, locationUrl);
- assertTrue(is != null);
- //exception should be thrown
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- throw (e);
- }
- assertTrue(success);
- }
-
- public void testGetRPM_withBadSystemId() throws Exception {
- String prop = System.getProperty(RhnHttpURLConnectionFactory.RHN_MOCK_HTTP_URL_CONNECTION);
- if (!StringUtils.isEmpty(prop)) {
- System.err.println("Skipping testGetRPM_withBadSystemId() since we are mocking the HTTP connection.");
- return;
- }
-
- boolean success = false;
- try {
- RhnDownloader comm = new RhnDownloader(serverUrl);
- String channelName = "rhel-x86_64-server-5";
- String rpmName = "openhpi-2.4.1-6.el5.1.x86_64.rpm";
- String locationUrl = RHNHelper.constructPackageUrl(serverUrl, channelName, rpmName);
- InputStream is = comm.getFileStream(SYSTEM_ID, locationUrl);
- //exception should be thrown
- assertTrue(false);
- } catch (XmlRpcException e) {
- assertTrue(e.getMessage().contains("Invalid System Credentials"));
- assertTrue(e.code == -9);
- success = true;
- }
- assertTrue(success);
- }
-
- public void testGetKickstartTree() throws Exception {
- boolean success = false;
- try {
- RhnComm comm = new RhnComm(serverUrl);
- String channelName = "rhel-i386-server-5";
- String ksTreeLabel = "ks-rhel-i386-server-5";
- List<String> reqLabels = new ArrayList<String>();
- // To get data for this call, look at channels kickstartable-trees=""
- reqLabels.add("ks-rhel-i386-server-5");
- List<RhnKickstartableTreeType> ksTrees = comm.getKickstartTreeMetadata(SYSTEM_ID, reqLabels);
- RhnKickstartableTreeType tree = ksTrees.get(0);
- RhnKickstartFilesType ksFiles = tree.getRhnKickstartFiles();
- System.err.println("ksFiles = " + ksFiles);
- List<RhnKickstartFileType> files = ksFiles.getRhnKickstartFile();
- RhnKickstartFileType f = files.get(0);
- //Only fetching one kickstart file to save time.
- //To do a more exhaustive test, simply interate of ks.getRhnKickstartFile()
- //and fetch each file, this will take a few minutes to complete.
- String ksRelativePath = f.getRelativePath();
- assertFalse(StringUtils.isBlank(ksRelativePath));
- System.err.println("fetching ks file: " + f.getRelativePath());
- RhnDownloader downloader = new RhnDownloader(serverUrl);
- String url = RHNHelper.constructKickstartFileUrl(serverUrl, channelName, ksTreeLabel, ksRelativePath);
- InputStream in = downloader.getFileStream(SYSTEM_ID, url);
- assertTrue(in != null);
- in.close();
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- assertTrue(success);
- }
-
- public void testGetErrata() throws Exception {
- boolean success = false;
- try {
- RhnComm comm = getRhnComm();
-
- List<String> errataIds = new ArrayList<String>();
-
- errataIds.add("rhn-erratum-6183");
- errataIds.add("rhn-erratum-6184");
- errataIds.add("rhn-erratum-6182");
- List<RhnErratumType> errata = comm.getErrataMetadata(SYSTEM_ID, errataIds);
- assertTrue(errata.size() == errataIds.size());
- for (RhnErratumType e : errata) {
- assertFalse(StringUtils.isBlank(e.getAdvisory()));
- assertFalse(StringUtils.isBlank(e.getChannels()));
- assertFalse(StringUtils.isBlank(e.getPackages()));
- assertFalse(StringUtils.isBlank(e.getRhnErratumAdvisoryName()));
- assertFalse(StringUtils.isBlank(e.getRhnErratumAdvisoryType()));
- assertFalse(StringUtils.isBlank(e.getRhnErratumDescription()));
- assertFalse(StringUtils.isBlank(e.getRhnErratumSynopsis()));
-
- }
- success = true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/test/resources/test-log4j.xml b/modules/enterprise/server/plugins/rhnhosted/src/test/resources/test-log4j.xml
deleted file mode 100644
index e526d2d..0000000
--- a/modules/enterprise/server/plugins/rhnhosted/src/test/resources/test-log4j.xml
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE log4j:configuration PUBLIC
- "-//log4j/log4j configuration//EN"
- "http://logging.apache.org/log4j/docs/api/org/apache/log4j/xml/log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- RHQ Server Log4j Configuration -->
-<!-- ===================================================================== -->
-
-<!--
- | For details on configuring Log4J, see: http://logging.apache.org/log4j/docs/
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ========= -->
- <!-- Appenders -->
- <!-- ========= -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <!-- Appender will not log any messages with priority lower than INFO even if the category's priority is set lower.
- So essentially, this means DEBUG and TRACE messages will never be output to the console -->
- <param name="Threshold" value="DEBUG"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- a size-based rolling file appender -->
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <param name="File" value="target/test-log4j.log"/>
- <param name="Append" value="true"/>
- <param name="MaxFileSize" value="5MB"/>
- <param name="MaxBackupIndex" value="5"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
-
- <!-- ========================================= -->
- <!-- Categories for the various RHQ subsystems -->
- <!-- ========================================= -->
-
- <!-- unless otherwise overridden, all org, com and net categories will be at INFO level -->
- <category name="org">
- <priority value="INFO"/>
- </category>
- <category name="com">
- <priority value="INFO"/>
- </category>
- <category name="net">
- <priority value="INFO"/>
- </category>
-
- <!-- this will control RHQ categories - set to DEBUG if you want full RHQ debug messages -->
- <!--
- <category name="org.rhq">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on dbsetup and dbupgrade ant tasks and their internals -->
- <category name="org.rhq.core.db.ant">
- <priority value="DEBUG"/>
- </category>
-
- <!-- details on the db setup classes used to build the database schema -->
- <category name="org.rhq.core.db.setup">
- <priority value="DEBUG"/>
- </category>
-
- <!-- details for hourly data compression job -->
- <!--
- <category name="org.rhq.enterprise.server.measurement.MeasurementCompressionManagerBean">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- trace commands coming in from agents -->
- <!--
- <category name="org.rhq.enterprise.communications.command.server.CommandProcessor">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on baseline calculations -->
- <!--
- <category name="org.rhq.enterprise.server.measurement.MeasurementBaselineManagerBean">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on incoming remote pojo invocations; emits concurrency limit debug messages -->
- <!--
- <category name="org.rhq.enterprise.communications.command.impl.remotepojo.server.RemotePojoInvocationCommandService">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- emits global concurrency limit debug messages -->
- <!--
- <category name="org.rhq.enterprise.communications.GlobalConcurrencyLimitCommandListener">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on outgoing messages; emits concurrency limit debug messages -->
- <!--
- <category name="org.rhq.enterprise.communications.command.client.ClientCommandSenderTask">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on incoming inventory reports -->
- <!--
- <category name="org.rhq.enterprise.server.discovery.DiscoveryBossBean">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Logs Hibernate statistics used to help trace Hibernate queries -->
- <!--
- <category name="org.rhq.enterprise.server.util.HibernatePerformanceMonitor">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Top category for the entire comm module -->
- <!--
- <category name="org.rhq.enterprise.communications">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Agent plugin deployer -->
- <!--
- <category name="org.rhq.enterprise.server.core.plugin">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Top category for the enterprise GUI module -->
- <!--
- <category name="org.rhq.enterprise.gui">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Top category for the serializers to log synchronized access to certain subsystems -->
- <!--
- <category name="org.rhq.enterprise.server.util.concurrent">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- INFO level gives full stacks to all threads active in aborted transactions -->
- <!-- Set to WARN to only log these events with single-line messages -->
- <category name="org.rhq.enterprise.server.common.TransactionInterruptInterceptor">
- <priority value="INFO"/>
- </category>
-
- <!-- Setting the status manager bean to DEBUG would allow you to see specific status bits -->
- <!-- DEBUG also has a negative impact on database performance -->
- <category name="org.rhq.enterprise.server.cloud.StatusManagerBean">
- <priority value="INFO" />
- </category>
-
- <!-- Top category for the server-side code, including SLSBs -->
- <!--
- <category name="org.rhq.enterprise.server">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.alert">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.authz">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.cloud">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.configuration">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <category name="org.rhq.enterprise.server.content">
- <priority value="DEBUG"/>
- </category>
-
- <category name="org.rhq.enterprise.server.plugin.pc.content">
- <priority value="DEBUG"/>
- </category>
-
- <category name="org.rhq.enterprise.server.plugins.rhnhosted">
- <priority value="DEBUG"/>
- </category>
-
- <!--
- <category name="org.rhq.enterprise.server.core">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.discovery">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.event">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.measurement">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.operation">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.plugin">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.resource">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.scheduler">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.system">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.util">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- ============================================= -->
- <!-- Categories for the various JBossAS subsystems -->
- <!-- ============================================= -->
-
- <category name="org.jboss.ejb.EJBDeployer.verifier">
- <priority value="OFF"/>
- </category>
-
- <category name="org.hibernate.ejb.Ejb3Configuration">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jboss.ejb3.JmxKernelAbstraction">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jboss.ejb3.EJBContainer">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jboss.resource.deployment.RARDeployment">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jgroups">
- <priority value="WARN"/>
- </category>
-
- <category name="jacorb">
- <priority value="WARN"/>
- </category>
-
- <category name="org.hibernate.cfg">
- <priority value="WARN"/>
- </category>
-
- <!-- JBNADM-2090: suppress warnings -->
- <category name="org.hibernate.engine.loading.LoadContexts">
- <priority value="OFF"/>
- </category>
-
- <!-- Suppress heavy ERROR level logging generated due to EJB3SafeEndpointInvoker, which unavoidably
- forces this exception, Hibernate has no workaround. -->
- <category name="org.hibernate.LazyInitializationException">
- <priority value="OFF"/>
- </category>
-
- <!-- log SQL statements -->
- <!--
- <category name="org.hibernate.SQL">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- log JDBC bind parameters -->
- <!--
- <category name="org.hibernate.type">
- <priority value="INFO"/>
- </category>
- -->
-
- <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
- <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- Increase the priority threshold for the RHQ Datasource category
- Useful for debugging connection leaks
- -->
- <!--
- <category name="RHQDS">
- <priority value="DEBUG"/>
- </category>
- -->
- <!--
- <category name="NoTxRHQDS">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- | An example of enabling the custom TRACE level priority that is used
- | by the JBoss internals to diagnose low level details. This example
- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
- | subpackages. This will produce A LOT of logging output.
- <category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- <category name="org.jboss.ejb.plugins">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- Clustering logging -->
- <!-- Uncomment the following to redirect the org.jgroups and
- org.jboss.ha categories to a cluster.log file.
-
- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- <category name="org.jgroups">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- <category name="org.jboss.ha">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- -->
-
- <!-- JSF RI (i.e. com.sun.faces.*) -->
- <category name="javax.enterprise.resource.webcontainer.jsf.application">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.config">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.context">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.lifecycle">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.managedbean">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.renderkit">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.taglib">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.timing">
- <priority value="WARN" />
- </category>
-
- <!-- ===================================================== -->
- <!-- Categories for the various 3rd-party libs used by RHQ -->
- <!-- ===================================================== -->
-
- <category name="org.quartz.impl.jdbcjobstore.JobStoreCMT">
- <priority value="WARN"/>
- </category>
-
- <category name="org.quartz.impl.jdbcjobstore.StdRowLockSemaphore">
- <priority value="ERROR"/>
- </category>
-
- <category name="org.apache.commons.validator.ValidatorResources">
- <priority value="OFF"/>
- </category>
-
- <category name="org.apache.struts">
- <priority value="ERROR"/>
- </category>
-
- <category name="org.apache.commons.httpclient">
- <priority value="ERROR"/>
- </category>
-
- <category name="org.ajax4jsf">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jboss.seam">
- <priority value="WARN"/>
- </category>
-
- <!-- ================= -->
- <!-- The root category -->
- <!-- ================= -->
-
- <root>
- <!-- default log priority -->
- <priority value="INFO"/>
-
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index a57d703..28f5f38 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -34,7 +34,6 @@
<pathelement location="../disk/target/rhq-serverplugin-disk-${project.version}.jar" />
<pathelement location="../jboss-software/target/rhq-serverplugin-jboss-software-${project.version}.jar" />
- <pathelement location="../rhnhosted/target/rhq-serverplugin-rhnhosted-${project.version}.jar" />
<pathelement location="../url/target/rhq-serverplugin-url-${project.version}.jar" />
<pathelement location="../yum/target/rhq-serverplugin-yum-${project.version}.jar" />
<pathelement location="../alert-email/target/alert-email-${project.version}.jar" />
commit b4fce666acdc478100a4f9b0920c61858b2b5f2e
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 16 14:31:03 2012 -0600
[BZ 535720] Adding back commented line that was causing failures due to content system discovery failure. Also, update the test code to match current CLI interface and resource structure.
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
index b1b866f..2ef2d7e 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
@@ -242,7 +242,7 @@ function testDeploy() {
// Get the parent
criteria = new ResourceCriteria();
criteria.strict = true;
- criteria.addFilterName( "Tomcat VHost (localhost)" );
+ criteria.addFilterResourceTypeName( "Tomcat Virtual Host" );
criteria.addFilterCurrentAvailability( AvailabilityType.UP );
var vhosts = ResourceManager.findResourcesByCriteria( criteria );
Assert.assertNotNull( vhosts, "Test requires Tomcat VHost (localhost) in inventory.");
@@ -286,7 +286,7 @@ function testDeploy() {
// no required plugin config for this resource type
// no required resource config for this resource type
// resource name defaults to war file name / context root
- ResourceFactoryManager.createPackageBackedResource( vhost.getId(), warType.getId(), null, null, file.getName(), "1.0", null, deployConfig, fileBytes);
+ ResourceFactoryManager.createPackageBackedResource( vhost.getId(), warType.getId(), null, null, file.getName(), "1.0", null, deployConfig, fileBytes, null);
criteria = new ResourceCriteria();
criteria.strict = false;
@@ -494,8 +494,7 @@ function testDeploy() {
Assert.assertNotNull( newBackingPackage, "backing package should exist after update." );
print( "\n After Update: BackingPackage=" + newBackingPackage.getId() );
- // TODO: This test may fail due to RHQ-2387, uncomment when fixed
- // Assert.assertTrue( ( backingPackage,getId() != newBackingPackage.getId() ), "Backing ackage should differ after update" );
+ Assert.assertTrue( ( backingPackage.getId() != newBackingPackage.getId() ), "Backing ackage should differ after update" );
// delete any existing test repos in the db
repos = RepoManager.findRepos(PageControl.getUnlimitedInstance());
commit 147eaace0daa24890d15a0ab1769266c5d0dc1f6
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 16 12:55:04 2012 -0600
[BZ 772722] Updates for the URL parser to correctly load MD5. Also, fixed a couple of failing unit tests due to changed functionality.
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
index 1ecde5a..34619f3 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
@@ -136,6 +136,7 @@ public class XmlIndexParser implements IndexParser {
details.setFileSize(pkg.getFileSize());
details.setFileCreatedDate(pkg.getFileCreatedDate());
details.setSHA256(pkg.getSha256());
+ details.setMD5(pkg.getMd5());
details.setLicenseName(pkg.getLicenseName());
details.setLicenseVersion(pkg.getLicenseVersion());
if (pkg.getMetadata() != null) {
diff --git a/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java b/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
index 7798e93..8f4be58 100644
--- a/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
+++ b/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
@@ -79,7 +79,7 @@ public class XmlIndexParserTest {
assert "Mazzpackage-type-name".equals(cspd.getPackageTypeName()) : cspd.getPackageTypeName();
assert "Mazzsha256".equals(cspd.getSHA256()) : cspd.getSHA256();
assert "Mazzshort-description".equals(cspd.getShortDescription()) : cspd.getShortDescription();
- assert "Mazzversion".equals(cspd.getVersion()) : cspd.getVersion();
+ assert ("[sha256=" + cspd.getSHA256() + "]").equals(cspd.getVersion()) : cspd.getVersion();
assert cspd.getResourceVersions().contains("Mazzresource-version1") : cspd.getResourceVersions();
assert cspd.getResourceVersions().contains("Mazzresource-version2") : cspd.getResourceVersions();
@@ -168,7 +168,7 @@ public class XmlIndexParserTest {
assert "WOTGORILLApackage-type-name".equals(cspd.getPackageTypeName()) : cspd.getPackageTypeName();
assert null == cspd.getSHA256() : cspd.getSHA256();
assert null == cspd.getShortDescription() : cspd.getShortDescription();
- assert "WOTGORILLAversion".equals(cspd.getVersion()) : cspd.getVersion();
+ assert "[sha256=null]".equals(cspd.getVersion()) : cspd.getVersion();
assert 0 == cspd.getResourceVersions().size() : cspd.getResourceVersions();
}
}
commit cdd378b2cf0b8819f70960a704fd66e14d5e00a1
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 16 09:41:49 2012 -0600
[BZ 771418] Added back delete methods for backward compatibility and created a new version of the method that takes the display version as an argument.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index 6976d25..63ca2d7 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -505,7 +505,11 @@ public class ResourceClientProxy {
return remoteClient.getContentManager().getBackingPackageForResource(remoteClient.getSubject(), resourceClientProxy.resourceId);
}
- public void updateBackingContent(String filename, String contentVersion) {
+ public void updateBackingContent(String filename) {
+ this.updateBackingContent(filename, null);
+ }
+
+ public void updateBackingContent(String filename, String displayVersion) {
File file = new File(filename);
if (!file.exists()) {
throw new IllegalArgumentException("File not found: " + file.getAbsolutePath());
@@ -529,12 +533,12 @@ public class ResourceClientProxy {
InstalledPackage oldPackage = getBackingContent();
PackageVersion pv =
- remoteClient.getContentManager().createPackageVersion(
+ remoteClient.getContentManager().createPackageVersionWithDisplayVersion(
remoteClient.getSubject(),
oldPackage.getPackageVersion().getGeneralPackage().getName(),
oldPackage.getPackageVersion().getGeneralPackage().getPackageType().getId(),
packageVersion,
- contentVersion,
+ displayVersion,
oldPackage.getPackageVersion().getArchitecture().getId(),
fileContents);
@@ -644,9 +648,9 @@ public class ResourceClientProxy {
public InstalledPackage getBackingContent();
+ public void updateBackingContent(String fileName, String displayVersion);
- public void updateBackingContent(String fileName, String contentVersion);
-
+ public void updateBackingContent(String fileName);
public void retrieveBackingContent(String fileName) throws IOException;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
index 20c53bc..819a46d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
@@ -758,8 +758,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot
q.setParameter("name", architecture.getName());
architecture = (Architecture) q.getSingleResult();
}
- PackageVersion packageVersion = contentManager.createPackageVersion(subject, name, packageType.getId(),
- version, null, architecture.getId(), fileStream);
+ PackageVersion packageVersion = contentManager.createPackageVersionWithDisplayVersion(subject, name,
+ packageType.getId(), version, null, architecture.getId(), fileStream);
// set the PackageVersion's filename to the bundleFile name, it's left null by default
packageVersion.setFileName(name);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 95dcc02..529ac32 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -1237,8 +1237,14 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
}
}
- public PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version, String displayVersion,
+ public PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version,
Integer architectureId, byte[] packageBytes) {
+ return createPackageVersionWithDisplayVersion(subject, packageName, packageTypeId, version, null,
+ architectureId, packageBytes);
+ }
+
+ public PackageVersion createPackageVersionWithDisplayVersion(Subject subject, String packageName,
+ int packageTypeId, String version, String displayVersion, Integer architectureId, byte[] packageBytes) {
// Check permissions first
if (!authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_CONTENT)) {
@@ -1246,13 +1252,14 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
+ "] does not have permission to create package versions");
}
- return createPackageVersion(subject, packageName, packageTypeId, version, displayVersion, (null == architectureId) ? getNoArchitecture()
+ return createPackageVersionWithDisplayVersion(subject, packageName, packageTypeId, version, displayVersion,
+ (null == architectureId) ? getNoArchitecture()
.getId() : architectureId, new ByteArrayInputStream(packageBytes));
}
@TransactionAttribute(value = TransactionAttributeType.REQUIRES_NEW)
- public PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId,
- String version, String displayVersion, int architectureId, InputStream packageBitStream) {
+ public PackageVersion createPackageVersionWithDisplayVersion(Subject subject, String packageName,
+ int packageTypeId, String version, String displayVersion, int architectureId, InputStream packageBitStream) {
// See if the package version already exists and return that if it does
Query packageVersionQuery = entityManager.createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH);
packageVersionQuery.setParameter("name", packageName);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
index 9da3c09..fc72896 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
@@ -234,13 +234,14 @@ public interface ContentManagerLocal {
* @param packageName parent package name; uniquely identifies the package under which this version goes
* @param packageTypeId identifies the type of package in case the general package needs to be created
* @param version identifies the version to be create
+ * @param displayVersion package display version
* @param architectureId architecture of the newly created package version
*
* @return newly created package version if one did not exist; existing package version that matches these data if
* one was found
*/
- PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version,
- String displayVersion, int architectureId, InputStream packageBitStream);
+ PackageVersion createPackageVersionWithDisplayVersion(Subject subject, String packageName, int packageTypeId,
+ String version, String displayVersion, int architectureId, InputStream packageBitStream);
/**
* This method is essentially the same as {@link #createPackageVersion(Subject, String, int, String, int, InputStream)}
@@ -350,7 +351,13 @@ public interface ContentManagerLocal {
* @see {@link createPackageVersion(Subject, String, int, String, int, byte[]);
*/
PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version,
- String displayVersion, Integer architectureId, byte[] packageBytes);
+ Integer architectureId, byte[] packageBytes);
+
+ /**
+ * @see {@link createPackageVersion(Subject, String, int, String, int, byte[]);
+ */
+ PackageVersion createPackageVersionWithDisplayVersion(Subject subject, String packageName, int packageTypeId,
+ String version, String displayVersion, Integer architectureId, byte[] packageBytes);
/**
* @see {@link ContentManagerRemote#deletePackages(Subject, int, int[], String)}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
index 52ff38a..a75d78f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
@@ -69,6 +69,29 @@ public interface ContentManagerRemote {
@WebParam(name = "packageName") String packageName, //
@WebParam(name = "packageTypeId") int packageTypeId, //
@WebParam(name = "version") String version, //
+ @WebParam(name = "architectureId") Integer architectureId, //
+ @WebParam(name = "packageBytes") byte[] packageBytes);
+
+ /**
+ * Creates a new package version in the system. If the parent package (identified by the packageName parameter) does
+ * not exist, it will be created. If a package version exists with the specified version ID, a new one will not be
+ * created and the existing package version instance will be returned.
+ *
+ * @param subject The logged in subject
+ * @param packageName parent package name; uniquely identifies the package under which this version goes
+ * @param packageTypeId identifies the type of package in case the general package needs to be created
+ * @param version identifies the version to be create
+ * @param architectureId architecture of the newly created package version. If null then no architecture restriction.
+ *
+ * @return newly created package version if one did not exist; existing package version that matches these data if
+ * one was found
+ */
+ @WebMethod
+ PackageVersion createPackageVersionWithDisplayVersion( //
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "packageName") String packageName, //
+ @WebParam(name = "packageTypeId") int packageTypeId, //
+ @WebParam(name = "version") String version, //
@WebParam(name = "displayVersion") String displayVersion, //
@WebParam(name = "architectureId") Integer architectureId, //
@WebParam(name = "packageBytes") byte[] packageBytes);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
index 0cb3349..6c016e7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
@@ -446,8 +446,8 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
// Create/locate package and package version
PackageVersion packageVersion = null;
if (packageUploadDetails == null) {
- packageVersion = contentManager.createPackageVersion(user, packageName, newPackageType.getId(),
- packageVersionNumber, null, architectureId, packageBitStream);
+ packageVersion = contentManager.createPackageVersionWithDisplayVersion(user, packageName,
+ newPackageType.getId(), packageVersionNumber, null, architectureId, packageBitStream);
} else {
packageVersion = contentManager.getUploadedPackageVersion(user, packageName, newPackageType.getId(),
packageVersionNumber, architectureId, packageBitStream, packageUploadDetails, null);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
index 21e3e1c..fe6725c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
@@ -507,11 +507,16 @@ public class WebservicesManagerBean implements WebservicesRemote {
//CONTENTMANAGER: BEGIN ----------------------------------
public PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version,
- String displayVersion,
Integer architectureId, byte[] packageBytes) {
- return contentManager.createPackageVersion(subject, packageName, packageTypeId, version, displayVersion,
- architectureId,
- packageBytes);
+ return contentManager.createPackageVersionWithDisplayVersion(subject, packageName, packageTypeId, version,
+ null, architectureId, packageBytes);
+ }
+
+ public PackageVersion createPackageVersionWithDisplayVersion(Subject subject, String packageName,
+ int packageTypeId, String version,
+ String displayVersion, Integer architectureId, byte[] packageBytes) {
+ return contentManager.createPackageVersionWithDisplayVersion(subject, packageName, packageTypeId, version,
+ displayVersion, architectureId, packageBytes);
}
public void deletePackages(Subject subject, int resourceId, int[] installedPackageIds, String requestNotes) {
commit 5d744ed0ed9cae0923f0d74e450feddc8bb2cb40
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Jan 13 17:45:25 2012 -0600
[BZ 758753] Adding back old deployPackages method to keep the remote interface backwards compatible. The old method was set to deprecated and no longer used in internal code.
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
index 69cb01d..b1b866f 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
@@ -462,7 +462,7 @@ function testDeploy() {
Assert.assertNumberEqualsJS( pvsInRepo.get(0).getId(), pv.getId(), "unexpected pv returned" );
// do the update
- ContentManager.deployPackages( [war.getId()], [pv.getId()], "Test Note" );
+ ContentManager.deployPackagesWithNote( [war.getId()], [pv.getId()], "Test Note" );
// Make sure things still look good
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index 5390752..6976d25 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -538,7 +538,7 @@ public class ResourceClientProxy {
oldPackage.getPackageVersion().getArchitecture().getId(),
fileContents);
- remoteClient.getContentManager().deployPackages(
+ remoteClient.getContentManager().deployPackagesWithNote(
remoteClient.getSubject(),
new int[] { resourceClientProxy.getId()},
new int[] {pv.getId()},
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
index 3fe6228..4ff6981 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
@@ -94,7 +94,7 @@ public class DeployPackagesUIBean extends PagedDataTableUIBean {
try {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
- contentManager.deployPackages(subject, new int[] { resource.getId() }, packagesVersionsIdsToDeploy, notes);
+ contentManager.deployPackagesWithNote(subject, new int[] { resource.getId() }, packagesVersionsIdsToDeploy, notes);
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Could not send deploy request to agent", e);
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java
index c6eb4c7..a5776d3 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java
@@ -33,8 +33,8 @@ import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean;
import org.rhq.enterprise.gui.common.paging.PageControlView;
import org.rhq.enterprise.gui.common.paging.PagedListDataModel;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
-import org.rhq.enterprise.server.content.RepoManagerLocal;
import org.rhq.enterprise.server.content.ContentManagerLocal;
+import org.rhq.enterprise.server.content.RepoManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
public class RepoPackageVersionsUIBean extends PagedDataTableUIBean {
@@ -68,7 +68,7 @@ public class RepoPackageVersionsUIBean extends PagedDataTableUIBean {
resourceIds[i] = resources.get(i).getId();
}
- contentManager.deployPackages(subject, resourceIds, packageIds, "Repository package install");
+ contentManager.deployPackagesWithNote(subject, resourceIds, packageIds, "Repository package install");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to deploy packages: " + packageIds
+ " to Resources subscribed to repository: " + repoId + " Error: " + e.getMessage());
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 5edc4d9..95dcc02 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -343,7 +343,11 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
+ (System.currentTimeMillis() - start) + "ms");
}
- public void deployPackages(Subject user, int[] resourceIds, int[] packageVersionIds, String requestNotes) {
+ public void deployPackages(Subject user, int[] resourceIds, int[] packageVersionIds) {
+ this.deployPackagesWithNote(user, resourceIds, packageVersionIds, null);
+ }
+
+ public void deployPackagesWithNote(Subject user, int[] resourceIds, int[] packageVersionIds, String requestNotes) {
for (int resourceId : resourceIds) {
Set<ResourcePackageDetails> packages = new HashSet<ResourcePackageDetails>();
for (int packageVersionId : packageVersionIds) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
index 9819ee7..9da3c09 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
@@ -363,9 +363,9 @@ public interface ContentManagerLocal {
public void deletePackageVersion(Subject subject, int packageVersionId);
/**
- * @see {@link ContentManagerRemote#deployPackages(Subject, int[], int[], String)}
+ * @see {@link ContentManagerRemote#deployPackagesWithNote(Subject, int[], int[], String)}
*/
- void deployPackages(Subject subject, int[] resourceIds, int[] packageVersionIds, String requestNotes);
+ void deployPackagesWithNote(Subject subject, int[] resourceIds, int[] packageVersionIds, String requestNotes);
/**
* @see {@link ContentManagerRemote#findArchitectures(Subject)}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
index 439c8a7..52ff38a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
@@ -110,9 +110,26 @@ public interface ContentManagerRemote {
* @param packageVersionIds packageVersions we want to install
*/
@WebMethod
+ @Deprecated
void deployPackages(
@WebParam(name = "subject") Subject subject, //
@WebParam(name = "resourceIds") int[] resourceIds, //
+ @WebParam(name = "packageVersionIds") int[] packageVersionIds);
+
+ /**
+ * Deploys packages on the specified resources. Each installed package entry should be populated with the <code>
+ * PackageVersion</code> being installed, along with the deployment configuration values if any. This method will
+ * take care of populating the rest of the values in each installed package object.
+ *
+ * @param subject The logged in subject
+ * @param resourceIds identifies the resources against which the package will be deployed
+ * @param packageVersionIds packageVersions we want to install
+ * @param requestNotes request notes
+ */
+ @WebMethod
+ void deployPackagesWithNote(
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "resourceIds") int[] resourceIds, //
@WebParam(name = "packageVersionIds") int[] packageVersionIds,
@WebParam(name = "requestNotes") String requestNotes);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
index f5d4a36..21e3e1c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
@@ -522,8 +522,12 @@ public class WebservicesManagerBean implements WebservicesRemote {
contentManager.deletePackageVersion(subject, packageVersionId);
}
- public void deployPackages(Subject subject, int[] resourceIds, int[] packageVersionIds, String requestNotes) {
- contentManager.deployPackages(subject, resourceIds, packageVersionIds, requestNotes);
+ public void deployPackages(Subject subject, int[] resourceIds, int[] packageVersionIds) {
+ contentManager.deployPackagesWithNote(subject, resourceIds, packageVersionIds, null);
+ }
+
+ public void deployPackagesWithNote(Subject subject, int[] resourceIds, int[] packageVersionIds, String requestNotes) {
+ contentManager.deployPackagesWithNote(subject, resourceIds, packageVersionIds, requestNotes);
}
public List<Architecture> findArchitectures(Subject subject) {
@@ -1240,4 +1244,5 @@ public class WebservicesManagerBean implements WebservicesRemote {
}
}
+
}
commit 308f0b8dab812f3cf5c4097256789c1efc35cc85
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Jan 10 16:23:25 2012 -0600
[BZ 773061] Ignore subfolders discovered in the repo folder. This will prevent attempts to import full folders and/or import packages from sub repos.
diff --git a/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java b/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
index 2c4e907..2c1f079 100644
--- a/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
+++ b/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
@@ -201,19 +201,22 @@ public class DiskSource implements ContentProvider, PackageSource, RepoSource {
if (file.getName().equals(repoName)) {
for (File filePackage : file.listFiles()) {
- ContentProviderPackageDetails details = createPackage(filePackage);
- if (details != null) {
- ContentProviderPackageDetails existing = findPackage(packages, details);
- if (existing == null) {
- report.addNewPackage(details);
- } else {
- packages.remove(existing); // it still exists, remove it from our list
- if (details.getFileCreatedDate().compareTo(existing.getFileCreatedDate()) > 0) {
- report.addUpdatedPackage(details);
+ if (!filePackage.isDirectory()) {
+ ContentProviderPackageDetails details = createPackage(filePackage);
+ if (details != null) {
+ ContentProviderPackageDetails existing = findPackage(packages, details);
+ if (existing == null) {
+ report.addNewPackage(details);
+ } else {
+ packages.remove(existing); // it still exists, remove it from our list
+ if (details.getFileCreatedDate().compareTo(existing.getFileCreatedDate()) > 0) {
+ report.addUpdatedPackage(details);
+ }
}
}
- } else {
- // file does not match any filter and is therefore an unknown type - ignore it
+ else {
+ // file does not match any filter and is therefore an unknown type - ignore it
+ }
}
}
commit ed3a509e8dd2f306fe1ed857503cf16db45a7723
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 9 14:29:15 2012 -0600
[BZ 772722] Update the CSP server side plugin for remote package sources to use SHA256 for version and save the actual version information in the display version field.
diff --git a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java
index 5fb03b2..a30bfab 100644
--- a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java
+++ b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java
@@ -159,14 +159,22 @@ public class RssFeedParser {
// Technically, this is a check for installable patches. But for now, that's the same as a cumulative
// patch
if (softwareType.equals(RSS_SOFTWARE_TYPE_BUGFIX) && instructionCompatibilityVersion != null) {
- String version = parseCumulativePatchVersion(packageName);
- if (version == null) {
- log.error("Could not parse version for package: " + packageName);
+ String displayVersion = parseCumulativePatchVersion(packageName);
+ if (displayVersion == null) {
+ log.error("Could not parse version for package: " + packageName + ". Package skipped.");
continue;
}
+ if (patch.getSha256() == null) {
+ log.error("Could not parse SHA256 for package: " + packageName + ". Package skipped.");
+ continue;
+ }
+
+ String version = "[sha256=" + patch.getSha256() + "]";
+
ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(packageName, version,
- PACKAGE_TYPE_CUMULATIVE_PATCH, ARCHITECTURE, RESOURCE_TYPE_JBOSS_AS, getPluginName(version));
+ PACKAGE_TYPE_CUMULATIVE_PATCH, ARCHITECTURE, RESOURCE_TYPE_JBOSS_AS,
+ getPluginName(displayVersion));
// If this package is already known to the server, don't add it as a new package
// Remove from the map; entries still in the map will be returned as deleted packages
@@ -187,6 +195,7 @@ public class RssFeedParser {
packageDetails.setLocation(patch.getAutomatedDownloadUrl());
packageDetails.setMD5(patch.getMd5());
packageDetails.setSHA256(patch.getSha256());
+ packageDetails.setDisplayVersion(displayVersion);
packageDetails.setShortDescription(patch.getShortDescription());
packageDetails.setLongDescription(patch.getLongDescription());
commit fa0843f28f77f556f2c19e803fd19934e308b571
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 9 14:03:04 2012 -0600
[BZ 772722] Updates for the url remote repository server side plugin. SHA256 is now used for checksum and version.
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java
index 48361cb..43c7d3a 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java
@@ -33,7 +33,7 @@ public class FullRemotePackageInfo extends RemotePackageInfo {
private final ContentProviderPackageDetails details;
public FullRemotePackageInfo(URL url, ContentProviderPackageDetails details) {
- super(details.getLocation(), url, details.getMD5());
+ super(details.getLocation(), url, details.getSHA256());
this.details = details;
// the metadata provided let's us know our package type
@@ -53,7 +53,7 @@ public class FullRemotePackageInfo extends RemotePackageInfo {
StringBuilder str = new StringBuilder("FullRemotePackageInfo: ");
str.append("location=[").append(this.getLocation());
str.append("], url=[").append(this.getUrl());
- str.append("], md5=[").append(this.getMD5());
+ str.append("], sha256=[").append(this.getSHA256());
if (this.getSupportedPackageType() != null) {
str.append("], supportedPackageType=[").append(this.getSupportedPackageType().packageTypeName);
str.append(",").append(this.getSupportedPackageType().architectureName);
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java
index a512ec3..71f7fdb 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java
@@ -23,13 +23,13 @@ import java.net.URL;
public class RemotePackageInfo {
private String location; // the path of the package relative to the root URL
private URL url;
- private String md5;
+ private String sha256;
private SupportedPackageType supportedPackageType;
- public RemotePackageInfo(String location, URL url, String md5) {
+ public RemotePackageInfo(String location, URL url, String sha256) {
this.location = location;
this.url = url;
- this.md5 = md5;
+ this.sha256 = sha256;
this.supportedPackageType = null; // we don't know it
}
@@ -41,8 +41,8 @@ public class RemotePackageInfo {
return this.url;
}
- public String getMD5() {
- return this.md5;
+ public String getSHA256() {
+ return this.sha256;
}
/**
@@ -63,7 +63,7 @@ public class RemotePackageInfo {
StringBuilder str = new StringBuilder("RemotePackageInfo: ");
str.append("location=[").append(this.location);
str.append("], url=[").append(this.url);
- str.append("], md5=[").append(this.md5);
+ str.append("], sha256=[").append(this.sha256);
if (this.supportedPackageType != null) {
str.append("], supportedPackageType=[").append(this.supportedPackageType.packageTypeName);
str.append(",").append(this.supportedPackageType.architectureName);
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java
index 8a22062..4e92cc1 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java
@@ -20,17 +20,17 @@ package org.rhq.enterprise.server.plugins.url;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.URL;
-import java.security.MessageDigest;
import java.util.HashMap;
import java.util.Map;
+import org.rhq.core.util.MessageDigestGenerator;
+
/**
- * Parses the simple index txt file whose format is simply "location|md5" where location
+ * Parses the simple index txt file whose format is simply "location|sha256" where location
* is a relative filepath where the file is found on the content source.
*
* @author John Mazzitelli
@@ -38,7 +38,6 @@ import java.util.Map;
public class SimpleIndexParser implements IndexParser {
public Map<String, RemotePackageInfo> parse(InputStream indexStream, UrlProvider contentSource) throws Exception {
-
Map<String, RemotePackageInfo> fileList = new HashMap<String, RemotePackageInfo>();
BufferedReader reader = new BufferedReader(new InputStreamReader(indexStream));
@@ -47,11 +46,11 @@ public class SimpleIndexParser implements IndexParser {
line = (line.length() > 1) ? line.substring(1) : ""; // we don't want a leading slash
}
if (line.length() > 0) {
- String[] locationAndMd5 = line.split("\\|");
- // if the line doesn't have location|md5, we silently skip it
- if (locationAndMd5.length == 2) {
- URL locationUrl = new URL(contentSource.getRootUrl().toString() + locationAndMd5[0]);
- RemotePackageInfo rpi = new RemotePackageInfo(locationAndMd5[0], locationUrl, locationAndMd5[1]);
+ String[] locationAndSHA256 = line.split("\\|");
+ // if the line doesn't have location|sha256, we silently skip it
+ if (locationAndSHA256.length == 2) {
+ URL locationUrl = new URL(contentSource.getRootUrl().toString() + locationAndSHA256[0]);
+ RemotePackageInfo rpi = new RemotePackageInfo(locationAndSHA256[0], locationUrl, locationAndSHA256[1]);
fileList.put(rpi.getLocation(), rpi);
}
}
@@ -103,40 +102,11 @@ public class SimpleIndexParser implements IndexParser {
} else if (!file.getCanonicalPath().equals(new File(root, "content-index.txt").getCanonicalPath())) {
// determine the relative location of the file
String location = file.getCanonicalPath().substring(root.getCanonicalPath().length() + 1);
-
- // we need the MD5 of the file
- String md5;
- FileInputStream is = null;
- try {
- MessageDigest messageDigest = MessageDigest.getInstance("MD5");
- is = new FileInputStream(file);
-
- byte[] bytes = new byte[1024];
- int len;
- while ((len = is.read(bytes, 0, bytes.length)) != -1) {
- messageDigest.update(bytes, 0, len);
- }
-
- bytes = messageDigest.digest();
- StringBuffer sb = new StringBuffer(bytes.length * 2);
-
- for (int i = 0; i < bytes.length; i++) {
- int hi = (bytes[i] >> 4) & 0xf;
- int lo = bytes[i] & 0xf;
- sb.append(Character.forDigit(hi, 16));
- sb.append(Character.forDigit(lo, 16));
- }
- md5 = sb.toString();
- } finally {
- if (is != null) {
- is.close();
- }
- }
+ MessageDigestGenerator messageDigestGenerator = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String sha256 = messageDigestGenerator.calcDigestString(file);
// write the line in the index file
- indexWriter.println(location.replace('\\', '/') + '|' + md5);
+ indexWriter.println(location.replace('\\', '/') + '|' + sha256);
}
-
- return;
}
}
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java
index c229a2b..9c4a182 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java
@@ -315,9 +315,9 @@ public class UrlProvider implements ContentProvider, PackageSource {
}
if (pkg == null) {
- String md5 = rpi.getMD5();
+ String sha256 = rpi.getSHA256();
String name = new File(rpi.getLocation()).getName();
- String version = md5; // very crude, but we don't know the "real" version so use md5 as the next best thing
+ String version = "[sha256=" + sha256 + "]";
String packageTypeName = supportedPackageType.packageTypeName;
String architectureName = supportedPackageType.architectureName;
String resourceTypeName = supportedPackageType.resourceTypeName;
@@ -332,7 +332,7 @@ public class UrlProvider implements ContentProvider, PackageSource {
pkg.setFileSize(new Long(urlConn.getContentLength()));
pkg.setDisplayName(name);
pkg.setFileName(name);
- pkg.setMD5(md5);
+ pkg.setSHA256(sha256);
pkg.setLocation(rpi.getLocation());
pkg.setShortDescription(null);
}
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
index a988f2d..1ecde5a 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
@@ -20,12 +20,10 @@ package org.rhq.enterprise.server.plugins.url;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.URL;
-import java.security.MessageDigest;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -49,6 +47,7 @@ import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails;
import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetailsKey;
import org.rhq.enterprise.server.xmlschema.XmlSchemas;
@@ -123,8 +122,9 @@ public class XmlIndexParser implements IndexParser {
PackageDetailsKeyType keyType = pkg.getPackageDetailsKey();
try {
- ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(keyType.getName(), keyType
- .getVersion(), keyType.getPackageTypeName(), keyType.getArchitectureName(), keyType
+ String version = "[sha256=" + pkg.getSha256() + "]";
+ ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(keyType.getName(), version,
+ keyType.getPackageTypeName(), keyType.getArchitectureName(), keyType
.getResourceTypeName(), keyType.getResourceTypePlugin());
ContentProviderPackageDetails details = new ContentProviderPackageDetails(key);
details.setDisplayName(pkg.getDisplayName());
@@ -135,7 +135,6 @@ public class XmlIndexParser implements IndexParser {
details.setFileName(pkg.getFileName());
details.setFileSize(pkg.getFileSize());
details.setFileCreatedDate(pkg.getFileCreatedDate());
- details.setMD5(pkg.getMd5());
details.setSHA256(pkg.getSha256());
details.setLicenseName(pkg.getLicenseName());
details.setLicenseVersion(pkg.getLicenseVersion());
@@ -293,12 +292,15 @@ public class XmlIndexParser implements IndexParser {
}
} else if (!file.getCanonicalPath().equals(new File(root, "content-index.xml").getCanonicalPath())) {
String relativeLocation = file.getCanonicalPath().substring(root.getCanonicalPath().length() + 1);
- String md5 = generateHash(file, "MD5");
- String sha256 = generateHash(file, "SHA-256");
+
+ MessageDigestGenerator messageDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String sha256 = messageDigest.calcDigestString(file);
+
+ String version = "[sha256=" + sha256 + "]";
PackageDetailsKeyType detailsKeyType = new PackageDetailsKeyType();
detailsKeyType.setName(file.getName());
- detailsKeyType.setVersion(md5);
+ detailsKeyType.setVersion(version);
detailsKeyType.setPackageTypeName(packageTypeInfo.getPackageTypeName());
detailsKeyType.setArchitectureName(packageTypeInfo.getArchitectureName());
detailsKeyType.setResourceTypeName(packageTypeInfo.getResourceTypeName());
@@ -306,21 +308,11 @@ public class XmlIndexParser implements IndexParser {
PackageDetailsType detailsType = new PackageDetailsType();
detailsType.setPackageDetailsKey(detailsKeyType);
- //detailsType.setResourceVersions();
detailsType.setDisplayName(file.getName());
- detailsType.setDisplayVersion(md5);
- //detailsType.setShortDescription();
- //detailsType.setLongDescription();
- //detailsType.setClassification();
detailsType.setFileName(file.getName());
detailsType.setFileSize(file.length());
detailsType.setFileCreatedDate(file.lastModified());
- detailsType.setMd5(md5);
detailsType.setSha256(sha256);
- //detailsType.setLicenseName();
- //detailsType.setLicenseVersion();
- //detailsType.setMetadata();
- //detailsType.setExtraProperties();
detailsType.setLocation(relativeLocation);
list.add(detailsType);
@@ -328,44 +320,4 @@ public class XmlIndexParser implements IndexParser {
return;
}
-
- /**
- * Generates a hash code for the given file.
- * @param file the file whose contents is used to generate the hash
- * @param algorithm "MD5" or "SHA-256"
- * @return
- * @return the hash as a string
- * @throws Exception
- */
- protected static String generateHash(File file, String algorithm) throws Exception {
- String hash;
- FileInputStream is = null;
- try {
- MessageDigest messageDigest = MessageDigest.getInstance(algorithm);
- is = new FileInputStream(file);
-
- byte[] bytes = new byte[1024];
- int len;
- while ((len = is.read(bytes, 0, bytes.length)) != -1) {
- messageDigest.update(bytes, 0, len);
- }
-
- bytes = messageDigest.digest();
- StringBuffer sb = new StringBuffer(bytes.length * 2);
-
- for (int i = 0; i < bytes.length; i++) {
- int hi = (bytes[i] >> 4) & 0xf;
- int lo = bytes[i] & 0xf;
- sb.append(Character.forDigit(hi, 16));
- sb.append(Character.forDigit(lo, 16));
- }
- hash = sb.toString();
- } finally {
- if (is != null) {
- is.close();
- }
- }
-
- return hash;
- }
}
diff --git a/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java b/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
index 50ed388..7798e93 100644
--- a/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
+++ b/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
@@ -51,7 +51,7 @@ public class XmlIndexParserTest {
assert details instanceof FullRemotePackageInfo : "Bad class=" + details.getClass();
FullRemotePackageInfo fullDetails = (FullRemotePackageInfo) details;
assert "Mazzlocation".equals(fullDetails.getLocation()) : fullDetails.getLocation();
- assert "Mazzmd5".equals(fullDetails.getMD5()) : fullDetails.getMD5();
+ assert "Mazzsha256".equals(fullDetails.getSHA256()) : fullDetails.getSHA256();
assert new URL("http://root/url/Mazzlocation").equals(fullDetails.getUrl()) : fullDetails.getUrl();
assert "Mazzarchitecture-name".equals(fullDetails.getSupportedPackageType().architectureName) : fullDetails
.getSupportedPackageType().architectureName;
@@ -140,7 +140,7 @@ public class XmlIndexParserTest {
assert details instanceof FullRemotePackageInfo : "Bad class=" + details.getClass();
fullDetails = (FullRemotePackageInfo) details;
assert "WOTGORILLAlocation".equals(fullDetails.getLocation()) : fullDetails.getLocation();
- assert null == fullDetails.getMD5() : fullDetails.getMD5();
+ assert null == fullDetails.getSHA256() : fullDetails.getSHA256();
assert new URL("http://root/url/WOTGORILLAlocation").equals(fullDetails.getUrl()) : fullDetails.getUrl();
assert "WOTGORILLAarchitecture-name".equals(fullDetails.getSupportedPackageType().architectureName) : fullDetails
.getSupportedPackageType().architectureName;
commit 490ad1f0cdc7f2e7c294dee87f3cc9a9b57ceacf
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 9 13:32:23 2012 -0600
[BZ 772722] Fixes for Yum and disk remote content plugins to use SHA256 for the version and corretly set the display version.
diff --git a/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java b/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
index 3155976..2c4e907 100644
--- a/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
+++ b/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
@@ -234,14 +234,15 @@ public class DiskSource implements ContentProvider, PackageSource, RepoSource {
}
ContentFileInfo fileInfo = ContentFileInfoFactory.createContentFileInfo(file);
- String md5;
+ String sha256;
try {
- md5 = MessageDigestGenerator.getDigestString(file);
+ sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(file);
} catch (IOException e) {
throw new SyncException("Error digesting file", e);
}
String name = file.getName();
- String version = fileInfo.getVersion(md5);
+ String version = "[sha256=" + sha256 + "]";
+ String displayVersion = fileInfo.getVersion(null);
String packageTypeName = supportedPackageType.packageTypeName;
String architectureName = supportedPackageType.architectureName;
String resourceTypeName = supportedPackageType.resourceTypeName;
@@ -255,7 +256,8 @@ public class DiskSource implements ContentProvider, PackageSource, RepoSource {
pkg.setFileName(name);
pkg.setFileCreatedDate(file.lastModified());
pkg.setFileSize(file.length());
- pkg.setMD5(md5);
+ pkg.setSHA256(sha256);
+ pkg.setDisplayVersion(displayVersion);
pkg.setLocation(getRelativePath(file));
pkg.setShortDescription(fileInfo.getDescription(null));
diff --git a/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java b/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java
index 616dad4..2a31298 100644
--- a/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java
+++ b/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java
@@ -219,7 +219,9 @@ public class Repo {
*/
private ContentProviderPackageDetails getDetails(Element p) throws Exception {
String name = p.getChildText("name", Repodata.yumns);
- String version = encodeVersion(p);
+ String displayVersion = encodeVersion(p);
+ String sha256 = p.getChildText("checksum", Repodata.yumns);
+ String version = "[sha256=" + sha256 + "]";
String arch = p.getChildText("arch", Repodata.yumns);
ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(name, version, "rpm", arch,
"Linux", "Platforms");
@@ -233,6 +235,7 @@ public class Repo {
pkg.setFileCreatedDate(filedate(p));
pkg.setLicenseName(p.getChild("format", Repodata.yumns).getChildText("license", Repodata.rpmns));
pkg.setSHA256(p.getChildText("checksum", Repodata.yumns));
+ pkg.setDisplayVersion(displayVersion);
pkg.setLocation(location(p));
pkg.setMetadata(gzip(p));
return pkg;
commit 0800e7dfb264d2c97e7f9638e98fcad6deeeab4a
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Jan 5 15:23:07 2012 -0600
[BZ 758753] Revert to using version for querying packages during the merge process. This is possible because the version is now SHA256 across all the plugins.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
index 6a1af87..135a619 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
@@ -58,14 +58,13 @@ import org.rhq.core.domain.util.OSGiVersionComparator;
*/
@Entity
@NamedQueries({
- @NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS, query = "" //
+ @NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_VERSION, query = "" //
+ "SELECT pv FROM PackageVersion AS pv " //
+ " WHERE pv.generalPackage.name = :packageName " //
+ " AND pv.generalPackage.packageType.name = :packageTypeName " //
+ " AND pv.generalPackage.packageType.resourceType.id = :resourceTypeId " //
- + " AND ( ( NOT pv.sha256 IS NULL AND pv.sha256 = :sha ) OR "
- + " ( pv.sha256 IS NULL AND pv.architecture.name = :architectureName AND pv.version = :version ) "
- + " ) "),
+ + " AND pv.version = :version "//
+ + " ORDER BY pv.id DESC "),
@NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_SHA, query = "" //
+ "SELECT pv FROM PackageVersion AS pv " //
+ " WHERE pv.generalPackage.name = :packageName " //
@@ -272,7 +271,7 @@ public class PackageVersion implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String QUERY_FIND_BY_PACKAGE_DETAILS = "PackageVersion.findByPackageDetails";
+ public static final String QUERY_FIND_BY_PACKAGE_VERSION = "PackageVersion.findByPackageVersion";
public static final String QUERY_FIND_BY_PACKAGE_VER_ARCH = "PackageVersion.findByPackageVerArch";
public static final String QUERY_FIND_BY_PACKAGE_SHA = "PackageVersion.findByPackageSha";
public static final String QUERY_FIND_BY_PACKAGE_SHA_RES_TYPE = "PackageVersion.findByPackageShaResType";
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 234d400..5edc4d9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -202,12 +202,12 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// If the package exists see if package version already exists
if (null != generalPackage) {
Query packageVersionQuery = entityManager
- .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_SHA);
+ .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_VERSION);
packageVersionQuery.setFlushMode(FlushModeType.COMMIT);
packageVersionQuery.setParameter("packageName", discoveredPackage.getName());
packageVersionQuery.setParameter("packageTypeName", discoveredPackage.getPackageTypeName());
packageVersionQuery.setParameter("resourceTypeId", resource.getResourceType().getId());
- packageVersionQuery.setParameter("sha", discoveredPackage.getSHA256());
+ packageVersionQuery.setParameter("version", discoveredPackage.getVersion());
List<PackageVersion> resultPackageVersions = packageVersionQuery.getResultList();
if (resultPackageVersions.size() > 0) {
packageVersion = resultPackageVersions.get(0);
commit c59b59bdcd6d2d33cc6cce212aee971616fb00aa
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Jan 5 15:06:41 2012 -0600
[BZ 771777] If there are multiple installed packages associated with an application then return the one with the latest timestamp.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index fd1db2a..234d400 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -1603,8 +1603,18 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
PageList<InstalledPackage> ips = findInstalledPackagesByCriteria(subject, criteria);
// should not be more than 1
- if ((null != ips) && (1 == ips.size())) {
- result = ips.get(0);
+ if ((null != ips) && (ips.size() > 0)) {
+ int mostRecentPackageIndex = 0;
+
+ if (ips.size() > 1) {
+ for (int index = 1; index < ips.size(); index++) {
+ if (ips.get(index).getInstallationDate() > ips.get(mostRecentPackageIndex).getInstallationDate()) {
+ mostRecentPackageIndex = index;
+ }
+ }
+ }
+
+ result = ips.get(mostRecentPackageIndex);
// fetch these
result.getPackageVersion().getGeneralPackage().getId();
commit 3bfbb166f8d9a5b821869a0462acc677c0b879b2
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Jan 3 15:07:14 2012 -0600
[BZ 771418] updateBackingContent now requires a version from the user. This version will be used as a display version for the uploaded package.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
index 7096645..6a1af87 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
@@ -71,7 +71,8 @@ import org.rhq.core.domain.util.OSGiVersionComparator;
+ " WHERE pv.generalPackage.name = :packageName " //
+ " AND pv.generalPackage.packageType.name = :packageTypeName " //
+ " AND pv.generalPackage.packageType.resourceType.id = :resourceTypeId " //
- + " AND pv.sha256 = :sha "),
+ + " AND pv.sha256 = :sha "
+ + " ORDER BY pv.id DESC "),
@NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH, query = "SELECT pv FROM PackageVersion AS pv "
+ " WHERE pv.generalPackage.name = :name " + " AND pv.generalPackage.packageType.id = :packageTypeId "
+ " AND pv.architecture.id = :architectureId " + " AND pv.version = :version "),
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index eade28b..5390752 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -29,11 +29,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javassist.util.proxy.MethodHandler;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javassist.util.proxy.MethodHandler;
-
import org.rhq.bindings.util.ConfigurationClassBuilder;
import org.rhq.bindings.util.LazyLoadScenario;
import org.rhq.bindings.util.ResourceTypeFingerprint;
@@ -505,7 +505,7 @@ public class ResourceClientProxy {
return remoteClient.getContentManager().getBackingPackageForResource(remoteClient.getSubject(), resourceClientProxy.resourceId);
}
- public void updateBackingContent(String filename) {
+ public void updateBackingContent(String filename, String contentVersion) {
File file = new File(filename);
if (!file.exists()) {
throw new IllegalArgumentException("File not found: " + file.getAbsolutePath());
@@ -524,7 +524,7 @@ public class ResourceClientProxy {
LOG.error("Message digest for the package bits failed.", e);
}
- String version = "[sha256="+sha+"]";
+ String packageVersion = "[sha256="+sha+"]";
InstalledPackage oldPackage = getBackingContent();
@@ -533,7 +533,8 @@ public class ResourceClientProxy {
remoteClient.getSubject(),
oldPackage.getPackageVersion().getGeneralPackage().getName(),
oldPackage.getPackageVersion().getGeneralPackage().getPackageType().getId(),
- version,
+ packageVersion,
+ contentVersion,
oldPackage.getPackageVersion().getArchitecture().getId(),
fileContents);
@@ -644,7 +645,7 @@ public class ResourceClientProxy {
public InstalledPackage getBackingContent();
- public void updateBackingContent(String fileName);
+ public void updateBackingContent(String fileName, String contentVersion);
public void retrieveBackingContent(String fileName) throws IOException;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
index 3c2111a..20c53bc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
@@ -28,7 +28,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -760,7 +759,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot
architecture = (Architecture) q.getSingleResult();
}
PackageVersion packageVersion = contentManager.createPackageVersion(subject, name, packageType.getId(),
- version, architecture.getId(), fileStream);
+ version, null, architecture.getId(), fileStream);
// set the PackageVersion's filename to the bundleFile name, it's left null by default
packageVersion.setFileName(name);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 5b03fd2..fd1db2a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -93,7 +93,6 @@ import org.rhq.core.domain.criteria.PackageCriteria;
import org.rhq.core.domain.criteria.PackageVersionCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.resource.ResourceCreationDataType;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.util.MessageDigestGenerator;
@@ -1234,7 +1233,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
}
}
- public PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version,
+ public PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version, String displayVersion,
Integer architectureId, byte[] packageBytes) {
// Check permissions first
@@ -1243,13 +1242,13 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
+ "] does not have permission to create package versions");
}
- return createPackageVersion(subject, packageName, packageTypeId, version, (null == architectureId) ? getNoArchitecture()
+ return createPackageVersion(subject, packageName, packageTypeId, version, displayVersion, (null == architectureId) ? getNoArchitecture()
.getId() : architectureId, new ByteArrayInputStream(packageBytes));
}
@TransactionAttribute(value = TransactionAttributeType.REQUIRES_NEW)
public PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId,
- String version, int architectureId, InputStream packageBitStream) {
+ String version, String displayVersion, int architectureId, InputStream packageBitStream) {
// See if the package version already exists and return that if it does
Query packageVersionQuery = entityManager.createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH);
packageVersionQuery.setParameter("name", packageName);
@@ -1260,7 +1259,13 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// Result of the query should be either 0 or 1
List existingVersionList = packageVersionQuery.getResultList();
if (existingVersionList.size() > 0) {
- return (PackageVersion) existingVersionList.get(0);
+ PackageVersion existingPackageVersion = (PackageVersion) existingVersionList.get(0);
+ if (displayVersion != null && !displayVersion.trim().isEmpty()) {
+ existingPackageVersion.setDisplayVersion(displayVersion);
+ existingPackageVersion = persistOrMergePackageVersionSafely(existingPackageVersion);
+ }
+
+ return existingPackageVersion;
}
Architecture architecture = entityManager.find(Architecture.class, architectureId);
@@ -1315,6 +1320,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
newPackageVersion.setPackageBits(bits);
newPackageVersion.setFileSize(Long.valueOf(contentDetails.get(UPLOAD_FILE_SIZE)).longValue());
newPackageVersion.setSHA256(contentDetails.get(UPLOAD_SHA256));
+ newPackageVersion.setDisplayVersion(displayVersion);
existingPackage.addVersion(newPackageVersion);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
index 566b4fc..9819ee7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
@@ -240,7 +240,7 @@ public interface ContentManagerLocal {
* one was found
*/
PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version,
- int architectureId, InputStream packageBitStream);
+ String displayVersion, int architectureId, InputStream packageBitStream);
/**
* This method is essentially the same as {@link #createPackageVersion(Subject, String, int, String, int, InputStream)}
@@ -350,7 +350,7 @@ public interface ContentManagerLocal {
* @see {@link createPackageVersion(Subject, String, int, String, int, byte[]);
*/
PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version,
- Integer architectureId, byte[] packageBytes);
+ String displayVersion, Integer architectureId, byte[] packageBytes);
/**
* @see {@link ContentManagerRemote#deletePackages(Subject, int, int[], String)}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
index 0038824..439c8a7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
@@ -69,6 +69,7 @@ public interface ContentManagerRemote {
@WebParam(name = "packageName") String packageName, //
@WebParam(name = "packageTypeId") int packageTypeId, //
@WebParam(name = "version") String version, //
+ @WebParam(name = "displayVersion") String displayVersion, //
@WebParam(name = "architectureId") Integer architectureId, //
@WebParam(name = "packageBytes") byte[] packageBytes);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
index 37131c2..0cb3349 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
@@ -447,7 +447,7 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
PackageVersion packageVersion = null;
if (packageUploadDetails == null) {
packageVersion = contentManager.createPackageVersion(user, packageName, newPackageType.getId(),
- packageVersionNumber, architectureId, packageBitStream);
+ packageVersionNumber, null, architectureId, packageBitStream);
} else {
packageVersion = contentManager.getUploadedPackageVersion(user, packageName, newPackageType.getId(),
packageVersionNumber, architectureId, packageBitStream, packageUploadDetails, null);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
index 54725a6..f5d4a36 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
@@ -507,8 +507,10 @@ public class WebservicesManagerBean implements WebservicesRemote {
//CONTENTMANAGER: BEGIN ----------------------------------
public PackageVersion createPackageVersion(Subject subject, String packageName, int packageTypeId, String version,
+ String displayVersion,
Integer architectureId, byte[] packageBytes) {
- return contentManager.createPackageVersion(subject, packageName, packageTypeId, version, architectureId,
+ return contentManager.createPackageVersion(subject, packageName, packageTypeId, version, displayVersion,
+ architectureId,
packageBytes);
}
commit e3738bc8c84fa9f42c077db6ee758969c4ddf6a4
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Dec 22 16:29:00 2011 -0600
[BZ 769986] The version field is no longer required when uploading a package. If the user types a version then the display version is used to capture that information.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
index 2a08598..666cac8 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
@@ -136,7 +136,7 @@ public class CreateNewPackageUIBean {
return response;
}
- public String createNewPackage(String packageName, String version, int architectureId, int packageTypeId) {
+ private String createNewPackage(String packageName, String displayVersion, int architectureId, int packageTypeId) {
// Collect the necessary information
Subject subject = EnterpriseFacesContextUtility.getSubject();
@@ -155,11 +155,6 @@ public class CreateNewPackageUIBean {
return null;
}
- if (version == null || version.trim().equals("")) {
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Package version must be specified");
- return null;
- }
-
if (repoOption == null) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
"A repository deployment option must be specified");
@@ -189,8 +184,8 @@ public class CreateNewPackageUIBean {
repoId = determineRepo(repoOption, subject, resource.getId());
} catch (ContentException ce) {
String errorMessages = ThrowableUtil.getAllMessages(ce);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
- + errorMessages);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
+ "Failed to determine repository. Cause: " + errorMessages);
return "failure";
}
} else {
@@ -199,7 +194,7 @@ public class CreateNewPackageUIBean {
repoId = FacesContextUtility.getRequiredRequestParameter("id");
}
}
-
+
try {
PackageVersion packageVersion = null;
try {
@@ -221,31 +216,38 @@ public class CreateNewPackageUIBean {
//store information about uploaded file for packageDetails as most of it is already available
Map<String, String> packageUploadDetails = new HashMap<String, String>();
- packageUploadDetails.put(ContentManagerLocal.UPLOAD_FILE_SIZE, String.valueOf(fileItem.getFileSize()));
- packageUploadDetails.put(ContentManagerLocal.UPLOAD_FILE_INSTALL_DATE, String.valueOf(System
- .currentTimeMillis()));
+ packageUploadDetails.put(ContentManagerLocal.UPLOAD_FILE_SIZE,
+ String.valueOf(fileItem.getFileSize()));
+ packageUploadDetails.put(ContentManagerLocal.UPLOAD_FILE_INSTALL_DATE,
+ String.valueOf(System.currentTimeMillis()));
packageUploadDetails.put(ContentManagerLocal.UPLOAD_OWNER, subject.getName());
packageUploadDetails.put(ContentManagerLocal.UPLOAD_FILE_NAME, fileItem.getFileName());
+ String sha = null;
+ String md5 = null;
try {//Easier to implement here than in server side bean. Shouldn't affect performance too much.
- packageUploadDetails.put(ContentManagerLocal.UPLOAD_MD5, new MessageDigestGenerator(
- MessageDigestGenerator.MD5).calcDigestString(fileItem.getFile()));
- packageUploadDetails.put(ContentManagerLocal.UPLOAD_SHA256, new MessageDigestGenerator(
- MessageDigestGenerator.SHA_256).calcDigestString(fileItem.getFile()));
+ md5 = new MessageDigestGenerator(MessageDigestGenerator.MD5).calcDigestString(fileItem
+ .getFile());
+ sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(fileItem
+ .getFile());
} catch (IOException e1) {
log.warn("Error calculating file digest(s)", e1);
}
+ packageUploadDetails.put(ContentManagerLocal.UPLOAD_MD5, md5);
+ packageUploadDetails.put(ContentManagerLocal.UPLOAD_SHA256, sha);
+ packageUploadDetails.put(ContentManagerLocal.UPLOAD_DISPLAY_VERSION, displayVersion);
+
Integer iRepoId = usingARepo ? Integer.parseInt(repoId) : null;
packageVersion = contentManager.getUploadedPackageVersion(subject, packageName, packageTypeId,
- version, architectureId, packageStream, packageUploadDetails, iRepoId);
+ formatVersion(sha), architectureId, packageStream, packageUploadDetails, iRepoId);
} catch (NoResultException nre) {
//eat the exception. Some of the queries return no results if no package yet exists which is fine.
} catch (Exception e) {
String errorMessages = ThrowableUtil.getAllMessages(e);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to create package [" + packageName
- + "] in repository. Cause: " + errorMessages);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to create package ["
+ + packageName + "] in repository. Cause: " + errorMessages);
return "failure";
}
} finally {
@@ -258,7 +260,6 @@ public class CreateNewPackageUIBean {
return "failure";
}
-
int[] packageVersionList = new int[] { packageVersion.getId() };
// Put the package ID in the session so it can fit into the deploy existing package workflow
@@ -320,7 +321,7 @@ public class CreateNewPackageUIBean {
public SelectItem[] getPackageTypesWithResourceTypeNames() {
return getPackageTypes(true);
}
-
+
private SelectItem[] getPackageTypes(boolean includeResourceTypeResolution) {
Resource resource = EnterpriseFacesContextUtility.getResourceIfExists();
@@ -346,7 +347,7 @@ public class CreateNewPackageUIBean {
return items;
}
-
+
public SelectItem[] getSubscribedRepos() {
Resource resource = EnterpriseFacesContextUtility.getResource();
@@ -385,7 +386,7 @@ public class CreateNewPackageUIBean {
if (!isResourcePackage()) {
return true;
}
-
+
boolean isPackageBacked = isResourcePackageBacked();
boolean backingPackageExists = lookupBackingPackage() != null;
@@ -395,7 +396,7 @@ public class CreateNewPackageUIBean {
public boolean isResourcePackage() {
return EnterpriseFacesContextUtility.getResourceIfExists() != null;
}
-
+
public boolean isResourcePackageBacked() {
Resource resource = EnterpriseFacesContextUtility.getResource();
ResourceType resourceType = resource.getResourceType();
@@ -446,10 +447,10 @@ public class CreateNewPackageUIBean {
if (packageName != null) {
return packageName;
}
-
+
UploadNewPackageUIBean uploadUIBean = FacesContextUtility.getManagedBean(UploadNewPackageUIBean.class);
UploadItem fileItem = uploadUIBean.getFileItem();
-
+
return fileItem == null ? null : fileItem.getFileName();
}
@@ -540,4 +541,8 @@ public class CreateNewPackageUIBean {
return repoId;
}
+
+ private String formatVersion(String sha) {
+ return "[sha256=" + sha + "]";
+ }
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
index 2e7e95e..3fe6228 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
@@ -80,6 +80,8 @@ public class DeployPackagesUIBean extends PagedDataTableUIBean {
// Going forward, we'll need to create this earlier and store the user entered configuration in these
// objects. jdobies, Mar 3, 2008
+ // The following code is completely unnecessary as the package version ids are already
+ // stored in session.
ContentUIManagerLocal contentUIManager = LookupUtil.getContentUIManager();
int[] packagesVersionsIdsToDeploy = new int[packageIds.length];
for (int iterator = 0; iterator < packageIds.length; iterator++) {
@@ -92,7 +94,7 @@ public class DeployPackagesUIBean extends PagedDataTableUIBean {
try {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
- contentManager.deployPackages(subject, new int[] { resource.getId() }, new int[] {}, notes);
+ contentManager.deployPackages(subject, new int[] { resource.getId() }, packagesVersionsIdsToDeploy, notes);
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Could not send deploy request to agent", e);
}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml
index b45e738..15c3f35 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml
@@ -688,10 +688,10 @@
<ui:remove><!-- row 3 --></ui:remove>
<h:panelGroup style="float: right">
- <b>Version <span class="required-marker-text">*</span></b>
+ <b>Version</b>
</h:panelGroup>
<h:panelGroup style="clear: both">
- <h:inputText id="initialVersion" value="#{CreateNewPackageUIBean.version}" required="true"/>
+ <h:inputText id="initialVersion" value="#{CreateNewPackageUIBean.version}"/>
<h:message for="initialVersion" styleClass="ValidationErrorText"/>
</h:panelGroup>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml
index dba508b..0b6c45b 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml
@@ -89,19 +89,16 @@
<h:panelGrid columns="2">
<h:panelGroup style="float: right">
- <b>Version <span class="required-marker-text">*</span></b>
+ <b>Version</b>
</h:panelGroup>
<h:panelGroup style="clear: both">
- <h:inputText id="updateVersion" value="#{CreateNewPackageUIBean.version}" required="true"/>
- <h:message for="updateVersion" styleClass="ValidationErrorText"/>
+ <h:inputText id="updateVersion" value="#{CreateNewPackageUIBean.version}"/>
</h:panelGroup>
</h:panelGrid>
</rich:panel>
- <div class="note-panel"><span class="required-marker-text">*</span><span> denotes a required field.</span></div>
-
<rich:panel>
<f:facet name="header">Repository</f:facet>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 29c3c85..5b03fd2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -1712,13 +1712,14 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
packageVersion.setFileSize(Long.valueOf(contentDetails.get(UPLOAD_FILE_SIZE)).longValue());
packageVersion.setSHA256(contentDetails.get(UPLOAD_SHA256));
-
+
//populate extra details, persist
if (packageUploadDetails != null) {
packageVersion.setFileCreatedDate(Long.valueOf(packageUploadDetails
.get(ContentManagerLocal.UPLOAD_FILE_INSTALL_DATE)));
packageVersion.setFileName(packageUploadDetails.get(ContentManagerLocal.UPLOAD_FILE_NAME));
packageVersion.setMD5(packageUploadDetails.get(ContentManagerLocal.UPLOAD_MD5));
+ packageVersion.setDisplayVersion(packageUploadDetails.get(ContentManagerLocal.UPLOAD_DISPLAY_VERSION));
}
entityManager.merge(packageVersion);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
index 1957091..566b4fc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
@@ -76,6 +76,8 @@ public interface ContentManagerLocal {
public static final String UPLOAD_MD5 = "md5";
+ public static final String UPLOAD_DISPLAY_VERSION = "displayVersion";
+
/**
* This is currently ignored as the SHA is computed upon
* persist.
commit 4ba6830d2facb77544c50f0db191bfeca8e057b2
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Dec 22 16:26:46 2011 -0600
[BZ 769986] Updated JSF content view to correctly display the version of packages.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackage.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackage.java
index 2bfc04f..ba4eff0 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackage.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackage.java
@@ -53,7 +53,7 @@ import org.rhq.core.domain.resource.Resource;
@NamedQuery(name = InstalledPackage.QUERY_FIND_BY_RESOURCE_ID_AND_PKG_VER_ID, query = "SELECT ip FROM InstalledPackage AS ip WHERE ip.resource.id = :resourceId AND ip.packageVersion.id = :packageVersionId"),
@NamedQuery(name = InstalledPackage.QUERY_FIND_BY_RESOURCE_AND_PACKAGE, query = "SELECT ip FROM InstalledPackage AS ip WHERE ip.resource.id = :resourceId AND ip.packageVersion.generalPackage.id = :packageId "),
@NamedQuery(name = InstalledPackage.QUERY_FIND_BY_RESOURCE_AND_PACKAGE_VER, query = "SELECT ip FROM InstalledPackage AS ip WHERE ip.resource.id = :resourceId AND ip.packageVersion.id = :packageVersionId "),
- @NamedQuery(name = InstalledPackage.QUERY_FIND_PACKAGE_LIST_ITEM_COMPOSITE, query = "SELECT new org.rhq.core.domain.content.composite.PackageListItemComposite(ip.id, gp.name, pt.displayName, ip.packageVersion.version, ip.installationDate ) "
+ @NamedQuery(name = InstalledPackage.QUERY_FIND_PACKAGE_LIST_ITEM_COMPOSITE, query = "SELECT new org.rhq.core.domain.content.composite.PackageListItemComposite(ip.id, gp.name, pt.displayName, ip.packageVersion.version, ip.packageVersion.displayVersion, ip.installationDate ) "
+ " FROM InstalledPackage ip JOIN ip.resource res LEFT JOIN ip.packageVersion pv LEFT JOIN pv.generalPackage gp LEFT JOIN gp.packageType pt "
+ "WHERE res.id = :resourceId "
+ " AND (:packageTypeFilterId = pt.id OR :packageTypeFilterId is null) "
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageListItemComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageListItemComposite.java
index 76e886e..e51d530 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageListItemComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageListItemComposite.java
@@ -37,22 +37,17 @@ public class PackageListItemComposite implements Serializable {
private final String packageName;
private final String packageTypeName;
private final String version;
+ private final String displayVersion;
private final Long timestamp;
- public PackageListItemComposite(int id, String packageName, String packageTypeName, String version) {
- this.id = id;
- this.packageName = packageName;
- this.packageTypeName = packageTypeName;
- this.version = version;
- this.timestamp = null;
- }
-
- public PackageListItemComposite(int id, String packageName, String packageTypeName, String version, Long timestamp) {
+ public PackageListItemComposite(int id, String packageName, String packageTypeName, String version,
+ String displayVersion, Long timestamp) {
this.id = id;
this.packageName = packageName;
this.packageTypeName = packageTypeName;
this.version = version;
this.timestamp = timestamp;
+ this.displayVersion = displayVersion;
}
public int getId() {
@@ -71,6 +66,10 @@ public class PackageListItemComposite implements Serializable {
return version;
}
+ public String getDisplayVersion() {
+ return displayVersion;
+ }
+
public Long getTimestamp() {
return timestamp;
}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/view-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/view-plain.xhtml
index 7ff59f3..bc551d1 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/view-plain.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/view-plain.xhtml
@@ -105,7 +105,7 @@
</onc:sortableColumnHeader>
</f:facet>
- <h:outputText value="#{item.version}"/>
+ <h:outputText value="#{ not empty item.displayVersion ? item.displayVersion : item.version }"/>
</rich:column>
<rich:column>
commit a7a26fa49a37a1734c8eea4da55fdac905a0332b
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Dec 21 11:36:07 2011 -0600
[BZ 767393] Update JBoss AS5 plugin to use display version for manifest versions.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java
index a8eba4d..7d51d3f 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java
@@ -60,6 +60,8 @@ import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.exception.ThrowableUtil;
+import org.rhq.core.util.file.ContentFileInfo;
+import org.rhq.core.util.file.JarContentFileInfo;
import org.rhq.plugins.jbossas5.util.DeploymentUtils;
import org.rhq.plugins.jbossas5.util.FileContentDelegate;
@@ -145,6 +147,8 @@ public class StandaloneManagedDeploymentComponent extends AbstractManagedDeploym
String fileName = this.deploymentFile.getName();
String sha256 = getSHA256(this.deploymentFile);
String version = getVersion(sha256);
+ String displayVersion = getDisplayVersion(deploymentFile);
+
// Package name is the deployment's file name (e.g. foo.ear).
PackageDetailsKey key = new PackageDetailsKey(fileName, version, PKG_TYPE_FILE, ARCHITECTURE);
ResourcePackageDetails packageDetails = new ResourcePackageDetails(key);
@@ -155,6 +159,7 @@ public class StandaloneManagedDeploymentComponent extends AbstractManagedDeploym
packageDetails.setFileCreatedDate(null); // TODO: get created date via SIGAR
packageDetails.setSHA256(sha256);
packageDetails.setInstallationTimestamp(Long.valueOf(System.currentTimeMillis()));
+ packageDetails.setDisplayVersion(displayVersion);
Set<ResourcePackageDetails> packages = new HashSet<ResourcePackageDetails>();
packages.add(packageDetails);
@@ -187,6 +192,20 @@ public class StandaloneManagedDeploymentComponent extends AbstractManagedDeploym
return "[sha256=" + sha256 + "]";
}
+ /**
+ * Retrieve the display version for the component. The display version should be stored
+ * in the manifest of the application (implementation and/or specification version).
+ * It will attempt to retrieve the version for both archived or exploded deployments.
+ *
+ * @param file component file
+ * @return
+ */
+ private String getDisplayVersion(File file) {
+ //JarContentFileInfo extracts the version from archived and exploded deployments
+ ContentFileInfo contentFileInfo = new JarContentFileInfo(file);
+ return contentFileInfo.getVersion(null);
+ }
+
public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) {
throw new UnsupportedOperationException("Cannot remove the package backing an EAR/WAR resource.");
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java
index 3bb920a..da4ba86 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java
@@ -36,6 +36,8 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.core.util.file.ContentFileInfo;
+import org.rhq.core.util.file.JarContentFileInfo;
/**
* Discovers Jar files as artifacts including loading their manifest version into the artifact config.
@@ -123,6 +125,7 @@ public class JarContentDelegate extends FileContentDelegate {
details.setFileSize(file.length());
details.setClassification(MIME_TYPE_JAR);
details.setSHA256(sha256);
+ details.setDisplayVersion(getDisplayVersion(file));
details.setExtraProperties(config);
} catch (IOException e) {
@@ -143,4 +146,18 @@ public class JarContentDelegate extends FileContentDelegate {
private String getVersion(String sha256) {
return "[sha256=" + sha256 + "]";
}
+
+ /**
+ * Retrieve the display version for the component. The display version should be stored
+ * in the manifest of the application (implementation and/or specification version).
+ * It will attempt to retrieve the version for both archived or exploded deployments.
+ *
+ * @param file component file
+ * @return
+ */
+ private String getDisplayVersion(File file) {
+ //JarContentFileInfo extracts the version from archived and exploded deployments
+ ContentFileInfo contentFileInfo = new JarContentFileInfo(file);
+ return contentFileInfo.getVersion(null);
+ }
}
commit 548388553e339698d1d4980a9ac5a144d44371ba
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Dec 21 11:20:58 2011 -0600
[BZ 767247] Update JBoss AS4 plugin to use display version for manifest set version.
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java
index bf7e925..b2e0185 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java
@@ -54,6 +54,8 @@ import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.pluginapi.util.FileUtils;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.exception.ThrowableUtil;
+import org.rhq.core.util.file.ContentFileInfo;
+import org.rhq.core.util.file.JarContentFileInfo;
import org.rhq.plugins.jbossas.helper.MainDeployer;
import org.rhq.plugins.jbossas.util.FileContentDelegate;
import org.rhq.plugins.jmx.MBeanResourceComponent;
@@ -129,6 +131,8 @@ public class ApplicationComponent extends MBeanResourceComponent<JBossASServerCo
String sha256 = getSHA256(file);
String version = getVersion(sha256);
+ String displayVersion = getDisplayVersion(file);
+
PackageDetailsKey key = new PackageDetailsKey(fileName, version, PKG_TYPE_FILE, ARCHITECTURE);
ResourcePackageDetails details = new ResourcePackageDetails(key);
details.setFileName(fileName);
@@ -139,6 +143,7 @@ public class ApplicationComponent extends MBeanResourceComponent<JBossASServerCo
details.setFileCreatedDate(file.lastModified()); // TODO: get created date via SIGAR
details.setSHA256(sha256);
details.setInstallationTimestamp(Long.valueOf(System.currentTimeMillis()));
+ details.setDisplayVersion(displayVersion);
packages.add(details);
}
@@ -167,6 +172,20 @@ public class ApplicationComponent extends MBeanResourceComponent<JBossASServerCo
return "[sha256=" + sha256 + "]";
}
+ /**
+ * Retrieve the display version for the component. The display version should be stored
+ * in the manifest of the application (implementation and/or specification version).
+ * It will attempt to retrieve the version for both archived or exploded deployments.
+ *
+ * @param file component file
+ * @return
+ */
+ private String getDisplayVersion(File file) {
+ //JarContentFileInfo extracts the version from archived and exploded deployments
+ ContentFileInfo contentFileInfo = new JarContentFileInfo(file);
+ return contentFileInfo.getVersion(null);
+ }
+
public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) {
throw new UnsupportedOperationException("Cannot remove the package backing an EAR/WAR resource.");
}
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
index 9dd080e..33a2f02 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
@@ -36,6 +36,8 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.core.util.file.ContentFileInfo;
+import org.rhq.core.util.file.JarContentFileInfo;
/**
* Discovers Jar files as artifacts including loading their manifest version into the artifact config.
@@ -121,6 +123,7 @@ public class JarContentDelegate extends FileContentDelegate {
details.setFileSize(file.length());
details.setClassification(MIME_TYPE_JAR);
details.setSHA256(sha256);
+ details.setDisplayVersion(getDisplayVersion(file));
details.setExtraProperties(config);
} catch (IOException e) {
@@ -142,4 +145,17 @@ public class JarContentDelegate extends FileContentDelegate {
return "[sha256=" + sha256 + "]";
}
+ /**
+ * Retrieve the display version for the component. The display version should be stored
+ * in the manifest of the application (implementation and/or specification version).
+ * It will attempt to retrieve the version for both archived or exploded deployments.
+ *
+ * @param file component file
+ * @return
+ */
+ private String getDisplayVersion(File file) {
+ //JarContentFileInfo extracts the version from archived and exploded deployments
+ ContentFileInfo contentFileInfo = new JarContentFileInfo(file);
+ return contentFileInfo.getVersion(null);
+ }
}
\ No newline at end of file
commit 398c5e22e76aab0f16b4abfac37513f5abc5d372
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Dec 21 11:03:01 2011 -0600
[BZ 761593] Make use of display version to extract/report the version from the actual manifest of the deployment.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
index 5265962..96ae3a3 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
@@ -72,6 +72,8 @@ import org.rhq.core.pluginapi.util.ResponseTimeConfiguration;
import org.rhq.core.pluginapi.util.ResponseTimeLogParser;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.exception.ThrowableUtil;
+import org.rhq.core.util.file.ContentFileInfo;
+import org.rhq.core.util.file.JarContentFileInfo;
import org.rhq.plugins.jmx.MBeanResourceComponent;
import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
@@ -616,6 +618,7 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
String fileName = new File(fullFileName).getName();
String sha256 = getSHA256(file);
String version = getVersion(sha256);
+ String displayVersion = getDisplayVersion(file);
PackageDetailsKey key = new PackageDetailsKey(fileName, version, PKG_TYPE_FILE, ARCHITECTURE);
ResourcePackageDetails details = new ResourcePackageDetails(key);
@@ -626,6 +629,7 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
details.setFileCreatedDate(null); // TODO: get created date via SIGAR
details.setInstallationTimestamp(System.currentTimeMillis()); // TODO: anything better than discovery time
details.setSHA256(sha256);
+ details.setDisplayVersion(displayVersion);
packages.add(details);
}
@@ -658,6 +662,20 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
return "[sha256=" + sha256 + "]";
}
+ /**
+ * Retrieve the display version for the component. The display version should be stored
+ * in the manifest of the application (implementation and/or specification version).
+ * It will attempt to retrieve the version for both archived or exploded deployments.
+ *
+ * @param file component file
+ * @return
+ */
+ private String getDisplayVersion(File file) {
+ //JarContentFileInfo extracts the version from archived and exploded deployments
+ ContentFileInfo contentFileInfo = new JarContentFileInfo(file);
+ return contentFileInfo.getVersion(null);
+ }
+
public List<DeployPackageStep> generateInstallationSteps(ResourcePackageDetails packageDetails) {
return null;
}
commit d64679228d723cc4484da3407e2151a76e6f5acf
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Dec 14 11:07:02 2011 -0600
[BZ 767393] Updated the plugin code to use SHA256 as the version and persist it inside the manifest file. Also, add directory based SHA computation for default server applications.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java
index ebae861..a8eba4d 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java
@@ -58,11 +58,10 @@ import org.rhq.core.pluginapi.content.ContentFacet;
import org.rhq.core.pluginapi.content.ContentServices;
import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
-import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.exception.ThrowableUtil;
-import org.rhq.core.util.file.JarContentFileInfo;
import org.rhq.plugins.jbossas5.util.DeploymentUtils;
+import org.rhq.plugins.jbossas5.util.FileContentDelegate;
/**
* A resource component for managing a standalone/top-level Profile Service managed deployment.
@@ -144,9 +143,8 @@ public class StandaloneManagedDeploymentComponent extends AbstractManagedDeploym
+ getResourceDescription() + " does not exist.");
String fileName = this.deploymentFile.getName();
- JarContentFileInfo fileInfo = new JarContentFileInfo(this.deploymentFile);
- String sha256 = getSHA256(fileInfo);
- String version = getVersion(fileInfo, sha256);
+ String sha256 = getSHA256(this.deploymentFile);
+ String version = getVersion(sha256);
// Package name is the deployment's file name (e.g. foo.ear).
PackageDetailsKey key = new PackageDetailsKey(fileName, version, PKG_TYPE_FILE, ARCHITECTURE);
ResourcePackageDetails packageDetails = new ResourcePackageDetails(key);
@@ -164,46 +162,29 @@ public class StandaloneManagedDeploymentComponent extends AbstractManagedDeploym
return packages;
}
- // TODO: if needed we can speed this up by looking in the ResourceContainer's installedPackage
- // list for previously discovered packages. If there use the sha256 from that record. We'd have to
- // get access to that info by adding access in org.rhq.core.pluginapi.content.ContentServices
- private String getSHA256(JarContentFileInfo fileInfo) {
-
+ /**
+ * Retrieve SHA256 for a deployed app.
+ *
+ * @param file application file
+ * @return SHA256 of the content
+ */
+ private String getSHA256(File file) {
String sha256 = null;
try {
- sha256 = fileInfo.getAttributeValue(RHQ_SHA256, null);
- if (null == sha256) {
- sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(fileInfo
- .getContentFile());
- }
- } catch (IOException iex) {
- //log exception but move on, discovery happens often. No reason to hold up anything.
+ FileContentDelegate fileContentDelegate = new FileContentDelegate(file, null, null);
+ sha256 = fileContentDelegate.getSHA(file);
+ } catch (Exception iex) {
if (log.isDebugEnabled()) {
- log.debug("Problem calculating digest of package [" + fileInfo.getContentFile().getPath() + "]."
- + iex.getMessage());
+ log.debug("Problem calculating digest of package [" + file.getPath() + "]." + iex.getMessage());
}
}
return sha256;
}
- private String getVersion(JarContentFileInfo fileInfo, String sha256) {
- // Version string in order of preference
- // manifestVersion + sha256, sha256, manifestVersion, "0"
- String version = "0";
- String manifestVersion = fileInfo.getVersion(null);
-
- if ((null != manifestVersion) && (null != sha256)) {
- // this protects against the occasional differing binaries with poor manifest maintenance
- version = manifestVersion + " [sha256=" + sha256 + "]";
- } else if (null != sha256) {
- version = "[sha256=" + sha256 + "]";
- } else if (null != manifestVersion) {
- version = manifestVersion;
- }
-
- return version;
+ private String getVersion(String sha256) {
+ return "[sha256=" + sha256 + "]";
}
public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) {
@@ -238,8 +219,11 @@ public class StandaloneManagedDeploymentComponent extends AbstractManagedDeploym
log.debug("Writing new EAR/WAR bits to temporary file...");
File tempFile;
+ String sha = null;
try {
tempFile = writeNewAppBitsToTempFile(contentServices, packageDetails);
+ FileContentDelegate fileContentDelegate = new FileContentDelegate(null, null, null);
+ sha = fileContentDelegate.computeSHAForArchive(tempFile);
} catch (Exception e) {
return failApplicationDeployment("Error writing new application bits to temporary file - cause: " + e,
packageDetails);
@@ -320,6 +304,19 @@ public class StandaloneManagedDeploymentComponent extends AbstractManagedDeploym
// Deploy was successful!
deleteBackupOfOriginalFile(backupOfOriginalFile);
+ if (this.deploymentFile.isDirectory()) {
+ FileContentDelegate fileContentDelegate = new FileContentDelegate(deploymentFile, null, null);
+ try {
+ //This is a simulation of create content from FileContentDelegate split across
+ //this deployment method because JBoss AS5 is using a different deployment model.
+ //The SHA256 was pre-computed earlier (at the time the temp content file was created).
+ //The only thing left at this point is to store it in the manifest file.
+ fileContentDelegate.writeSHAToManifest(deploymentFile, sha);
+ } catch (IOException e) {
+ log.error("Unable to save SHA to manifest file for " + this.deploymentFile.getPath() + ".", e);
+ }
+ }
+
DeployPackagesResponse response = new DeployPackagesResponse(ContentResponseResult.SUCCESS);
DeployIndividualPackageResponse packageResponse = new DeployIndividualPackageResponse(packageDetails.getKey(),
ContentResponseResult.SUCCESS);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java
index 75f890a..915374a 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java
@@ -26,16 +26,22 @@ import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
+import java.util.Stack;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.rhq.core.domain.content.PackageDetails;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.pluginapi.util.FileUtils;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.file.FileUtil;
@@ -46,7 +52,9 @@ import org.rhq.core.util.file.FileUtil;
* @author Jason Dobies
*/
public class FileContentDelegate {
- // Attributes --------------------------------------------
+
+ private static final String RHQ_SHA_256 = "RHQ-Sha256";
+ private static final String MANIFEST_RELATIVE_PATH = "META-INF/MANIFEST.MF";
private final Log log = LogFactory.getLog(FileContentDelegate.class);
@@ -55,16 +63,12 @@ public class FileContentDelegate {
private final String fileEnding;
private final String packageTypeName;
- // Constructors --------------------------------------------
-
public FileContentDelegate(File directory, String fileEnding, String packageTypeName) {
this.directory = directory;
this.fileEnding = fileEnding;
this.packageTypeName = packageTypeName;
}
- // Public --------------------------------------------
-
public String getFileEnding() {
return fileEnding;
}
@@ -145,6 +149,44 @@ public class FileContentDelegate {
}
/**
+ * Retrieves the SHA256 for a deployed application.
+ * 1) If the app is exploded then return RHQ-Sha256 manifest attribute.
+ * 1.1) If RHQ-Sha256 is missing then compute it, save it and return the result.
+ * 2) If the app is an archive then compute SHA256 on fly and return it.
+ *
+ * @param deploymentFile deployment file
+ * @return
+ */
+ public String getSHA(File deploymentFile) {
+ String sha = null;
+ try {
+ if (deploymentFile.isDirectory()) {
+ File manifestFile = new File(deploymentFile.getAbsolutePath(), MANIFEST_RELATIVE_PATH);
+ if (manifestFile.exists()) {
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = null;
+ try {
+ manifest = new Manifest(manifestStream);
+ sha = manifest.getMainAttributes().getValue(RHQ_SHA_256);
+ } finally {
+ manifestStream.close();
+ }
+ }
+
+ if (sha == null || sha.trim().isEmpty()) {
+ sha = computeAndSaveSHA(deploymentFile);
+ }
+ } else {
+ sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(deploymentFile);
+ }
+ } catch (IOException ex) {
+ throw new RuntimeException("Problem calculating digest of package [" + deploymentFile.getPath() + "].", ex);
+ }
+
+ return sha;
+ }
+
+ /**
* Returns a stream from which the content of the specified package can be read.
*
* @param details package being loaded
@@ -185,4 +227,109 @@ public class FileContentDelegate {
*/
return null;
}
+
+ /**
+ * Computes SHA256 for an archive.
+ *
+ * @param contentFile content archive
+ * @return SHA256 of the archive
+ */
+ public String computeSHAForArchive(File contentFile) {
+ if (!contentFile.isDirectory()) {
+ try {
+ MessageDigestGenerator messageDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ return messageDigest.calcDigestString(contentFile);
+ } catch (Exception ex) {
+ log.error("Not able to compute SHA256 for " + contentFile.getPath() + " .");
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Compute SHA256 for the content of an exploded war deployment. This method should be used to
+ * compute the SHA256 for content deployed outside RHQ or for the initial content delivered
+ * with the server.
+ *
+ * @param deploymentDirectory app deployment folder
+ * @return
+ */
+ private String computeAndSaveSHA(File deploymentDirectory) {
+ String sha = null;
+ try {
+ if (deploymentDirectory.isDirectory()) {
+ MessageDigestGenerator messageDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+
+ Stack<File> unvisitedFolders = new Stack<File>();
+ unvisitedFolders.add(deploymentDirectory);
+ while (!unvisitedFolders.empty()) {
+ for (File file : unvisitedFolders.pop().listFiles()) {
+ if (file.isDirectory()) {
+ unvisitedFolders.add(file);
+ } else {
+ FileInputStream inputStream = null;
+ try {
+ inputStream = new FileInputStream(file);
+ messageDigest.add(inputStream);
+ } finally {
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+ }
+ }
+ }
+
+ sha = messageDigest.getDigestString();
+ writeSHAToManifest(deploymentDirectory, sha);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error creating artifact for contentFile: " + deploymentDirectory, e);
+ }
+
+ return sha;
+ }
+
+ /**
+ * Write the SHA256 to the manifest using the RHQ-Sha256 attribute tag.
+ *
+ * @param deploymentFolder app deployment folder
+ * @param sha SHA256
+ * @throws IOException
+ */
+ public void writeSHAToManifest(File deploymentFolder, String sha) throws IOException {
+ File manifestFile = new File(deploymentFolder, MANIFEST_RELATIVE_PATH);
+ Manifest manifest;
+ if (manifestFile.exists()) {
+ FileInputStream inputStream = new FileInputStream(manifestFile);
+ try {
+ manifest = new Manifest(inputStream);
+ } finally {
+ inputStream.close();
+ }
+ } else {
+ manifest = new Manifest();
+ manifestFile.getParentFile().mkdirs();
+ manifestFile.createNewFile();
+ }
+
+ Attributes attribs = manifest.getMainAttributes();
+
+ //The main section of the manifest file does not get saved if both of
+ //these two attributes are missing. Please see Attributes implementation.
+ if (!attribs.containsKey(Attributes.Name.MANIFEST_VERSION.toString())
+ && !attribs.containsKey(Attributes.Name.SIGNATURE_VERSION.toString())) {
+ attribs.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
+ }
+
+ attribs.putValue(RHQ_SHA_256, sha);
+
+ FileOutputStream outputStream = new FileOutputStream(manifestFile);
+ try {
+ manifest.write(outputStream);
+ } finally {
+ outputStream.close();
+ }
+ }
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java
index d68f429..3bb920a 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java
@@ -113,9 +113,9 @@ public class JarContentDelegate extends FileContentDelegate {
} catch (Exception e) {
// leave as null
}
- String version = getVersion(manifestVersion, sha256);
+
ResourcePackageDetails details = new ResourcePackageDetails(new PackageDetailsKey(file.getName(),
- version, getPackageTypeName(), "noarch"));
+ getVersion(sha256), getPackageTypeName(), "noarch"));
packages.add(details);
details.setFileCreatedDate(file.lastModified()); // Why don't we have a last modified time?
@@ -140,21 +140,7 @@ public class JarContentDelegate extends FileContentDelegate {
return packages;
}
- private String getVersion(String manifestVersion, String sha256) {
- // Version string in order of preference
- // manifestVersion + sha256, sha256, manifestVersion, "0"
- String version = "0";
-
- if ((null != manifestVersion) && (null != sha256)) {
- // this protects against the occasional differing binaries with poor manifest maintenance
- version = manifestVersion + " [sha256=" + sha256 + "]";
- } else if (null != sha256) {
- version = "[sha256=" + sha256 + "]";
- } else if (null != manifestVersion) {
- version = manifestVersion;
- }
-
- return version;
+ private String getVersion(String sha256) {
+ return "[sha256=" + sha256 + "]";
}
-
}
commit b003470d6580417261a8139bceb81cb496e8209f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Dec 13 17:17:58 2011 -0600
[BZ 767247] Updated the JBoss AS4 plugin to use the same design as Tomcat plugin with regards to version and SHA256.
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java
index a7c70db..bf7e925 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java
@@ -52,11 +52,10 @@ import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.pluginapi.util.FileUtils;
-import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.exception.ThrowableUtil;
-import org.rhq.core.util.file.JarContentFileInfo;
import org.rhq.plugins.jbossas.helper.MainDeployer;
+import org.rhq.plugins.jbossas.util.FileContentDelegate;
import org.rhq.plugins.jmx.MBeanResourceComponent;
/**
@@ -128,9 +127,8 @@ public class ApplicationComponent extends MBeanResourceComponent<JBossASServerCo
// Package name and file name of the application are the same
String fileName = new File(fullFileName).getName();
- JarContentFileInfo fileInfo = new JarContentFileInfo(file);
- String sha256 = getSHA256(fileInfo);
- String version = getVersion(fileInfo, sha256);
+ String sha256 = getSHA256(file);
+ String version = getVersion(sha256);
PackageDetailsKey key = new PackageDetailsKey(fileName, version, PKG_TYPE_FILE, ARCHITECTURE);
ResourcePackageDetails details = new ResourcePackageDetails(key);
details.setFileName(fileName);
@@ -148,46 +146,25 @@ public class ApplicationComponent extends MBeanResourceComponent<JBossASServerCo
return packages;
}
- // TODO: if needed we can speed this up by looking in the ResourceContainer's installedPackage
- // list for previously discovered packages. If there use the sha256 from that record. We'd have to
- // get access to that info by adding access in org.rhq.core.pluginapi.content.ContentServices
- private String getSHA256(JarContentFileInfo fileInfo) {
+ private String getSHA256(File file) {
String sha256 = null;
try {
- sha256 = fileInfo.getAttributeValue(RHQ_SHA256, null);
- if (null == sha256) {
- sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(fileInfo
- .getContentFile());
- }
- } catch (IOException iex) {
+ FileContentDelegate fileContentDelegate = new FileContentDelegate(file, null, null);
+ sha256 = fileContentDelegate.getSHA(file);
+ } catch (Exception iex) {
//log exception but move on, discovery happens often. No reason to hold up anything.
if (log.isDebugEnabled()) {
- log.debug("Problem calculating digest of package [" + fileInfo.getContentFile().getPath() + "]."
- + iex.getMessage());
+ log.debug("Problem calculating digest of package [" + file.getPath() + "]." + iex.getMessage());
}
}
return sha256;
}
- private String getVersion(JarContentFileInfo fileInfo, String sha256) {
- // Version string in order of preference
- // manifestVersion + sha256, sha256, manifestVersion, "0"
- String version = "0";
- String manifestVersion = fileInfo.getVersion(null);
-
- if ((null != manifestVersion) && (null != sha256)) {
- // this protects against the occasional differing binaries with poor manifest maintenance
- version = manifestVersion + " [sha256=" + sha256 + "]";
- } else if (null != sha256) {
- version = "[sha256=" + sha256 + "]";
- } else if (null != manifestVersion) {
- version = manifestVersion;
- }
-
- return version;
+ private String getVersion(String sha256) {
+ return "[sha256=" + sha256 + "]";
}
public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) {
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
index 3169376..45de746 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
@@ -100,7 +100,6 @@ import org.rhq.core.pluginapi.support.SnapshotReportResults;
import org.rhq.core.pluginapi.support.SupportFacet;
import org.rhq.core.pluginapi.util.FileUtils;
import org.rhq.core.pluginapi.util.SelectiveSkippingEntityResolver;
-import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.plugins.jbossas.helper.JavaSystemProperties;
import org.rhq.plugins.jbossas.helper.MainDeployer;
import org.rhq.plugins.jbossas.util.ConnectionFactoryConfigurationEditor;
@@ -896,9 +895,7 @@ public class JBossASServerComponent<T extends ResourceComponent<?>> implements M
return;
}
- InputStream isForTempDir = new BufferedInputStream(new FileInputStream(tempFile));
- String shaString = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).getDigestString(tempFile);
- deployer.createContent(details, isForTempDir, !zip, createBackup, shaString);
+ deployer.createContent(details, tempFile, !zip, createBackup);
String vhost = null;
if (resourceTypeName.equals(RESOURCE_TYPE_WAR)) {
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
index 6c4e83b..499d5a5 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
@@ -30,6 +30,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
+import java.util.Stack;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
@@ -40,6 +41,7 @@ import org.rhq.core.domain.content.PackageDetails;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.pluginapi.util.FileUtils;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.file.FileUtil;
@@ -50,7 +52,9 @@ import org.rhq.core.util.file.FileUtil;
* @author Jason Dobies
*/
public class FileContentDelegate {
- // Attributes --------------------------------------------
+
+ private static final String RHQ_SHA_256 = "RHQ-Sha256";
+ private static final String MANIFEST_RELATIVE_PATH = "META-INF/MANIFEST.MF";
private Log log = LogFactory.getLog(FileContentDelegate.class);
@@ -59,16 +63,12 @@ public class FileContentDelegate {
private String fileEnding;
private String packageTypeName;
- // Constructors --------------------------------------------
-
public FileContentDelegate(File directory, String fileEnding, String packageTypeName) {
this.directory = directory;
this.fileEnding = fileEnding;
this.packageTypeName = packageTypeName;
}
- // Public --------------------------------------------
-
public String getFileEnding() {
return fileEnding;
}
@@ -92,41 +92,23 @@ public class FileContentDelegate {
* @param createBackup If <code>true</code>, the original file will be backed up to file.bak
* @param shaString the SHA-256 of the specified input stream
*/
- public void createContent(PackageDetails details, InputStream content, boolean unzip, boolean createBackup,
- String shaString) {
- File contentFile = getPath(details);
+ public void createContent(PackageDetails details, File sourceContentFile, boolean unzip, boolean createBackup) {
+ File destinationContentFile = getPath(details);
try {
if (createBackup) {
- moveToBackup(contentFile, ".bak");
+ moveToBackup(destinationContentFile, ".bak");
}
if (unzip) {
- ZipUtil.unzipFile(content, contentFile);
- File manifestFile = new File(contentFile, "META-INF/MANIFEST.MF");
- Manifest manifest;
- if (manifestFile.exists()) {
- FileInputStream inputStream = new FileInputStream(manifestFile);
- try {
- manifest = new Manifest(inputStream);
- } finally {
- inputStream.close();
- }
- } else {
- manifest = new Manifest();
- }
- Attributes attribs = manifest.getMainAttributes();
- attribs.putValue("RHQ-Sha256", shaString);
- FileOutputStream outputStream = new FileOutputStream(manifestFile);
- try {
- manifest.write(outputStream);
- } finally {
- outputStream.close();
- }
+ ZipUtil.unzipFile(sourceContentFile, destinationContentFile);
+ String shaString = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
+ .calcDigestString(sourceContentFile);
+ writeSHAToManifest(destinationContentFile, shaString);
} else {
- FileUtil.writeFile(content, contentFile);
+ FileUtil.copyFile(sourceContentFile, destinationContentFile);
}
- details.setFileName(contentFile.getPath());
+ details.setFileName(destinationContentFile.getPath());
} catch (IOException e) {
- throw new RuntimeException("Error creating artifact from details: " + contentFile, e);
+ throw new RuntimeException("Error creating artifact from details: " + destinationContentFile, e);
}
}
@@ -211,4 +193,128 @@ public class FileContentDelegate {
*/
return null;
}
+
+ /**
+ * Retrieves the SHA256 for a deployed application.
+ * 1) If the app is exploded then return RHQ-Sha256 manifest attribute.
+ * 1.1) If RHQ-Sha256 is missing then compute it, save it and return the result.
+ * 2) If the app is an archive then compute SHA256 on fly and return it.
+ *
+ * @param deploymentFile deployment file
+ * @return
+ */
+ public String getSHA(File deploymentFile) {
+ String sha = null;
+ try {
+ if (deploymentFile.isDirectory()) {
+ File manifestFile = new File(deploymentFile.getAbsolutePath(), MANIFEST_RELATIVE_PATH);
+ if (manifestFile.exists()) {
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = null;
+ try {
+ manifest = new Manifest(manifestStream);
+ sha = manifest.getMainAttributes().getValue(RHQ_SHA_256);
+ } finally {
+ manifestStream.close();
+ }
+ }
+
+ if (sha == null || sha.trim().isEmpty()) {
+ sha = computeAndSaveSHA(deploymentFile);
+ }
+ } else {
+ sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(deploymentFile);
+ }
+ } catch (IOException ex) {
+ throw new RuntimeException("Problem calculating digest of package [" + deploymentFile.getPath() + "].", ex);
+ }
+
+ return sha;
+ }
+
+ /**
+ * Compute SHA256 for the content of an exploded war deployment. This method should be used to
+ * compute the SHA256 for content deployed outside RHQ or for the initial content delivered
+ * with the server.
+ *
+ * @param deploymentDirectory app deployment folder
+ * @return
+ */
+ private String computeAndSaveSHA(File deploymentDirectory) {
+ String sha = null;
+ try {
+ if (deploymentDirectory.isDirectory()) {
+ MessageDigestGenerator messageDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+
+ Stack<File> unvisitedFolders = new Stack<File>();
+ unvisitedFolders.add(deploymentDirectory);
+ while (!unvisitedFolders.empty()) {
+ for (File file : unvisitedFolders.pop().listFiles()) {
+ if (file.isDirectory()) {
+ unvisitedFolders.add(file);
+ } else {
+ FileInputStream inputStream = null;
+ try {
+ inputStream = new FileInputStream(file);
+ messageDigest.add(inputStream);
+ } finally {
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+ }
+ }
+ }
+
+ sha = messageDigest.getDigestString();
+ writeSHAToManifest(deploymentDirectory, sha);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error creating artifact for contentFile: " + deploymentDirectory, e);
+ }
+
+ return sha;
+ }
+
+ /**
+ * Write the SHA256 to the manifest using the RHQ-Sha256 attribute tag.
+ *
+ * @param deploymentFolder app deployment folder
+ * @param sha SHA256
+ * @throws IOException
+ */
+ private void writeSHAToManifest(File deploymentFolder, String sha) throws IOException {
+ File manifestFile = new File(deploymentFolder, MANIFEST_RELATIVE_PATH);
+ Manifest manifest;
+ if (manifestFile.exists()) {
+ FileInputStream inputStream = new FileInputStream(manifestFile);
+ try {
+ manifest = new Manifest(inputStream);
+ } finally {
+ inputStream.close();
+ }
+ } else {
+ manifest = new Manifest();
+ manifestFile.getParentFile().mkdirs();
+ manifestFile.createNewFile();
+ }
+
+ Attributes attribs = manifest.getMainAttributes();
+
+ //The main section of the manifest file does not get saved if both of
+ //these two attributes are missing. Please see Attributes implementation.
+ if (!attribs.containsKey(Attributes.Name.MANIFEST_VERSION.toString())
+ && !attribs.containsKey(Attributes.Name.SIGNATURE_VERSION.toString())) {
+ attribs.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
+ }
+
+ attribs.putValue(RHQ_SHA_256, sha);
+
+ FileOutputStream outputStream = new FileOutputStream(manifestFile);
+ try {
+ manifest.write(outputStream);
+ } finally {
+ outputStream.close();
+ }
+ }
}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
index ee3e603..9dd080e 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java
@@ -111,9 +111,9 @@ public class JarContentDelegate extends FileContentDelegate {
} catch (Exception e) {
// leave as null
}
- String version = getVersion(manifestVersion, sha256);
+
ResourcePackageDetails details = new ResourcePackageDetails(new PackageDetailsKey(file.getName(),
- version, getPackageTypeName(), "noarch"));
+ getVersion(sha256), getPackageTypeName(), "noarch"));
packages.add(details);
details.setFileCreatedDate(file.lastModified()); // Why don't we have a last modified time?
@@ -138,21 +138,8 @@ public class JarContentDelegate extends FileContentDelegate {
return packages;
}
- private String getVersion(String manifestVersion, String sha256) {
- // Version string in order of preference
- // manifestVersion + sha256, sha256, manifestVersion, "0"
- String version = "0";
-
- if ((null != manifestVersion) && (null != sha256)) {
- // this protects against the occasional differing binaries with poor manifest maintenance
- version = manifestVersion + " [sha256=" + sha256 + "]";
- } else if (null != sha256) {
- version = "[sha256=" + sha256 + "]";
- } else if (null != manifestVersion) {
- version = manifestVersion;
- }
-
- return version;
+ private String getVersion(String sha256) {
+ return "[sha256=" + sha256 + "]";
}
}
\ No newline at end of file
commit 3bbfcdabea8dad6533e1249f21424cb0d05a2a8e
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Dec 13 11:15:45 2011 -0600
[BZ 761593] Move all the code for computation and retrieval of SHA256 to file content delegate. This way the manifest and digest code is in one location only.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
index b9bd2fa..5265962 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
@@ -34,7 +34,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.jar.Manifest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -71,7 +70,6 @@ import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.pluginapi.util.FileUtils;
import org.rhq.core.pluginapi.util.ResponseTimeConfiguration;
import org.rhq.core.pluginapi.util.ResponseTimeLogParser;
-import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.plugins.jmx.MBeanResourceComponent;
@@ -636,43 +634,18 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
}
/**
- * Retrieve SHA 256 for a deployed app.
- * 1) If the app is exploded then look into the manifest file for the RHQ-Sha265 attribute.
- * The SHA should have been computed and the attribute added during package deployment.
- * 2) If the app is not exploded then compute the SHA256 for the archive.
+ * Retrieve SHA256 for a deployed app.
*
* @param file application file
- * @return the SHA 256
+ * @return SHA256 of the content
*/
private String getSHA256(File file) {
-
String sha256 = null;
try {
- //if the filesize of discovered package is null then it's an exploded and deployed war/ear.
- File app = new File(file.getPath());
- if (app.isDirectory()) {
- File manifestFile = new File(app.getAbsolutePath(), "META-INF/MANIFEST.MF");
- if (manifestFile.exists()) {
- InputStream manifestStream = new FileInputStream(manifestFile);
- Manifest manifest = null;
- try {
- manifest = new Manifest(manifestStream);
- sha256 = manifest.getMainAttributes().getValue("RHQ-Sha256");
- } finally {
- manifestStream.close();
- }
- }
-
- if (sha256 == null || sha256.trim().isEmpty()) {
- FileContentDelegate fileContentDelegate = new FileContentDelegate(app);
- sha256 = fileContentDelegate.calculateSHAForCotent(app);
- }
- } else {
- sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(app);
- }
- } catch (IOException iex) {
- //log exception but move on, discovery happens often. No reason to hold up anything.
+ FileContentDelegate fileContentDelegate = new FileContentDelegate(file);
+ sha256 = fileContentDelegate.getSHA(file);
+ } catch (Exception iex) {
if (log.isDebugEnabled()) {
log.debug("Problem calculating digest of package [" + file.getPath() + "]." + iex.getMessage());
}
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
index 5699ab4..6f914db 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
@@ -51,6 +51,9 @@ import org.rhq.core.util.file.FileUtil;
*/
public class FileContentDelegate {
+ private static final String RHQ_SHA_256 = "RHQ-Sha256";
+ private static final String MANIFEST_RELATIVE_PATH = "META-INF/MANIFEST.MF";
+
private File deployDirectory;
public FileContentDelegate(File directory) {
@@ -92,44 +95,38 @@ public class FileContentDelegate {
}
/**
- * Calculate SHA256 for the content of an exploded war deployment. This method should be used to
- * compute the SHA256 for content deployed outside RHQ or for the initial content delivered
- * with the server.
+ * Retrieves the SHA256 for a deployed application.
+ * 1) If the app is exploded then return RHQ-Sha256 manifest attribute.
+ * 1.1) If RHQ-Sha256 is missing then compute it, save it and return the result.
+ * 2) If the app is an archive then compute SHA256 on fly and return it.
*
- * @param deploymentDirectory app deployment folder
+ * @param deploymentFile deployment file
* @return
*/
- public String calculateSHAForCotent(File deploymentDirectory) {
+ public String getSHA(File deploymentFile) {
String sha = null;
try {
- if (deploymentDirectory.isDirectory()) {
- MessageDigestGenerator messageDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
-
- Stack<File> unvisitedFolders = new Stack<File>();
- unvisitedFolders.add(deploymentDirectory);
- while (!unvisitedFolders.empty()) {
- for (File file : unvisitedFolders.pop().listFiles()) {
- if (file.isDirectory()) {
- unvisitedFolders.add(file);
- } else {
- FileInputStream inputStream = null;
- try {
- inputStream = new FileInputStream(file);
- messageDigest.add(inputStream);
- } finally {
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
+ if (deploymentFile.isDirectory()) {
+ File manifestFile = new File(deploymentFile.getAbsolutePath(), MANIFEST_RELATIVE_PATH);
+ if (manifestFile.exists()) {
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = null;
+ try {
+ manifest = new Manifest(manifestStream);
+ sha = manifest.getMainAttributes().getValue(RHQ_SHA_256);
+ } finally {
+ manifestStream.close();
}
}
- sha = messageDigest.getDigestString();
- writeSHAToManifest(deploymentDirectory, sha);
+ if (sha == null || sha.trim().isEmpty()) {
+ sha = computeAndSaveSHA(deploymentFile);
+ }
+ } else {
+ sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(deploymentFile);
}
- } catch (IOException e) {
- throw new RuntimeException("Error creating artifact for contentFile: " + deploymentDirectory, e);
+ } catch (IOException ex) {
+ throw new RuntimeException("Problem calculating digest of package [" + deploymentFile.getPath() + "].", ex);
}
return sha;
@@ -200,6 +197,50 @@ public class FileContentDelegate {
}
/**
+ * Compute SHA256 for the content of an exploded war deployment. This method should be used to
+ * compute the SHA256 for content deployed outside RHQ or for the initial content delivered
+ * with the server.
+ *
+ * @param deploymentDirectory app deployment folder
+ * @return
+ */
+ private String computeAndSaveSHA(File deploymentDirectory) {
+ String sha = null;
+ try {
+ if (deploymentDirectory.isDirectory()) {
+ MessageDigestGenerator messageDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+
+ Stack<File> unvisitedFolders = new Stack<File>();
+ unvisitedFolders.add(deploymentDirectory);
+ while (!unvisitedFolders.empty()) {
+ for (File file : unvisitedFolders.pop().listFiles()) {
+ if (file.isDirectory()) {
+ unvisitedFolders.add(file);
+ } else {
+ FileInputStream inputStream = null;
+ try {
+ inputStream = new FileInputStream(file);
+ messageDigest.add(inputStream);
+ } finally {
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+ }
+ }
+ }
+
+ sha = messageDigest.getDigestString();
+ writeSHAToManifest(deploymentDirectory, sha);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error creating artifact for contentFile: " + deploymentDirectory, e);
+ }
+
+ return sha;
+ }
+
+ /**
* Write the SHA256 to the manifest using the RHQ-Sha256 attribute tag.
*
* @param deploymentFolder app deployment folder
@@ -207,7 +248,7 @@ public class FileContentDelegate {
* @throws IOException
*/
private void writeSHAToManifest(File deploymentFolder, String sha) throws IOException {
- File manifestFile = new File(deploymentFolder, "META-INF/MANIFEST.MF");
+ File manifestFile = new File(deploymentFolder, MANIFEST_RELATIVE_PATH);
Manifest manifest;
if (manifestFile.exists()) {
FileInputStream inputStream = new FileInputStream(manifestFile);
@@ -231,7 +272,7 @@ public class FileContentDelegate {
attribs.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
}
- attribs.putValue("RHQ-Sha256", sha);
+ attribs.putValue(RHQ_SHA_256, sha);
FileOutputStream outputStream = new FileOutputStream(manifestFile);
try {
commit b960588d8d6f13d9fcfe2c5c48c1252adad8819a
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Dec 13 09:40:15 2011 -0600
[BZ 761593] Compute SHA256 for content that was deployed outside RHQ or for default content delivered with the server.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
index f605e2d..0024cf8 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
@@ -302,7 +302,7 @@ public class TomcatVHostComponent extends MBeanResourceComponent<TomcatServerCom
return;
}
- FileContentDelegate fileContent = new FileContentDelegate(deployDir, details.getPackageTypeName());
+ FileContentDelegate fileContent = new FileContentDelegate(deployDir);
fileContent.createContent(path, tempFile, explodeOnDeploy);
// Resource key is a canonical objectName similar to:
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
index 0aedf94..b9bd2fa 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
@@ -511,7 +511,7 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
log.warn("Failed to create app backup but proceeding with redeploy of " + appFile.getPath() + ": " + e);
}
- FileContentDelegate contentDelegate = new FileContentDelegate(appFile.getParentFile(), packageDetails.getName());
+ FileContentDelegate contentDelegate = new FileContentDelegate(appFile.getParentFile());
try {
// Write the new bits for the application. If successful Tomcat will pick it up and complete the deploy.
@@ -653,13 +653,20 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
File app = new File(file.getPath());
if (app.isDirectory()) {
File manifestFile = new File(app.getAbsolutePath(), "META-INF/MANIFEST.MF");
- InputStream manifestStream = new FileInputStream(manifestFile);
- Manifest manifest = null;
- try {
- manifest = new Manifest(manifestStream);
- sha256 = manifest.getMainAttributes().getValue("RHQ-Sha256");
- } finally {
- manifestStream.close();
+ if (manifestFile.exists()) {
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = null;
+ try {
+ manifest = new Manifest(manifestStream);
+ sha256 = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ } finally {
+ manifestStream.close();
+ }
+ }
+
+ if (sha256 == null || sha256.trim().isEmpty()) {
+ FileContentDelegate fileContentDelegate = new FileContentDelegate(app);
+ sha256 = fileContentDelegate.calculateSHAForCotent(app);
}
} else {
sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(app);
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
index a93eddf..5699ab4 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
@@ -30,6 +30,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
+import java.util.Stack;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
@@ -49,24 +50,18 @@ import org.rhq.core.util.file.FileUtil;
* @author Jason Dobies
*/
public class FileContentDelegate {
- // Attributes --------------------------------------------
private File deployDirectory;
- private String packageTypeName;
- // Constructors --------------------------------------------
-
- public FileContentDelegate(File directory, String packageTypeName) {
+ public FileContentDelegate(File directory) {
this.deployDirectory = directory;
- this.packageTypeName = packageTypeName;
- }
-
- // Public --------------------------------------------
-
- public String getPackageTypeName() {
- return packageTypeName;
}
+ /**
+ * Getter for deployment directory.
+ *
+ * @return deploy directory
+ */
public File getDirectory() {
return deployDirectory;
}
@@ -85,30 +80,8 @@ public class FileContentDelegate {
try {
if (unzip) {
ZipUtil.unzipFile(content, destination);
-
- File manifestFile = new File(destination, "META-INF/MANIFEST.MF");
- Manifest manifest;
- if (manifestFile.exists()) {
- FileInputStream inputStream = new FileInputStream(manifestFile);
- try {
- manifest = new Manifest(inputStream);
- } finally {
- inputStream.close();
- }
- } else {
- manifest = new Manifest();
- }
-
- Attributes attribs = manifest.getMainAttributes();
String sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(content);
- attribs.putValue("RHQ-Sha256", sha);
-
- FileOutputStream outputStream = new FileOutputStream(manifestFile);
- try {
- manifest.write(outputStream);
- } finally {
- outputStream.close();
- }
+ writeSHAToManifest(destination, sha);
} else {
InputStream contentStream = new BufferedInputStream(new FileInputStream(content));
FileUtil.writeFile(contentStream, destination);
@@ -118,6 +91,50 @@ public class FileContentDelegate {
}
}
+ /**
+ * Calculate SHA256 for the content of an exploded war deployment. This method should be used to
+ * compute the SHA256 for content deployed outside RHQ or for the initial content delivered
+ * with the server.
+ *
+ * @param deploymentDirectory app deployment folder
+ * @return
+ */
+ public String calculateSHAForCotent(File deploymentDirectory) {
+ String sha = null;
+ try {
+ if (deploymentDirectory.isDirectory()) {
+ MessageDigestGenerator messageDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+
+ Stack<File> unvisitedFolders = new Stack<File>();
+ unvisitedFolders.add(deploymentDirectory);
+ while (!unvisitedFolders.empty()) {
+ for (File file : unvisitedFolders.pop().listFiles()) {
+ if (file.isDirectory()) {
+ unvisitedFolders.add(file);
+ } else {
+ FileInputStream inputStream = null;
+ try {
+ inputStream = new FileInputStream(file);
+ messageDigest.add(inputStream);
+ } finally {
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+ }
+ }
+ }
+
+ sha = messageDigest.getDigestString();
+ writeSHAToManifest(deploymentDirectory, sha);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error creating artifact for contentFile: " + deploymentDirectory, e);
+ }
+
+ return sha;
+ }
+
public File getPath(PackageDetails details) {
/* JBNADM-2022 - It still needs to be determined if it is the responsibility of the plugin container or the
* plugin to be concerned with path information in the package name. For now, it's the plugin's
@@ -181,4 +198,46 @@ public class FileContentDelegate {
*/
return null;
}
+
+ /**
+ * Write the SHA256 to the manifest using the RHQ-Sha256 attribute tag.
+ *
+ * @param deploymentFolder app deployment folder
+ * @param sha SHA256
+ * @throws IOException
+ */
+ private void writeSHAToManifest(File deploymentFolder, String sha) throws IOException {
+ File manifestFile = new File(deploymentFolder, "META-INF/MANIFEST.MF");
+ Manifest manifest;
+ if (manifestFile.exists()) {
+ FileInputStream inputStream = new FileInputStream(manifestFile);
+ try {
+ manifest = new Manifest(inputStream);
+ } finally {
+ inputStream.close();
+ }
+ } else {
+ manifest = new Manifest();
+ manifestFile.getParentFile().mkdirs();
+ manifestFile.createNewFile();
+ }
+
+ Attributes attribs = manifest.getMainAttributes();
+
+ //The main section of the manifest file does not get saved if both of
+ //these two attributes are missing. Please see Attributes implementation.
+ if (!attribs.containsKey(Attributes.Name.MANIFEST_VERSION.toString())
+ && !attribs.containsKey(Attributes.Name.SIGNATURE_VERSION.toString())) {
+ attribs.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
+ }
+
+ attribs.putValue("RHQ-Sha256", sha);
+
+ FileOutputStream outputStream = new FileOutputStream(manifestFile);
+ try {
+ manifest.write(outputStream);
+ } finally {
+ outputStream.close();
+ }
+ }
}
\ No newline at end of file
commit 1dd4054df01aa17977498813f8b9dd5fcf3bc697
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Dec 12 13:51:12 2011 -0600
[BZ 758753] Use SHA as the version for the package; the format is consistent with the existing versioning scheme.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index 25068bd..eade28b 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -66,6 +66,7 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.core.domain.util.Summary;
import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.enterprise.server.content.ContentManagerRemote;
import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException;
@@ -513,32 +514,26 @@ public class ResourceClientProxy {
throw new IllegalArgumentException("File expected, found directory: " + file.getAbsolutePath());
}
-
- InstalledPackage oldPackage = getBackingContent();
-
-
- String oldVersion = oldPackage.getPackageVersion().getVersion();
- String newVersion = "1.0";
- if (oldVersion != null && oldVersion.length() != 0) {
- String[] parts = oldVersion.split("[^a-zA-Z0-9]");
- String lastPart = parts[parts.length-1];
- try {
- int lastNumber = Integer.parseInt(lastPart);
- newVersion = oldVersion.substring(0, oldVersion.length() - lastPart.length()) + (lastNumber + 1);
- } catch (NumberFormatException nfe) {
- newVersion = oldVersion + ".1";
- }
+ byte[] fileContents = new ScriptUtil(remoteClient).getFileBytes(filename);
+ String sha = null;
+ try {
+ sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(fileContents);
+ }
+ catch(Exception e){
+ //do nothing because the sha will remain null.
+ LOG.error("Message digest for the package bits failed.", e);
}
- byte[] fileContents = new ScriptUtil(remoteClient).getFileBytes(filename);
+ String version = "[sha256="+sha+"]";
+ InstalledPackage oldPackage = getBackingContent();
PackageVersion pv =
remoteClient.getContentManager().createPackageVersion(
remoteClient.getSubject(),
oldPackage.getPackageVersion().getGeneralPackage().getName(),
oldPackage.getPackageVersion().getGeneralPackage().getPackageType().getId(),
- newVersion,
+ version,
oldPackage.getPackageVersion().getArchitecture().getId(),
fileContents);
@@ -547,8 +542,6 @@ public class ResourceClientProxy {
new int[] { resourceClientProxy.getId()},
new int[] {pv.getId()},
"CLI deployment request");
-
-
}
public void retrieveBackingContent(String fileName) throws IOException {
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
index f2191d4..0aedf94 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
@@ -74,7 +74,6 @@ import org.rhq.core.pluginapi.util.ResponseTimeLogParser;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.exception.ThrowableUtil;
-import org.rhq.core.util.file.JarContentFileInfo;
import org.rhq.plugins.jmx.MBeanResourceComponent;
import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
@@ -618,8 +617,7 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
// Package name and file name of the application are the same
String fileName = new File(fullFileName).getName();
String sha256 = getSHA256(file);
- JarContentFileInfo info = new JarContentFileInfo(file);
- String version = getVersion(info, sha256);
+ String version = getVersion(sha256);
PackageDetailsKey key = new PackageDetailsKey(fileName, version, PKG_TYPE_FILE, ARCHITECTURE);
ResourcePackageDetails details = new ResourcePackageDetails(key);
@@ -676,22 +674,8 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
return sha256;
}
- private String getVersion(JarContentFileInfo fileInfo, String sha256) {
- // Version string in order of preference
- // manifestVersion + sha256, sha256, manifestVersion, "0"
- String version = "0";
- String manifestVersion = fileInfo.getVersion(null);
-
- if ((null != manifestVersion) && (null != sha256)) {
- // this protects against the occasional differing binaries with poor manifest maintenance
- version = manifestVersion + " [sha256=" + sha256 + "]";
- } else if (null != sha256) {
- version = "[sha256=" + sha256 + "]";
- } else if (null != manifestVersion) {
- version = manifestVersion;
- }
-
- return version;
+ private String getVersion(String sha256) {
+ return "[sha256=" + sha256 + "]";
}
public List<DeployPackageStep> generateInstallationSteps(ResourcePackageDetails packageDetails) {
commit 5fced2929b4840cf01b6eeab7dc35ed38b379e9b
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Dec 12 10:03:40 2011 -0600
[BZ 758753] Use SHA as the identifier for package discovery. The version is unreliable and not correctly updated between server and agent.
Also, populate the installed package during discovery; the complete method is not the correct place because it does not necessarly mean that the package was fully deployed even if copied.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
index d64d8a5..7096645 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
@@ -57,7 +57,7 @@ import org.rhq.core.domain.util.OSGiVersionComparator;
* @author Jason Dobies
*/
@Entity
-@NamedQueries( {
+@NamedQueries({
@NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS, query = "" //
+ "SELECT pv FROM PackageVersion AS pv " //
+ " WHERE pv.generalPackage.name = :packageName " //
@@ -66,6 +66,12 @@ import org.rhq.core.domain.util.OSGiVersionComparator;
+ " AND ( ( NOT pv.sha256 IS NULL AND pv.sha256 = :sha ) OR "
+ " ( pv.sha256 IS NULL AND pv.architecture.name = :architectureName AND pv.version = :version ) "
+ " ) "),
+ @NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_SHA, query = "" //
+ + "SELECT pv FROM PackageVersion AS pv " //
+ + " WHERE pv.generalPackage.name = :packageName " //
+ + " AND pv.generalPackage.packageType.name = :packageTypeName " //
+ + " AND pv.generalPackage.packageType.resourceType.id = :resourceTypeId " //
+ + " AND pv.sha256 = :sha "),
@NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH, query = "SELECT pv FROM PackageVersion AS pv "
+ " WHERE pv.generalPackage.name = :name " + " AND pv.generalPackage.packageType.id = :packageTypeId "
+ " AND pv.architecture.id = :architectureId " + " AND pv.version = :version "),
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 70f5c0c..29c3c85 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -203,13 +203,11 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// If the package exists see if package version already exists
if (null != generalPackage) {
Query packageVersionQuery = entityManager
- .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS);
+ .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_SHA);
packageVersionQuery.setFlushMode(FlushModeType.COMMIT);
packageVersionQuery.setParameter("packageName", discoveredPackage.getName());
packageVersionQuery.setParameter("packageTypeName", discoveredPackage.getPackageTypeName());
packageVersionQuery.setParameter("resourceTypeId", resource.getResourceType().getId());
- packageVersionQuery.setParameter("architectureName", discoveredPackage.getArchitectureName());
- packageVersionQuery.setParameter("version", discoveredPackage.getVersion());
packageVersionQuery.setParameter("sha", discoveredPackage.getSHA256());
List<PackageVersion> resultPackageVersions = packageVersionQuery.getResultList();
if (resultPackageVersions.size() > 0) {
@@ -546,10 +544,6 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// We're closing out the package request for this package version, so remove it from the cache of entries
// that need to be closed
inProgressEntries.remove(packageVersion);
-
- if (singleResponse.getResult() == ContentResponseResult.SUCCESS) {
- updateInstalledPackages(resource, packageVersion);
- }
}
// For any entries that were not closed, add closing entries
@@ -2077,37 +2071,4 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
ex.printStackTrace();
}
}
-
- /**
- * Update the set of installed packages for a content type resource.
- * Existing installed packages are purged and a new set of installed
- * packages is created. Currently, a content type resource has only
- * and only one installed package.
- *
- * @param resource resource
- * @param packageVersion package version
- */
- @SuppressWarnings("unchecked")
- private void updateInstalledPackages(Resource resource, PackageVersion packageVersion) {
- if (resource.getResourceType().getCreationDataType() == ResourceCreationDataType.CONTENT) {
- Query installedPackageQuery = entityManager.createNamedQuery(InstalledPackage.QUERY_FIND_BY_RESOURCE_ID);
- installedPackageQuery.setParameter("resourceId", resource.getId());
-
- List<InstalledPackage> installedPackages = installedPackageQuery.getResultList();
- if ((installedPackages != null) && (installedPackages.size() > 0)) {
- for (InstalledPackage installedPackage : installedPackages) {
- entityManager.refresh(installedPackage);
- entityManager.remove(installedPackage);
- }
- }
-
- InstalledPackage installedPackage = new InstalledPackage();
- installedPackage.setInstallationDate(System.currentTimeMillis());
- installedPackage.setPackageVersion(packageVersion);
- installedPackage.setResource(resource);
- entityManager.persist(installedPackage);
-
- entityManager.flush();
- }
- }
}
\ No newline at end of file
commit f185673bc3ec2c9739912b62e2700814d73494aa
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Dec 8 16:41:19 2011 -0600
[BZ 761593] Update the code to correctly compute SHA 265 for the exploded war file. The existing code was computing MD5 sums.
Also, removed warning supression code left behind from incorrect use of the message digest generator.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
index aa48a20..f605e2d 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
@@ -228,7 +228,6 @@ public class TomcatVHostComponent extends MBeanResourceComponent<TomcatServerCom
return report;
}
- @SuppressWarnings("static-access")
private void warCreate(CreateResourceReport report) throws Exception {
ResourcePackageDetails details = report.getPackageDetails();
PackageDetailsKey key = details.getKey();
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
index 42dbde7..a93eddf 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
@@ -81,7 +81,6 @@ public class FileContentDelegate {
* it is written, using the package name as the base directory; if <code>false</code> the
* content will be written to directly to a file using the package name as the file name
*/
- @SuppressWarnings("static-access")
public void createContent(File destination, File content, boolean unzip) {
try {
if (unzip) {
@@ -101,7 +100,7 @@ public class FileContentDelegate {
}
Attributes attribs = manifest.getMainAttributes();
- String sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).getDigestString(content);
+ String sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(content);
attribs.putValue("RHQ-Sha256", sha);
FileOutputStream outputStream = new FileOutputStream(manifestFile);
commit 53268f7ce298e11e1a5fa079ff3c25b051d75746
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Dec 8 16:38:17 2011 -0600
[BZ 761593] The plugin was not obtaining the SHA from the manifest file. Since the deployment is exploded the existing code would just fail.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
index 0a95ad7..f2191d4 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
@@ -34,6 +34,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.jar.Manifest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -636,9 +637,15 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
return packages;
}
- // TODO: if needed we can speed this up by looking in the ResourceContainer's installedPackage
- // list for previously discovered packages. If there use the sha256 from that record. We'd have to
- // get access to that info by adding access in org.rhq.core.pluginapi.content.ContentServices
+ /**
+ * Retrieve SHA 256 for a deployed app.
+ * 1) If the app is exploded then look into the manifest file for the RHQ-Sha265 attribute.
+ * The SHA should have been computed and the attribute added during package deployment.
+ * 2) If the app is not exploded then compute the SHA256 for the archive.
+ *
+ * @param file application file
+ * @return the SHA 256
+ */
private String getSHA256(File file) {
String sha256 = null;
@@ -647,8 +654,15 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
//if the filesize of discovered package is null then it's an exploded and deployed war/ear.
File app = new File(file.getPath());
if (app.isDirectory()) {
- File associatedWarFile = new File(app.getAbsolutePath() + ".war");
- sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(associatedWarFile);
+ File manifestFile = new File(app.getAbsolutePath(), "META-INF/MANIFEST.MF");
+ InputStream manifestStream = new FileInputStream(manifestFile);
+ Manifest manifest = null;
+ try {
+ manifest = new Manifest(manifestStream);
+ sha256 = manifest.getMainAttributes().getValue("RHQ-Sha256");
+ } finally {
+ manifestStream.close();
+ }
} else {
sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(app);
}
commit 810fa9312582fa68526aaffab74eabca35ffa7c7
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Dec 8 14:45:00 2011 -0600
[BZ 761593] The war component was not using the content delegate to redeploy applications. Because of this any redeployments were missing the SHA manifest attribute.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
index 0f63e1f..aa48a20 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
@@ -23,13 +23,10 @@
package org.jboss.on.plugins.tomcat;
-import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.util.StringTokenizer;
import java.util.jar.JarEntry;
@@ -54,7 +51,6 @@ import org.rhq.core.pluginapi.content.ContentServices;
import org.rhq.core.pluginapi.inventory.ApplicationServerComponent;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
-import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.plugins.jmx.MBeanResourceComponent;
@@ -308,9 +304,7 @@ public class TomcatVHostComponent extends MBeanResourceComponent<TomcatServerCom
}
FileContentDelegate fileContent = new FileContentDelegate(deployDir, details.getPackageTypeName());
- InputStream isForTempDir = new BufferedInputStream(new FileInputStream(tempFile));
- String sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).getDigestString(tempFile);
- fileContent.createContent(path, isForTempDir, explodeOnDeploy, sha);
+ fileContent.createContent(path, tempFile, explodeOnDeploy);
// Resource key is a canonical objectName similar to:
// Catalina:j2eeType=WebModule,name=//<vHost>/<path>,J2EEApplication=none,J2EEServer=none
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
index 75f8e92..0a95ad7 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
@@ -43,6 +43,7 @@ import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.mc4j.ems.connection.bean.operation.EmsOperation;
+import org.jboss.on.plugins.tomcat.helper.FileContentDelegate;
import org.jboss.on.plugins.tomcat.helper.TomcatApplicationDeployer;
import org.rhq.core.domain.configuration.Configuration;
@@ -510,15 +511,17 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
log.warn("Failed to create app backup but proceeding with redeploy of " + appFile.getPath() + ": " + e);
}
+ FileContentDelegate contentDelegate = new FileContentDelegate(appFile.getParentFile(), packageDetails.getName());
+
try {
// Write the new bits for the application. If successful Tomcat will pick it up and complete the deploy.
- moveTempFileToDeployLocation(tempFile, appFile, isExploded);
+ contentDelegate.createContent(appFile, tempFile, isExploded);
} catch (Exception e) {
// Deploy failed - rollback to the original app file...
String errorMessage = ThrowableUtil.getAllMessages(e);
try {
FileUtils.purge(appFile, true);
- moveTempFileToDeployLocation(backupFile, appFile, isExploded);
+ contentDelegate.createContent(appFile, backupFile, isExploded);
errorMessage += " ***** ROLLED BACK TO ORIGINAL APPLICATION FILE. *****";
} catch (Exception e1) {
errorMessage += " ***** FAILED TO ROLLBACK TO ORIGINAL APPLICATION FILE. *****: "
@@ -539,17 +542,6 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
return response;
}
- private void moveTempFileToDeployLocation(File tempFile, File appFile, boolean isExploded) throws IOException {
- InputStream tempIs = null;
- if (isExploded) {
- tempIs = new BufferedInputStream(new FileInputStream(tempFile));
- appFile.mkdir();
- ZipUtil.unzipFile(tempIs, appFile);
- } else {
- tempFile.renameTo(appFile);
- }
- }
-
private File backupAppBitsToTempFile(File appFile) throws Exception {
File tempDir = getResourceContext().getTemporaryDirectory();
File tempFile = new File(tempDir.getAbsolutePath(), appFile.getName() + System.currentTimeMillis());
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
index 709c6b7..42dbde7 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
@@ -37,6 +37,7 @@ import org.rhq.core.domain.content.PackageDetails;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.pluginapi.util.FileUtils;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.file.FileUtil;
@@ -80,12 +81,13 @@ public class FileContentDelegate {
* it is written, using the package name as the base directory; if <code>false</code> the
* content will be written to directly to a file using the package name as the file name
*/
- public void createContent(File contentFile, InputStream content, boolean unzip, String sha) {
+ @SuppressWarnings("static-access")
+ public void createContent(File destination, File content, boolean unzip) {
try {
if (unzip) {
- ZipUtil.unzipFile(content, contentFile);
+ ZipUtil.unzipFile(content, destination);
- File manifestFile = new File(contentFile, "META-INF/MANIFEST.MF");
+ File manifestFile = new File(destination, "META-INF/MANIFEST.MF");
Manifest manifest;
if (manifestFile.exists()) {
FileInputStream inputStream = new FileInputStream(manifestFile);
@@ -99,6 +101,7 @@ public class FileContentDelegate {
}
Attributes attribs = manifest.getMainAttributes();
+ String sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).getDigestString(content);
attribs.putValue("RHQ-Sha256", sha);
FileOutputStream outputStream = new FileOutputStream(manifestFile);
@@ -108,10 +111,11 @@ public class FileContentDelegate {
outputStream.close();
}
} else {
- FileUtil.writeFile(content, contentFile);
+ InputStream contentStream = new BufferedInputStream(new FileInputStream(content));
+ FileUtil.writeFile(contentStream, destination);
}
} catch (IOException e) {
- throw new RuntimeException("Error creating artifact for contentFile: " + contentFile, e);
+ throw new RuntimeException("Error creating artifact for contentFile: " + destination, e);
}
}
commit 9149b3a7b20af133724d7f0a2dda4f09f54105ae
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Dec 8 12:14:16 2011 -0600
[BZ 761593] Add SHA to manifest for exploded WAR deployments.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
index 7f600a7..0f63e1f 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java
@@ -54,6 +54,7 @@ import org.rhq.core.pluginapi.content.ContentServices;
import org.rhq.core.pluginapi.inventory.ApplicationServerComponent;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.plugins.jmx.MBeanResourceComponent;
@@ -231,6 +232,7 @@ public class TomcatVHostComponent extends MBeanResourceComponent<TomcatServerCom
return report;
}
+ @SuppressWarnings("static-access")
private void warCreate(CreateResourceReport report) throws Exception {
ResourcePackageDetails details = report.getPackageDetails();
PackageDetailsKey key = details.getKey();
@@ -307,11 +309,11 @@ public class TomcatVHostComponent extends MBeanResourceComponent<TomcatServerCom
FileContentDelegate fileContent = new FileContentDelegate(deployDir, details.getPackageTypeName());
InputStream isForTempDir = new BufferedInputStream(new FileInputStream(tempFile));
- fileContent.createContent(path, isForTempDir, explodeOnDeploy);
-
- // Resource key is a canonical objectName similar to :
- // Catalina:j2eeType=WebModule,name=//<vHost>/<path>,J2EEApplication=none,J2EEServer=none
+ String sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).getDigestString(tempFile);
+ fileContent.createContent(path, isForTempDir, explodeOnDeploy, sha);
+ // Resource key is a canonical objectName similar to:
+ // Catalina:j2eeType=WebModule,name=//<vHost>/<path>,J2EEApplication=none,J2EEServer=none
String objectName = "Catalina:j2eeType=WebModule,J2EEApplication=none,J2EEServer=none,name=//" + getName()
+ "/" + contextRoot;
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
index 1d2b6b2..709c6b7 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java
@@ -26,9 +26,12 @@ import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
import org.rhq.core.domain.content.PackageDetails;
import org.rhq.core.domain.content.PackageDetailsKey;
@@ -77,10 +80,33 @@ public class FileContentDelegate {
* it is written, using the package name as the base directory; if <code>false</code> the
* content will be written to directly to a file using the package name as the file name
*/
- public void createContent(File contentFile, InputStream content, boolean unzip) {
+ public void createContent(File contentFile, InputStream content, boolean unzip, String sha) {
try {
if (unzip) {
ZipUtil.unzipFile(content, contentFile);
+
+ File manifestFile = new File(contentFile, "META-INF/MANIFEST.MF");
+ Manifest manifest;
+ if (manifestFile.exists()) {
+ FileInputStream inputStream = new FileInputStream(manifestFile);
+ try {
+ manifest = new Manifest(inputStream);
+ } finally {
+ inputStream.close();
+ }
+ } else {
+ manifest = new Manifest();
+ }
+
+ Attributes attribs = manifest.getMainAttributes();
+ attribs.putValue("RHQ-Sha256", sha);
+
+ FileOutputStream outputStream = new FileOutputStream(manifestFile);
+ try {
+ manifest.write(outputStream);
+ } finally {
+ outputStream.close();
+ }
} else {
FileUtil.writeFile(content, contentFile);
}
commit a49908fba6460d7d310268c5f187e94f7ce1614d
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Dec 6 12:46:44 2011 -0600
[BZ 758753] If a package is successfully installed and the resource is a cotennt resource then update the installed package information in the database (delete old entry and add a new entry).
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 3a985b8..70f5c0c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -93,6 +93,7 @@ import org.rhq.core.domain.criteria.PackageCriteria;
import org.rhq.core.domain.criteria.PackageVersionCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceCreationDataType;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.util.MessageDigestGenerator;
@@ -545,6 +546,10 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// We're closing out the package request for this package version, so remove it from the cache of entries
// that need to be closed
inProgressEntries.remove(packageVersion);
+
+ if (singleResponse.getResult() == ContentResponseResult.SUCCESS) {
+ updateInstalledPackages(resource, packageVersion);
+ }
}
// For any entries that were not closed, add closing entries
@@ -2073,4 +2078,36 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
}
}
+ /**
+ * Update the set of installed packages for a content type resource.
+ * Existing installed packages are purged and a new set of installed
+ * packages is created. Currently, a content type resource has only
+ * and only one installed package.
+ *
+ * @param resource resource
+ * @param packageVersion package version
+ */
+ @SuppressWarnings("unchecked")
+ private void updateInstalledPackages(Resource resource, PackageVersion packageVersion) {
+ if (resource.getResourceType().getCreationDataType() == ResourceCreationDataType.CONTENT) {
+ Query installedPackageQuery = entityManager.createNamedQuery(InstalledPackage.QUERY_FIND_BY_RESOURCE_ID);
+ installedPackageQuery.setParameter("resourceId", resource.getId());
+
+ List<InstalledPackage> installedPackages = installedPackageQuery.getResultList();
+ if ((installedPackages != null) && (installedPackages.size() > 0)) {
+ for (InstalledPackage installedPackage : installedPackages) {
+ entityManager.refresh(installedPackage);
+ entityManager.remove(installedPackage);
+ }
+ }
+
+ InstalledPackage installedPackage = new InstalledPackage();
+ installedPackage.setInstallationDate(System.currentTimeMillis());
+ installedPackage.setPackageVersion(packageVersion);
+ installedPackage.setResource(resource);
+ entityManager.persist(installedPackage);
+
+ entityManager.flush();
+ }
+ }
}
\ No newline at end of file
commit 0db85189e02048786d8cd6ad83d8c4ef04076846
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Dec 5 09:32:43 2011 -0600
[BZ 758753] Use a single bean method for all deployment requests. A single point of entry simplifies design and allows adding post installation processing code in a single place.
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
index 0ad272c..69cb01d 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js
@@ -462,7 +462,7 @@ function testDeploy() {
Assert.assertNumberEqualsJS( pvsInRepo.get(0).getId(), pv.getId(), "unexpected pv returned" );
// do the update
- ContentManager.deployPackages( [war.getId()], [pv.getId()] );
+ ContentManager.deployPackages( [war.getId()], [pv.getId()], "Test Note" );
// Make sure things still look good
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index 928468b..25068bd 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -545,7 +545,8 @@ public class ResourceClientProxy {
remoteClient.getContentManager().deployPackages(
remoteClient.getSubject(),
new int[] { resourceClientProxy.getId()},
- new int[] {pv.getId()});
+ new int[] {pv.getId()},
+ "CLI deployment request");
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
index f5d973f..2e7e95e 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java
@@ -18,9 +18,6 @@
*/
package org.rhq.enterprise.gui.content;
-import java.util.HashSet;
-import java.util.Set;
-
import javax.faces.application.FacesMessage;
import javax.faces.component.UIData;
import javax.faces.model.DataModel;
@@ -34,7 +31,6 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.content.Package;
import org.rhq.core.domain.content.PackageVersion;
import org.rhq.core.domain.content.composite.PackageVersionComposite;
-import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -85,11 +81,10 @@ public class DeployPackagesUIBean extends PagedDataTableUIBean {
// Going forward, we'll need to create this earlier and store the user entered configuration in these
// objects. jdobies, Mar 3, 2008
ContentUIManagerLocal contentUIManager = LookupUtil.getContentUIManager();
- Set<ResourcePackageDetails> packagesToDeploy = new HashSet<ResourcePackageDetails>(packageIds.length);
- for (int pkgId : packageIds) {
- PackageVersion packageVersion = contentUIManager.getPackageVersion(pkgId);
- ResourcePackageDetails pkgDetails = ContentUtils.toResourcePackageDetails(packageVersion);
- packagesToDeploy.add(pkgDetails);
+ int[] packagesVersionsIdsToDeploy = new int[packageIds.length];
+ for (int iterator = 0; iterator < packageIds.length; iterator++) {
+ PackageVersion packageVersion = contentUIManager.getPackageVersion(packageIds[iterator]);
+ packagesVersionsIdsToDeploy[iterator] = packageVersion.getId();
}
Subject subject = EnterpriseFacesContextUtility.getSubject();
@@ -97,7 +92,7 @@ public class DeployPackagesUIBean extends PagedDataTableUIBean {
try {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
- contentManager.deployPackages(subject, resource.getId(), packagesToDeploy, notes);
+ contentManager.deployPackages(subject, new int[] { resource.getId() }, new int[] {}, notes);
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Could not send deploy request to agent", e);
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java
index f00118b..c6eb4c7 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java
@@ -68,7 +68,7 @@ public class RepoPackageVersionsUIBean extends PagedDataTableUIBean {
resourceIds[i] = resources.get(i).getId();
}
- contentManager.deployPackages(subject, resourceIds, packageIds);
+ contentManager.deployPackages(subject, resourceIds, packageIds, "Repository package install");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to deploy packages: " + packageIds
+ " to Resources subscribed to repository: " + repoId + " Error: " + e.getMessage());
diff --git a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsRepoManagerTest.java b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsRepoManagerTest.java
index 2267411..b94e422 100644
--- a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsRepoManagerTest.java
+++ b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsRepoManagerTest.java
@@ -512,7 +512,7 @@ public class WsRepoManagerTest extends AssertJUnit implements TestPropertiesInte
// ContentManager.deployPackages( [war.getId()], [pv.getId()] );
List<Integer> warBag = new ArrayList<Integer>();
warBag.add(war.getId());
- WEBSERVICE_REMOTE.deployPackages(subject, warBag, pvBag);
+ WEBSERVICE_REMOTE.deployPackages(subject, warBag, pvBag, "Test Notes");
// Make sure things still look good
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 121ea7e..3a985b8 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -345,7 +345,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
+ (System.currentTimeMillis() - start) + "ms");
}
- public void deployPackages(Subject user, int[] resourceIds, int[] packageVersionIds) {
+ public void deployPackages(Subject user, int[] resourceIds, int[] packageVersionIds, String requestNotes) {
for (int resourceId : resourceIds) {
Set<ResourcePackageDetails> packages = new HashSet<ResourcePackageDetails>();
for (int packageVersionId : packageVersionIds) {
@@ -359,7 +359,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
packages.add(details);
}
- deployPackages(user, resourceId, packages, null);
+ deployPackages(user, resourceId, packages, requestNotes);
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
index 4295e3a..1957091 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
@@ -64,18 +64,18 @@ public interface ContentManagerLocal {
* upon persist.
*/
public static final String UPLOAD_FILE_SIZE = "fileSize";
-
+
public static final String UPLOAD_FILE_INSTALL_DATE = "fileInstallDate";
-
+
/**
* This doesn't seem to serve any purpose.
*/
public static final String UPLOAD_OWNER = "owner";
-
+
public static final String UPLOAD_FILE_NAME = "fileName";
-
+
public static final String UPLOAD_MD5 = "md5";
-
+
/**
* This is currently ignored as the SHA is computed upon
* persist.
@@ -338,7 +338,6 @@ public interface ContentManagerLocal {
*/
PackageType getResourceCreationPackageType(int resourceTypeId);
-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
// The following are shared with the Remote Interface
@@ -362,9 +361,9 @@ public interface ContentManagerLocal {
public void deletePackageVersion(Subject subject, int packageVersionId);
/**
- * @see {@link ContentManagerRemote#deployPackages(Subject, int[], int[])}
+ * @see {@link ContentManagerRemote#deployPackages(Subject, int[], int[], String)}
*/
- void deployPackages(Subject subject, int[] resourceIds, int[] packageVersionIds);
+ void deployPackages(Subject subject, int[] resourceIds, int[] packageVersionIds, String requestNotes);
/**
* @see {@link ContentManagerRemote#findArchitectures(Subject)}
@@ -381,12 +380,12 @@ public interface ContentManagerLocal {
* @see {@link ContentManagerRemote#findPackageType(Subject, Integer, String)}
*/
PackageType findPackageType(Subject subject, Integer resourceTypeId, String packageTypeName);
-
+
/**
* @see {@link ContentManagerRemote#findPackageTypeWithVersionFormat(Subject, Integer, String)}
*/
PackageTypeAndVersionFormatComposite findPackageTypeWithVersionFormat(Subject subject, Integer resourceTypeId, String packageTypeName);
-
+
/**
* @see {@link ContentManagerRemote#findInstalledPackagesByCriteria(Subject, InstalledPackageCriteria)}
*/
@@ -430,7 +429,7 @@ public interface ContentManagerLocal {
* @throws IllegalArgumentException if the supplied package type has non-null resource type
*/
PackageType persistServersidePackageType(PackageType packageType);
-
+
void writeBlobOutToStream(OutputStream stream, PackageBits bits, boolean closeStreams);
void updateBlobStream(InputStream stream, PackageBits bits, Map<String, String> contentDetails);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
index edeb2b2..0038824 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java
@@ -109,10 +109,11 @@ public interface ContentManagerRemote {
* @param packageVersionIds packageVersions we want to install
*/
@WebMethod
- void deployPackages( //
+ void deployPackages(
@WebParam(name = "subject") Subject subject, //
@WebParam(name = "resourceIds") int[] resourceIds, //
- @WebParam(name = "packageVersionIds") int[] packageVersionIds);
+ @WebParam(name = "packageVersionIds") int[] packageVersionIds,
+ @WebParam(name = "requestNotes") String requestNotes);
/**
* Returns all architectures known to the system.
@@ -157,7 +158,7 @@ public interface ContentManagerRemote {
@WebParam(name = "resourceTypeId") Integer resourceTypeId,
@WebParam(name = "packageTypeName") String packageTypeName
);
-
+
/**
* Similar to {@link #findPackageType(Subject, Integer, String)} but
* returns the package type along with the version format specification.
@@ -172,6 +173,7 @@ public interface ContentManagerRemote {
@WebParam(name = "subject") Subject subject,
@WebParam(name ="resourceTypeId") Integer resourceTypeId,
@WebParam(name = "packageTypeName") String packageTypeName);
+
/**
* @param subject
* @param criteria {@link InstalledPackageCriteria}
@@ -210,7 +212,7 @@ public interface ContentManagerRemote {
PageList<Package> findPackagesByCriteria(
@WebParam(name = "subject") Subject subject,
@WebParam(name = "criteria") PackageCriteria criteria);
-
+
/**
* Akin to {@link #findPackagesByCriteria(Subject, PackageCriteria)} but also
* determines the latest version of the returned packages.
@@ -222,11 +224,11 @@ public interface ContentManagerRemote {
* @return
* @throws IllegalArgumentException if the criteria doesn't define a repo filter
*/
- @WebMethod
+ @WebMethod
PageList<PackageAndLatestVersionComposite> findPackagesWithLatestVersion(
@WebParam(name = "subject") Subject subject,
@WebParam(name = "criteria") PackageCriteria criteria);
-
+
/**
* For a resource that is content-backed (aka package-backed), this call will return InstalledPackage information
* for the backing content (package).
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
index 1cb14b2..54725a6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java
@@ -520,8 +520,8 @@ public class WebservicesManagerBean implements WebservicesRemote {
contentManager.deletePackageVersion(subject, packageVersionId);
}
- public void deployPackages(Subject subject, int[] resourceIds, int[] packageVersionIds) {
- contentManager.deployPackages(subject, resourceIds, packageVersionIds);
+ public void deployPackages(Subject subject, int[] resourceIds, int[] packageVersionIds, String requestNotes) {
+ contentManager.deployPackages(subject, resourceIds, packageVersionIds, requestNotes);
}
public List<Architecture> findArchitectures(Subject subject) {
@@ -1202,7 +1202,7 @@ public class WebservicesManagerBean implements WebservicesRemote {
public void setSystemSettings(Subject subject, SystemSettings settings) throws Exception {
systemManager.setSystemSettings(subject, settings);
}
-
+
//SYSTEMMANAGER: END ------------------------------------
//SYNCHRONIZATIONMANANGER: BEGIN -------------------------
commit 697e623181c89789d6ae75615435e01e78609b69
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Feb 6 12:26:59 2012 -0500
[BZ 787766] upgrade Postgres JDBC driver to version 9.1-901.jdbc4
(https://bugzilla.redhat.com/show_bug.cgi?id=787766)
diff --git a/modules/helpers/inventory-serializer/pom.xml b/modules/helpers/inventory-serializer/pom.xml
index 687296d..ed18040 100644
--- a/modules/helpers/inventory-serializer/pom.xml
+++ b/modules/helpers/inventory-serializer/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.0-801.jdbc4</version>
+ <version>9.1-901.jdbc4</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -124,4 +124,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index ec0c098..a1babd7 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -35,7 +35,7 @@
<artifactItem>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.0-801.jdbc4</version>
+ <version>9.1-901.jdbc4</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
@@ -62,11 +62,10 @@
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.0-801.jdbc4</version>
+ <version>9.1-901.jdbc4</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 9edf427..5d55bae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
<jsf-impl.version>1.2_14</jsf-impl.version>
<ojdbc6.version>11.2.0.3.0</ojdbc6.version>
<ems.version>1.3</ems.version>
- <postgresql.version>9.0-801.jdbc4</postgresql.version>
+ <postgresql.version>9.1-901.jdbc4</postgresql.version>
<h2.version>1.2.139</h2.version>
<jtds.version>1.2.2</jtds.version>
<richfaces.version>3.3.3.Final</richfaces.version>
commit e8d82f1538dc9950d9089e06d075371492237542
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Feb 6 12:15:27 2012 -0500
[BZ 787769] upgrade Oracle JDBC driver to ojdbc6 (JDK6) version 11.2.0.3.0
(https://bugzilla.redhat.com/show_bug.cgi?id=787769)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index c18ffe1..d434713 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -144,7 +144,7 @@
</systemProperties>
<!-- The below is required for tests to run against Oracle. -->
<additionalClasspathElements>
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -209,7 +209,7 @@
<property name="settings.localRepository" location="${user.home}/.m2/repository" />
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
<property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="ojdbc6.version" value="${ojdbc6.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
<property name="jtds.version" value="${jtds.version}" />
@@ -240,7 +240,7 @@
<property name="settings.localRepository" location="${user.home}/.m2/repository" />
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
<property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="ojdbc6.version" value="${ojdbc6.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
<property name="jtds.version" value="${jtds.version}" />
@@ -270,7 +270,7 @@
<echo>settings.localRepository=${settings.localRepository}</echo>
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="ojdbc6.version" value="${ojdbc6.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
<property name="jtds.version" value="${jtds.version}" />
@@ -317,7 +317,7 @@
<property name="settings.localRepository" location="${user.home}/.m2/repository" />
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="create-release-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="ojdbc6.version" value="${ojdbc6.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
<property name="jtds.version" value="${jtds.version}" />
@@ -480,8 +480,8 @@
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>${ojdbc5.version}</version>
+ <artifactId>ojdbc6</artifactId>
+ <version>${ojdbc6.version}</version>
</dependency>
</dependencies>
<build>
@@ -493,8 +493,8 @@
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>${ojdbc5.version}</version>
+ <artifactId>ojdbc6</artifactId>
+ <version>${ojdbc6.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
index fc1138b..e7f2c12 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
@@ -58,7 +58,7 @@ To run the default target, you must set one of the following properties to true:
unless="dbsetup-init-taskdefs.notrequired">
<path id="full.task.classpath">
<pathelement path="${task.classpath.property}" />
- <pathelement location="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"/>
+ <pathelement location="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"/>
<pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/>
<pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/>
<pathelement location="${settings.localRepository}/net/sourceforge/jtds/jtds/${jtds.version}/jtds-${jtds.version}.jar"/>
@@ -339,7 +339,7 @@ To run the default target, you must set one of the following properties to true:
print="true"
showheaders="false">
<classpath>
- <pathelement location="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"/>
+ <pathelement location="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"/>
<pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/>
<pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/>
<pathelement location="${settings.localRepository}/net/sourceforge/jtds/jtds/${jtds.version}/jtds-${jtds.version}.jar"/>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index ceedba7..c125944 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -282,7 +282,7 @@
</excludes>
<!-- The below is required for tests to run against Oracle. -->
<additionalClasspathElements>
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index d03919c..ea9c917 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -166,7 +166,7 @@
<!-- dependency versions -->
<property name="rhq.version" value="${project.version}" />
<property name="jboss.version" value="${jboss.version}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="ojdbc6.version" value="${ojdbc6.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
<property name="jboss-javassist.version" value="${jboss-javassist.version}" />
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index 0ddd0de..98bd130 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -246,7 +246,7 @@
<property name="jboss.lib.dir" location="${jboss.home}/server/default/lib" />
<echo>Copying additional libs to ${jboss.lib.dir} ...</echo>
- <copy file="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"
+ <copy file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"
toDir="${jboss.lib.dir}" failonerror="false" verbose="true" />
<copy file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"
toDir="${jboss.lib.dir}" verbose="true" />
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 653ef99..d69050c 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -311,7 +311,7 @@
<argLine>-Djava.security.manager -Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
<additionalClasspathElements>
<!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 92f4cf1..68ecc5c 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -663,7 +663,7 @@ Build-OS-Version=${os.version}
</systemPropertyVariables>
<additionalClasspathElements>
<!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index fad4127..ff9ee56 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -316,7 +316,7 @@
<additionalClasspathElements>
<!-- The below is required for tests to run against
Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 509a614..ab22ead 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -58,7 +58,7 @@
<artifactItems>
<artifactItem>
<groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
+ <artifactId>ojdbc6</artifactId>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
@@ -161,10 +161,11 @@
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>${ojdbc5.version}</version>
+ <artifactId>ojdbc6</artifactId>
+ <version>${ojdbc6.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -186,7 +187,7 @@
</systemProperties>
<!-- The below is required for tests to run against Oracle.
<additionalClasspathElements>
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
-->
</configuration>
diff --git a/pom.xml b/pom.xml
index 44c6b34..9edf427 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<jaxb-impl.version>2.1.9</jaxb-impl.version>
<jsf-api.version>1.2_14</jsf-api.version>
<jsf-impl.version>1.2_14</jsf-impl.version>
- <ojdbc5.version>11.2.0.2.0</ojdbc5.version>
+ <ojdbc6.version>11.2.0.3.0</ojdbc6.version>
<ems.version>1.3</ems.version>
<postgresql.version>9.0-801.jdbc4</postgresql.version>
<h2.version>1.2.139</h2.version>
@@ -1058,8 +1058,8 @@
this profile should not be active by default. -->
<dependency>
<groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>${ojdbc5.version}</version>
+ <artifactId>ojdbc6</artifactId>
+ <version>${ojdbc6.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
commit 0ed38f2bf952d9cf773e092856b93f1d438fcabe
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Feb 3 13:17:37 2012 -0500
[787250] add comment telling user not to include the --daemon option in
RHQ_AGENT_CMDLINE_OPTS (https://bugzilla.redhat.com/show_bug.cgi?id=787250)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-env.bat b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
index 7116516..62d727b 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent-env.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
@@ -103,11 +103,14 @@ rem passed through to the RHQ Agent.
rem If you want to have command line arguments
rem added to the arguments specified here, append
rem '%*' to the end of this option. For example,
-rem "--daemon %*". In this case, both the command
+rem "--nonative %*". In this case, both the command
rem line options and the ones specified here will
-rem be passed to the agent.
+rem be passed to the Agent. Note, the --daemon option
+rem should generally not be included here, since it
+rem would cause the Agent to always start in daemon
+rem mode, even when started via rhq-agent.bat.
rem
-rem set RHQ_AGENT_CMDLINE_OPTS=--nonative
+rem set RHQ_AGENT_CMDLINE_OPTS=--nonative %*
rem ===========================================================================
rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent-wrapper.bat SCRIPT
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-env.sh b/modules/enterprise/agent/src/etc/rhq-agent-env.sh
index bb679ef..c7a259e 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent-env.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent-env.sh
@@ -99,11 +99,14 @@
# If you want to have command line arguments
# added to the arguments specified here, append
# '$*' to the end of this option. For example,
-# "--daemon $*". In this case, both the command
+# "--nonative $*". In this case, both the command
# line options and the ones specified here will
-# be passed to the agent.
+# be passed to the Agent. Note, the --daemon option
+# should generally not be included here, since it
+# would cause the Agent to always start in daemon
+# mode, even when started via rhq-agent.sh.
#
-#RHQ_AGENT_CMDLINE_OPTS="--daemon --nonative"
+#RHQ_AGENT_CMDLINE_OPTS="--nonative $*"
# RHQ_AGENT_IN_BACKGROUND - If this is defined, the RHQ Agent JVM will
# be launched in the background (thus causing this
commit 16224a4092762e54928f411026f3c674cf210efa
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Feb 3 13:11:27 2012 -0500
[BZ 773031] enhance test to check and make sure the state is set properly
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java
index 39ae23d..f35965a 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java
@@ -35,7 +35,9 @@ import org.rhq.core.domain.resource.InventoryStatus;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.pc.PluginContainer;
import org.rhq.core.pc.ServerServices;
+import org.rhq.core.pc.inventory.InventoryManager;
import org.rhq.core.pc.inventory.ResourceContainer;
+import org.rhq.core.pc.inventory.ResourceContainer.ResourceComponentState;
import org.rhq.test.pc.PluginContainerSetup;
import org.rhq.test.pc.PluginContainerTest;
@@ -299,6 +301,14 @@ public class ResourceUpgradeTest extends ResourceUpgradeTestBase {
assertEquals(discoveredResource.getName(), "resource-name-v1");
assertEquals(discoveredResource.getDescription(), "resource-description-v1");
+ InventoryManager im = PluginContainer.getInstance().getInventoryManager();
+ ResourceContainer container = im.getResourceContainer(discoveredResource.getId());
+ if (discoveredResource.getInventoryStatus() == InventoryStatus.COMMITTED) {
+ assert container.getResourceComponentState() == ResourceComponentState.STARTED;
+ } else {
+ assert container.getResourceComponentState() == ResourceComponentState.STOPPED;
+ }
+
return inv;
}
commit cb78bd893aa614d0fcc5760f2a25a73175fe6c2e
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Feb 3 14:12:51 2012 +0100
update the JNDI access tests to not use the "context" variable which seems
to be predefined.
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
index f6772e5..06fc76a 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
@@ -67,8 +67,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager = context.lookup('SubjectManagerBean/local');\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var subjectManager = ctx.lookup('SubjectManagerBean/local');\n"
+ "subjectManager.getOverlord();");
Assert.fail("The script shouldn't have been able to call local SLSB method.");
@@ -84,8 +84,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager = context.lookup('SubjectManagerBean/remote');\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var subjectManager = ctx.lookup('SubjectManagerBean/remote');\n"
+ "subjectManager.getSubjectByName('rhqadmin');");
Assert.fail("The script shouldn't have been able to call remote SLSB method directly.");
@@ -133,8 +133,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "datasource = context.lookup('java:/RHQDS');\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var datasource = ctx.lookup('java:/RHQDS');\n"
+ "con = datasource.getConnection();");
Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI.");
@@ -150,9 +150,9 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var entityManagerFactory = ctx.lookup('java:/RHQEntityManagerFactory');\n"
+ + "var entityManager = entityManagerFactory.createEntityManager();\n"
+ "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
Assert.fail("The script shouldn't have been able to use the EntityManager.");
@@ -163,12 +163,12 @@ public class JndiAccessTest extends AbstractEJB3Test {
//try harder with manually specifying the initial context factory
try {
engine.eval(""
- + "env = new java.util.Hashtable();"
+ + "var env = new java.util.Hashtable();"
+ "env.put('java.naming.factory.initial', 'org.jnp.interfaces.LocalOnlyContextFactory');"
+ "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "var ctx = new javax.naming.InitialContext(env);\n"
+ + "var entityManagerFactory = ctx.lookup('java:/RHQEntityManagerFactory');\n"
+ + "var entityManager = entityManagerFactory.createEntityManager();\n"
+ "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory.");
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
index c6140a0..3c4f530 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
@@ -24,8 +24,6 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
-import java.io.SerializablePermission;
-import java.security.PermissionCollection;
import java.util.Collections;
import java.util.Properties;
@@ -41,7 +39,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
-import org.rhq.bindings.SandboxedScriptEngine;
import org.rhq.bindings.ScriptEngineFactory;
import org.rhq.bindings.StandardBindings;
import org.rhq.bindings.StandardScriptPermissions;
@@ -145,9 +142,9 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "var ctx = new javax.naming.InitialContext();\n"
+ + "var entityManagerFactory = ctx.lookup('java:/RHQEntityManagerFactory');\n"
+ + "var entityManager = entityManagerFactory.createEntityManager();\n"
+ "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
Assert.fail("The script shouldn't have been able to use the EntityManager.");
@@ -164,11 +161,11 @@ public class JndiAccessTest extends AbstractEJB3Test {
try {
engine.eval(""
- + "env = new java.util.Hashtable();"
+ + "var env = new java.util.Hashtable();"
+ "env.put('java.naming.factory.initial', 'org.jboss.naming.NamingContextFactory');"
+ "env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort + "');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "kachny = context.lookup('kachny');\n"
+ + "var ctx = new javax.naming.InitialContext(env);\n"
+ + "var kachny = ctx.lookup('kachny');\n"
+ "assertNotNull(kachny);\n");
} catch (ScriptException e) {
Assert.fail("The script should have been able to access a remote JNDI server.", e);
commit 9e6d06064faf01d9380fad64c91525e7b228c3bf
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Feb 3 13:15:05 2012 +0100
[BZ 773661] - The security exception is thrown directly if the principal is
null but wrapped in another exception if the principal is non-null.
Report both instances as InvalidPluginConfigurationExceptions while
connecting to profile service.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
index 299bdcd..804657c 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
@@ -371,6 +371,7 @@ public class ApplicationServerComponent<T extends ResourceComponent<?>> implemen
this.connection = connectionProvider.connect();
} catch (RuntimeException e) {
Throwable rootCause = ExceptionUtils.getRootCause(e);
+ rootCause = rootCause == null ? e : rootCause;
if (rootCause instanceof SecurityException) {
if (log.isDebugEnabled()) {
log.debug("Failed to connect to Profile Service.", e);
commit e732f44351125a591582dbd2ee59f983eb7eb300
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Feb 3 13:13:18 2012 +0100
[BZ 773661] - Reporting invalid plugin configuration if the resource starts
failing startup after upgrade and after manual add of a resource.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index ab4ecbc..c39f6f2 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -797,6 +797,7 @@ public class InventoryManager extends AgentService implements ContainerService,
performServiceScan(resource.getId());
if (null != startError) {
+ handleInvalidPluginConfigurationResourceError(resource, startError);
throw new PluginContainerException("The resource [" + resource
+ "] has been added but could not be started. Verify the supplied configuration values: ",
startError);
@@ -1684,7 +1685,7 @@ public class InventoryManager extends AgentService implements ContainerService,
* @param t the exception that indicates the problem with the plugin configuration
* @return true if the error was sent successfully, or false otherwise
*/
- private boolean handleInvalidPluginConfigurationResourceError(Resource resource, Throwable t) {
+ public boolean handleInvalidPluginConfigurationResourceError(Resource resource, Throwable t) {
resource.setConnected(false); // invalid plugin configuration infers the resource component is disconnected
// Give the server-side an error message describing the connection failure that can be
// displayed on the resource's Inventory page.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java
index c32ca97..ffd2065 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java
@@ -217,8 +217,10 @@ public class ResourceUpgradeDelegate {
inventoryManager.activateResource(resource, container, true);
} catch (InvalidPluginConfigurationException e) {
log.debug("Resource [" + resource + "] failed to start up after upgrade.", e);
+ inventoryManager.handleInvalidPluginConfigurationResourceError(resource, e);
} catch (Throwable t) {
log.error("Failed to activate the resource [" + resource + "] after upgrade.", t);
+ inventoryManager.handleInvalidPluginConfigurationResourceError(resource, t);
}
}
}
commit 58bf2d23ab26790dcb019e0e0a28530b97c4c2f4
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Feb 2 22:09:23 2012 -0500
[BZ 751447] add plugin pack reminder to installer.
i)Add new i18n property for plugin reminder.
ii)Tweak the header and welcome.jsp files to update to display plugin pack reminder.
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java
index 0eca4ba..e9f1511 100644
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java
+++ b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java
@@ -181,6 +181,9 @@ public interface InstallerI18NResourceKeys {
@I18NMessage(locale = "en", value = "${product.name} will be installed!")
String ALREADY_INSTALLED = "alreadyInstalled";
+ @I18NMessage(locale = "en", value = "Note: Remember to install the plugin packs for the ${product.name} server to begin properly monitoring you environment.")
+ String ALREADY_INSTALLED_REMINDER = "alreadyInstalledReminder";
+
@I18NMessage(locale = "en", value = "Done! Click here to get started!")
String ALREADY_INSTALLED_STARTED_LINK = "alreadyInstalledStartedLink";
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
index 7c04d9d..78a33a9 100644
--- a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
+++ b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
@@ -62,8 +62,14 @@
if (xmlRequest.status == 200 || xmlRequest.status == 401)
{
linkText = "${bundle.alreadyInstalledStartedLink}";
+ reminderText = "${bundle.alreadyInstalledReminder}";
+ productInstalled = "${bundle.alreadyInstalled}";
+ reminderContent ='';
+ if(productInstalled.indexOf("RHQ")==-1){
+ reminderContent = '<br/><br/><b>'+reminderText+'</b><br/>';
+ }
document.getElementById('pleasewait-image').src="/images/finished.gif";
- document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/coregui">' + linkText + '<\/a>';
+ document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/coregui">' + linkText + '<\/a>'+reminderContent;
// this will immediately forward to the start page, uncomment if we want that functionality
// window.location.replace( startPage );
}
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp
index dc4e01d..94328ad 100644
--- a/modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp
+++ b/modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp
@@ -43,6 +43,7 @@
<br/>
</c:if>
+ <br/><br/>
<hr align="left" style="width: 30%">
<br/>
commit 945da047765c484f75a6c703dfcd410c022877c9
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Feb 2 22:05:49 2012 -0500
[BZ 759137] fix installer to say JBoss ON instead of JON.
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java
index 83e5d73..0eca4ba 100644
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java
+++ b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java
@@ -48,13 +48,13 @@ public interface InstallerI18NResourceKeys {
String PRODUCT_SUPPORT_EMAIL = "product.support.email";
// as we translate our documentation - point to each language's root doc location
- @I18NMessages( { @I18NMessage(locale = "en", value = "${product.help.doc.root}") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "${product.help.doc.root}") })
String HELP_DOC_ROOT = "helpDocRoot";
@I18NMessage(locale = "en", value = "Create Database/User")
String CREATE_DATABASE_USER_TITLE = "createDatabaseUserTitle";
- @I18NMessage(locale = "en", value = "Enter your database administrator's information here and press the button to create a database and user.")
+ @I18NMessage(locale = "en", value = "Enter your database administrator's information here and press the button to create a database and user.")
String CREATE_DATABASE_USER_HELP = "createDatabaseUserHelp";
@I18NMessage(locale = "en", value = "DB Connection URL")
@@ -112,20 +112,20 @@ public interface InstallerI18NResourceKeys {
String SAVE_ERROR = "saveError";
@I18NMessage(locale = "en", value = "Could not connect to the database with the given database settings. \\n\\\n"
- + "Please check the database settings and make sure your database is running.")
+ + "Please check the database settings and make sure your database is running.")
String INVALID_DATABASE_SETTINGS = "invalidDatabaseSettings";
- @I18NMessage(locale = "en", value = "These are the configuration settings for this ${product.shortName} Server installation. \\n\\\n"
- + "You may customize some, all or none as required. Click on the setting name for setting-specific help. Changes to settings marked as \"Restart Required\" \\n\\\n"
- + "will not take effect until after restarting the server. In this case restart the server immediately after successful installation.")
+ @I18NMessage(locale = "en", value = "These are the configuration settings for this ${product.name} Server installation. \\n\\\n"
+ + "You may customize some, all or none as required. Click on the setting name for setting-specific help. Changes to settings marked as \"Restart Required\" \\n\\\n"
+ + "will not take effect until after restarting the server. In this case restart the server immediately after successful installation.")
String SET_PROPERTIES_INSTRUCTIONS = "setPropertiesInstructions";
@I18NMessage(locale = "en", value = "Click this checkbox to see both standard and advanced configuration settings.")
String ADVANCED_SETTINGS_INSTRUCTIONS = "advancedSettingsInstructions";
@I18NMessage(locale = "en", value = "Press the 'Production Installation' button for a normal installation.\\n\\\n"
- + "Press the 'Embedded Installation' button to quickly create a complete environment with the help of the embedded database and embedded agent. "
- + "The embedded installation is for demonstration and evaluation purposes ONLY!")
+ + "Press the 'Embedded Installation' button to quickly create a complete environment with the help of the embedded database and embedded agent. "
+ + "The embedded installation is for demonstration and evaluation purposes ONLY!")
String INSTALL_BUTTONS_TEXT = "installButtonsText";
@I18NMessage(locale = "en", value = "-- or --")
@@ -167,18 +167,18 @@ public interface InstallerI18NResourceKeys {
@I18NMessage(locale = "en", value = "Requires Restart?")
String REQUIRES_RESTART = "requiresRestart";
- @I18NMessage(locale = "en", value = "Welcome to ${product.shortName}!")
+ @I18NMessage(locale = "en", value = "Welcome to ${product.name}!")
String WELCOME_TITLE = "welcomeTitle";
- @I18NMessage(locale = "en", value = "You have reached the ${product.shortName} Installer. Use this page \\n\\\n"
- + "to install and configure the ${product.shortName} Server. \\n\\\n"
- + "Once complete you will be able to log on and use ${product.shortName}.")
+ @I18NMessage(locale = "en", value = "You have reached the ${product.name} Installer. Use this page \\n\\\n"
+ + "to install and configure the ${product.name} Server. \\n\\\n"
+ + "Once complete you will be able to log on and use ${product.name}.")
String WELCOME_MESSAGE = "welcomeMessage";
@I18NMessage(locale = "en", value = "Starting up, please wait...")
String STARTING = "starting";
- @I18NMessage(locale = "en", value = "${product.shortName} will be installed!")
+ @I18NMessage(locale = "en", value = "${product.name} will be installed!")
String ALREADY_INSTALLED = "alreadyInstalled";
@I18NMessage(locale = "en", value = "Done! Click here to get started!")
@@ -231,7 +231,7 @@ public interface InstallerI18NResourceKeys {
@I18NMessage("-ServerBindAddress")
String PROP_SERVER_BIND_ADDRESS_HELP = "propertyBindAddressHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "HTTP Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "HTTP Port") })
String PROP_HTTP_PORT = "propertyHttpPort";
@I18NMessage("-HTTPPort")
String PROP_HTTP_PORT_HELP = "propertyHttpPortHelp";
@@ -241,252 +241,252 @@ public interface InstallerI18NResourceKeys {
@I18NMessage("-SecureHTTPSPort")
String PROP_HTTPS_PORT_HELP = "propertyHttpsPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Web Service Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Web Service Port") })
String PROP_WEB_SERVICE_PORT = "propertyWebServicePort";
@I18NMessage("-WebServicePort")
String PROP_WEB_SERVICE_PORT_HELP = "propertyWebServicePortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Naming Service Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Naming Service Port") })
String PROP_NAMING_SERVICE_PORT = "propertyNamingServicePort";
@I18NMessage("-NamingServicePort")
String PROP_NAMING_SERVICE_PORT_HELP = "propertyNamingServicePortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Naming Service RMI Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Naming Service RMI Port") })
String PROP_NAMING_SERVICE_RMI_PORT = "propertyNamingServiceRmiPort";
@I18NMessage("-NamingServiceRMIPort")
String PROP_NAMING_SERVICE_RMI_PORT_HELP = "propertyNamingServiceRmiPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "JRMP Invoker RMI Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "JRMP Invoker RMI Port") })
String PROP_JRMP_INVOKER_RMI_PORT = "propertyJrmpInvokerRmiPort";
@I18NMessage("-JRMPInvokerRMIPort")
String PROP_JRMP_INVOKER_RMI_PORT_HELP = "propertyJrmpInvokerRmiPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Pooled Invoker RMI Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Pooled Invoker RMI Port") })
String PROP_POOLED_INVOKER_RMI_PORT = "propertyPooledInvokerRmiPort";
@I18NMessage("-PooledInvokerRMIPort")
String PROP_POOLED_INVOKER_RMI_PORT_HELP = "propertyPooledInvokerRmiPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "AJP Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "AJP Port") })
String PROP_AJP_PORT = "propertyAjpPort";
@I18NMessage("-AJPPort")
String PROP_AJP_PORT_HELP = "propertyAjpPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Unified Invoker Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Unified Invoker Port") })
String PROP_UNIFIED_INVOKER_PORT = "propertyUnifiedInvokerPort";
@I18NMessage("-UnifiedInvokerPort")
String PROP_UNIFIED_INVOKER_PORT_HELP = "propertyUnifiedInvokerPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Aspect Deployer Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Aspect Deployer Port") })
String PROP_ASPECT_DEPLOYER_PORT = "propertyAspectDeployerPort";
@I18NMessage("-AspectDeployerPort")
String PROP_ASPECT_DEPLOYER_PORT_HELP = "propertyAspectDeployerPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Client Auth Mode") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Client Auth Mode") })
String PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD = "propertyTomcatClientAuthMode";
@I18NMessage("-TomcatClientAuthMode")
String PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD_HELP = "propertyTomcatClientAuthModeHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Keystore/Truststore Algorithm") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore/Truststore Algorithm") })
String PROP_TOMCAT_SECURITY_ALGORITHM = "propertyTomcatAlgorithm";
@I18NMessage("-TomcatAlgorithm")
String PROP_TOMCAT_SECURITY_ALGORITHM_HELP = "propertyTomcatAlgorithmHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Keystore") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore") })
String PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME = "propertyTomcatKeystoreFilename";
@I18NMessage("-TomcatKeystore")
String PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME_HELP = "propertyTomcatKeystoreFilenameHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Keystore Password") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Password") })
String PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD = "propertyTomcatKeystorePassword";
@I18NMessage("-TomcatKeystorePassword")
String PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD_HELP = "propertyTomcatKeystorePasswordHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Keystore Type") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Type") })
String PROP_TOMCAT_SECURITY_KEYSTORE_TYPE = "propertyTomcatKeystoreType";
@I18NMessage("-TomcatKeystoreType")
String PROP_TOMCAT_SECURITY_KEYSTORE_TYPE_HELP = "propertyTomcatKeystoreTypeHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Keystore Alias") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Alias") })
String PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS = "propertyTomcatKeystoreAlias";
@I18NMessage("-TomcatKeystoreAlias")
String PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS_HELP = "propertyTomcatKeystoreAliasHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Truststore") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore") })
String PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME = "propertyTomcatTruststoreFilename";
@I18NMessage("-TomcatTruststore")
String PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME_HELP = "propertyTomcatTruststoreFilenameHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Truststore Password") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore Password") })
String PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD = "propertyTomcatTruststorePassword";
@I18NMessage("-TomcatTruststorePassword")
String PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD_HELP = "propertyTomcatTruststorePasswordHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat Truststore Type") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore Type") })
String PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE = "propertyTomcatTruststoreType";
@I18NMessage("-TomcatTruststoreType")
String PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE_HELP = "propertyTomcatTruststoreTypeHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Tomcat SSL Protocol") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat SSL Protocol") })
String PROP_TOMCAT_SECURITY_SSL_PROTOCOL = "propertyTomcatSslProtocol";
@I18NMessage("-TomcatSSLProtocol")
String PROP_TOMCAT_SECURITY_SSL_PROTOCOL_HELP = "propertyTomcatSslProtocolHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Agent Communications Transport") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Transport") })
String PROP_CONNECTOR_TRANSPORT = "propertyConnectorTransport";
@I18NMessage("-IncomingAgentCommunicationsTransport")
String PROP_CONNECTOR_TRANSPORT_HELP = "propertyConnectorTransportHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Agent Communications Bind Address") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Bind Address") })
String PROP_CONNECTOR_BIND_ADDRESS = "propertyConnectorBindAddress";
@I18NMessage("-IncomingAgentCommunicationsBindAddress")
String PROP_CONNECTOR_BIND_ADDRESS_HELP = "propertyConnectorBindAddressHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Agent Communications Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Port") })
String PROP_CONNECTOR_BIND_PORT = "propertyConnectorBindPort";
@I18NMessage("-IncomingAgentCommunicationsPort")
String PROP_CONNECTOR_BIND_PORT_HELP = "propertyConnectorBindPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Agent Communications Transport Parameters") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Transport Parameters") })
String PROP_CONNECTOR_TRANSPORT_PARAMS = "propertyConnectorTransportParams";
@I18NMessage("-IncomingAgentCommunicationsTransportParameters")
String PROP_CONNECTOR_TRANSPORT_PARAMS_HELP = "propertyConnectorTransportParamsHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Agent Multicast Detector Enabled") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Enabled") })
String PROP_AGENT_MULTICAST_DETECTOR_ENABLED = "propertyAgentMulticastDetectorEnabled";
@I18NMessage("-AgentMulticastDetectorEnabled")
String PROP_AGENT_MULTICAST_DETECTOR_ENABLED_HELP = "propertyAgentMulticastDetectorEnabledHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Agent Multicast Detector Bind Address") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Bind Address") })
String PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS = "propertyAgentMulticastDetectorBindAddress";
@I18NMessage("-AgentMulticastDetectorBindAddress")
String PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS_HELP = "propertyAgentMulticastDetectorBindAddressHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Agent Multicast Detector Multicast Address") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Multicast Address") })
String PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS = "propertyAgentMulticastDetectorMulticastAddress";
@I18NMessage("-AgentMulticastDetectorMulticastAddress")
String PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS_HELP = "propertyAgentMulticastDetectorMulticastAddressHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Agent Multicast Detector Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Port") })
String PROP_AGENT_MULTICAST_DETECTOR_PORT = "propertyAgentMulticastDetectorPort";
@I18NMessage("-AgentMulticastDetectorPort")
String PROP_AGENT_MULTICAST_DETECTOR_PORT_HELP = "propertyAgentMulticastDetectorPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Secure Socket Protocol") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Secure Socket Protocol") })
String PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL = "propertySecurityServerSecureSocketProtocol";
@I18NMessage("-IncomingSecureSocketProtocol")
String PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL_HELP = "propertySecurityServerSecureSocketProtocolHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Keystore File") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore File") })
String PROP_SECURITY_SERVER_KEYSTORE_FILE = "propertySecurityServerKeystoreFile";
@I18NMessage("-IncomingKeystoreFile")
String PROP_SECURITY_SERVER_KEYSTORE_FILE_HELP = "propertySecurityServerKeystoreFileHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Keystore Algorithm") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Algorithm") })
String PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM = "propertySecurityServerKeystoreAlgorithm";
@I18NMessage("-IncomingKeystoreAlgorithm")
String PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM_HELP = "propertySecurityServerKeystoreAlgorithmHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Keystore Type") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Type") })
String PROP_SECURITY_SERVER_KEYSTORE_TYPE = "propertySecurityServerKeystoreType";
@I18NMessage("-IncomingKeystoreType")
String PROP_SECURITY_SERVER_KEYSTORE_TYPE_HELP = "propertySecurityServerKeystoreTypeHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Keystore Password") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Password") })
String PROP_SECURITY_SERVER_KEYSTORE_PASSWORD = "propertySecurityServerKeystorePassword";
@I18NMessage("-IncomingKeystorePassword")
String PROP_SECURITY_SERVER_KEYSTORE_PASSWORD_HELP = "propertySecurityServerKeystorePasswordHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Keystore Key Password") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Key Password") })
String PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD = "propertySecurityServerKeystoreKeyPassword";
@I18NMessage("-IncomingKeystoreKeyPassword")
String PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD_HELP = "propertySecurityServerKeystoreKeyPasswordHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Keystore Alias") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Alias") })
String PROP_SECURITY_SERVER_KEYSTORE_ALIAS = "propertySecurityServerKeystoreAlias";
@I18NMessage("-IncomingKeystoreAlias")
String PROP_SECURITY_SERVER_KEYSTORE_ALIAS_HELP = "propertySecurityServerKeystoreAliasHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Truststore File") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore File") })
String PROP_SECURITY_SERVER_TRUSTSTORE_FILE = "propertySecurityServerTruststoreFile";
@I18NMessage("-IncomingTruststoreFile")
String PROP_SECURITY_SERVER_TRUSTSTORE_FILE_HELP = "propertySecurityServerTruststoreFileHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Truststore Algorithm") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Algorithm") })
String PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM = "propertySecurityServerTruststoreAlgorithm";
@I18NMessage("-IncomingTruststoreAlgorithm")
String PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM_HELP = "propertySecurityServerTruststoreAlgorithmHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Truststore Type") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Type") })
String PROP_SECURITY_SERVER_TRUSTSTORE_TYPE = "propertySecurityServerTruststoreType";
@I18NMessage("-IncomingTruststoreType")
String PROP_SECURITY_SERVER_TRUSTSTORE_TYPE_HELP = "propertySecurityServerTruststoreTypeHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Truststore Password") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Password") })
String PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD = "propertySecurityServerTruststorePassword";
@I18NMessage("-IncomingTruststorePassword")
String PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD_HELP = "propertySecurityServerTruststorePasswordHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Incoming Security - Client Authentication Mode") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Client Authentication Mode") })
String PROP_SECURITY_SERVER_CLIENT_AUTH_MODE = "propertySecurityServerClientAuthMode";
@I18NMessage("-IncomingClientAuthenticationMode")
String PROP_SECURITY_SERVER_CLIENT_AUTH_MODE_HELP = "propertySecurityServerClientAuthModeHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Secure Socket Protocol") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Secure Socket Protocol") })
String PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL = "propertySecurityClientSecureSocketProtocol";
@I18NMessage("-OutgoingSecureSocketProtocol")
String PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL_HELP = "propertySecurityClientSecureSocketProtocolHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Keystore File") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore File") })
String PROP_SECURITY_CLIENT_KEYSTORE_FILE = "propertySecurityClientKeystoreFile";
@I18NMessage("-OutgoingKeystoreFile")
String PROP_SECURITY_CLIENT_KEYSTORE_FILE_HELP = "propertySecurityClientKeystoreFileHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Algorithm") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Algorithm") })
String PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM = "propertySecurityClientKeystoreAlgorithm";
@I18NMessage("-OutgoingKeystoreAlgorithm")
String PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM_HELP = "propertySecurityClientKeystoreAlgorithmHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Type") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Type") })
String PROP_SECURITY_CLIENT_KEYSTORE_TYPE = "propertySecurityClientKeystoreType";
@I18NMessage("-OutgoingKeystoreType")
String PROP_SECURITY_CLIENT_KEYSTORE_TYPE_HELP = "propertySecurityClientKeystoreTypeHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Password") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Password") })
String PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD = "propertySecurityClientKeystorePassword";
@I18NMessage("-OutgoingKeystorePassword")
String PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD_HELP = "propertySecurityClientKeystorePasswordHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Key Password") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Key Password") })
String PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD = "propertySecurityClientKeystoreKeyPassword";
@I18NMessage("-OutgoingKeystoreKeyPassword")
String PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD_HELP = "propertySecurityClientKeystoreKeyPasswordHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Alias") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Alias") })
String PROP_SECURITY_CLIENT_KEYSTORE_ALIAS = "propertySecurityClientKeystoreAlias";
@I18NMessage("-OutgoingKeystoreAlias")
String PROP_SECURITY_CLIENT_KEYSTORE_ALIAS_HELP = "propertySecurityClientKeystoreAliasHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Truststore File") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore File") })
String PROP_SECURITY_CLIENT_TRUSTSTORE_FILE = "propertySecurityClientTruststoreFile";
@I18NMessage("-OutgoingTruststoreFile")
String PROP_SECURITY_CLIENT_TRUSTSTORE_FILE_HELP = "propertySecurityClientTruststoreFileHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Algorithm") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Algorithm") })
String PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM = "propertySecurityClientTruststoreAlgorithm";
@I18NMessage("-OutgoingTruststoreAlgorithm")
String PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM_HELP = "propertySecurityClientTruststoreAlgorithmHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Type") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Type") })
String PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE = "propertySecurityClientTruststoreType";
@I18NMessage("-OutgoingTruststoreType")
String PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE_HELP = "propertySecurityClientTruststoreTypeHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Password") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Password") })
String PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD = "propertySecurityClientTruststorePassword";
@I18NMessage("-OutgoingTruststorePassword")
String PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD_HELP = "propertySecurityClientTruststorePasswordHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Outgoing Security - Server Authentication Mode Enabled") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Server Authentication Mode Enabled") })
String PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED = "propertySecurityClientServerAuthModeEnabled";
@I18NMessage("-OutgoingServerAuthenticationModeEnabled")
String PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED_HELP = "propertySecurityClientServerAuthModeEnabledHelp";
@@ -501,12 +501,12 @@ public interface InstallerI18NResourceKeys {
@I18NMessage("-EmbeddedRHQAgentName")
String PROP_EMBEDDED_RHQ_AGENT_NAME_HELP = "propertyEmbeddedRHQAgentNameHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Embedded Agent Disable Native System") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Embedded Agent Disable Native System") })
String PROP_EMBEDDED_RHQ_AGENT_DISABLE_NATIVE_SYSTEM = "propertyEmbeddedRHQAgentDisableNativeSystem";
@I18NMessage("-EmbeddedRHQAgentDisableNativeSystem")
String PROP_EMBEDDED_RHQ_AGENT_DISABLE_NATIVE_SYSTEM_HELP = "propertyEmbeddedRHQAgentDisableNativeSystemHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Embedded Agent Reset Configuration") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Embedded Agent Reset Configuration") })
String PROP_EMBEDDED_RHQ_AGENT_RESET_CONFIGURATION = "propertyEmbeddedRHQAgentResetConfiguration";
@I18NMessage("-EmbeddedRHQAgentResetConfiguration")
String PROP_EMBEDDED_RHQ_AGENT_RESET_CONFIGURATION_HELP = "propertyEmbeddedRHQAgentResetConfigurationHelp";
@@ -516,7 +516,7 @@ public interface InstallerI18NResourceKeys {
@I18NMessage("-EmailSMTPHostname")
String PROP_EMAIL_SMTP_HOST_HELP = "propertyEmailSmtpHostHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Email SMTP Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Email SMTP Port") })
String PROP_EMAIL_SMTP_PORT = "propertyEmailSmtpPort";
@I18NMessage("-EmailSMTPPort")
String PROP_EMAIL_SMTP_PORT_HELP = "propertyEmailSmtpPortHelp";
@@ -526,144 +526,144 @@ public interface InstallerI18NResourceKeys {
@I18NMessage("-EmailFromAddress")
String PROP_EMAIL_FROM_ADDRESS_HELP = "propertyEmailFromAddressHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Operation Invocation Default Timeout") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Operation Invocation Default Timeout") })
String PROP_OPERATION_TIMEOUT = "propertyOperationTimeout";
@I18NMessage("-OperationInvocationDefaultTimeout")
String PROP_OPERATION_TIMEOUT_HELP = "propertyOperationTimeoutHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - Partition Name") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition Name") })
String PROP_CLUSTER_PARTITION_NAME = "propertyClusterPartitionName";
@I18NMessage("-PartitionName")
String PROP_CLUSTER_PARTITION_NAME_HELP = "propertyClusterPartitionNameHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - Partition Bind Address") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition Bind Address") })
String PROP_CLUSTER_PARTITION_BIND_ADDRESS = "propertyClusterPartitionBindAddress";
@I18NMessage("-PartitionBindAddress")
String PROP_CLUSTER_PARTITION_BIND_ADDRESS_HELP = "propertyClusterPartitionBindAddressHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - Partition UDP Multicast Group IP Address") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Multicast Group IP Address") })
String PROP_CLUSTER_UDP_GROUP = "propertyClusterUdpGroup";
@I18NMessage("-PartitionUDPMulticastGroupIPAddress")
String PROP_CLUSTER_UDP_GROUP_HELP = "propertyClusterUdpGroupHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - Partition UDP Multicast Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Multicast Port") })
String PROP_CLUSTER_HAPARTITION_PORT = "propertyClusterHaPartitionPort";
@I18NMessage("-PartitionUDPMulticastPort")
String PROP_CLUSTER_HAPARTITION_PORT_HELP = "propertyClusterHaPartitionPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - Partition UDP EJB3 Entity Cache Multicast Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP EJB3 Entity Cache Multicast Port") })
String PROP_CLUSTER_EJB3CACHE_PORT = "propertyClusterEjb3CachePort";
@I18NMessage("-PartitionUDPEJB3EntityCacheMulticastPort")
String PROP_CLUSTER_EJB3CACHE_PORT_HELP = "propertyClusterEjb3CachePortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - Partition UDP Alert Cache Multicast Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Alert Cache Multicast Port") })
String PROP_CLUSTER_ALERTCACHE_PORT = "propertyClusterAlertCachePort";
@I18NMessage("-PartitionUDPAlertCacheMulticastPort")
String PROP_CLUSTER_ALERTCACHE_PORT_HELP = "propertyClusterAlertCachePortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - Partition UDP Loopback") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Loopback") })
String PROP_CLUSTER_UDP_LOOPBACK = "propertyClusterUdpLoopback";
@I18NMessage("-PartitionUDPLoopback")
String PROP_CLUSTER_UDP_LOOPBACK_HELP = "propertyClusterUdpLoopbackHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - HA JNDI Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI Port") })
String PROP_CLUSTER_HAJNDI_PORT = "propertyClusterHaJndiPort";
@I18NMessage("-HAJNDIPort")
String PROP_CLUSTER_HAJNDI_PORT_HELP = "propertyClusterHaJndiPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - HA JNDI RMI Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI RMI Port") })
String PROP_CLUSTER_HAJNDI_RMIPORT = "propertyClusterHaJndiRmiPort";
@I18NMessage("-HAJNDIRMIPort")
String PROP_CLUSTER_HAJNDI_RMIPORT_HELP = "propertyClusterHaJndiRmiPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - HA JNDI Auto Discovery Group Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI Auto Discovery Group Port") })
String PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT = "propertyClusterHaJndiAutoDiscoveryPort";
@I18NMessage("-HAJNDIAutoDiscoveryGroupPort")
String PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT_HELP = "propertyClusterHaJndiAutoDiscoveryPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - HA JRMP Invoker RMI Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JRMP Invoker RMI Port") })
String PROP_CLUSTER_HAJRMPINVOKER_RMIPORT = "propertyClusterHaJrmpInvokerRmiPort";
@I18NMessage("-HAJRMPInvokerRMIPort")
String PROP_CLUSTER_HAJRMPINVOKER_RMIPORT_HELP = "propertyClusterHaJrmpInvokerRmiPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - HA Pooled Invoker Port") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA Pooled Invoker Port") })
String PROP_CLUSTER_HAPOOLEDINVOKER_PORT = "propertyClusterHaPooledInvokerPort";
@I18NMessage("-HAPooledInvokerPort")
String PROP_CLUSTER_HAPOOLEDINVOKER_PORT_HELP = "propertyClusterHaPooledInvokerPortHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Cluster - JGroups UDP IP Time To Live") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - JGroups UDP IP Time To Live") })
String PROP_CLUSTER_JGROUPS_UDP_IP_TTL = "propertyClusterJGroupsUdpIpTtl";
@I18NMessage("-JGroupsUDPIPTimeToLive")
String PROP_CLUSTER_JGROUPS_UDP_IP_TTL_HELP = "propertyClusterJGroupsUdpIpTtlHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Maximum Web Connections") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Maximum Web Connections") })
String PROP_CONCURRENCY_LIMIT_WEBCONNS = "propertyConcurrencyLimitWebConns";
@I18NMessage("-WebConnections")
String PROP_CONCURRENCY_LIMIT_WEBCONNS_HELP = "propertyConcurrencyLimitWebConnsHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Global") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Global") })
String PROP_CONCURRENCY_LIMIT_GLOBAL = "propertyConcurrencyLimitGlobal";
@I18NMessage("-GlobalConcurrencyLimit")
String PROP_CONCURRENCY_LIMIT_GLOBAL_HELP = "propertyConcurrencyLimitGlobalHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Inventory Reports") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Inventory Reports") })
String PROP_CONCURRENCY_LIMIT_INV_REPORT = "propertyConcurrencyLimitInventoryReport";
@I18NMessage("-InventoryReport")
String PROP_CONCURRENCY_LIMIT_INV_REPORT_HELP = "propertyConcurrencyLimitInventoryReportHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Availability Reports") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Availability Reports") })
String PROP_CONCURRENCY_LIMIT_AVAIL_REPORT = "propertyConcurrencyLimitAvailabilityReport";
@I18NMessage("-AvailabilityReport")
String PROP_CONCURRENCY_LIMIT_AVAIL_REPORT_HELP = "propertyConcurrencyLimitAvailabilityReportHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Inventory Synchronizations") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Inventory Synchronizations") })
String PROP_CONCURRENCY_LIMIT_INV_SYNC = "propertyConcurrencyLimitInventorySync";
@I18NMessage("-InventorySynchronization")
String PROP_CONCURRENCY_LIMIT_INV_SYNC_HELP = "propertyConcurrencyLimitInventorySyncHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Content Reports") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Content Reports") })
String PROP_CONCURRENCY_LIMIT_CONTENT_REPORT = "propertyConcurrencyLimitContentReport";
@I18NMessage("-ContentReport")
String PROP_CONCURRENCY_LIMIT_CONTENT_REPORT_HELP = "propertyConcurrencyLimitContentReportHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Content Downloads") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Content Downloads") })
String PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD = "propertyConcurrencyLimitContentDownload";
@I18NMessage("-ContentDownload")
String PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD_HELP = "propertyConcurrencyLimitContentDownloadHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Measurement Reports") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Measurement Reports") })
String PROP_CONCURRENCY_LIMIT_MEAS_REPORT = "propertyConcurrencyLimitMeasurementReport";
@I18NMessage("-MeasurementReport")
String PROP_CONCURRENCY_LIMIT_MEAS_REPORT_HELP = "propertyConcurrencyLimitMeasurementReportHelp";
- @I18NMessages( { @I18NMessage(locale = "en", value = "Concurrency Limit - Measurement Schedule Requests") })
+ @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Measurement Schedule Requests") })
String PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ = "propertyConcurrencyLimitMeasurementScheduleRequest";
@I18NMessage("-MeasurementScheduleRequest")
String PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ_HELP = "propertyConcurrencyLimitMeasurementScheduleRequestHelp";
// Help Documentation - links to the wiki
- @I18NMessage(locale = "en", value = "Please review the documentation linked below to learn more about ${product.shortName}:")
+ @I18NMessage(locale = "en", value = "Please review the documentation linked below to learn more about ${product.name}:")
String INTRODUCE_HELP_DOCS = "introduceHelpDocs";
@I18NMessage("${product.help.installation}")
String HELP_DOC_RHQ_SERVER_INSTALL_GUIDE = "helpDocRHQServerInstallGuide";
- @I18NMessage(locale = "en", value = "${product.shortName} Server Installation Guide")
+ @I18NMessage(locale = "en", value = "${product.name} Server Installation Guide")
String HELP_DOC_RHQ_SERVER_INSTALL_GUIDE_LABEL = "helpDocRHQServerInstallGuideLabel";
@I18NMessage("GUI+Console+Users+Guide")
String HELP_DOC_RHQ_GUI_CONSOLE_USERS_GUIDE = "helpDocRHQGuiConsoleUsersGuide";
- @I18NMessage(locale = "en", value = "${product.shortName} GUI Console Users Guide")
+ @I18NMessage(locale = "en", value = "${product.name} GUI Console Users Guide")
String HELP_DOC_RHQ_GUI_CONSOLE_USERS_GUIDE_LABEL = "helpDocRHQGuiConsoleUsersGuideLabel";
@I18NMessage("${product.help.guide.server}")
String HELP_DOC_RHQ_SERVER_USERS_GUIDE = "helpDocRHQServerUsersGuide";
- @I18NMessage(locale = "en", value = "${product.shortName} Server Users Guide")
+ @I18NMessage(locale = "en", value = "${product.name} Server Users Guide")
String HELP_DOC_RHQ_SERVER_USERS_GUIDE_LABEL = "helpDocRHQServerUsersGuideLabel";
@I18NMessage("${product.help.guide.agent}")
String HELP_DOC_RHQ_AGENT_USERS_GUIDE = "helpDocRHQAgentUsersGuide";
- @I18NMessage(locale = "en", value = "${product.shortName} Agent Users Guide")
+ @I18NMessage(locale = "en", value = "${product.name} Agent Users Guide")
String HELP_DOC_RHQ_AGENT_USERS_GUIDE_LABEL = "helpDocRHQAgentUsersGuideLabel";
@I18NMessage("${product.help.FAQ}")
commit 4ef5591636537a6f19fa15433482e6d84aacd833
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Feb 2 17:45:12 2012 -0500
[BZ 786980] avoid potential ConcurrentModificationException for Resource.childResources Set
(https://bugzilla.redhat.com/show_bug.cgi?id=786980)
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 3d30b83..ab4ecbc 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -1860,7 +1860,10 @@ public class InventoryManager extends AgentService implements ContainerService,
try {
ResourceContainer container = getResourceContainer(resource);
if ((container != null) && (container.getResourceComponentState() == ResourceComponentState.STARTED)) {
- for (Resource child : resource.getChildResources()) {
+ // Copy child Resources to an array and iterate that, rather than iterating the Set, which could cause
+ // a ConcurrentModificationException if another thread tries to modify the Set while we're iterating it.
+ Resource[] childResources = resource.getChildResources().toArray(new Resource[resource.getChildResources().size()]);
+ for (Resource child : childResources) {
deactivateResource(child);
}
commit f819631220c83f1ae8874953035e60720e61cff4
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Feb 2 13:32:01 2012 -0500
[BZ 768706] add some more code to make sure we do proper error correction/checking
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index fc5be1c..3d30b83 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -1463,6 +1463,7 @@ public class InventoryManager extends AgentService implements ContainerService,
// state is a transient field, so reinitialize it just in case this is invoked just after loadFromDisk()
if (state == null) {
container.setResourceComponentState(ResourceComponentState.STOPPED);
+ state = ResourceComponentState.STOPPED;
}
// if the component exists and is not stopped then we may not have to do anything
@@ -1589,11 +1590,19 @@ public class InventoryManager extends AgentService implements ContainerService,
if (prepareResourceForActivation(resource, container, updatedPluginConfig)) {
container.setResourceComponentState(ResourceComponentState.STARTING);
- ResourceContext context = container.getResourceContext();
+ ResourceContext context;
+ ResourceComponent component;
- // Wrap the component in a proxy that will provide locking and a timeout for the call to start().
- ResourceComponent component = container.createResourceComponentProxy(ResourceComponent.class,
- FacetLockType.READ, COMPONENT_START_TIMEOUT, true, false);
+ try {
+ context = container.getResourceContext();
+
+ // Wrap the component in a proxy that will provide locking and a timeout for the call to start().
+ component = container.createResourceComponentProxy(ResourceComponent.class, FacetLockType.READ,
+ COMPONENT_START_TIMEOUT, true, false);
+ } catch (Throwable t) {
+ container.setResourceComponentState(ResourceComponentState.STOPPED);
+ throw new PluginContainerException("Failed getting proxy for resource " + resource + ".", t);
+ }
try {
component.start(context);
@@ -2889,4 +2898,4 @@ public class InventoryManager extends AgentService implements ContainerService,
// nothing to do
}
}
-}
\ No newline at end of file
+}
commit 3ac2a05f042d3137bb0003a086d0e69556e3bea5
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Feb 2 20:35:11 2012 +0100
[BZ 773661] - Invalid plugin configuration errors are now reported also
during the InventoryManager start up.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 2afe7f0..fc5be1c 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -2848,9 +2848,10 @@ public class InventoryManager extends AgentService implements ContainerService,
}
} catch (InvalidPluginConfigurationException e) {
log.debug("Failed to activate resource [" + resource + "] due to invalid plugin configuration.", e);
-
+ handleInvalidPluginConfigurationResourceError(resource, e);
} catch (Throwable t) {
log.error("Exception thrown while activating [" + resource + "].", t);
+ handleInvalidPluginConfigurationResourceError(resource, t);
}
}
}
commit d003658a94b0f88852f469e9f473eee418377849
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 1 14:28:41 2012 -0500
[Bug 785773 - CLI exporter variable not respecting settings]
This was rooted in the handling of the standard bindings we inject
into the script engine in an interactive CLI session. See the BZ for
details but in short this commit:
- stops treating every command line entry as a new script with new bindings
- ensures that non-standard bindings (like var x = 10) and non-client-dependent
standard bindings (like exporter) are maintained between command line
entries as well as through login/logout.
- treat 'exec -f' commands like extendsions of the command line session.
They inherit the current bindings and any modifications made by the script
file will affect the command line session after the script file has completed.
- ensure that login/logout update client-related bindings as needed, and
no others.
- don't leave behind manager bindings when the client changes (like on logout)
- protect against NPE for consecutive logout commands
- trivial: removed unused import from CliSender
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
index 5834922..106c2ae 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
@@ -88,7 +88,7 @@ public class ScriptEngineFactory {
public static ScriptEngine getScriptEngine(String language, PackageFinder packageFinder, StandardBindings bindings)
throws ScriptException, IOException {
ScriptEngineInitializer initializer = getInitializer(language);
-
+
if (initializer == null) {
return null;
}
@@ -101,7 +101,7 @@ public class ScriptEngineFactory {
return engine;
}
-
+
/**
* This method is similar to the {@link #getScriptEngine(String, PackageFinder, StandardBindings)} method
* but additionally applies a security wrapper on the returned script engine so that the scripts execute
@@ -109,9 +109,10 @@ public class ScriptEngineFactory {
*
* @see #getScriptEngine(String, PackageFinder, StandardBindings)
*/
- public static ScriptEngine getSecuredScriptEngine(final String language, final PackageFinder packageFinder, final StandardBindings bindings, final PermissionCollection permissions) throws ScriptException, IOException {
+ public static ScriptEngine getSecuredScriptEngine(final String language, final PackageFinder packageFinder,
+ final StandardBindings bindings, final PermissionCollection permissions) throws ScriptException, IOException {
CodeSource src = new CodeSource(new URL("http://rhq-project.org/scripting"), (Certificate[]) null);
- ProtectionDomain scriptDomain = new ProtectionDomain(src, permissions);
+ ProtectionDomain scriptDomain = new ProtectionDomain(src, permissions);
AccessControlContext ctx = new AccessControlContext(new ProtectionDomain[] { scriptDomain });
try {
return AccessController.doPrivileged(new PrivilegedExceptionAction<ScriptEngine>() {
@@ -121,10 +122,10 @@ public class ScriptEngineFactory {
//change in security handling in the rhino script engine
//that occured in Java6u27 (due to a CVE desribed here:
//https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2011-3544)
-
+
//In Java 6u26 and earlier, it was enough to wrap a script engine
//in the sandbox and everything would work.
-
+
//Java 6u27 introduced new behavior where the rhino script engine
//remembers the access control context with which it has been
//constructed and combines that with the callers protection domain
@@ -132,7 +133,7 @@ public class ScriptEngineFactory {
//all the code in RHQ that called ScriptEngine.eval* also
//had all perms, the scripts would never be sandboxed even if the call
//was pushed through the SandboxedScriptEngine.
-
+
//This means that the below wrapping is necessary for the security
//to work in java6 pre u27 while the surrounding privileged block
//is necessary for the security to be applied in java6 u27 and later.
@@ -164,8 +165,8 @@ public class ScriptEngineFactory {
boolean deleteExistingBindings) {
bindings.preInject(engine);
- Bindings engineBindings =
- deleteExistingBindings ? engine.createBindings() : engine.getBindings(ScriptContext.ENGINE_SCOPE);
+ Bindings engineBindings = deleteExistingBindings ? engine.createBindings() : engine
+ .getBindings(ScriptContext.ENGINE_SCOPE);
for (Map.Entry<String, Object> entry : bindings.entrySet()) {
engineBindings.put(entry.getKey(), entry.getValue());
@@ -177,6 +178,23 @@ public class ScriptEngineFactory {
}
/**
+ * Remove the specified bindings from the engine.
+ *
+ * @param engine the engine
+ * @param keySet the binding keys to be removed
+ */
+ public static void removeBindings(ScriptEngine engine, Set<String> keySet) {
+
+ Bindings engineBindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
+
+ for (String key : keySet) {
+ engineBindings.remove(key);
+ }
+
+ engine.setBindings(engineBindings, ScriptContext.ENGINE_SCOPE);
+ }
+
+ /**
* Goes through the methods of the object found in the <code>scriptEngine</code>'s ENGINE_SCOPE
* and for each of them generates a top-level function that is called the same name and accepts the same
* parameters.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java
index ad29dc3..fd84c6d 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java
@@ -97,9 +97,25 @@ public class StandardBindings extends HashMap<String, Object> {
put(PRETTY, new TabularWriter(output));
put(ASSERT, new ScriptAssert());
+ setFacade(output, rhqFacade);
+ }
+
+ /**
+ * If you want to preserve non-client-dependent bindings when the facade changes, call this as opposed to
+ * constructing new StandardBindings.
+ */
+ public void setFacade(PrintWriter output, RhqFacade rhqFacade) {
+ // remove any existing managers
+ if (null != managers) {
+ for (String manager : managers.keySet()) {
+ remove(manager);
+ }
+ managers.clear();
+ }
+
//script utils can handle a null facade
put(SCRIPT_UTIL, new ScriptUtil(rhqFacade));
-
+
if (rhqFacade != null) {
managers = rhqFacade.getManagers();
@@ -112,15 +128,6 @@ public class StandardBindings extends HashMap<String, Object> {
}
putAll(managers);
-
- //I don't think these should belong in the standard bindings
- //because all the controller does is "login/logout" as methods
- //of the "rhq" object. ConfigurationEditor is interactive and
- //thus unusable outside of console bound CLI.
-
- //(the below were originally defined in the ScriptCommand)
- //bindObjectAndGlobalFuctions(new Controller(client), "rhq");
- //bindObjectAndGlobalFuctions(new ConfigurationEditor(client), "configurationEditor");
}
public void preInject(ScriptEngine scriptEngine) {
@@ -128,11 +135,11 @@ public class StandardBindings extends HashMap<String, Object> {
((ScriptAssert) get(ASSERT)).init(scriptEngine);
}
- public void postInject(ScriptEngine scriptEngine) {
+ public void postInject(ScriptEngine scriptEngine) {
ScriptEngineFactory.bindIndirectionMethods(scriptEngine, SCRIPT_UTIL);
ScriptEngineFactory.bindIndirectionMethods(scriptEngine, ASSERT);
}
-
+
public Map.Entry<String, PageControl> getUnlimitedPC() {
return castEntry(UNLIMITED_PC, PageControl.class);
}
@@ -162,8 +169,8 @@ public class StandardBindings extends HashMap<String, Object> {
}
public Map<String, Object> getManagers() {
- //XXX ideally this should be a projection into our map
- return managers;
+ //XXX ideally this should be a projection into our map
+ return (null == managers) ? managers = Collections.emptyMap() : managers;
}
private Map.Entry<String, Object> getEntry(String key) {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
old mode 100755
new mode 100644
index 7323ecd..0444c3b
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -80,7 +80,7 @@ public class ClientMain {
private String user;
private String pass;
private ArrayList<String> notes = new ArrayList<String>();
- private boolean showDetailedVersion;
+ private boolean showDetailedVersion;
// reference to the webservice reference factory
private RemoteClient remoteClient;
@@ -96,7 +96,7 @@ public class ClientMain {
// Entrance to main.
public static void main(String[] args) throws Exception {
- initCommands();
+ initCommands();
// instantiate
ClientMain main = new ClientMain();
@@ -126,10 +126,10 @@ public class ClientMain {
private void initScriptCommandAndServiceCompletor() {
ScriptCommand sc = (ScriptCommand) commands.get("exec");
- sc.initBindings(this);
-
+ sc.initClient(this);
+
this.serviceCompletor.setContext(sc.getContext());
-
+
if (remoteClient != null) {
this.serviceCompletor.setServices(remoteClient.getManagers());
}
@@ -156,12 +156,12 @@ public class ClientMain {
this.serviceCompletor = new InteractiveJavascriptCompletor(consoleReader);
consoleReader.addCompletor(new MultiCompletor(new Completor[] { serviceCompletor, helpCompletor,
commandCompletor }));
-
+
//ScriptCommand is super special because it handles executing all the code for us
initScriptCommandAndServiceCompletor();
// enable pagination
- consoleReader.setUsePagination(true);
+ consoleReader.setUsePagination(true);
}
public String getUserInput(String prompt) {
@@ -288,7 +288,8 @@ public class ClientMain {
outputWriter.println(command.getPromptCommandString() + ": " + e.getMessage());
outputWriter.println("Usage: " + command.getSyntax());
} catch (ArrayIndexOutOfBoundsException e) {
- outputWriter.println(command.getPromptCommandString() + ": An incorrect number of arguments was specified.");
+ outputWriter.println(command.getPromptCommandString()
+ + ": An incorrect number of arguments was specified.");
outputWriter.println("Usage: " + command.getSyntax());
}
} else {
@@ -373,7 +374,8 @@ public class ClientMain {
}
private void displayUsage() {
- outputWriter.println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-v] [-f file]|[-c command]");
+ outputWriter
+ .println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-v] [-f file]|[-c command]");
}
void processArguments(String[] args) throws IllegalArgumentException, IOException {
@@ -398,79 +400,80 @@ public class ClientMain {
while ((code = getopt.getopt()) != -1) {
switch (code) {
- case ':':
- case '?': {
- // for now both of these should exit
- displayUsage();
- throw new IllegalArgumentException(MSG.getMsg(ClientI18NResourceKeys.BAD_ARGS));
- }
+ case ':':
+ case '?': {
+ // for now both of these should exit
+ displayUsage();
+ throw new IllegalArgumentException(MSG.getMsg(ClientI18NResourceKeys.BAD_ARGS));
+ }
- case 1: {
- // this catches non-option arguments which can be passed when running a script in non-interactive mode
- // with -f or running a single command in non-interactive mode with -c.
- execCmdLine.add(getopt.getOptarg());
- break;
- }
+ case 1: {
+ // this catches non-option arguments which can be passed when running a script in non-interactive mode
+ // with -f or running a single command in non-interactive mode with -c.
+ execCmdLine.add(getopt.getOptarg());
+ break;
+ }
- case 'h': {
- displayUsage();
- break;
- }
+ case 'h': {
+ displayUsage();
+ break;
+ }
- case 'u': {
- this.user = getopt.getOptarg();
- break;
- }
- case 'p': {
- this.pass = getopt.getOptarg();
- break;
- }
- case 'P': {
- this.pass = this.consoleReader.readLine("password: ", (char) 0);
- break;
- }
- case 'c': {
- interactiveMode = false;
- execCmdLine.add(getopt.getOptarg());
- break;
- }
- case 'f': {
- interactiveMode = false;
- execCmdLine.add("-f");
- execCmdLine.add(getopt.getOptarg());
- break;
- }
- case -2: {
- execCmdLine.add("--args-style=" + getopt.getOptarg());
- break;
- }
- case 's': {
- setHost(getopt.getOptarg());
- break;
- }
- case 'r': {
- setTransport(getopt.getOptarg());
- break;
- }
- case 't': {
- String portArg = getopt.getOptarg();
- try {
- setPort(Integer.parseInt(portArg));
- } catch (Exception e) {
- outputWriter.println("Invalid port [" + portArg + "]");
- }
- break;
- }
- case 'v': {
- showDetailedVersion = true;
- break;
+ case 'u': {
+ this.user = getopt.getOptarg();
+ break;
+ }
+ case 'p': {
+ this.pass = getopt.getOptarg();
+ break;
+ }
+ case 'P': {
+ this.pass = this.consoleReader.readLine("password: ", (char) 0);
+ break;
+ }
+ case 'c': {
+ interactiveMode = false;
+ execCmdLine.add(getopt.getOptarg());
+ break;
+ }
+ case 'f': {
+ interactiveMode = false;
+ execCmdLine.add("-f");
+ execCmdLine.add(getopt.getOptarg());
+ break;
+ }
+ case -2: {
+ execCmdLine.add("--args-style=" + getopt.getOptarg());
+ break;
+ }
+ case 's': {
+ setHost(getopt.getOptarg());
+ break;
+ }
+ case 'r': {
+ setTransport(getopt.getOptarg());
+ break;
+ }
+ case 't': {
+ String portArg = getopt.getOptarg();
+ try {
+ setPort(Integer.parseInt(portArg));
+ } catch (Exception e) {
+ outputWriter.println("Invalid port [" + portArg + "]");
}
+ break;
+ }
+ case 'v': {
+ String versionString = Version.getProductNameAndVersionBuildInfo();
+ outputWriter.println(versionString);
+ break;
+ }
}
}
if (interactiveMode) {
- String version = (showDetailedVersion) ? Version.getProductNameAndVersionBuildInfo() :
- Version.getProductNameAndVersion();
+ String version = (showDetailedVersion) ? Version.getProductNameAndVersionBuildInfo() : Version
+ .getProductNameAndVersion();
outputWriter.println(version);
if (showDetailedVersion && args.length == 1) {
// If -v was the only option specified, exit after printing the version.
@@ -501,10 +504,10 @@ public class ClientMain {
public void setRemoteClient(RemoteClient remoteClient) {
this.remoteClient = remoteClient;
-
+
initScriptCommandAndServiceCompletor();
}
-
+
public Subject getSubject() {
return subject;
}
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
index 72bd8e1..97221af 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
@@ -112,23 +112,16 @@ public class LoginCommand implements ClientCommand {
Subject subject = remoteClient.login(username, password);
ProductInfo info = remoteClient.getSystemManager().getProductInfo(subject);
- String version = info.getVersion()
- + " (" + info.getBuildNumber() + ")";
+ String version = info.getVersion() + " (" + info.getBuildNumber() + ")";
client.getPrintWriter().println("Remote server version is: " + version);
+ // this call has the side effect of setting bindings for the new remote client and its subject
client.setRemoteClient(remoteClient);
client.setSubject(subject);
- bindSubject(client, subject);
-
return subject;
}
- private void bindSubject(ClientMain client, Subject subject) {
- ScriptCommand cmd = (ScriptCommand) client.getCommands().get("exec");
- cmd.initBindings(client);
- }
-
private String usage() {
return "Usage: " + getSyntax();
}
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
index 6966508..a29731f 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.client.commands;
import org.rhq.enterprise.client.ClientMain;
+import org.rhq.enterprise.clientapi.RemoteClient;
/**
* @author Greg Hinkle
@@ -40,7 +41,11 @@ public class LogoutCommand implements ClientCommand {
client.setTransport(null);
client.setHost(null);
client.setPort(0);
- client.getRemoteClient().logout();
+ RemoteClient remoteClient = client.getRemoteClient();
+ if (null != remoteClient) {
+ remoteClient.logout();
+ }
+ // this call has the side effect of setting bindings for the new remote client and its subject
client.setRemoteClient(null);
client.setSubject(null);
client.setUser(null);
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
index 4a99316..4e7e79a 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
@@ -69,15 +69,15 @@ public class ScriptCommand implements ClientCommand {
public ScriptEngine getScriptEngine() {
if (jsEngine == null) {
try {
- jsEngine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Arrays
- .asList(getLibDir())), null);
+ jsEngine = ScriptEngineFactory.getScriptEngine("JavaScript",
+ new PackageFinder(Arrays.asList(getLibDir())), null);
} catch (ScriptException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
-
+
return jsEngine;
}
@@ -86,7 +86,14 @@ public class ScriptCommand implements ClientCommand {
}
public boolean execute(ClientMain client, String[] args) {
- initBindings(client);
+ // for a command line session we don't want to reset the bindings for each executed command line, the
+ // state, e.g. exporter settings, should be maintained from line to line. Note that scriptFiles
+ // executed via 'exec -f' are treated like extensions of the command line session. They inherit the
+ // current bindings and any modifications made by the script file will affect the command line session
+ // after the script file has completed.
+ if (null == bindings) {
+ initBindings(client);
+ }
if (isScriptFileCommandLine(args)) {
try {
@@ -177,29 +184,50 @@ public class ScriptCommand implements ClientCommand {
return true;
}
- public void initBindings(ClientMain client) {
+ private void initBindings(ClientMain client) {
bindings = new StandardBindings(client.getPrintWriter(), client.getRemoteClient());
- bindings.getSubject().setValue(client.getSubject());
+ // init pretty width with console setting
bindings.getPretty().getValue().setWidth(client.getConsoleWidth());
+ // replace ResourceClientFactory with Editable version or none at all
if (client.getRemoteClient() != null) {
bindings.getProxyFactory().setValue(new EditableResourceClientFactory(client));
} else {
bindings.getProxyFactory().setValue(null);
}
- //non-standard bindings
+ //non-standard bindings for console
bindings.put("configurationEditor", new ConfigurationEditor(client));
bindings.put("rhq", new Controller(client));
ScriptEngine engine = getScriptEngine();
-
+
ScriptEngineFactory.injectStandardBindings(engine, bindings, false);
- ScriptEngineFactory
- .bindIndirectionMethods(engine, "configurationEditor");
+ ScriptEngineFactory.bindIndirectionMethods(engine, "configurationEditor");
ScriptEngineFactory.bindIndirectionMethods(engine, "rhq");
}
+ public void initClient(ClientMain client) {
+ if (null == bindings) {
+ initBindings(client);
+
+ } else {
+ ScriptEngine engine = getScriptEngine();
+
+ // remove any current manager bindings from the engine, they may not be valid for the
+ // new client. The new standard bindings will include any new managers.
+ ScriptEngineFactory.removeBindings(engine, bindings.getManagers().keySet());
+
+ bindings.setFacade(client.getPrintWriter(), client.getRemoteClient());
+
+ // update the engine with the new client bindings. Keep the existing engine bindings as they
+ // may contain bindings outside this standard set (like any var created by the script or command line user)
+ ScriptEngineFactory.injectStandardBindings(engine, bindings, false);
+ }
+
+ return;
+ }
+
private void executeUtilScripts() {
InputStream stream = getClass().getResourceAsStream("test_utils.js");
InputStreamReader reader = new InputStreamReader(stream);
diff --git a/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java b/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
index 43090c7..deba524 100644
--- a/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
+++ b/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
@@ -40,7 +40,6 @@ import javax.script.ScriptException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.rhq.bindings.SandboxedScriptEngine;
import org.rhq.bindings.ScriptEngineFactory;
import org.rhq.bindings.StandardBindings;
import org.rhq.bindings.StandardScriptPermissions;
@@ -135,7 +134,7 @@ public class CliSender extends AlertSender<CliComponent> {
final ExceptionHolder exceptionHolder = new ExceptionHolder();
- final ScriptEngine e = engine;
+ final ScriptEngine e = engine;
Thread scriptRunner = new Thread(new Runnable() {
public void run() {
try {
@@ -336,8 +335,10 @@ public class CliSender extends AlertSender<CliComponent> {
if (versionToUse != null) {
ret = ret.replace("$packageName", versionToUse.getDisplayName());
- ret = ret.replace("$packageVersion", versionToUse.getDisplayVersion() == null ? versionToUse
- .getVersion() : versionToUse.getDisplayVersion());
+ ret = ret.replace(
+ "$packageVersion",
+ versionToUse.getDisplayVersion() == null ? versionToUse.getVersion() : versionToUse
+ .getDisplayVersion());
} else {
ret = ret.replace("$packageName", "unknown script with package id " + config.packageId);
ret = ret.replace("$packageVersion", "no version");
@@ -413,8 +414,8 @@ public class CliSender extends AlertSender<CliComponent> {
ScriptEngine engine = SCRIPT_ENGINES.poll();
if (engine == null) {
- engine = ScriptEngineFactory.getSecuredScriptEngine(ENGINE_NAME, new PackageFinder(Collections
- .<File> emptyList()), bindings, new StandardScriptPermissions());
+ engine = ScriptEngineFactory.getSecuredScriptEngine(ENGINE_NAME,
+ new PackageFinder(Collections.<File> emptyList()), bindings, new StandardScriptPermissions());
} else {
ScriptEngineFactory.injectStandardBindings(engine, bindings, true);
}
commit 48eab9a4fc98505c845f2c8d695312b7cc6a6674
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Feb 1 14:31:11 2012 -0500
when a commands are passed invalid options, print an error message and the command's usage - do not print a stack trace
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
index 94a4d05..1809e39 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
@@ -64,6 +64,7 @@ public class TabularWriter {
private CSVWriter csvWriter;
private SummaryFilter summaryFilter = new SummaryFilter();
boolean exportMode;
+ boolean hideRowCount;
static Set<String> IGNORED_PROPS = new HashSet<String>();
@@ -115,6 +116,10 @@ public class TabularWriter {
}
}
+ public void setHideRowCount(boolean hideRowCount) {
+ this.hideRowCount = hideRowCount;
+ }
+
public void print(Object object) {
if (object instanceof Map) {
@@ -305,15 +310,18 @@ public class TabularWriter {
public void print(Collection list) {
// List of arbitrary objects
- if (list == null || list.size() == 0)
- out.println("no data");
- else if (list.size() == 1 && !CSV.equals(format)) {
- out.println("one row");
+ if (list == null || list.size() == 0) {
+ if (!hideRowCount) {
+ out.println("0 rows");
+ }
+ } else if (list.size() == 1 && !CSV.equals(format)) {
+ if (!hideRowCount) {
+ out.println("one row");
+ }
print(list.iterator().next());
} else {
-
- String[][] data = null;
+ String[][] data;
if (!allOneType(list)) {
printStrings(list);
@@ -550,7 +558,9 @@ public class TabularWriter {
public void print(Object[] data) {
if (data == null || data.length == 0) {
- out.println("0 rows");
+ if (!hideRowCount) {
+ out.println("0 rows");
+ }
return;
}
out.println("Array of " + (data.getClass().getComponentType().getName()));
@@ -592,7 +602,9 @@ public class TabularWriter {
public void print(String[][] data) {
if (data == null || data.length == 0) {
- out.println("0 rows");
+ if (!hideRowCount) {
+ out.println("0 rows");
+ }
return;
}
@@ -661,7 +673,9 @@ public class TabularWriter {
}
}
- out.print(data.length + " rows\n");
+ if (!hideRowCount) {
+ out.print(data.length + " rows\n");
+ }
}
private void printSpaced(PrintWriter out, String data, int length) {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
index d42fc6d..7323ecd 100755
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -45,6 +45,7 @@ import mazz.i18n.Msg;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.client.commands.ClientCommand;
import org.rhq.enterprise.client.commands.ScriptCommand;
+import org.rhq.enterprise.client.script.CommandLineParseException;
import org.rhq.enterprise.clientapi.RemoteClient;
/**
@@ -273,14 +274,8 @@ public class ClientMain {
ClientCommand command = commands.get(cmd);
if (shouldDisplayHelp(args)) {
- outputWriter.println("syntax: " + command.getSyntax());
- outputWriter.println("description: " + command.getHelp() + "\n");
- return true;
- }
-
- if (shouldDisplayDetailedHelp(args)) {
- outputWriter.println("syntax: " + command.getSyntax());
- outputWriter.println("description: " + command.getDetailedHelp() + "\n");
+ outputWriter.println("Usage: " + command.getSyntax());
+ outputWriter.println(command.getDetailedHelp());
return true;
}
@@ -289,9 +284,12 @@ public class ClientMain {
processNotes(outputWriter);
outputWriter.println("");
return response;
+ } catch (CommandLineParseException e) {
+ outputWriter.println(command.getPromptCommandString() + ": " + e.getMessage());
+ outputWriter.println("Usage: " + command.getSyntax());
} catch (ArrayIndexOutOfBoundsException e) {
- outputWriter.println("An incorrect number of arguments was specified.");
- outputWriter.println("Expected syntax: " + command.getSyntax());
+ outputWriter.println(command.getPromptCommandString() + ": An incorrect number of arguments was specified.");
+ outputWriter.println("Usage: " + command.getSyntax());
}
} else {
boolean result = commands.get("exec").execute(this, args);
@@ -309,15 +307,7 @@ public class ClientMain {
return false;
}
- return args[1].equals("-h");
- }
-
- private boolean shouldDisplayDetailedHelp(String[] args) {
- if (args.length < 2) {
- return false;
- }
-
- return args[1].equals("--help");
+ return args[1].equals("-h") || args[1].equals("--help");
}
/**
@@ -585,8 +575,8 @@ public class ClientMain {
*
* These notes are meant to be terse, and pasted/purged at the end of every command execution.
*
- * @param note
- * String. Ex."There were errors retrieving some data from the server objects. See System Admin."
+ * @param note the note to be displayed, e.g. "There were errors retrieving some data from the server objects. See
+ * System Admin."
*/
public void addMenuNote(String note) {
if ((note != null) && (note.trim().length() > 0)) {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java
index 6366b6e..4676730 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java
@@ -55,9 +55,10 @@ public class HelpCommand implements ClientCommand {
data[i][0] = name;
data[i++][1] = command.getHelp();
}
+
TabularWriter tw = new TabularWriter(client.getPrintWriter(), "Command", "Description");
tw.setWidth(client.getConsoleWidth());
-
+ tw.setHideRowCount(true);
tw.print(data);
} else if ("api".equals(args[1])) {
Map<String, Object> services = client.getRemoteClient().getManagers();
@@ -131,18 +132,18 @@ public class HelpCommand implements ClientCommand {
tw.print(data);
} else {
client.getPrintWriter().println(
- "Unknown service [" + args[2] + "] try 'help api' for a listing of services");
+ "Unknown service [" + args[2] + "] - try 'help api' for a listing of services");
}
}
} else {
- ClientCommand cmd = commands.get(args[1]);
- if (cmd == null) {
- client.getPrintWriter().println("Uknown command [" + args[1] + "]");
+ String commandName = args[1];
+ ClientCommand command = commands.get(commandName);
+ if (command == null) {
+ client.getPrintWriter().println(getPromptCommandString() + ": Unknown command: " + commandName);
} else {
- client.getPrintWriter().println("Help [" + args[1] + "]");
- client.getPrintWriter().println("Syntax [" + cmd.getSyntax() + "]");
- client.getPrintWriter().println(cmd.getDetailedHelp());
+ client.getPrintWriter().println("Usage: " + command.getSyntax());
+ client.getPrintWriter().println(command.getDetailedHelp());
}
}
@@ -150,16 +151,16 @@ public class HelpCommand implements ClientCommand {
}
public String getSyntax() {
- return "help [command] | [api [service]]";
+ return getPromptCommandString() + " [command] | [api [service]]";
}
public String getHelp() {
- return "Help on the client and its commands";
+ return "Display help on CLI commands or services";
}
public String getDetailedHelp() {
- return "Use help [command] to get detailed help\n"
- + "help api will return the list of service apis available for script execs\n"
- + "help api [service] will display the methods and signatures of a specific api";
+ return "Use \"help [command]\" to get detailed help for a command\n"
+ + "\"help api\" will return the list of service APIs available for script execs\n"
+ + "\"help api [service]\" will list the methods provided by the specified service API";
}
-}
\ No newline at end of file
+}
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
index 2e3dbed..72bd8e1 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.enterprise.client.ClientMain;
+import org.rhq.enterprise.client.script.CommandLineParseException;
import org.rhq.enterprise.clientapi.RemoteClient;
/**
@@ -44,22 +45,22 @@ public class LoginCommand implements ClientCommand {
}
public boolean execute(ClientMain client, String[] args) {
- String user = null;
- String pass = null;
+ if (args.length < 3) {
+ throw new CommandLineParseException("Too few arguments");
+ }
+ if (args.length > 7) {
+ throw new CommandLineParseException("Too many arguments");
+ }
+
+ String user = args[1];
+ String pass = args[2];
String host = "localhost";
String transport = null;
int port = 7080;
PrintWriter printWriter = client.getPrintWriter();
- if (args.length<3) {
- printWriter.println(usage());
- return true;
- }
try {
- user = args[1];
- pass = args[2];
-
if (args.length == 5) {
host = args[3];
port = Integer.parseInt(args[4]);
@@ -133,7 +134,7 @@ public class LoginCommand implements ClientCommand {
}
public String getSyntax() {
- return "login username password [host port [transport]]";
+ return getPromptCommandString() + " username password [host port [transport]]";
}
public String getHelp() {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
index c764bab..6966508 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
@@ -48,11 +48,11 @@ public class LogoutCommand implements ClientCommand {
}
public String getSyntax() {
- return "logout";
+ return getPromptCommandString();
}
public String getHelp() {
- return "Logout and disconnect from the server but does not exit the CLI interpreter";
+ return "Logout and disconnect from the server but do not exit the CLI";
}
public String getDetailedHelp() {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java
index 8640599..1aa3b90 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java
@@ -34,11 +34,11 @@ public class QuitCommand implements ClientCommand {
}
public String getSyntax() {
- return "quit";
+ return getPromptCommandString();
}
public String getHelp() {
- return "Exit the CLI interpreter";
+ return "Exit the CLI";
}
public String getDetailedHelp() {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
index 468076e..1e32092 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
@@ -64,7 +64,8 @@ public class RecordCommand implements ClientCommand {
new LongOpt("start", LongOpt.OPTIONAL_ARGUMENT, null, 'b'),
new LongOpt("end", LongOpt.OPTIONAL_ARGUMENT, null, 'e')
};
- Getopt getopt = new Getopt("exec", args, shortOpts, longOpts);
+ Getopt getopt = new Getopt(getPromptCommandString(), args, shortOpts, longOpts);
+ getopt.setOpterr(false);
RecordArgs recordArgs = new RecordArgs();
@@ -73,7 +74,7 @@ public class RecordCommand implements ClientCommand {
switch (code) {
case ':':
case '?':
- throw new IllegalArgumentException("Invalid options");
+ throw new CommandLineParseException("Invalid option");
case 1:
break;
case 'f':
@@ -128,7 +129,7 @@ public class RecordCommand implements ClientCommand {
}
public String getSyntax() {
- return "record [[-b | --start] | [-e | --end]] [-a | --append] -f <file>";
+ return getPromptCommandString() + " [[-b | --start] | [-e | --end]] [-a | --append] -f <file>";
}
public String getHelp() {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
index 7b8c37f..4a99316 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
@@ -274,7 +274,7 @@ public class ScriptCommand implements ClientCommand {
}
public String getSyntax() {
- return "exec <statement> | [-s<indexed|named>] -f <file> [args]";
+ return getPromptCommandString() + " <statement> | [-s<indexed|named>] -f <file> [args]";
}
public String getHelp() {
@@ -282,8 +282,8 @@ public class ScriptCommand implements ClientCommand {
}
public String getDetailedHelp() {
- return "Execute a statement or a script. The following services managers are available: "
- + RhqManagers.values();
+ return "Execute a statement or a script. The following service managers are available: "
+ + Arrays.toString(RhqManagers.values());
}
public ScriptContext getContext() {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
index 2df0b72..802ac4c 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
@@ -25,6 +25,7 @@ import gnu.getopt.Getopt;
import gnu.getopt.LongOpt;
import org.rhq.enterprise.client.ClientMain;
import org.rhq.enterprise.client.Version;
+import org.rhq.enterprise.client.script.CommandLineParseException;
/**
* Command to show the user the version information of the CLI.
@@ -68,7 +69,8 @@ public class VersionCommand implements ClientCommand {
LongOpt[] longOpts = {
new LongOpt("verbose", LongOpt.OPTIONAL_ARGUMENT, null, 'v')
};
- Getopt getopt = new Getopt("exec", args, shortOpts, longOpts);
+ Getopt getopt = new Getopt(getPromptCommandString(), args, shortOpts, longOpts);
+ getopt.setOpterr(false);
VersionArgs versionArgs = new VersionArgs();
@@ -76,7 +78,7 @@ public class VersionCommand implements ClientCommand {
while (code != -1) {
switch (code) {
case ':':
- throw new IllegalArgumentException("Illegal option.");
+ throw new CommandLineParseException("Invalid option");
case 'v':
versionArgs.verbose = true;
break;
commit 534d91a7ba0786ebd521cb150b7713718aed946d
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Feb 1 11:36:21 2012 -0500
minor: remove unused imports; alphabetize ClientCommand.COMMANDS array
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ClientCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ClientCommand.java
index 8581484..905d346 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ClientCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ClientCommand.java
@@ -32,8 +32,8 @@ public interface ClientCommand {
LoginCommand.class,
LogoutCommand.class,
QuitCommand.class,
- ScriptCommand.class,
RecordCommand.class,
+ ScriptCommand.class,
VersionCommand.class
};
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java
index abddad4..6366b6e 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java
@@ -19,11 +19,7 @@
package org.rhq.enterprise.client.commands;
import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.WildcardType;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,7 +30,6 @@ import java.util.Map;
import org.rhq.bindings.output.TabularWriter;
import org.rhq.enterprise.client.ClientMain;
-import org.rhq.enterprise.client.Controller;
import org.rhq.enterprise.client.utility.ReflectionUtility;
import javax.jws.WebParam;
@@ -154,8 +149,6 @@ public class HelpCommand implements ClientCommand {
return true;
}
-
-
public String getSyntax() {
return "help [command] | [api [service]]";
}
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
index 2f4c640..2e3dbed 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
@@ -20,18 +20,13 @@ package org.rhq.enterprise.client.commands;
import java.io.PrintWriter;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.ProductInfo;
-import org.rhq.core.domain.common.ServerDetails;
import org.rhq.enterprise.client.ClientMain;
import org.rhq.enterprise.clientapi.RemoteClient;
-import org.rhq.enterprise.server.system.ServerVersion;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java
index f618a41..8640599 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java
@@ -19,7 +19,6 @@
package org.rhq.enterprise.client.commands;
import org.rhq.enterprise.client.ClientMain;
-import org.rhq.enterprise.client.Controller;
/**
* @author Greg Hinkle
commit ee0af237ea589d4bacf2f6c3cd35867fce2d24cc
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 1 16:39:02 2012 +0100
We need to disable the datasource before making changes an re-enable it later.
Sub-resource properties are read-only for now
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
index ee8c108..0543b81 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
@@ -10,6 +10,8 @@ import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
+import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.modules.plugins.jbossas7.json.Address;
@@ -21,7 +23,7 @@ import org.rhq.modules.plugins.jbossas7.json.Result;
* Handle JDBC-driver related stuff
* @author Heiko W. Rupp
*/
-public class DatasourceComponent extends BaseComponent implements OperationFacet {
+public class DatasourceComponent extends BaseComponent implements OperationFacet, ConfigurationFacet {
private static final String NOTSET = "-notset-";
private final Log log = LogFactory.getLog(DatasourceComponent.class);
@@ -143,4 +145,22 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
void addOptionalToOp(Operation op, Configuration parameters, String property) {
addAdditionalToOp(op,parameters,property,true);
}
+
+ @Override
+ public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+
+ Operation op = new Operation("disable",getAddress());
+ Result res = getASConnection().execute(op);
+ if (!res.isSuccess()) {
+ report.setErrorMessage("Was not able to disable the datasource for config changes");
+ return;
+ }
+
+
+ super.updateResourceConfiguration(report); // TODO: Customise this generated block
+
+ op = new Operation("enable",getAddress());
+ res = getASConnection().execute(op);
+
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index a7f5b64..495c050 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1353,10 +1353,10 @@
<c:group name="children:xa-datasource-properties:key+" displayName="XA Datasource Properties">
- <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="true">
<c:map-property name="*:key" displayName="Name" readOnly="true">
<c:simple-property name="key" displayName="Property-Name" readOnly="true"/>
- <c:simple-property name="value" displayName="Value"/>
+ <c:simple-property name="value" displayName="Value" readOnly="true"/>
</c:map-property>
</c:list-property>
</c:group>
commit 7daec9f1b83a4d16735ebb4004437f59f8d03a94
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 1 14:59:25 2012 +0100
Take care of changes in XA-DS land within AS7
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
index 68c0bce..ee8c108 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
@@ -1,19 +1,20 @@
package org.rhq.modules.plugins.jbossas7;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
-import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
import org.rhq.modules.plugins.jbossas7.json.Result;
/**
@@ -64,16 +65,41 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
Address theAddress = new Address(address);
theAddress.add("xa-data-source",name);
- op = new Operation("add",theAddress);
- addRequiredToOp(op,parameters,"driver-name");
- addRequiredToOp(op,parameters,"jndi-name");
- addOptionalToOp(op,parameters,"user-name");
- addOptionalToOp(op,parameters,"password");
- addRequiredToOp(op,parameters,"xa-datasource-class");
-
- Map<String,Object> props = new HashMap<String, Object>(); // TODO
- op.addAdditionalProperty("xa-data-source-properties",props);
-
+ op = new CompositeOperation();
+ Operation step1 = new Operation("add",theAddress);
+ addRequiredToOp(step1,parameters,"driver-name");
+ addRequiredToOp(step1,parameters,"jndi-name");
+ addOptionalToOp(step1,parameters,"user-name");
+ addOptionalToOp(step1,parameters,"password");
+ addRequiredToOp(step1,parameters,"xa-datasource-class");
+
+ ((CompositeOperation)op).addStep(step1);
+
+ // handling of xa-properties -- this is now a subresource in AS7 and at least needs a connection url
+ String connectionUrl = parameters.getSimpleValue("connection-url",null);
+ if (connectionUrl==null || connectionUrl.isEmpty())
+ throw new IllegalArgumentException("Connection-url must not be empty");
+ Address cuAddress = new Address(theAddress);
+ cuAddress.add("xa-datasource-properties","connection-url");
+ Operation step2 = new Operation("add",cuAddress);
+ step2.addAdditionalProperty("value",connectionUrl);
+ ((CompositeOperation)op).addStep(step2);
+
+
+ PropertyList xaPropList = parameters.getList("xa-properties");
+ if (xaPropList != null) {
+ List<Property> xaProps = xaPropList.getList();
+ for (Property prop : xaProps) {
+ PropertyMap pMap = (PropertyMap) prop;
+ PropertySimple keyProp = pMap.getSimple("key");
+ PropertySimple valProp = pMap.getSimple("value");
+ Address propAddress = new Address(theAddress);
+ propAddress.add("xa-datasource-properties",keyProp.getStringValue());
+ Operation step = new Operation("add",propAddress);
+ step.addAdditionalProperty("value",valProp.getStringValue()); // TODO ??
+ ((CompositeOperation)op).addStep(step);
+ }
+ }
}
else {
/*
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java
new file mode 100644
index 0000000..aa870fb
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java
@@ -0,0 +1,53 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+/**
+ * Discovery component for special treatment of JVMs, which live below server=server-x for managed servers
+ * @author Heiko W. Rupp
+ */
+public class JVMDiscoveryComponent extends SubsystemDiscovery {
+
+ @Override
+ public Set<DiscoveredResourceDetails> discoverResources(
+ ResourceDiscoveryContext<BaseComponent<?>> context) throws Exception {
+
+ ResourceContext parentContext = context.getParentResourceContext();
+
+
+ if (!parentContext.getResourceType().getName().equals("Managed Server"))
+ return super.discoverResources(context);
+
+ PropertySimple pathProp = parentContext.getPluginConfiguration().getSimple("path");
+ String path = pathProp.getStringValue();
+ path = path.replaceAll("server-config=","server=");
+ path = path + ",core-service=platform-mbean";
+
+ Configuration config = new Configuration();
+ PropertySimple ps = new PropertySimple("path",path);
+ config.getProperties().add(ps);
+
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
+ context.getResourceType(),
+ path,
+ path, // dname, todo
+ null,
+ context.getResourceType().getDescription(),
+ config,
+ null
+ );
+
+ Set<DiscoveredResourceDetails> discoveredResourceDetails = new HashSet<DiscoveredResourceDetails>();
+ discoveredResourceDetails.add(detail);
+ return discoveredResourceDetails;
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 3ef70c9..a7f5b64 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -558,12 +558,13 @@
<server name="JVM"
- discovery="SubsystemDiscovery"
+ discovery="JVMDiscoveryComponent"
class="BaseComponent"
description="Information about the underlying JVM"
singleton="true">
<runs-inside>
<parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
+ <parent-resource-type name="Host" plugin="jboss-as-7"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
@@ -619,9 +620,8 @@
<resource-configuration>
<c:simple-property name="thread-contention-monitoring-enabled" required="false" type="boolean" readOnly="false" description="Whether thread contention monitoring is enabled."/>
<c:simple-property name="thread-cpu-time-enabled" required="false" type="boolean" readOnly="false" description="Whether thread CPU time measurement is enabled."/>
- <c:list-property name="all-thread-ids" description="All live thread IDs. If a security manager is installed and the caller does not have ManagementPermission('monitor'), the result will be und
- ." >
- <c:simple-property name="all-thread-ids" />
+ <c:list-property name="all-thread-ids" description="All live thread IDs. If a security manager is installed and the caller does not have ManagementPermission('monitor'), the result will be undefined." readOnly="true">
+ <c:simple-property name="all-thread-ids" readOnly="true"/>
</c:list-property>
<c:simple-property name="thread-contention-monitoring-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports thread contention monitoring."/>
<c:simple-property name="thread-cpu-time-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine implementation supports CPU time measurement for any thread."/>
@@ -1036,10 +1036,11 @@
<c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/>
</c:simple-property>
<c:simple-property name="xa-datasource-class" required="true" description="xa-datasource-class"/>
+ <c:simple-property name="connection-url" required="true" description="Connection URL. Will be turned into an Xa-property)"/>
<c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/>
<c:simple-property name="user-name" description="User name for DB-connections" required="false" />
<c:simple-property name="password" description="Password" type="password" required="false"/>
- <c:list-property name="xa-properties" displayName="XA Properties" description="Additional XA Properties" required="false">
+ <c:list-property name="xa-properties" displayName="XA Properties" description="Additional XA Properties (connection url is set above)" required="false">
<c:map-property name="xa-properties">
<c:simple-property name="key" displayName="Key" description="Key of the property"/>
<c:simple-property name="value" displayName="Value" description="Value of the property"/>
@@ -1349,6 +1350,16 @@
</c:map-property>
-->
<c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="if true no recovery are tried for this connection pool"/>
+
+
+ <c:group name="children:xa-datasource-properties:key+" displayName="XA Datasource Properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:key" displayName="Name" readOnly="true">
+ <c:simple-property name="key" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
</resource-configuration>
</service>
commit 55a89fae4b11ca5a8fecb668b87dbcef2bc04cf9
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 17:12:36 2012 -0500
[BZ 784678] prevent NPE from occurring if -f option is not passed to CLI record command - instead throw a command line
parse exception with an informative error message (https://bugzilla.redhat.com/show_bug.cgi?id=784678)
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
index e38e81a..468076e 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -96,8 +96,12 @@ public class RecordCommand implements ClientCommand {
code = getopt.getopt();
}
+ if (recordArgs.file == null) {
+ throw new CommandLineParseException("The file option must be specified.");
+ }
+
if (recordArgs.recordState == null) {
- throw new CommandLineParseException("Either the start or stop option must be specified");
+ throw new CommandLineParseException("Either the start or stop option must be specified.");
}
return recordArgs;
commit ed89cb1f3eb14ef0a805d0723635236bd5870a98
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 16:59:05 2012 -0500
(minor) remove unused import
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
index a6b97b8..d42fc6d 100755
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -25,7 +25,6 @@ package org.rhq.enterprise.client;
import gnu.getopt.Getopt;
import gnu.getopt.LongOpt;
-import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
commit 0c0a5c916127fd3235850e6619d61eaaf96c88eb
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 16:58:15 2012 -0500
remove a bunch of dead code
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
index d4444fe..a6b97b8 100755
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -65,8 +65,6 @@ public class ClientMain {
*/
private Thread inputLoopThread;
- private BufferedReader inputReader;
-
// JLine console reader
private ConsoleReader consoleReader;
@@ -114,7 +112,7 @@ public class ClientMain {
private static void initCommands() {
for (Class<ClientCommand> commandClass : ClientCommand.COMMANDS) {
- ClientCommand command = null;
+ ClientCommand command;
try {
command = commandClass.newInstance();
commands.put(command.getPromptCommandString(), command);
@@ -136,8 +134,7 @@ public class ClientMain {
this.serviceCompletor.setServices(remoteClient.getManagers());
}
}
-
- //
+
public ClientMain() throws Exception {
// this.inputReader = new BufferedReader(new
@@ -167,24 +164,15 @@ public class ClientMain {
consoleReader.setUsePagination(true);
}
- // ?? what is this again? Might be able to remove this.
- public void start() {
- outputWriter = new PrintWriter(System.out);
- // inputReader = new BufferedReader(new InputStreamReader(System.in));
-
- }
-
public String getUserInput(String prompt) {
String input_string = "";
- boolean use_default_prompt = (prompt == null);
while ((input_string != null) && (input_string.trim().length() == 0)) {
if (prompt == null) {
if (!loggedIn()) {
prompt = "unconnected$ ";
} else {
- // prompt = host + ":" + port + "> ";
// Modify the prompt to display host:port(logged-in-user)
String loggedInUser = "";
if ((getSubject() != null) && (getSubject().getName() != null)) {
@@ -197,12 +185,10 @@ public class ClientMain {
}
}
}
- // outputWriter.print(prompt);
try {
outputWriter.flush();
input_string = consoleReader.readLine(prompt);
- // inputReader.readLine();
} catch (Exception e) {
input_string = null;
}
@@ -213,12 +199,6 @@ public class ClientMain {
if (!stdinInput) {
outputWriter.println(input_string);
}
- } else if (!stdinInput) {
- // if we are processing a script, we hit the EOF, so close the inputstream
- try {
- inputReader.close();
- } catch (IOException e1) {
- }
}
return input_string;
@@ -602,7 +582,7 @@ public class ClientMain {
/**
* This method allows ClientCommands to insert a small note to be displayed after the command has been executed. A
- * note can be an indicaiton of a problem that was handled or a note about some option that should be changed.
+ * note can be an indication of a problem that was handled or a note about some option that should be changed.
*
* These notes are meant to be terse, and pasted/purged at the end of every command execution.
*
commit 3c0e9542e0ddfa60828ea44c37af715a79bfcc6b
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 16:43:11 2012 -0500
[BZ 785218] fix so -v/--version option does not print redundant info
(https://bugzilla.redhat.com/show_bug.cgi?id=785218)
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
index 191c537..d4444fe 100755
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2009 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -82,6 +82,7 @@ public class ClientMain {
private String user;
private String pass;
private ArrayList<String> notes = new ArrayList<String>();
+ private boolean showDetailedVersion;
// reference to the webservice reference factory
private RemoteClient remoteClient;
@@ -403,7 +404,7 @@ public class ClientMain {
}
private void displayUsage() {
- outputWriter.println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-f file]|[-c command]");
+ outputWriter.println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-v] [-f file]|[-c command]");
}
void processArguments(String[] args) throws IllegalArgumentException, IOException {
@@ -478,10 +479,10 @@ public class ClientMain {
setHost(getopt.getOptarg());
break;
}
- case 'r': {
- setTransport(getopt.getOptarg());
- break;
- }
+ case 'r': {
+ setTransport(getopt.getOptarg());
+ break;
+ }
case 't': {
String portArg = getopt.getOptarg();
try {
@@ -492,15 +493,20 @@ public class ClientMain {
break;
}
case 'v': {
- String versionString = Version.getProductNameAndVersionBuildInfo();
- outputWriter.println(versionString);
+ showDetailedVersion = true;
break;
}
}
}
if (interactiveMode) {
- outputWriter.println(Version.getProductNameAndVersion());
+ String version = (showDetailedVersion) ? Version.getProductNameAndVersionBuildInfo() :
+ Version.getProductNameAndVersion();
+ outputWriter.println(version);
+ if (showDetailedVersion && args.length == 1) {
+ // If -v was the only option specified, exit after printing the version.
+ System.exit(0);
+ }
}
if (user != null && pass != null) {
@@ -516,7 +522,7 @@ public class ClientMain {
}
if (!interactiveMode) {
- commands.get("exec").execute(this, execCmdLine.toArray(new String[] {}));
+ commands.get("exec").execute(this, execCmdLine.toArray(new String[execCmdLine.size()]));
}
}
commit 35e9cce2d3dc07636bf2ece0acbde13a3b862eeb
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 31 22:33:36 2012 +0100
Upgrade RESTEasy to 2.3.1.GA
diff --git a/pom.xml b/pom.xml
index 3b77493..44c6b34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<twitter4j.version>2.2.4</twitter4j.version>
<commons-codec.version>1.4</commons-codec.version>
<!-- NOTE (ips, 10/04/11): Upgrading testng to 6.2.x causes 10 server-jar tests to fail for an unknown reason. -->
- <!-- NOTE (jshaughn, 01/20/12): With the latest work, the sserver-jar tests passed using testng to 6.3.1, so perhaps an upgrade is possible -->
+ <!-- NOTE (jshaughn, 01/20/12): With the latest work, the sserver-jar tests passed using testng to 6.3.1, so perhaps an upgrade is possible -->
<testng.version>6.1.1</testng.version>
<cobertura.version>1.9.4.1</cobertura.version>
<augeas.version>0.9.0</augeas.version>
@@ -101,7 +101,7 @@
<augeas.zip.location>${settings.localRepository}/net/augeas/augeas-native/${augeas.version}</augeas.zip.location>
<augeas.zip.mask>*-${augeas.classifier}.zip</augeas.zip.mask>
<ant.contrib.version>1.0b3</ant.contrib.version>
- <resteasy.version>2.2.3.GA</resteasy.version>
+ <resteasy.version>2.3.1.GA</resteasy.version>
<freemarker.version>2.3.18</freemarker.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
@@ -888,11 +888,11 @@
<phase>generate-sources</phase>
<configuration>
<tasks>
- <mkdir dir="target" />
+ <mkdir dir="target" />
<tstamp>
<format property="buildTime" pattern="MM/dd/yy hh:mm aa z" locale="en,US" timezone="GMT" />
- </tstamp>
+ </tstamp>
<echo file="target/build.properties">buildTime = ${buildTime}${line.separator}</echo>
<exec executable="git" outputproperty="buildNumber" failonerror="false" failifexecutionfails="false">
@@ -918,7 +918,7 @@
</tasks>
</configuration>
</execution>
-
+
<execution>
<id>javadoc-dist</id>
<phase>site</phase>
@@ -949,7 +949,7 @@
</goals>
<configuration>
<files>
- <file>${project.build.directory}/build.properties</file>
+ <file>${project.build.directory}/build.properties</file>
</files>
<quiet>true</quiet>
</configuration>
commit 43f016c9d9da95d2f5ea1bed4d1ee7fdbf9e07c3
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 16:08:05 2012 -0500
[BZ 784983] fix output of CLI version command (https://bugzilla.redhat.com/show_bug.cgi?id=784983)
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 32921bb..21e9c47 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -172,14 +172,6 @@
</includes>
<archive>
<index>true</index>
- <manifestEntries>
- <Implementation-Title>${rhq.product.name} - ${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Specification-Vendor>org.jboss</Specification-Vendor>
- <Specification-Title>JBossWS</Specification-Title>
- <Specification-Version>${jbossws-native-dist.version}</Specification-Version>
- <Build-Number>${buildNumber}</Build-Number>
- </manifestEntries>
</archive>
</configuration>
</plugin>
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
index d27c3f3..2df0b72 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,10 @@
package org.rhq.enterprise.client.commands;
import java.util.Properties;
+import java.util.jar.Attributes;
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
import org.rhq.enterprise.client.ClientMain;
import org.rhq.enterprise.client.Version;
@@ -35,26 +38,56 @@ public class VersionCommand implements ClientCommand {
}
public boolean execute(ClientMain client, String[] args) {
- if (args.length <= 1) {
+ VersionArgs versionArgs = parseArgs(args);
+ if (versionArgs.verbose) {
client.getPrintWriter().println(Version.getVersionPropertiesAsString());
} else {
Properties props = Version.getVersionProperties();
- for (int i = 1; i < args.length; i++) {
- client.getPrintWriter().println(args[i] + "=" + props.getProperty(args[i], "<unknown>"));
- }
+ String version = props.getProperty(Attributes.Name.IMPLEMENTATION_VERSION.toString());
+ client.getPrintWriter().println(version);
}
+
return true;
}
public String getSyntax() {
- return "version [prop name]...";
+ return getPromptCommandString() + " [-v | --verbose]";
}
public String getHelp() {
- return "Show version information and properties";
+ return "Show CLI version information";
}
public String getDetailedHelp() {
- return getHelp();
+ return getHelp() + ". If no arguments are specified, the CLI's version is printed. If the verbose option is "
+ + "specified, the values of the main attributes from the CLI jar's MANIFEST.MF are printed.";
+ }
+
+ private VersionArgs parseArgs(String[] args) {
+ String shortOpts = "-:v";
+ LongOpt[] longOpts = {
+ new LongOpt("verbose", LongOpt.OPTIONAL_ARGUMENT, null, 'v')
+ };
+ Getopt getopt = new Getopt("exec", args, shortOpts, longOpts);
+
+ VersionArgs versionArgs = new VersionArgs();
+
+ int code = getopt.getopt();
+ while (code != -1) {
+ switch (code) {
+ case ':':
+ throw new IllegalArgumentException("Illegal option.");
+ case 'v':
+ versionArgs.verbose = true;
+ break;
+ }
+ code = getopt.getopt();
+ }
+
+ return versionArgs;
+ }
+
+ private static class VersionArgs {
+ boolean verbose;
}
}
\ No newline at end of file
commit 5853591e052fc9bf2e852f98c6fdb9ad4f278c2a
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 16:00:44 2012 -0500
minor: make help output consistent w/ the other CLI commands
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
index 7db869a..e38e81a 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
@@ -128,7 +128,7 @@ public class RecordCommand implements ClientCommand {
}
public String getHelp() {
- return "Records user input commands to a specified file. Use the --start option to begin recording. Use the " +
+ return "Record user input commands to a specified file. Use the --start option to begin recording. Use the " +
"--end option to stop recording. Use --append to append output to the end of an existing file; otherwise, " +
"recording will start at the beginning of the file.";
}
commit ab6ce9d9ddbb25d78a8d46859a9e025a2d820094
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 15:34:47 2012 -0500
fix typo and remove redundant import
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
index e1244ae..7db869a 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
@@ -20,10 +20,8 @@
* if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
package org.rhq.enterprise.client.commands;
-import org.rhq.enterprise.client.Controller;
import org.rhq.enterprise.client.ClientMain;
import org.rhq.enterprise.client.NoOpRecorder;
import org.rhq.enterprise.client.Recorder;
@@ -132,7 +130,7 @@ public class RecordCommand implements ClientCommand {
public String getHelp() {
return "Records user input commands to a specified file. Use the --start option to begin recording. Use the " +
"--end option to stop recording. Use --append to append output to the end of an existing file; otherwise, " +
- "recording will start at the begining of the file.";
+ "recording will start at the beginning of the file.";
}
public String getDetailedHelp() {
commit 3ae6a9600f01eb0fad0f52b61277d9cbb31e5479
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jan 31 15:05:24 2012 -0500
[Bug 785022 - Server upgrade fails if db-uprade.xml task is unable to created index when index already exists]
Applying suggested fix from loleary. Could not apply patch successfully
so manually reapplied the fix, which is to protect create/drop index
stmts with ignoreErrors="true".
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index c9b0bea..7b1f9a2 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -296,7 +296,7 @@
</schema-directSQL>
<schema-alterColumn table="RHQ_SERVER" column="OPERATION_MODE" nullable="FALSE" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_SERVER unique constraint on NAME">
CREATE UNIQUE INDEX rhq_server_name_unique ON rhq_server (name)
</statement>
@@ -853,7 +853,7 @@
</schemaSpec>
<schemaSpec version="2.24">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_MEASUREMENT_BLINE index on SCHEDULE_ID">
CREATE INDEX rhq_meas_baseline_sid_idx ON rhq_measurement_bline (schedule_id)
</statement>
@@ -1078,7 +1078,7 @@
</schemaSpec>
<schemaSpec version="2.36">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Deleting unique constraint on RHQ_MEASUREMENT_DEF">
DROP INDEX RHQ_METRIC_DEF_KEY_IDX
</statement>
@@ -1093,7 +1093,7 @@
WHERE NUMERIC_TYPE = 0
</statement>
</schema-directSQL>
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating unique index on RHQ_MEASUREMENT_DEF (RESOURCE_TYPE_ID, NAME, RAW_NUMERIC_TYPE)">
CREATE UNIQUE INDEX RHQ_METRIC_DEF_KEY_IDX ON RHQ_MEASUREMENT_DEF (RESOURCE_TYPE_ID, NAME, RAW_NUMERIC_TYPE)
</statement>
@@ -1193,49 +1193,77 @@
<!-- RHQ 1448 -->
<schemaSpec version="2.44">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R00 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R00_SID_IDX ON RHQ_MEAS_DATA_NUM_R00 (schedule_id)
- </statement>
+ </statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R01 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R01_SID_IDX ON RHQ_MEAS_DATA_NUM_R01 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R02 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R02_SID_IDX ON RHQ_MEAS_DATA_NUM_R02 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R03 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R03_SID_IDX ON RHQ_MEAS_DATA_NUM_R03 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R04 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R04_SID_IDX ON RHQ_MEAS_DATA_NUM_R04 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R05 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R05_SID_IDX ON RHQ_MEAS_DATA_NUM_R05 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R06 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R06_SID_IDX ON RHQ_MEAS_DATA_NUM_R06 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R07 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R07_SID_IDX ON RHQ_MEAS_DATA_NUM_R07 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R08 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R08_SID_IDX ON RHQ_MEAS_DATA_NUM_R08 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R09 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R09_SID_IDX ON RHQ_MEAS_DATA_NUM_R09 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R10 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R10_SID_IDX ON RHQ_MEAS_DATA_NUM_R10 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R11 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R11_SID_IDX ON RHQ_MEAS_DATA_NUM_R11 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R12 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R12_SID_IDX ON RHQ_MEAS_DATA_NUM_R12 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R13 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R13_SID_IDX ON RHQ_MEAS_DATA_NUM_R13 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R14 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R14_SID_IDX ON RHQ_MEAS_DATA_NUM_R14 (schedule_id)
</statement>
@@ -1300,7 +1328,7 @@
</schemaSpec>
<schemaSpec version="2.50">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_RESOURCE_ERROR.RESOURCE_ID">
CREATE INDEX RHQ_RES_ERROR_IDX_RES_ID ON RHQ_RESOURCE_ERROR (RESOURCE_ID)
</statement>
@@ -1313,12 +1341,12 @@
</schemaSpec>
<schemaSpec version="2.52">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Deleting unique name constraint on RHQ_RESOURCE_GROUP">
DROP INDEX RHQ_RES_GROUP_NAME
</statement>
</schema-directSQL>
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Deleting unique name constraint on RHQ_RESOURCE_GROUP">
CREATE INDEX RHQ_RES_GROUP_NAME ON RHQ_RESOURCE_GROUP (name)
</statement>
@@ -1348,57 +1376,87 @@
</schemaSpec>
<schemaSpec version="2.55">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on TIME_STAMP column of RHQ_MEASUREMENT_DATA_NUM_1H">
CREATE INDEX RHQ_MEAS_DATA_1H_TIME_IDX ON RHQ_MEASUREMENT_DATA_NUM_1H(TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on TIME_STAMP column of RHQ_MEASUREMENT_DATA_NUM_6H">
CREATE INDEX RHQ_MEAS_DATA_6H_TIME_IDX ON RHQ_MEASUREMENT_DATA_NUM_6H(TIME_STAMP)
</statement>
</schema-directSQL>
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R00 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R00_TS_IDX ON RHQ_MEAS_DATA_NUM_R00 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R01 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R01_TS_IDX ON RHQ_MEAS_DATA_NUM_R01 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R02 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R02_TS_IDX ON RHQ_MEAS_DATA_NUM_R02 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R03 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R03_TS_IDX ON RHQ_MEAS_DATA_NUM_R03 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R04 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R04_TS_IDX ON RHQ_MEAS_DATA_NUM_R04 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R05 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R05_TS_IDX ON RHQ_MEAS_DATA_NUM_R05 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R06 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R06_TS_IDX ON RHQ_MEAS_DATA_NUM_R06 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R07 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R07_TS_IDX ON RHQ_MEAS_DATA_NUM_R07 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R08 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R08_TS_IDX ON RHQ_MEAS_DATA_NUM_R08 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R09 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R09_TS_IDX ON RHQ_MEAS_DATA_NUM_R09 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R10 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R10_TS_IDX ON RHQ_MEAS_DATA_NUM_R10 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R11 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R11_TS_IDX ON RHQ_MEAS_DATA_NUM_R11 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R12 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R12_TS_IDX ON RHQ_MEAS_DATA_NUM_R12 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R13 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R13_TS_IDX ON RHQ_MEAS_DATA_NUM_R13 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R14 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R14_TS_IDX ON RHQ_MEAS_DATA_NUM_R14 (TIME_STAMP)
</statement>
@@ -1406,49 +1464,77 @@
</schemaSpec>
<schemaSpec version="2.56">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R00_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R00_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R01_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R01_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R02_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R02_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R03_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R03_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R04_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R04_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R05_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R05_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R06_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R06_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R07_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R07_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R08_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R08_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R09_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R09_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R10_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R10_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R11_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R11_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R12_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R12_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R13_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R13_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R14_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R14_SID_IDX
</statement>
@@ -1456,7 +1542,7 @@
</schemaSpec>
<schemaSpec version="2.57">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Create index on RHQ_CONFIG_PROPERTY(PARENT_LIST_ID)">
CREATE INDEX RHQ_CONFIG_PROP_idx_list_key ON RHQ_CONFIG_PROPERTY(PARENT_LIST_ID)
</statement>
@@ -1683,6 +1769,8 @@
FOREIGN KEY ( REPO_GROUP_TYPE_ID )
REFERENCES RHQ_REPO_GROUP_TYPE ( ID )
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_REPO_GROUP_IDX
ON RHQ_REPO_GROUP ( NAME, REPO_GROUP_TYPE_ID )
@@ -1842,7 +1930,7 @@
<schema-alterColumn table="RHQ_DISTRIBUTION" column="BASE_PATH" nullable="false" />
<schema-addColumn table="RHQ_DISTRIBUTION" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_DISTRIBUTION" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_DISTRIBUTION_IDX ON RHQ_DISTRIBUTION ( LABEL, BASE_PATH )
</statement>
@@ -1947,6 +2035,8 @@
FOREIGN KEY (DISTRIBUTION_ID)
REFERENCES RHQ_DISTRIBUTION ( ID )
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_DISTRIBUTION_FILE_IDX
ON RHQ_DISTRIBUTION_FILE ( DISTRIBUTION_ID, RELATIVE_FILENAME )
@@ -2019,7 +2109,7 @@
</schema-directSQL>
<!-- Fix bug:538157 -->
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE INDEX RHQ_REPO_PKG_VER_MAP_IDX
ON RHQ_REPO_PKG_VERSION_MAP ( PACKAGE_VERSION_ID )
@@ -2040,10 +2130,12 @@
<schemaSpec version="2.69.2">
<!-- plugin names must be unique only if they are deployed on the same side (agent vs. server) -->
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping unique index on RHQ_PLUGIN (NAME)">
DROP INDEX RHQ_PLUGIN_NAME_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating unique index on RHQ_PLUGIN (NAME, DEPLOYMENT) so server plugin names need not be unique with agent plugins">
CREATE UNIQUE INDEX RHQ_PLUGIN_NAME_DEPLOY_IDX ON RHQ_PLUGIN (NAME, DEPLOYMENT)
</statement>
@@ -2086,7 +2178,7 @@
<schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="MESSAGE" columnType="VARCHAR2" precision="4000" />
</schemaSpec>
<schemaSpec version="2.70.3">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping unique index RHQ_ALERT_IDX_ALERT">
DROP INDEX RHQ_ALERT_IDX_ALERT
</statement>
@@ -2127,7 +2219,7 @@
<schema-deleteColumn table="RHQ_ALERT" column="triggered_operation" />
</schemaSpec>
<schemaSpec version="2.70.7">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Recreating RHQ_ALERT_IDX_ALERT as non-unique index">
CREATE INDEX RHQ_ALERT_IDX_ALERT ON RHQ_ALERT_NOTIF_LOG (alert_id)
</statement>
@@ -2168,13 +2260,17 @@
<schema-addColumn table="RHQ_ADVISORY" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_ADVISORY" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_NAME_UQ ON RHQ_ADVISORY ( ADVISORY_NAME )
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_UQ ON RHQ_ADVISORY ( ADVISORY )
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE INDEX RHQ_ADVISORY_UDATE_IDX ON RHQ_ADVISORY (UPDATE_DATE )
</statement>
@@ -2193,7 +2289,7 @@
<schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="PACKAGE_VERSION_ID" nullable="false" />
<schema-addColumn table="RHQ_ADVISORY_PACKAGE" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_PACKAGE_IDX ON RHQ_ADVISORY_PACKAGE ( ADVISORY_ID, PACKAGE_VERSION_ID )
</statement>
@@ -2234,7 +2330,7 @@
<schema-alterColumn table="RHQ_ADVISORY_CVE" column="CVE_ID" nullable="false" />
<schema-addColumn table="RHQ_ADVISORY_CVE" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_ADVISORY_CVE" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_CVE_IDX ON RHQ_ADVISORY_CVE ( ADVISORY_ID, CVE_ID )
</statement>
@@ -2266,7 +2362,7 @@
<schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="BUG_ID" nullable="false" />
<schema-addColumn table="RHQ_ADVISORY_BUGLIST" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_BUG_IDX ON RHQ_ADVISORY_BUGLIST ( ADVISORY_ID, BUG_ID )
</statement>
@@ -2365,6 +2461,8 @@
FOREIGN KEY (RESOURCE_TYPE_ID)
REFERENCES RHQ_RESOURCE_TYPE (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE_TYPE unique constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_TYPE_UNIQUE ON RHQ_BUNDLE_TYPE (name)
</statement>
@@ -2406,6 +2504,8 @@
FOREIGN KEY (PACKAGE_TYPE_ID)
REFERENCES RHQ_PACKAGE_TYPE (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE unique constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_UNIQUE ON RHQ_BUNDLE (bundle_type_id, name)
</statement>
@@ -2444,6 +2544,8 @@
FOREIGN KEY (CONFIG_DEF_ID)
REFERENCES RHQ_CONFIG_DEF (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE_VERSION unique constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_VERSION_UNIQUE ON RHQ_BUNDLE_VERSION (bundle_id, name, version)
</statement>
@@ -2539,6 +2641,8 @@
FOREIGN KEY (GROUP_ID)
REFERENCES RHQ_RESOURCE_GROUP (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE_DESTINATION unique constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_DESTINATION_UNIQUE
ON RHQ_BUNDLE_DESTINATION (bundle_id, group_id, deploy_dir)
@@ -2630,6 +2734,8 @@
FOREIGN KEY (RESOURCE_ID)
REFERENCES RHQ_RESOURCE (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE_RES_DEPLOY unique constraint on dep-resource mapping">
CREATE UNIQUE INDEX RHQ_BUNDLE_RES_DEPLOY_IDX
ON RHQ_BUNDLE_RES_DEPLOY (BUNDLE_DEPLOYMENT_ID, RESOURCE_ID)
@@ -2788,6 +2894,8 @@
FOREIGN KEY ( ROLE_ID )
REFERENCES RHQ_ROLE (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ROLE_LDAP_GROUP_IDX
ON RHQ_ROLE_LDAP_GROUP ( ROLE_ID, LDAP_GROUP_NAME )
@@ -2996,10 +3104,12 @@
</schemaSpec>
<schemaSpec version="2.87">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Drop non-unique RHQ_RES_TYPE_IDX_PLG_NAME index">
DROP INDEX RHQ_RES_TYPE_IDX_PLG_NAME
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Recreate RHQ_RES_TYPE_IDX_PLG_NAME index as unique">
CREATE UNIQUE INDEX RHQ_RES_TYPE_IDX_PLG_NAME ON RHQ_RESOURCE_TYPE (name, plugin)
</statement>
@@ -3007,10 +3117,12 @@
</schemaSpec>
<schemaSpec version="2.88">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Add end time index on call time data to speed up purges">
CREATE INDEX RHQ_CT_DA_VA_END_TIM_IDX ON RHQ_CALLTIME_DATA_VALUE (end_time)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Add index on measurement definition numeric type">
CREATE INDEX RHQ_METRIC_DEF_NT_IDX ON RHQ_MEASUREMENT_DEF (numeric_type)
</statement>
@@ -3131,7 +3243,7 @@
</schemaSpec>
<schemaSpec version="2.92.4">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Add index on measurement data 1d table timestamp">
CREATE INDEX RHQ_MEAS_DATA_1D_TIME_IDX ON RHQ_MEASUREMENT_DATA_NUM_1D (time_stamp)
</statement>
@@ -3294,6 +3406,8 @@
<statement desc="Changing primary key of RHQ_OPERATION_SCHEDULE to ID. Step2/3...">
ALTER TABLE RHQ_OPERATION_SCHEDULE ADD PRIMARY KEY (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Changing primary key of RHQ_OPERATION_SCHEDULE to ID. Step3/3...">
CREATE UNIQUE INDEX RHQ_OPERATION_SCHEDULE_KEY_IDX ON RHQ_OPERATION_SCHEDULE (JOB_NAME, JOB_GROUP)
</statement>
@@ -3607,10 +3721,12 @@
</schemaSpec>
<schemaSpec version="2.113">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_ALERT_CONDITION_LOG index on CONDITION_ID">
CREATE INDEX RHQ_ALERT_COND_LOG_COND_IDX ON RHQ_ALERT_CONDITION_LOG (CONDITION_ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_MEASUREMENT_SCHED index on RESOURCE_ID">
CREATE INDEX RHQ_MEAS_SCHED_RESID_IDX ON RHQ_MEASUREMENT_SCHED (RESOURCE_ID)
</statement>
@@ -3669,7 +3785,7 @@
REFERENCES RHQ_CONFIG (ID)
</statement>
</schema-directSQL>
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating unique index on RESOURCE_TYPE_ID and NAME columns">
CREATE UNIQUE INDEX RHQ_TYPE_DEF_NAME ON RHQ_DRIFT_DEF_TEMPLATE ( RESOURCE_TYPE_ID, NAME )
</statement>
commit c9cc6ed13db6d9d246611f627323abc86bd3f461
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 31 19:11:25 2012 +0100
[BZ 786194] - Make sure to set the correct context classloader when
simplifying the interfaces for the LocalClientProxy.
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 29ac29a..f200744 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -40,6 +40,13 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java
new file mode 100644
index 0000000..3b949e3
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java
@@ -0,0 +1,101 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.client.test;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+import org.jmock.Expectations;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.client.LocalClient;
+import org.rhq.enterprise.server.alert.AlertManagerLocal;
+import org.rhq.enterprise.server.alert.AlertManagerRemote;
+import org.rhq.test.JMockTest;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class LocalClientTest extends JMockTest {
+
+ public static class FakeContextFactory implements InitialContextFactory {
+ @Override
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ return CONTEXT_MOCK_FOR_TEST;
+ }
+ }
+
+ public static Context CONTEXT_MOCK_FOR_TEST = null;
+
+ @BeforeClass
+ public void setUpNaming() {
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FakeContextFactory.class.getName());
+ }
+
+ @Test
+ public void testResilienceAgainstContextClassloaders() throws Exception {
+ CONTEXT_MOCK_FOR_TEST = context.mock(Context.class);
+ final AlertManagerRemote alertManagerMock = (AlertManagerRemote) Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[] { AlertManagerRemote.class, AlertManagerLocal.class }, new InvocationHandler() {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ return null;
+ }
+
+ });
+
+ context.checking(new Expectations() {{
+ allowing(CONTEXT_MOCK_FOR_TEST).lookup(with(any(String.class)));
+ will(returnValue(alertManagerMock));
+
+ allowing(CONTEXT_MOCK_FOR_TEST).close();
+ }});
+
+ ClassLoader origCl = Thread.currentThread().getContextClassLoader();
+ try {
+ ClassLoader differentCl = new URLClassLoader(new URL[0], getClass().getClassLoader());
+
+ Thread.currentThread().setContextClassLoader(differentCl);
+
+ LocalClient lc = new LocalClient(null);
+
+ //this call creates the proxy and is theoretically prone to the context classloader
+ AlertManagerRemote am = lc.getAlertManager();
+
+ //check that both the original and simplified methods exist on the returned object
+ am.getClass().getMethod("deleteAlerts", new Class<?>[] { Subject.class, int[].class });
+ am.getClass().getMethod("deleteAlerts", new Class<?>[] { int[].class });
+ } finally {
+ Thread.currentThread().setContextClassLoader(origCl);
+ }
+ }
+}
commit ef9f0ada2d2ac587d701da5ea03507b2fb74b8c3
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 30 18:37:21 2012 +0100
Make sure to set the correct context classloader when running inside
a EJB container.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
index 6f15e81..2c1258d 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
@@ -199,7 +199,13 @@ public class ResourceClientFactory {
}
}
- return customClass.toClass();
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(ResourceClientProxy.class.getClassLoader());
+ return customClass.toClass();
+ } finally {
+ Thread.currentThread().setContextClassLoader(cl);
+ }
} catch (NotFoundException e) {
LOG.error("Could not create custom interface for resource with id " + proxy.getId(), e);
} catch (CannotCompileException e) {
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
index 2414bf6..2e48048 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
@@ -432,10 +432,19 @@ public class LocalClient implements RhqFacade {
private <T> T getProxy(Object slsb, Class<T> iface) {
RhqManagers manager = RhqManagers.forInterface(iface);
- Class<?> simplified = InterfaceSimplifier.simplify(iface);
+ Class<?> simplified = null;
+
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(iface.getClassLoader());
+ simplified = InterfaceSimplifier.simplify(iface);
+ } finally {
+ Thread.currentThread().setContextClassLoader(cl);
+ }
- Object proxy = Proxy.newProxyInstance(iface.getClassLoader(), new Class<?>[] { simplified },
- new LocalClientProxy(slsb, this, manager));
+ Object proxy =
+ Proxy.newProxyInstance(iface.getClassLoader(), new Class<?>[] { simplified }, new LocalClientProxy(slsb,
+ this, manager));
return iface.cast(proxy);
}
commit 5b7557b941711586d3c3be1447e0a9c3319fe029
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 12:21:04 2012 -0500
[BZ 785026] log an informative warning, if log files cannot be polled for events due to SIGAR being disabled or unavailable (https://bugzilla.redhat.com/show_bug.cgi?id=785026)
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java
index f9bb654..8651272 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java
@@ -22,6 +22,7 @@
*/
package org.rhq.core.pluginapi.event;
+import com.sun.istack.Nullable;
import org.hyperic.sigar.SigarProxy;
import org.jetbrains.annotations.NotNull;
@@ -90,10 +91,10 @@ public interface EventContext {
/**
* Gets an instance of Sigar. Plugins that need to use Sigar, should use this method to get an instance, rather than
- * instantiating Sigar themselves.
+ * instantiating Sigar themselves. Returns null if the native layer is unavailable or has been disabled.
*
- * @return an instance of Sigar
+ * @return an instance of Sigar, or null if the native layer is unavailable or has been disabled
*/
- @NotNull
+ @Nullable
SigarProxy getSigar();
}
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
index 6fcb6d1..b4e19c4 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -54,6 +54,7 @@ public class LogFileEventPoller implements EventPoller {
private FileInfo logFileInfo;
private LogEntryProcessor entryProcessor;
private EventContext eventContext;
+ private boolean initialized;
public LogFileEventPoller(EventContext eventContext, String eventType, File logFile,
LogEntryProcessor entryProcessor) {
@@ -73,45 +74,54 @@ public class LogFileEventPoller implements EventPoller {
return this.logFile.getPath();
}
- // we can't get the FileInfo in the constructor because pollers are constructed during pc initialization, and
- // at that time the eventManager is not available (and so we can't get sigar).
- private FileInfo getFileInfo() {
- if (null == this.logFileInfo) {
- try {
- SigarProxy sigar = eventContext.getSigar();
- this.logFileInfo = new LogFileInfo(sigar.getFileInfo(logFile.getPath()));
- // once we have the file info we can let go of the event context, just in case that's useful
- this.eventContext = null;
-
- } catch (SigarException e) {
- throw new RuntimeException(e);
- }
- }
-
- return this.logFileInfo;
- }
-
@Nullable
public Set<Event> poll() {
-
+ if (!this.initialized) {
+ init();
+ }
+ if (this.logFileInfo == null) {
+ // This means SIGAR, which we require, is unavailable, so just return null.
+ return null;
+ }
+
if (!this.logFile.exists()) {
- log.warn("Log file [" + this.logFile + "' being polled does not exist.");
+ log.warn("Log file [" + this.logFile + "] being polled does not exist.");
return null;
}
if (this.logFile.isDirectory()) {
- log.error("Log file [" + this.logFile + "' being polled is a directory, not a regular file.");
+ log.error("Log file [" + this.logFile + "] being polled is a directory, not a regular file.");
return null;
}
- FileInfo fileInfo;
- try {
- fileInfo = getFileInfo();
- if (!fileInfo.changed()) {
+
+ try {
+ if (!this.logFileInfo.changed()) {
return null;
}
} catch (SigarException e) {
throw new RuntimeException(e);
}
- return processNewLines(fileInfo);
+ return processNewLines(this.logFileInfo);
+ }
+
+ /**
+ * This performs any initialization that requires using the EventContext. It must *not* be called from our
+ * constructor, because pollers are constructed during PC initialization, and at that time the PC EventManager,
+ * which the EventContext relies on, is not yet available. Instead it is called from {@link #poll()} on the first
+ * invocation of that method, at which point the PC will be initialized.
+ */
+ protected void init() {
+ SigarProxy sigar = this.eventContext.getSigar();
+ if (sigar != null) {
+ try {
+ this.logFileInfo = new LogFileInfo(sigar.getFileInfo(logFile.getPath()));
+ } catch (SigarException e) {
+ throw new RuntimeException("Failed to obtain file info for log file [" + this.logFile + "].", e);
+ }
+ } else {
+ log.warn("SIGAR is unavailable - cannot poll log file [" + this.logFile + "] for events.");
+ }
+
+ this.initialized = true;
}
private Set<Event> processNewLines(FileInfo fileInfo) {
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java
index 962764a..d134638 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,9 @@ package org.rhq.core.pluginapi.event.log;
import java.io.File;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -32,10 +35,12 @@ import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.event.EventSeverity;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.event.EventContext;
import org.rhq.core.pluginapi.event.EventPoller;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.system.SystemInfoFactory;
/**
* @author Ian Springer
@@ -47,83 +52,132 @@ public class LogFileEventResourceComponentHelper {
public static final String LOG_EVENT_SOURCE_CONFIG_PROP = "logEventSource";
public abstract static class LogEventSourcePropertyNames {
- public static final String LOG_FILE_PATH = "logFilePath";
- public static final String ENABLED = "enabled";
- public static final String DATE_FORMAT = "dateFormat";
- public static final String INCLUDES_PATTERN = "includesPattern";
- public static final String MINIMUM_SEVERITY = "minimumSeverity";
+ public static final String LOG_FILE_PATH = "logFilePath"; // required
+ public static final String ENABLED = "enabled"; // required
+ public static final String DATE_FORMAT = "dateFormat"; // optional
+ public static final String INCLUDES_PATTERN = "includesPattern"; // optional
+ public static final String MINIMUM_SEVERITY = "minimumSeverity"; // optional
}
+ // TODO: Make this configurable via a plugin config prop.
+ private static final int POLLING_INTERVAL_IN_SECONDS = 60;
+
private final Log log = LogFactory.getLog(this.getClass());
private ResourceContext<?> resourceContext;
+ private List<PropertyMap> startedEventSources = new ArrayList<PropertyMap>();
public LogFileEventResourceComponentHelper(ResourceContext<?> resourceContext) {
this.resourceContext = resourceContext;
}
public void startLogFileEventPollers() {
+ // Grab the list-o-maps of event sources from the plugin config.
Configuration pluginConfig = this.resourceContext.getPluginConfiguration();
PropertyList logEventSources = pluginConfig.getList(LOG_EVENT_SOURCES_CONFIG_PROP);
+
+ // Build a new list containing the event sources that are enabled.
+ List<PropertyMap> enabledEventSources = new ArrayList<PropertyMap>();
for (Property prop : logEventSources.getList()) {
PropertyMap logEventSource = (PropertyMap) prop;
- Boolean enabled = Boolean.valueOf(logEventSource.getSimpleValue(LogEventSourcePropertyNames.ENABLED, null));
- if (enabled) {
- String logFilePathname = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
- if (logFilePathname == null) {
- log.info("LOGFILE: No logfile path given, can not watch this event log.");
- return;
- }
- File logFile = new File(logFilePathname);
- if (!logFile.exists() || !logFile.canRead()) {
- log.error("LOGFILE: Logfile at location " + logFilePathname
- + " does not exist or is not readable. Can not start watching the event log.");
- return;
- }
+ String enabled = logEventSource.getSimpleValue(LogEventSourcePropertyNames.ENABLED, null);
+ if (enabled == null) {
+ throw new IllegalStateException("Required property [" + LogEventSourcePropertyNames.ENABLED
+ + "] is not defined in map.");
+ }
+ if (Boolean.valueOf(enabled)) {
+ enabledEventSources.add(logEventSource);
+ }
+ }
- Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(LOG_ENTRY_EVENT_TYPE, logFile);
- String dateFormatString = logEventSource.getSimpleValue(LogEventSourcePropertyNames.DATE_FORMAT, null);
- if (dateFormatString != null) {
- try {
- DateFormat dateFormat = new SimpleDateFormat(dateFormatString); // TODO locale specific ?
- processor.setDateFormat(dateFormat);
- } catch (IllegalArgumentException e) {
- throw new InvalidPluginConfigurationException("Date format [" + dateFormatString
- + "] is not a valid simple date format.");
- }
- }
- String includesPatternString = logEventSource.getSimpleValue(
- LogEventSourcePropertyNames.INCLUDES_PATTERN, null);
- if (includesPatternString != null) {
- try {
- Pattern includesPattern = Pattern.compile(includesPatternString);
- processor.setIncludesPattern(includesPattern);
- } catch (PatternSyntaxException e) {
- throw new InvalidPluginConfigurationException("Includes pattern [" + includesPatternString
- + "] is not a valid regular expression.");
- }
+ // Log a warning then return if SIGAR isn't available, since LogFileEventPoller depends on it. We only log this
+ // warning if at least one event source is enabled, since otherwise the user probably doesn't care.
+ boolean sigarAvailable = this.resourceContext.getSystemInformation().isNative();
+ if (!sigarAvailable && !enabledEventSources.isEmpty()) {
+ boolean nativeSystemInfoDisabled = SystemInfoFactory.isNativeSystemInfoDisabled();
+ ResourceType resourceType = this.resourceContext.getResourceType();
+ List<String> logFilePaths = getLogFilePaths(enabledEventSources);
+ log.warn("Log files " + logFilePaths + " for [" + resourceType.getPlugin() + ":"
+ + resourceType.getName() + "] Resource with key [" + this.resourceContext.getResourceKey()
+ + "] cannot be polled, because log file polling requires RHQ native support, which "
+ + ((nativeSystemInfoDisabled) ? "has been disabled for this Agent" : "is not available on this platform") + ".");
+ return;
+ }
+
+ // Start up log file pollers for each of the enabled event sources.
+ for (PropertyMap logEventSource : enabledEventSources) {
+ String logFilePath = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
+ if (logFilePath == null) {
+ throw new IllegalStateException("Required property [" + LogEventSourcePropertyNames.LOG_FILE_PATH
+ + "] is not defined in map.");
+ }
+ File logFile = new File(logFilePath);
+ if (!logFile.canRead()) {
+ log.error("LOGFILE: Logfile at location " + logFilePath
+ + " does not exist or is not readable. Can not start watching the event log.");
+ continue;
+ }
+
+ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(LOG_ENTRY_EVENT_TYPE, logFile);
+ String dateFormatString = logEventSource.getSimpleValue(LogEventSourcePropertyNames.DATE_FORMAT, null);
+ if (dateFormatString != null) {
+ try {
+ DateFormat dateFormat = new SimpleDateFormat(dateFormatString); // TODO locale specific ?
+ processor.setDateFormat(dateFormat);
+ } catch (IllegalArgumentException e) {
+ throw new InvalidPluginConfigurationException("Date format [" + dateFormatString
+ + "] is not a valid simple date format.");
}
- String minimumSeverityString = logEventSource.getSimpleValue(
- LogEventSourcePropertyNames.MINIMUM_SEVERITY, null);
- if (minimumSeverityString != null) {
- EventSeverity minimumSeverity = EventSeverity.valueOf(minimumSeverityString.toUpperCase());
- processor.setMinimumSeverity(minimumSeverity);
+ }
+ String includesPatternString = logEventSource.getSimpleValue(
+ LogEventSourcePropertyNames.INCLUDES_PATTERN, null);
+ if (includesPatternString != null) {
+ try {
+ Pattern includesPattern = Pattern.compile(includesPatternString);
+ processor.setIncludesPattern(includesPattern);
+ } catch (PatternSyntaxException e) {
+ throw new InvalidPluginConfigurationException("Includes pattern [" + includesPatternString
+ + "] is not a valid regular expression.");
}
- EventContext eventContext = this.resourceContext.getEventContext();
- EventPoller poller = new LogFileEventPoller(eventContext, LOG_ENTRY_EVENT_TYPE, logFile, processor);
- eventContext.registerEventPoller(poller, 60, logFile.getPath());
}
+ String minimumSeverityString = logEventSource.getSimpleValue(
+ LogEventSourcePropertyNames.MINIMUM_SEVERITY, null);
+ if (minimumSeverityString != null) {
+ EventSeverity minimumSeverity = EventSeverity.valueOf(minimumSeverityString.toUpperCase());
+ processor.setMinimumSeverity(minimumSeverity);
+ }
+ EventContext eventContext = this.resourceContext.getEventContext();
+ EventPoller poller = new LogFileEventPoller(eventContext, LOG_ENTRY_EVENT_TYPE, logFile, processor);
+ eventContext.registerEventPoller(poller, POLLING_INTERVAL_IN_SECONDS, logFile.getPath());
+ this.startedEventSources.add(logEventSource);
}
}
public void stopLogFileEventPollers() {
- Configuration pluginConfig = this.resourceContext.getPluginConfiguration();
- PropertyList logEventSources = pluginConfig.getList(LOG_EVENT_SOURCES_CONFIG_PROP);
- for (Property prop : logEventSources.getList()) {
- PropertyMap logEventSource = (PropertyMap) prop;
- String logFilePath = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
+ boolean sigarAvailable = this.resourceContext.getSystemInformation().isNative();
+ if (!sigarAvailable) {
+ return;
+ }
+
+ for (Iterator<PropertyMap> iterator = this.startedEventSources.iterator(); iterator.hasNext(); ) {
+ PropertyMap logEventSource = iterator.next();
EventContext eventContext = this.resourceContext.getEventContext();
+ String logFilePath = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
eventContext.unregisterEventPoller(LOG_ENTRY_EVENT_TYPE, logFilePath);
+ iterator.remove();
+ }
+ }
+
+ private List<String> getLogFilePaths(List<PropertyMap> enabledEventSources) {
+ List<String> logFilePaths = new ArrayList<String>(enabledEventSources.size());
+ for (PropertyMap logEventSource : enabledEventSources) {
+ String logFilePath = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
+ if (logFilePath == null) {
+ throw new IllegalStateException("Required property [" + LogEventSourcePropertyNames.LOG_FILE_PATH
+ + "] is not defined in map.");
+ }
+ logFilePaths.add(logFilePath);
}
+ return logFilePaths;
}
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java
index b0b37ec..1735aff 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java
@@ -24,6 +24,7 @@ package org.rhq.core.pc.event;
import org.hyperic.sigar.SigarProxy;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.rhq.core.domain.event.Event;
import org.rhq.core.domain.event.EventDefinition;
import org.rhq.core.domain.resource.Resource;
@@ -99,7 +100,7 @@ public class EventContextImpl implements EventContext {
unregisterEventPollerInternal(eventType, sourceLocation);
}
- @NotNull
+ @Nullable
public SigarProxy getSigar() {
return getEventManager().getSigar();
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java
index 4ad5c50..87b9bd7 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java
@@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory;
import org.hyperic.sigar.SigarProxy;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.rhq.core.domain.event.Event;
import org.rhq.core.domain.event.EventDefinition;
import org.rhq.core.domain.event.EventSource;
@@ -44,6 +45,7 @@ import org.rhq.core.pc.PluginContainerConfiguration;
import org.rhq.core.pc.util.LoggingThreadFactory;
import org.rhq.core.pluginapi.event.EventPoller;
import org.rhq.core.system.SigarAccess;
+import org.rhq.core.system.SystemInfoException;
/**
* Manager for the Plugin Container's Event subsystem.
@@ -113,9 +115,12 @@ public class EventManager implements ContainerService {
}
}
+ @Nullable
SigarProxy getSigar() {
if (this.sigar == null) {
- this.sigar = SigarAccess.getSigar();
+ if (SigarAccess.isSigarAvailable()) {
+ this.sigar = SigarAccess.getSigar();
+ }
}
return this.sigar;
}
commit 47aff4689a8275d18382a8f0f93d7144cc8f0795
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 31 16:55:49 2012 +0100
Fix compile error
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 6205576..382a145 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -173,7 +173,7 @@ public class ASConnection {
Result failure = new Result();
failure.setFailureDescription(ste.getMessage());
failure.setOutcome("failure");
-// failure.setThrowable(ste); TODO
+ failure.setRhqThrowable(ste);
JsonNode ret = mapper.valueToTree(failure);
return ret;
@@ -201,7 +201,7 @@ public class ASConnection {
Result failure = new Result();
failure.setFailureDescription(e.getMessage());
failure.setOutcome("failure");
-// failure.setThrowable(e); TODO
+ failure.setRhqThrowable(e);
JsonNode ret = mapper.valueToTree(failure);
return ret;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 60f819f..8078e15 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -162,7 +162,7 @@ public class BaseServerComponent extends BaseComponent {
* reading, this is a good sign.
*/
if (!res.isSuccess()) {
- if (res.getThrowable()!=null && (res.getThrowable() instanceof ConnectException || res.getThrowable().getMessage().equals("Connection refused"))) {
+ if (res.getRhqThrowable()!=null && (res.getRhqThrowable() instanceof ConnectException || res.getRhqThrowable().getMessage().equals("Connection refused"))) {
operationResult.setSimpleResult("Success");
log.debug("Got a ConnectionRefused for operation " + name + " this is considered ok, as the remote server sometimes closes the communications channel before sending a reply");
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
index abf40fa..c87b899 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -173,6 +173,9 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet
Operation op = new ReadChildrenResources(address1,"deployment");
ComplexResult cres = getASConnection().executeComplex(op);
+ if (cres==null)
+ return details;
+
if (!cres.isSuccess())
return details;
@@ -181,19 +184,22 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet
Map<String,Object> deployment = (Map<String, Object>) deployments.get(key);
log.info("Discover package [" + key + "] for type [" + type + "]");
- List<Map> contentList = (List<Map>) deployment.get("content"); // deployments on SG or ManagedServer level have no hash
- Map<String,Map> hashMap = contentList.get(0);
- Map<String,String> bvMap = hashMap.get("hash");
- String content = bvMap.get("BYTES_VALUE");
- PackageDetailsKey pdKey = new PackageDetailsKey(key,
- content, // no way to obtain the user defined version from the server
- type.getName(),
- "noarch"
- );
- ResourcePackageDetails detail = new ResourcePackageDetails(pdKey);
- detail.setSHA256(content);
-
- details.add(detail);
+ List<Map> contentList = (List<Map>) deployment.get("content"); // TODO deployments on SG or ManagedServer level have no hash
+ if (contentList!=null) {
+
+ Map<String,Map> hashMap = contentList.get(0);
+ Map<String,String> bvMap = hashMap.get("hash");
+ String content = bvMap.get("BYTES_VALUE");
+ PackageDetailsKey pdKey = new PackageDetailsKey(key,
+ content, // no way to obtain the user defined version from the server
+ type.getName(),
+ "noarch"
+ );
+ ResourcePackageDetails detail = new ResourcePackageDetails(pdKey);
+ detail.setSHA256(content);
+
+ details.add(detail);
+ }
}
return details;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
index f21e598..b46b108 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
@@ -117,7 +117,7 @@ public class HostControllerComponent extends BaseServerComponent implements Oper
else {
report.setErrorMessage(res.getFailureDescription());
report.setStatus(CreateResourceStatus.FAILURE);
- report.setException(res.getThrowable());
+ report.setException(res.getRhqThrowable());
}
return report;
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
index 8f6cfa0..1c68eca 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
@@ -40,6 +40,8 @@ public class Result {
private boolean success = false;
@JsonProperty("rolled-back")
private boolean rolledBack = false;
+ @JsonIgnore
+ private Throwable rhqThrowable;
/** Record throwsables during low level processing */
@JsonIgnore
@@ -106,6 +108,13 @@ public class Result {
this.throwable = throwable;
}
+ public Throwable getRhqThrowable() {
+ return rhqThrowable;
+ }
+
+ public void setRhqThrowable(Throwable rhqThrowable) {
+ this.rhqThrowable = rhqThrowable;
+ }
@Override
public String toString() {
commit 02dafbc97a76c3813afd0f05b213d8a1de70a3c2
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 31 14:35:07 2012 +0100
[BZ 786106] Wrap calls to obtain managers in privileged blocks so that 3rd
callers can safely obtain them.
The StandardBindings put all the managers into the script context before
the script engine is initialized with the security measures which makes
the managers available inside the scripts. Java code that gets injected as
other params into the scripts (like the "ProxyFactory" (of class
ResourceClientFactory) would suffer from access control exceptions when
it tried to obtain some manager while being called from the script because
it would try to call the methods from the LocalClient to obtain the remote
interfaces directly, without a wrapping in a privileged block). Obtaining
the remote interfaces is a safe operation wrt the scripts and so can be
wrapped in privileged block so that any caller of the LocalClient can
have access to the regardless of the access control restrictions in place.
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
index 025b60d..2414bf6 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
@@ -21,6 +21,9 @@ package org.rhq.enterprise.client;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
import java.util.HashMap;
import java.util.Map;
@@ -79,141 +82,335 @@ public class LocalClient implements RhqFacade {
this.subject = subject;
}
+ @Override
public Subject getSubject() {
return subject;
}
+ @Override
public Subject login(String user, String password) throws Exception {
return subject;
}
+ @Override
public void logout() {
}
+ @Override
public boolean isLoggedIn() {
return true;
}
+ @Override
public AlertManagerRemote getAlertManager() {
- return getProxy(LookupUtil.getAlertManager(), AlertManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<AlertManagerRemote>() {
+ @Override
+ public AlertManagerRemote run() {
+ return AccessController.doPrivileged(new PrivilegedAction<AlertManagerRemote>() {
+ @Override
+ public AlertManagerRemote run() {
+ return getProxy(LookupUtil.getAlertManager(), AlertManagerRemote.class);
+ }
+ });
+ }
+ });
}
+ @Override
public AlertDefinitionManagerRemote getAlertDefinitionManager() {
- return getProxy(LookupUtil.getAlertDefinitionManager(), AlertDefinitionManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<AlertDefinitionManagerRemote>() {
+ @Override
+ public AlertDefinitionManagerRemote run() {
+ return getProxy(LookupUtil.getAlertDefinitionManager(), AlertDefinitionManagerRemote.class);
+ }
+ });
}
+ @Override
public AvailabilityManagerRemote getAvailabilityManager() {
- return getProxy(LookupUtil.getAvailabilityManager(), AvailabilityManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<AvailabilityManagerRemote>() {
+ @Override
+ public AvailabilityManagerRemote run() {
+ return getProxy(LookupUtil.getAvailabilityManager(), AvailabilityManagerRemote.class);
+ }
+ });
}
+ @Override
public BundleManagerRemote getBundleManager() {
- return getProxy(LookupUtil.getBundleManager(), BundleManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<BundleManagerRemote>() {
+ @Override
+ public BundleManagerRemote run() {
+ return AccessController.doPrivileged(new PrivilegedAction<BundleManagerRemote>() {
+ @Override
+ public BundleManagerRemote run() {
+ return getProxy(LookupUtil.getBundleManager(), BundleManagerRemote.class);
+ }
+ });
+ }
+ });
}
+ @Override
public CallTimeDataManagerRemote getCallTimeDataManager() {
- return getProxy(LookupUtil.getCallTimeDataManager(), CallTimeDataManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<CallTimeDataManagerRemote>() {
+ @Override
+ public CallTimeDataManagerRemote run() {
+ return getProxy(LookupUtil.getCallTimeDataManager(), CallTimeDataManagerRemote.class);
+ }
+ });
}
+ @Override
public RepoManagerRemote getRepoManager() {
- return getProxy(LookupUtil.getRepoManagerLocal(), RepoManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<RepoManagerRemote>() {
+ @Override
+ public RepoManagerRemote run() {
+ return getProxy(LookupUtil.getRepoManagerLocal(), RepoManagerRemote.class);
+ }
+ });
}
+ @Override
public ConfigurationManagerRemote getConfigurationManager() {
- return getProxy(LookupUtil.getConfigurationManager(), ConfigurationManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ConfigurationManagerRemote>() {
+ @Override
+ public ConfigurationManagerRemote run() {
+ return getProxy(LookupUtil.getConfigurationManager(), ConfigurationManagerRemote.class);
+ }
+ });
}
+ @Override
public ContentManagerRemote getContentManager() {
- return getProxy(LookupUtil.getContentManager(), ContentManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ContentManagerRemote>() {
+ @Override
+ public ContentManagerRemote run() {
+ return getProxy(LookupUtil.getContentManager(), ContentManagerRemote.class);
+ }
+ });
}
+ @Override
public DataAccessManagerRemote getDataAccessManager() {
- return getProxy(LookupUtil.getDataAccessManager(), DataAccessManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<DataAccessManagerRemote>() {
+ @Override
+ public DataAccessManagerRemote run() {
+ return getProxy(LookupUtil.getDataAccessManager(), DataAccessManagerRemote.class);
+ }
+ });
}
+ @Override
public DiscoveryBossRemote getDiscoveryBoss() {
- return getProxy(LookupUtil.getDiscoveryBoss(), DiscoveryBossRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<DiscoveryBossRemote>() {
+ @Override
+ public DiscoveryBossRemote run() {
+ return getProxy(LookupUtil.getDiscoveryBoss(), DiscoveryBossRemote.class);
+ }
+ });
}
+ @Override
public DriftManagerRemote getDriftManager() {
- return getProxy(LookupUtil.getDriftManager(), DriftManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<DriftManagerRemote>() {
+ @Override
+ public DriftManagerRemote run() {
+ return getProxy(LookupUtil.getDriftManager(), DriftManagerRemote.class);
+ }
+ });
}
public DriftTemplateManagerRemote getDriftTemplateManager() {
- return getProxy(LookupUtil.getDriftTemplateManager(), DriftTemplateManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<DriftTemplateManagerRemote>() {
+ @Override
+ public DriftTemplateManagerRemote run() {
+ return getProxy(LookupUtil.getDriftTemplateManager(), DriftTemplateManagerRemote.class);
+ }
+ });
}
+ @Override
public EventManagerRemote getEventManager() {
- return getProxy(LookupUtil.getEventManager(), EventManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<EventManagerRemote>() {
+ @Override
+ public EventManagerRemote run() {
+ return getProxy(LookupUtil.getEventManager(), EventManagerRemote.class);
+ }
+ });
}
+ @Override
public MeasurementBaselineManagerRemote getMeasurementBaselineManager() {
- return getProxy(LookupUtil.getMeasurementBaselineManager(), MeasurementBaselineManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<MeasurementBaselineManagerRemote>() {
+ @Override
+ public MeasurementBaselineManagerRemote run() {
+ return getProxy(LookupUtil.getMeasurementBaselineManager(), MeasurementBaselineManagerRemote.class);
+ }
+ });
}
+ @Override
public MeasurementDataManagerRemote getMeasurementDataManager() {
- return getProxy(LookupUtil.getMeasurementDataManager(), MeasurementDataManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<MeasurementDataManagerRemote>() {
+ @Override
+ public MeasurementDataManagerRemote run() {
+ return getProxy(LookupUtil.getMeasurementDataManager(), MeasurementDataManagerRemote.class);
+ }
+ });
}
+ @Override
public MeasurementDefinitionManagerRemote getMeasurementDefinitionManager() {
- return getProxy(LookupUtil.getMeasurementDefinitionManager(), MeasurementDefinitionManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<MeasurementDefinitionManagerRemote>() {
+ @Override
+ public MeasurementDefinitionManagerRemote run() {
+ return getProxy(LookupUtil.getMeasurementDefinitionManager(), MeasurementDefinitionManagerRemote.class);
+ }
+ });
}
+ @Override
public MeasurementScheduleManagerRemote getMeasurementScheduleManager() {
- return getProxy(LookupUtil.getMeasurementScheduleManager(), MeasurementScheduleManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<MeasurementScheduleManagerRemote>() {
+ @Override
+ public MeasurementScheduleManagerRemote run() {
+ return getProxy(LookupUtil.getMeasurementScheduleManager(), MeasurementScheduleManagerRemote.class);
+ }
+ });
}
+ @Override
public OperationManagerRemote getOperationManager() {
- return getProxy(LookupUtil.getOperationManager(), OperationManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<OperationManagerRemote>() {
+ @Override
+ public OperationManagerRemote run() {
+ return getProxy(LookupUtil.getOperationManager(), OperationManagerRemote.class);
+ }
+ });
}
+ @Override
public ResourceManagerRemote getResourceManager() {
- return getProxy(LookupUtil.getResourceManager(), ResourceManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ResourceManagerRemote>() {
+ @Override
+ public ResourceManagerRemote run() {
+ return getProxy(LookupUtil.getResourceManager(), ResourceManagerRemote.class);
+ }
+ });
}
+ @Override
public ResourceFactoryManagerRemote getResourceFactoryManager() {
- return getProxy(LookupUtil.getResourceFactoryManager(), ResourceFactoryManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ResourceFactoryManagerRemote>() {
+ @Override
+ public ResourceFactoryManagerRemote run() {
+ return getProxy(LookupUtil.getResourceFactoryManager(), ResourceFactoryManagerRemote.class);
+ }
+ });
}
+ @Override
public ResourceGroupManagerRemote getResourceGroupManager() {
- return getProxy(LookupUtil.getResourceGroupManager(), ResourceGroupManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ResourceGroupManagerRemote>() {
+ @Override
+ public ResourceGroupManagerRemote run() {
+ return getProxy(LookupUtil.getResourceGroupManager(), ResourceGroupManagerRemote.class);
+ }
+ });
}
+ @Override
public ResourceTypeManagerRemote getResourceTypeManager() {
- return getProxy(LookupUtil.getResourceTypeManager(), ResourceTypeManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ResourceTypeManagerRemote>() {
+ @Override
+ public ResourceTypeManagerRemote run() {
+ return getProxy(LookupUtil.getResourceTypeManager(), ResourceTypeManagerRemote.class);
+ }
+ });
}
+ @Override
public RoleManagerRemote getRoleManager() {
- return getProxy(LookupUtil.getRoleManager(), RoleManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<RoleManagerRemote>() {
+ @Override
+ public RoleManagerRemote run() {
+ return getProxy(LookupUtil.getRoleManager(), RoleManagerRemote.class);
+ }
+ });
}
+ @Override
public SavedSearchManagerRemote getSavedSearchManager() {
- return getProxy(LookupUtil.getSavedSearchManager(), SavedSearchManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SavedSearchManagerRemote>() {
+ @Override
+ public SavedSearchManagerRemote run() {
+ return getProxy(LookupUtil.getSavedSearchManager(), SavedSearchManagerRemote.class);
+ }
+ });
}
+ @Override
public SubjectManagerRemote getSubjectManager() {
- return getProxy(LookupUtil.getSubjectManager(), SubjectManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SubjectManagerRemote>() {
+ @Override
+ public SubjectManagerRemote run() {
+ return getProxy(LookupUtil.getSubjectManager(), SubjectManagerRemote.class);
+ }
+ });
}
+ @Override
public SupportManagerRemote getSupportManager() {
- return getProxy(LookupUtil.getSupportManager(), SupportManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SupportManagerRemote>() {
+ @Override
+ public SupportManagerRemote run() {
+ return getProxy(LookupUtil.getSupportManager(), SupportManagerRemote.class);
+ }
+ });
}
+ @Override
public SystemManagerRemote getSystemManager() {
- return getProxy(LookupUtil.getSystemManager(), SystemManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SystemManagerRemote>() {
+ @Override
+ public SystemManagerRemote run() {
+ return getProxy(LookupUtil.getSystemManager(), SystemManagerRemote.class);
+ }
+ });
}
+ @Override
public RemoteInstallManagerRemote getRemoteInstallManager() {
- return getProxy(LookupUtil.getRemoteInstallManager(), RemoteInstallManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<RemoteInstallManagerRemote>() {
+ @Override
+ public RemoteInstallManagerRemote run() {
+ return getProxy(LookupUtil.getRemoteInstallManager(), RemoteInstallManagerRemote.class);
+ }
+ });
}
+ @Override
public TagManagerRemote getTagManager() {
- return getProxy(LookupUtil.getTagManager(), TagManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<TagManagerRemote>() {
+ @Override
+ public TagManagerRemote run() {
+ return getProxy(LookupUtil.getTagManager(), TagManagerRemote.class);
+ }
+ });
}
+ @Override
public SynchronizationManagerRemote getSynchronizationManager() {
- return getProxy(LookupUtil.getSynchronizationManager(), SynchronizationManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SynchronizationManagerRemote>() {
+ @Override
+ public SynchronizationManagerRemote run() {
+ return getProxy(LookupUtil.getSynchronizationManager(), SynchronizationManagerRemote.class);
+ }
+ });
}
-
+
+ @Override
public Map<String, Object> getManagers() {
if (managers == null) {
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
index de0d912..f6772e5 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
@@ -21,7 +21,6 @@ package org.rhq.enterprise.client.security.test;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.SerializablePermission;
import java.security.PermissionCollection;
import java.util.Collections;
@@ -31,7 +30,6 @@ import javax.script.ScriptException;
import org.testng.Assert;
import org.testng.annotations.Test;
-import org.rhq.bindings.SandboxedScriptEngine;
import org.rhq.bindings.ScriptEngineFactory;
import org.rhq.bindings.StandardBindings;
import org.rhq.bindings.StandardScriptPermissions;
@@ -179,6 +177,21 @@ public class JndiAccessTest extends AbstractEJB3Test {
}
}
+ @Test
+ public void testProxyFactoryWorksWithSecuredScriptEngine() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval("var resource = ProxyFactory.getResource(10001);");
+ } catch (ScriptException e) {
+ //if the script fails (there is no resource with ID 10001)
+ //it should not be because of an access control exception
+ checkIsNotASecurityException(e);
+ }
+ }
+
private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
@@ -193,4 +206,11 @@ public class JndiAccessTest extends AbstractEJB3Test {
Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
}
+
+ private static void checkIsNotASecurityException(ScriptException e) {
+ String message = e.getMessage();
+ String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
+
+ Assert.assertFalse(message.contains(permissionTrace), "The script exception does seem to be caused by the AllowRhqServerInternalsAccessPermission security exception although it shouldn't. " + message);
+ }
}
commit fda3d0ac47f1eb68f6ef9d2d4f60df21262a1500
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 30 22:27:51 2012 +0100
Set timeouts for connecting and reading of data.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 9651be2..6205576 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -26,6 +26,7 @@ import java.io.OutputStream;
import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
import java.net.URL;
import org.apache.commons.logging.Log;
@@ -108,12 +109,17 @@ public class ASConnection {
conn.setRequestMethod("POST");
conn.addRequestProperty("Content-Type", "application/json");
conn.addRequestProperty("Accept","application/json");
+ conn.setConnectTimeout(10 * 1000); // 10s
+ conn.setReadTimeout(10 * 1000); // 10s
+
+ if (conn.getReadTimeout()!=10*1000)
+ log.warn("JRE uses a broken timeout mechanism - nothing we can do");
OutputStream out = conn.getOutputStream();
- String result = mapper.writeValueAsString(operation);
+ String json_to_send = mapper.writeValueAsString(operation);
if (verbose) {
- log.info("Json to send: " + result);
+ log.info("Json to send: " + json_to_send);
}
mapper.writeValue(out, operation);
@@ -158,6 +164,19 @@ public class ASConnection {
} else {
log.error("IS was null and code was " + responseCode);
}
+ } catch (IllegalArgumentException iae) {
+ log.error("Illegal argument " + iae);
+ log.error(" for input " + operation);
+ } catch (SocketTimeoutException ste) {
+ log.error("Request to AS timed out " + ste.getMessage());
+ conn.disconnect();
+ Result failure = new Result();
+ failure.setFailureDescription(ste.getMessage());
+ failure.setOutcome("failure");
+// failure.setThrowable(ste); TODO
+
+ JsonNode ret = mapper.valueToTree(failure);
+ return ret;
} catch (IOException e) {
log.error("Failed to get data: " + e.getMessage());
@@ -182,7 +201,7 @@ public class ASConnection {
Result failure = new Result();
failure.setFailureDescription(e.getMessage());
failure.setOutcome("failure");
- failure.setThrowable(e);
+// failure.setThrowable(e); TODO
JsonNode ret = mapper.valueToTree(failure);
return ret;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
index ff5aa94..90316a4 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
@@ -82,6 +82,8 @@ public class ASUploadConnection {
// Create the HTTP connection to the upload URL
String url = "http://" + host + ":" + port + UPLOAD_URL_PATH;
connection = (HttpURLConnection) new URL(url).openConnection();
+ connection.setConnectTimeout(10 * 1000); // 10s
+ connection.setReadTimeout(60 * 1000); // 60s
connection.setDoInput(true);
connection.setDoOutput(true);
connection.setRequestMethod(POST_REQUEST_METHOD);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
index 42ffee7..8f6cfa0 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
@@ -43,7 +43,7 @@ public class Result {
/** Record throwsables during low level processing */
@JsonIgnore
- private Throwable throwable;
+ private Map<String,Object> throwable;
public Object getResponseHeaders() {
return responseHeaders;
@@ -98,11 +98,11 @@ public class Result {
this.rolledBack = rolledBack;
}
- public Throwable getThrowable() {
+ public Map<String, Object> getThrowable() {
return throwable;
}
- public void setThrowable(Throwable throwable) {
+ public void setThrowable(Map<String,Object> throwable) {
this.throwable = throwable;
}
commit 8e4ea4f7a28dd0f877e909941615136af85d1b4b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Jan 30 10:18:16 2012 -0500
[BZ 703557] eclipse has to be told where tools.jar is in order to build the jmx plugin
diff --git a/.classpath b/.classpath
index 9eaf31b..e20fe75 100644
--- a/.classpath
+++ b/.classpath
@@ -124,7 +124,8 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.2.1.GA/resteasy-jaxrs-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jettison-provider/2.2.1.GA/resteasy-jettison-provider-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/2.2.1.GA/jaxrs-api-2.2.1.GA.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar"/>
+ <classpathentry exported="true" kind="var" path="JDK_HOME/lib/tools.jar"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/itests/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/drift-mongodb/src/main/java"/>
commit 4073cfff186308efce9da4566b749c1076e91f7f
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 30 16:01:03 2012 +0100
BZ 758655 - more fixes.
BZ 767629 - filter, only allow .jar for jdbc drivers.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 60550be..980d9e9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -25,6 +25,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.ejb.EJB;
import javax.ejb.Stateless;
@@ -2511,6 +2513,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
PropertyOptionsSource pos = pds.getOptionsSource();
PropertyOptionsSource.TargetType tt = pos.getTargetType();
String expression = pos.getExpression();
+ String filter = pos.getFilter();
+ Pattern filterPattern = null;
+ if (filter!=null)
+ filterPattern = Pattern.compile(filter);
+
if (tt == PropertyOptionsSource.TargetType.RESOURCE || tt == PropertyOptionsSource.TargetType.CONFIGURATION) {
ResourceCriteria criteria = new ResourceCriteria();
@@ -2533,10 +2540,21 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if (tt == PropertyOptionsSource.TargetType.RESOURCE) {
- PropertyDefinitionEnumeration pde = new PropertyDefinitionEnumeration(composite.getResource()
- .getName(), "" + composite.getResource().getName());
- // TODO filter -- or leave up to search expression??
- pds.getEnumeratedValues().add(pde);
+ String name = composite.getResource().getName();
+ // filter if the user provided a filter
+
+ if (filterPattern !=null ) {
+ Matcher m = filterPattern.matcher(name);
+ if (m.matches()) {
+ PropertyDefinitionEnumeration pde = new PropertyDefinitionEnumeration(name, "" + name);
+ pds.getEnumeratedValues().add(pde);
+ }
+ } else { // Filter is null -> none provided -> do not filter
+ PropertyDefinitionEnumeration pde = new PropertyDefinitionEnumeration(name, "" + name);
+ pds.getEnumeratedValues().add(pde);
+
+ }
+
} else if (tt == PropertyOptionsSource.TargetType.CONFIGURATION) {
// for configuration we need to drill down into the resource configuration
if (!handleConfigurationTarget(pds, expression, composite.getResource()))
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
index 4a7c4cc..68c0bce 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
@@ -69,7 +69,7 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
addRequiredToOp(op,parameters,"jndi-name");
addOptionalToOp(op,parameters,"user-name");
addOptionalToOp(op,parameters,"password");
- addRequiredToOp(op,parameters,"xa-data-source-class");
+ addRequiredToOp(op,parameters,"xa-datasource-class");
Map<String,Object> props = new HashMap<String, Object>(); // TODO
op.addAdditionalProperty("xa-data-source-properties",props);
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 3f29cce..3ef70c9 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1017,7 +1017,7 @@
<parameters>
<c:simple-property name="name" required="true" description="Name of the datasource"/>
<c:simple-property name="driver-name" required="true">
- <c:option-source target="resource" expression="type=^Deployment$" filter="sameHierarchy"/>
+ <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/>
</c:simple-property>
<c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/>
<c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/>
@@ -1033,11 +1033,10 @@
<parameters>
<c:simple-property name="name" required="true" description="Name of the datasource"/>
<c:simple-property name="driver-name" required="true">
- <c:option-source target="resource" expression="type=^Deployment$"/>
+ <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/>
</c:simple-property>
- <c:simple-property name="xa-data-source-class" required="true" description="xa-data-source-class"/>
+ <c:simple-property name="xa-datasource-class" required="true" description="xa-datasource-class"/>
<c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/>
- <!--<c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/>-->
<c:simple-property name="user-name" description="User name for DB-connections" required="false" />
<c:simple-property name="password" description="Password" type="password" required="false"/>
<c:list-property name="xa-properties" displayName="XA Properties" description="Additional XA Properties" required="false">
@@ -1128,8 +1127,6 @@
description="Defines the JDBC driver the datasource should use with this format: driver-name>#major-version.minor-version where driver-name is the fully qualifed name of the JDBC driver class"/>
<c:simple-property name="new-connection-sql" type="string" readOnly="true" required="false"
description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/>
- <c:simple-property name="pool-name" type="string" readOnly="true"
- description="Specifies the pool name for the datasource used for management"/>
<c:simple-property name="url-delimiter" type="string" readOnly="true"
description="Specifies the delimeter for URLs in connection-url for HA datasources" required="false"/>
<c:simple-property name="url-selector-strategy-class-name" type="string" readOnly="true"
@@ -1273,11 +1270,10 @@
<metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/>
<resource-configuration>
- <c:simple-property name="xa-data-source-class" required="true" type="string" readOnly="true" description="The fully qualifed name of the javax.sql.XADataSource implementation"/>
+ <c:simple-property name="xa-datasource-class" required="true" type="string" readOnly="true" description="The fully qualifed name of the javax.sql.XADataSource implementation"/>
<c:simple-property name="jndi-name" required="true" type="string" readOnly="true" description="Specifies the JNDI name for the datasource"/>
<c:simple-property name="driver-name" required="true" type="string" readOnly="true" description="Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit"/>
<c:simple-property name="new-connection-sql" required="false" type="string" readOnly="true" description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/>
- <c:simple-property name="pool-name" required="false" type="string" readOnly="true" description="Specifies the pool name for the datasource used for management"/>
<c:simple-property name="url-delimiter" required="false" type="string" readOnly="true" description="Specifies the delimeter for URLs in connection-url for HA datasources"/>
<c:simple-property name="url-selector-strategy-class-name" required="false" type="string" readOnly="true" description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy"/>
<c:simple-property name="use-java-context" required="false" type="boolean" readOnly="true" description="Setting this to false will bind the DataSource into global JNDI;"/>
@@ -1286,7 +1282,7 @@
<c:simple-property name="min-pool-size" required="false" type="integer" readOnly="false" description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/>
<c:simple-property name="pool-prefill" required="false" type="boolean" readOnly="false" description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/>
<c:simple-property name="pool-use-strict-min" required="false" type="boolean" readOnly="false" description="Define if the min-pool-size should be considered a strictly."/>
- <c:simple-property name="interliving" required="false" type="boolean" readOnly="true" description="An element to enable interleaving for XA connection factories"/>
+ <c:simple-property name="interleaving" required="false" type="boolean" readOnly="true" description="An element to enable interleaving for XA connection factories"/>
<c:simple-property name="no-tx-separate-pool" required="false" type="boolean" readOnly="true" description="Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different context"/>
<c:simple-property name="pad-xid" required="false" type="boolean" readOnly="true" description="Should the Xid be padded"/>
<c:simple-property name="same-rm-override" required="false" type="boolean" readOnly="true" description="The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false"/>
commit a8622b6e11a76be7558ef8561f475e827ff2a80c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 30 13:57:15 2012 +0100
BZ 758655 - remove no longer needed attributes, as they were removed in AS7
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
index 1a44230..4a7c4cc 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
@@ -55,7 +55,6 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
op = new Operation("add",theAddress);
addRequiredToOp(op,parameters,"driver-name");
addRequiredToOp(op,parameters,"jndi-name");
- addRequiredToOp(op, parameters, "pool-name");
addRequiredToOp(op, parameters, "connection-url");
addOptionalToOp(op, parameters, "user-name");
addOptionalToOp(op,parameters,"password");
@@ -68,14 +67,11 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
op = new Operation("add",theAddress);
addRequiredToOp(op,parameters,"driver-name");
addRequiredToOp(op,parameters,"jndi-name");
- addRequiredToOp(op,parameters,"pool-name");
- addRequiredToOp(op,parameters,"connection-url");
addOptionalToOp(op,parameters,"user-name");
addOptionalToOp(op,parameters,"password");
addRequiredToOp(op,parameters,"xa-data-source-class");
Map<String,Object> props = new HashMap<String, Object>(); // TODO
- props.put("_foo","_bar"); // TODO AS7-1209
op.addAdditionalProperty("xa-data-source-properties",props);
}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 2e6aba3..3f29cce 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1021,7 +1021,6 @@
</c:simple-property>
<c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/>
<c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/>
- <c:simple-property name="pool-name" description="Name of the pool" required="true"/>
<c:simple-property name="user-name" description="User name for DB-connections" required="false" />
<c:simple-property name="password" description="Password" type="password" required="false"/>
</parameters>
@@ -1038,8 +1037,7 @@
</c:simple-property>
<c:simple-property name="xa-data-source-class" required="true" description="xa-data-source-class"/>
<c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/>
- <c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/>
- <c:simple-property name="pool-name" description="Name of the pool" required="true"/>
+ <!--<c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/>-->
<c:simple-property name="user-name" description="User name for DB-connections" required="false" />
<c:simple-property name="password" description="Password" type="password" required="false"/>
<c:list-property name="xa-properties" displayName="XA Properties" description="Additional XA Properties" required="false">
commit 04f7e30401feb9cc210e075779792db1c08e02b6
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 30 12:05:16 2012 +0100
Small comment fix.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
index b5cf9e8..1badea3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
@@ -438,7 +438,7 @@ public class SystemSettingsView extends LocatableVLayout implements PropertyValu
pd.setDescription(MSG.view_admin_systemSettings_BaselineDataSet_desc());
pd.setDisplayName(MSG.view_admin_systemSettings_BaselineDataSet_name());
pd.setPropertyGroupDefinition(baselineGroup);
- pd.addConstraints(new IntegerRangeConstraint(Long.valueOf(1), Long.valueOf(14))); // can't do more than 14 days since our raw tables don't hold more
+ pd.addConstraints(new IntegerRangeConstraint(Long.valueOf(1), Long.valueOf(14))); // can't do more than 14 days since our 1h table doesn't hold more
pd.setDefaultValue("7");
break;
commit 1bdc6262cd500351b67d5685562f3e54ab03e2ff
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 30 11:35:36 2012 +0100
Add a note about the max. allowed value.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index e96c012..8de2555 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -507,7 +507,7 @@ view_admin_downloads_bundle_link_label = Link
view_admin_downloads_bundle_link_value = Download Bundle Deployer {0}
view_admin_downloads_bundle_loadError = Cannot get bundle deployer info
view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download
-view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition.
+view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition.
view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download
view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download
view_admin_downloads_cliDownload = Command Line Client Download
@@ -587,7 +587,7 @@ view_admin_systemSettings_BaseURL_desc = A URL to the server GUI, used mainly wi
view_admin_systemSettings_BaseURL_name = GUI Console URL
view_admin_systemSettings_BaselineDataSet_desc = The amount of past measurement data that is used to determine a baseline. This is specified in days.
view_admin_systemSettings_BaselineDataSet_name = Baseline Dataset
-view_admin_systemSettings_BaselineFrequency_desc = The frequency which the auto-calculation of baselines will be performed. If 0, baseline auto-calculation is disabled. This is specified in days.
+view_admin_systemSettings_BaselineFrequency_desc = The frequency which the auto-calculation of baselines will be performed. If 0, baseline auto-calculation is disabled. This is specified in days. Maximum value is 'Baseline Dataset'.
view_admin_systemSettings_BaselineFrequency_name = Baseline Calculation Frequency
view_admin_systemSettings_DataMaintenance_desc = How often database maintenance is performed (for example, vacuuming if using Postgres). This is specified in hours.
view_admin_systemSettings_DataMaintenance_name = Database Maintenance Period
commit 657f2f242c2193173b8e68b6cdb34f04f2057d43
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 27 16:56:27 2012 -0500
[BZ 785268] fix the case where you do a clean deploy but a file was edited (where the file content didn't change from bundle v1 to bundle v2)
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
index 40ce727..602df4c 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
@@ -422,9 +422,11 @@ public class Deployer {
// that a file is different from the deployment distribution.
// If the new is different from the original and if the new is different than the current, we need to backup the
// current because we will be overwriting the current file with the new.
+ // Note that if we were told to "clean", we never leave files alone (since everything must be cleaned) but
+ // we will backup the touched file that is being removed
String changedFileHashcode = changed.getValue();
String originalFileHashcode = original.get(changedFilePath);
- if (newHashcode.equals(originalFileHashcode)) {
+ if (newHashcode.equals(originalFileHashcode) && !clean) {
currentFilesToLeaveAlone.put(changedFilePath, originalFileHashcode);
} else if (!newHashcode.equals(changedFileHashcode)) {
currentFilesToBackup.add(changedFilePath);
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
index d8a355f..8a222a4 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
@@ -118,7 +118,11 @@ public class SimpleDeployerTest {
}
public void testX_Y_X() throws Exception {
- baseX_Y_X(false);
+ baseX_Y_X(false, false);
+ }
+
+ public void testX_Y_X_Clean() throws Exception {
+ baseX_Y_X(false, true);
}
public void testX_Y_Y() throws Exception {
@@ -174,7 +178,11 @@ public class SimpleDeployerTest {
}
public void testX_Y_X_DryRun() throws Exception {
- baseX_Y_X(true);
+ baseX_Y_X(true, false);
+ }
+
+ public void testX_Y_X_DryRun_Clean() throws Exception {
+ baseX_Y_X(true, true);
}
public void testX_Y_Y_DryRun() throws Exception {
@@ -414,7 +422,7 @@ public class SimpleDeployerTest {
}
}
- private void baseX_Y_X(boolean dryRun) throws Exception {
+ private void baseX_Y_X(boolean dryRun, boolean clean) throws Exception {
String newContent = "testX_Y_X";
String newHashcode = MessageDigestGenerator.getDigestString(newContent);
writeFile(newContent, this.currentFile);
@@ -423,11 +431,7 @@ public class SimpleDeployerTest {
null, null, true, null);
Deployer deployer = new Deployer(dd);
FileHashcodeMap newFileHashcodeMap;
- if (dryRun) {
- newFileHashcodeMap = deployer.dryRun(this.diff);
- } else {
- newFileHashcodeMap = deployer.deploy(this.diff);
- }
+ newFileHashcodeMap = deployer.deploy(this.diff, clean, dryRun);
// very important to understand this - even though the current file is changed, the hashcode
// stored in the map and the metadata directory is the ORIGINAL hashcode. This is to make it
@@ -439,17 +443,37 @@ public class SimpleDeployerTest {
assert newFileHashcodeMap.equals(this.originalFileHashcodeMap);
String[] contentHash = getOriginalFilenameContentHashcode();
- assert contentHash[0].equals(newContent);
- assert contentHash[1].equals(newHashcode);
+
+ // if we are cleaning, then the old content is blown away anyway and the original is replaced
+ // (but not if this is a dryRun - dryRun always means the changed/new content remains)
+ if (clean && !dryRun) {
+ assert contentHash[0].equals(originalContent);
+ assert contentHash[1].equals(originalHashcode);
+ } else {
+ assert contentHash[0].equals(newContent);
+ assert contentHash[1].equals(newHashcode);
+ }
// note nothing changed - our current file remains as is
assert this.diff.getAddedFiles().isEmpty() : this.diff;
assert this.diff.getDeletedFiles().isEmpty() : this.diff;
assert this.diff.getChangedFiles().isEmpty() : this.diff;
- assert this.diff.getBackedUpFiles().isEmpty() : this.diff;
+ if (clean) {
+ assert this.diff.getBackedUpFiles().size() == 1 : this.diff;
+ assert this.diff.getBackedUpFiles().containsKey(originalFileName) : this.diff;
+ File backupFile = new File(this.diff.getBackedUpFiles().get(originalFileName));
+ if (dryRun) {
+ assert !backupFile.exists() : "dry run should not create backup";
+ } else {
+ assert readFile(backupFile).equals(newContent) : "did not backup the correct file?";
+ }
+ } else {
+ assert this.diff.getBackedUpFiles().isEmpty() : this.diff;
+ }
assert this.diff.getIgnoredFiles().isEmpty() : this.diff;
assert this.diff.getRealizedFiles().isEmpty() : this.diff;
assert this.diff.getErrors().isEmpty() : this.diff;
+ assert this.diff.wasCleaned() == clean : this.diff;
if (dryRun) {
assert this.metadata.getCurrentDeploymentProperties().equals(originalDeployProps);
commit 2dc60e41f255d5b64b991be32eee560cd5887ed9
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 27 16:07:24 2012 -0500
[BZ 785270] add 4 new unit tests to make sure we handle the case when a new file was added but is not part of any bundle deployment (either in the original or new deployment)
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
index 2736f16..d8a355f 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
@@ -145,6 +145,14 @@ public class SimpleDeployerTest {
baseNoOriginalWithCurrentWithNew(false);
}
+ public void testNoOriginalWithCurrentNoNew() throws Exception {
+ baseNoOriginalWithCurrentNoNew(false, false);
+ }
+
+ public void testNoOriginalWithCurrentNoNew_Clean() throws Exception {
+ baseNoOriginalWithCurrentNoNew(false, true);
+ }
+
public void testNoCurrent() throws Exception {
baseNoCurrent(false);
}
@@ -193,6 +201,14 @@ public class SimpleDeployerTest {
baseNoOriginalWithCurrentWithNew(true);
}
+ public void testNoOriginalWithCurrentNoNew_DryRun() throws Exception {
+ baseNoOriginalWithCurrentNoNew(true, false);
+ }
+
+ public void testNoOriginalWithCurrentNoNew_DryRun_Clean() throws Exception {
+ baseNoOriginalWithCurrentNoNew(true, true);
+ }
+
public void testNoCurrent_DryRun() throws Exception {
baseNoCurrent(true);
}
@@ -683,6 +699,54 @@ public class SimpleDeployerTest {
}
}
+ /**
+ * This tests when there was no file in the bundle but some unknown file was added to the
+ * destination directory. When redeploying the same bundle, there is no original file,
+ * there is no new file, but there is a current file (which is unknown to the bundle).
+ * It should be removed and backed up.
+ */
+ private void baseNoOriginalWithCurrentNoNew(boolean dryRun, boolean clean) throws Exception {
+ String inTheWayFileName = "unknown.txt";
+ File inTheWayFile = new File(this.deployDir, inTheWayFileName);
+ String inTheWayContent = "this is a new file but shouldn't be here - its not part of the bundle";
+ writeFile(inTheWayContent, inTheWayFile);
+
+ DeploymentData dd = new DeploymentData(originalDeployProps, originalZipFiles, null, tmpDir, deployDir, null,
+ null, null, null, true, null);
+ Deployer deployer = new Deployer(dd);
+ FileHashcodeMap newFileHashcodeMap;
+ newFileHashcodeMap = deployer.deploy(this.diff, clean, dryRun);
+
+ assert newFileHashcodeMap.equals(this.originalFileHashcodeMap);
+ assert newFileHashcodeMap.size() == 1;
+ assert newFileHashcodeMap.get(originalFileName).equals(originalHashcode);
+ String[] contentHash = getOriginalFilenameContentHashcode();
+ assert contentHash[0].equals(originalContent);
+ assert contentHash[1].equals(originalHashcode);
+
+ assert this.diff.getAddedFiles().isEmpty() : this.diff;
+ assert this.diff.getDeletedFiles().size() == 1 : this.diff;
+ assert this.diff.getDeletedFiles().contains(inTheWayFileName) : this.diff;
+ assert this.diff.getChangedFiles().isEmpty() : this.diff;
+ assert this.diff.getBackedUpFiles().size() == 1 : this.diff;
+ assert this.diff.getBackedUpFiles().containsKey(inTheWayFileName) : this.diff;
+ assert this.diff.getIgnoredFiles().isEmpty() : this.diff;
+ assert this.diff.getRealizedFiles().isEmpty() : this.diff;
+ assert this.diff.getErrors().isEmpty() : this.diff;
+ assert this.diff.wasCleaned() == clean : this.diff;
+
+ assert this.metadata.getCurrentDeploymentProperties().equals(originalDeployProps);
+ assert this.metadata.getCurrentDeploymentFileHashcodes().equals(originalFileHashcodeMap);
+
+ // verify the backup copy
+ File backupFile = new File(this.diff.getBackedUpFiles().get(inTheWayFileName));
+ if (dryRun) {
+ assert !backupFile.exists() : "dry run should not create backup";
+ } else {
+ assert readFile(backupFile).equals(inTheWayContent) : "did not backup the correct file?";
+ }
+ }
+
private void baseNoCurrent(boolean dryRun) throws Exception {
assert this.currentFile.delete() : "Failed to delete the current file, cannot prepare the test";
commit 581bb4295d1a6bc3c991493a38f35ad9ef9073b7
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Jan 27 17:28:43 2012 +0100
Also allow to deploy to domain deployments.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
index 2e6163d..abf40fa 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -15,6 +15,7 @@ import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.PackageType;
import org.rhq.core.domain.content.transfer.ContentResponseResult;
+import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse;
import org.rhq.core.domain.content.transfer.DeployPackageStep;
import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
@@ -89,11 +90,13 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet
public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> packages,
ContentServices contentServices) {
+ log.info("Starting deployment..");
DeployPackagesResponse response = new DeployPackagesResponse();
if (packages.size()!=1) {
response.setOverallRequestResult(ContentResponseResult.FAILURE);
response.setOverallRequestErrorMessage("Can only deploy one package at a time");
+ log.warn("deployPackages can only deploy one package at a time");
}
ResourcePackageDetails detail = packages.iterator().next();
@@ -102,7 +105,7 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet
OutputStream out = uploadConnection.getOutputStream(detail.getFileName());
ResourceType resourceType = context.getResourceType();
- log.info("trying " + resourceType.getName() + ", " + detail.getKey() );
+ log.info("trying deployment of" + resourceType.getName() + ", key=" + detail.getKey() );
contentServices.downloadPackageBits(context.getContentContext(),
detail.getKey(), out, true);
@@ -128,11 +131,15 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet
try {
redeployOnServer(detail.getKey().getName(), hash);
response.setOverallRequestResult(ContentResponseResult.SUCCESS);
+ DeployIndividualPackageResponse packageResponse = new DeployIndividualPackageResponse(detail.getKey(), ContentResponseResult.SUCCESS);
+ response.addPackageResponse(packageResponse);
+
}
catch (Exception e) {
response.setOverallRequestResult(ContentResponseResult.FAILURE);
}
+ log.info(".. result is " + response);
return response;
}
@@ -172,8 +179,9 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet
Map<String,Object> deployments = cres.getResult();
for (String key : deployments.keySet()) {
Map<String,Object> deployment = (Map<String, Object>) deployments.get(key);
+ log.info("Discover package [" + key + "] for type [" + type + "]");
- List<Map> contentList = (List<Map>) deployment.get("content");
+ List<Map> contentList = (List<Map>) deployment.get("content"); // deployments on SG or ManagedServer level have no hash
Map<String,Map> hashMap = contentList.get(0);
Map<String,String> bvMap = hashMap.get("hash");
String content = bvMap.get("BYTES_VALUE");
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java
new file mode 100644
index 0000000..8db86c7
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java
@@ -0,0 +1,23 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadResource;
+import org.rhq.modules.plugins.jbossas7.json.Result;
+
+/**
+ * Handle domain deployments
+ * @author Heiko W. Rupp
+ */
+public class DomainDeploymentComponent extends DeploymentComponent{
+
+ @Override
+ public AvailabilityType getAvailability() {
+ // Domain deployments have no 'enabled' attribute
+
+ Operation op = new ReadResource(getAddress());
+ Result res = getASConnection().execute(op);
+
+ return (res!=null && res.isSuccess()) ? AvailabilityType.UP: AvailabilityType.DOWN;
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index fdebf0a..2e6aba3 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -284,7 +284,9 @@
<operation name="server:add" displayName="Create server" description="Add a new server to this host.">
<parameters>
<c:simple-property name="name" description="Name of this new server" required="true"/>
- <c:simple-property name="group" displayName="Server Group" description="Server group to put this sever in" default="" required="false"/>
+ <c:simple-property name="group" displayName="Server Group" description="Server group to put this sever in" default="" required="true">
+ <c:option-source target="resource" expression="type=ServerGroup"/>
+ </c:simple-property>
<c:simple-property name="auto-start" displayName="Autostart" description="Should this server start at boot?" type="boolean" default="false" required="true"/>
</parameters>
<results>
@@ -293,7 +295,7 @@
</operation>
<operation name="server:remove" displayName="Delete server" description="Deletes a server on this host.">
<parameters>
- <c:simple-property name="name" description="Name of this new server" required="true"/>
+ <c:simple-property name="name" description="Name of the server to be removed" required="true"/>
</parameters>
<results>
<c:simple-property name="operationResult" description="Outcome of the delete server operation"/>
@@ -366,7 +368,7 @@
</server>
<service name="DomainDeployment"
- class="BaseComponent"
+ class="DomainDeploymentComponent"
discovery="SubsystemDiscovery"
createDeletePolicy="both"
creationDataType="content">
@@ -2125,11 +2127,10 @@ working area for individual server instances</li></ul>"/>
createDeletePolicy="both"
creationDataType="content">
-
<runs-inside>
- <parent-resource-type name="ServerGroup" plugin="jboss-as-7"/>
+ <parent-resource-type name="ServerGroup" plugin="jboss-as-7"/> <!-- TODO -->
<parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
- <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
+ <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> <!-- TODO -->
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" default="deployment" readOnly="true"/>
commit d8bd66821bfa11f77ce7c539d9fa90a7c9daf102
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 27 10:02:49 2012 -0500
[BZ 784124] forgot to fix this test
diff --git a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
index 0240f72..bd2d35d 100644
--- a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
+++ b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
@@ -108,12 +108,13 @@ public class AntLauncherTest {
public void testInstall() throws Exception {
- if (skipNonRHLinux("testInstall")) return;
+ if (skipNonRHLinux("testInstall"))
+ return;
// We want to test a fresh install, so make sure the deploy dir doesn't pre-exist.
FileUtil.purge(DEPLOY_DIR, true);
- // but we do want to add an unrelated file to see that it remains untouched - the install just "goes around" it
+ // but we do want to add an unrelated file to see that it goes away - since we have manageRootDir=true
File unrelatedFile = writeFile("unrelated content", DEPLOY_DIR, "unrelated-file.txt");
AntLauncher ant = new AntLauncher();
@@ -157,7 +158,7 @@ public class AntLauncherTest {
assert new File(DEPLOY_DIR, "subdir/test.properties").exists() : "missing file";
assert new File(DEPLOY_DIR, "archived-bundle-file.txt").exists() : "missing archived bundle file";
assert new File(DEPLOY_DIR, "archived-subdir/archived-file-in-subdir.properties").exists() : "missing subdir archive file";
- assert unrelatedFile.exists() : "unrelated file was removed during the install";
+ assert !unrelatedFile.exists() : "unrelated file was not removed during the install";
assert readPropsFile(new File(DEPLOY_DIR, "subdir/test.properties")).getProperty("junk.listener.port").equals(
"10000");
assert readPropsFile(new File(DEPLOY_DIR, "archived-subdir/archived-file-in-subdir.properties")).getProperty(
@@ -165,7 +166,7 @@ public class AntLauncherTest {
}
private boolean skipNonRHLinux(String meth) {
- if (!System.getProperty("os.name").equals("Linux") || !REDHAT_RELEASE_FILE.exists()) {
+ if (!System.getProperty("os.name").equals("Linux") || !REDHAT_RELEASE_FILE.exists()) {
System.out.println("Skipping " + meth + "() as this only works on Red Hat Linux flavors");
return true;
}
@@ -175,10 +176,10 @@ public class AntLauncherTest {
@Test(dependsOnMethods = "testInstall")
public void testUpgrade() throws Exception {
- if (skipNonRHLinux("testUpgrade")) return;
+ if (skipNonRHLinux("testUpgrade"))
+ return;
- // We want to test an upgrade, so do *not* wipe out the deploy dir - our test method @dependsOnMethods testInstall
- // but we do want to add an unrelated file to see that it gets deleted as part of the upgrade
+ // add an unrelated file to see that it gets deleted as part of the upgrade
File unrelatedFile = writeFile("unrelated content", DEPLOY_DIR, "unrelated-file.txt");
AntLauncher ant = new AntLauncher();
@@ -231,14 +232,15 @@ public class AntLauncherTest {
public void testUpgradeNoManageRootDir() throws Exception {
- if (skipNonRHLinux("testInstall")) return;
+ if (skipNonRHLinux("testInstall"))
+ return;
// We want to test an upgrade, so do *not* wipe out the deploy dir - let's re-invoke testInstall
// to get us to an initial state of the v1 bundle installed
testInstall();
// we still want the unrelated file - we want to see that manageRootDir=false works (unrelated files should not be deleted)
- File unrelatedFile = new File(DEPLOY_DIR, "unrelated-file.txt");
+ File unrelatedFile = writeFile("unrelated content", DEPLOY_DIR, "unrelated-file.txt");
assert unrelatedFile.exists() : "our initial install test method should have prepared an unmanaged file";
AntLauncher ant = new AntLauncher();
commit 42b9f09016e6cb0bff55901869b8f5e12dad73d6
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Jan 26 17:37:21 2012 -0500
BZ[784873] fixing issue displaying LDAP registration screen with clean browser cache.
i)Can't count on CoreGUI to be loaded in this case as the user may not have logged in before.
ii)Some refactoring to embed asynchronous call.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
index 74d11e3..50c87a4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
@@ -103,6 +103,7 @@ public class LoginView extends LocatableCanvas {
private static final String DEPARTMENT = "department";
private static final String SESSIONID = "ldap.sessionid";
static final String PASSWORD = "ldap.password";
+ private ProductInfo productInfo;
public void showLoginDialog(String message) {
showLoginDialog();
@@ -206,195 +207,232 @@ public class LoginView extends LocatableCanvas {
if (!loginShowing) {
loginShowing = true;
- ProductInfo productInfo = CoreGUI.get().getProductInfo();
-
- int fieldWidth = 120;
-
- LocatableVLayout column = new LocatableVLayout(extendLocatorId("NewLdapRegistration"));
- column.setMargin(25);
- HeaderItem header = new HeaderItem();
- header.setValue(MSG.view_login_welcomeMsg(productInfo.getName()));
- header.setWidth("100%");
- //build ui elements for registration screen
- first = new TextItem(FIRST, MSG.dataSource_users_field_firstName());
- {
- first.setRequired(true);
- first.setWrapTitle(false);
- first.setWidth(fieldWidth);
- }
- last = new TextItem(LAST, MSG.dataSource_users_field_lastName());
- {
- last.setWrapTitle(false);
- last.setWidth(fieldWidth);
- last.setRequired(true);
- }
- final TextItem username = new TextItem(USERNAME, MSG.dataSource_users_field_name());
- {
- username.setValue(user);
- username.setDisabled(true);
- username.setWidth(fieldWidth);
- }
- email = new TextItem(EMAIL, MSG.dataSource_users_field_emailAddress());
- email.setRequired(true);
- email.setWidth(fieldWidth);
- email.setWrapTitle(false);
- phone = new TextItem(PHONE, MSG.dataSource_users_field_phoneNumber());
- phone.setWidth(fieldWidth);
- phone.setWrapTitle(false);
- department = new TextItem(DEPARTMENT, MSG.dataSource_users_field_department());
- department.setWidth(fieldWidth);
- SpacerItem space = new SpacerItem();
- space.setColSpan(1);
-
- inputForm = new LocatableDynamicForm(extendLocatorId("LdapUserRegistrationInput"));
- inputForm.setAutoFocus(true);
- inputForm.setErrorOrientation(FormErrorOrientation.LEFT);
- inputForm.setNumCols(4);
- //moving header to it's own container for proper display. Didn't display right in production mode
- inputForm.setFields(username, first, last, email, phone, department);
- loadValidators(inputForm);
- inputForm.setValidateOnExit(true);
- DynamicForm headerWrapper = new DynamicForm();
- headerWrapper.setFields(header);
- column.addMember(headerWrapper);
- column.addMember(inputForm);
-
- HTMLFlow hr = new HTMLFlow("<br/><hr/><br/><br/>");
- hr.setWidth(620);
- hr.setAlign(Alignment.CENTER);
- column.addMember(hr);
-
- HStack row = new HStack();
- row.setMembersMargin(5);
- row.setAlign(VerticalAlignment.CENTER);
- IButton okButton = new LocatableIButton(inputForm.extendLocatorId("OK"), MSG.common_button_ok());
- okButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
-
- //F5 refresh check? If they've reloaded the form for some reason then bail.
- boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password
- .trim().isEmpty()));
- //check for session timeout
- if (UserSessionManager.isLoggedOut() || (credentialsEmpty)) {
- resetLogin(LoginView.this.extendLocatorId("Register"));
- return;
+ //BZ:784873. To fix issue with users logging in by LDAP integration with clean browser cache.
+ if (CoreGUI.get().getProductInfo() == null) {
+ //We need to explicitly retrieve product info here as can't count on CoreGui to load it
+ //during LDAP registration. After registration CoreGui is loaded as usual.
+ GWTServiceLookup.getSystemService().getProductInfo(new AsyncCallback<ProductInfo>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_aboutBox_failedToLoad(), caught);
+ productInfo = null;
+ Log.trace("ProductInfo could not be retrieved for some reason. Proceeding anyway.");
+ buildRegistrationWindow(user, sessionId, password, callback);
}
- //validation
- if (inputForm.validate()) {
- Log.trace("Successfully validated all data for user registration.");
- //populate form
- if (first.getValue() != null)
- inputForm.setValue(FIRST, String.valueOf(first.getValue()));
- if (last.getValue() != null)
- inputForm.setValue(LAST, String.valueOf(last.getValue()));
- inputForm.setValue(USERNAME, String.valueOf(username.getValue()));
- if (email.getValue() != null)
- inputForm.setValue(EMAIL, String.valueOf(email.getValue()));
- if (phone.getValue() != null)
- inputForm.setValue(PHONE, String.valueOf(phone.getValue()));
- if (department.getValue() != null)
- inputForm.setValue(DEPARTMENT, String.valueOf(department.getValue()));
- inputForm.setValue(SESSIONID, sessionId);
- inputForm.setValue(PASSWORD, password);
- registerLdapUser(LoginView.this.extendLocatorId("RegisterLdap"), inputForm, callback);
+ public void onSuccess(ProductInfo result) {
+ productInfo = result;
+ Log.trace("ProductInfo has been retrieved for LDAP registration.");
+ buildRegistrationWindow(user, sessionId, password, callback);
}
- }
+ });
+ } else {//if productInfo has already been loaded, save a gwt call.
+ productInfo = CoreGUI.get().getProductInfo();
+ buildRegistrationWindow(user, sessionId, password, callback);
+ }
+ }
+ }
- });
- row.addMember(okButton);
- //send request to LDAP server to grab user details for this user. Already sure ldap user exists
- GWTServiceLookup.getLdapService().getLdapDetailsFor(user, new AsyncCallback<Map<String, String>>() {
- public void onSuccess(final Map<String, String> ldapUserDetails) {
- //now prepopulate UI fields if they exist
- for (String key : ldapUserDetails.keySet()) {
- String value;
- if (key.equalsIgnoreCase("givenName")) {//aka first name
- value = ldapUserDetails.get(key);
- first.setValue(value);
- } else if (key.equalsIgnoreCase("sn")) {//aka Surname
- value = ldapUserDetails.get(key);
- if ((value != null) && (!value.isEmpty())) {
- last.setValue(value);
- }
- } else if (key.equalsIgnoreCase("telephoneNumber")) {
- value = ldapUserDetails.get(key);
- if ((value != null) && (!value.isEmpty())) {
- phone.setValue(value);
- }
- } else if (key.equalsIgnoreCase("mail")) {
- value = ldapUserDetails.get(key);
- if ((value != null) && (!value.isEmpty())) {
- email.setValue(value);
- }
- }
- }
+ /** Duplicate modal Login mechanism to now show last registration screen before launching
+ * core gui.
+ *
+ * @param user prepopulate username field for LDAP registration
+ * @param sessionId pass in valid session id for LDAP registration steps.
+ * @param callback pass in callback reference to indicate success and launch of coreGUI
+ */
+ private void buildRegistrationWindow(final String user, final String sessionId, final String password,
+ final AsyncCallback<Subject> callback) {
+ int fieldWidth = 120;
+
+ //Build registration window.
+ LocatableVLayout column = new LocatableVLayout(extendLocatorId("NewLdapRegistration"));
+ column.setMargin(25);
+ HeaderItem header = new HeaderItem();
+ //Locate product info for registration screen.
+ if (productInfo != null) {
+ header.setValue(MSG.view_login_welcomeMsg(productInfo.getName()));
+ } else {//if not available, let registration continue. Errors already logged and no functionality lost.
+ header.setValue(MSG.view_login_welcomeMsg(""));
+ }
+ header.setWidth("100%");
+ //build ui elements for registration screen
+ first = new TextItem(FIRST, MSG.dataSource_users_field_firstName());
+ {
+ first.setRequired(true);
+ first.setWrapTitle(false);
+ first.setWidth(fieldWidth);
+ }
+ last = new TextItem(LAST, MSG.dataSource_users_field_lastName());
+ {
+ last.setWrapTitle(false);
+ last.setWidth(fieldWidth);
+ last.setRequired(true);
+ }
+ final TextItem username = new TextItem(USERNAME, MSG.dataSource_users_field_name());
+ {
+ username.setValue(user);
+ username.setDisabled(true);
+ username.setWidth(fieldWidth);
+ }
+ email = new TextItem(EMAIL, MSG.dataSource_users_field_emailAddress());
+ email.setRequired(true);
+ email.setWidth(fieldWidth);
+ email.setWrapTitle(false);
+ phone = new TextItem(PHONE, MSG.dataSource_users_field_phoneNumber());
+ phone.setWidth(fieldWidth);
+ phone.setWrapTitle(false);
+ department = new TextItem(DEPARTMENT, MSG.dataSource_users_field_department());
+ department.setWidth(fieldWidth);
+ SpacerItem space = new SpacerItem();
+ space.setColSpan(1);
+
+ inputForm = new LocatableDynamicForm(extendLocatorId("LdapUserRegistrationInput"));
+ inputForm.setAutoFocus(true);
+ inputForm.setErrorOrientation(FormErrorOrientation.LEFT);
+ inputForm.setNumCols(4);
+ //moving header to it's own container for proper display. Didn't display right in production mode
+ inputForm.setFields(username, first, last, email, phone, department);
+ loadValidators(inputForm);
+ inputForm.setValidateOnExit(true);
+ DynamicForm headerWrapper = new DynamicForm();
+ headerWrapper.setFields(header);
+ column.addMember(headerWrapper);
+ column.addMember(inputForm);
+
+ HTMLFlow hr = new HTMLFlow("<br/><hr/><br/><br/>");
+ hr.setWidth(620);
+ hr.setAlign(Alignment.CENTER);
+ column.addMember(hr);
+
+ HStack row = new HStack();
+ row.setMembersMargin(5);
+ row.setAlign(VerticalAlignment.CENTER);
+ IButton okButton = new LocatableIButton(inputForm.extendLocatorId("OK"), MSG.common_button_ok());
+ okButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
+
+ //F5 refresh check? If they've reloaded the form for some reason then bail.
+ boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password
+ .trim().isEmpty()));
+ //check for session timeout
+ if (UserSessionManager.isLoggedOut() || (credentialsEmpty)) {
+ resetLogin(LoginView.this.extendLocatorId("Register"));
+ return;
}
- public void onFailure(Throwable caught) {
- inputForm.setFieldErrors(FIRST, MSG.view_login_noLdap(), true);
- Log.debug("Optional LDAP detail retrieval did not succeed. Registration prepopulation will not occur.");
+ //validation
+ if (inputForm.validate()) {
+ Log.trace("Successfully validated all data for user registration.");
+ //populate form
+ if (first.getValue() != null)
+ inputForm.setValue(FIRST, String.valueOf(first.getValue()));
+ if (last.getValue() != null)
+ inputForm.setValue(LAST, String.valueOf(last.getValue()));
+ inputForm.setValue(USERNAME, String.valueOf(username.getValue()));
+ if (email.getValue() != null)
+ inputForm.setValue(EMAIL, String.valueOf(email.getValue()));
+ if (phone.getValue() != null)
+ inputForm.setValue(PHONE, String.valueOf(phone.getValue()));
+ if (department.getValue() != null)
+ inputForm.setValue(DEPARTMENT, String.valueOf(department.getValue()));
+ inputForm.setValue(SESSIONID, sessionId);
+ inputForm.setValue(PASSWORD, password);
+ registerLdapUser(LoginView.this.extendLocatorId("RegisterLdap"), inputForm, callback);
}
- });
-
- IButton resetButton = new LocatableIButton(inputForm.extendLocatorId("Reset"), MSG.common_button_reset());
- resetButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
- //F5 refresh check? If they've reloaded the form for some reason then bail.
- boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password
- .trim().isEmpty()));
- if (UserSessionManager.isLoggedOut() || credentialsEmpty) {
- resetLogin(LoginView.this.extendLocatorId("Reset"));
- return;
- }
+ }
- //clear out all validation messages.
- {
- String empty = " ";
- first.setValue(empty);
- last.setValue(empty);
- email.setValue("test(a)test.com");
- inputForm.validate();
+ });
+ row.addMember(okButton);
+ //send request to LDAP server to grab user details for this user. Already sure ldap user exists
+ GWTServiceLookup.getLdapService().getLdapDetailsFor(user, new AsyncCallback<Map<String, String>>() {
+ public void onSuccess(final Map<String, String> ldapUserDetails) {
+ //now prepopulate UI fields if they exist
+ for (String key : ldapUserDetails.keySet()) {
+ String value;
+ if (key.equalsIgnoreCase("givenName")) {//aka first name
+ value = ldapUserDetails.get(key);
+ first.setValue(value);
+ } else if (key.equalsIgnoreCase("sn")) {//aka Surname
+ value = ldapUserDetails.get(key);
+ if ((value != null) && (!value.isEmpty())) {
+ last.setValue(value);
+ }
+ } else if (key.equalsIgnoreCase("telephoneNumber")) {
+ value = ldapUserDetails.get(key);
+ if ((value != null) && (!value.isEmpty())) {
+ phone.setValue(value);
+ }
+ } else if (key.equalsIgnoreCase("mail")) {
+ value = ldapUserDetails.get(key);
+ if ((value != null) && (!value.isEmpty())) {
+ email.setValue(value);
+ }
}
- first.clearValue();
- last.clearValue();
- email.clearValue();
- phone.clearValue();
- department.clearValue();
}
- });
- row.addMember(resetButton);
+ }
- IButton cancelButton = new LocatableIButton(inputForm.extendLocatorId("Cancel"), MSG.common_button_cancel());
- cancelButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
- UserSessionManager.logout();
+ public void onFailure(Throwable caught) {
+ inputForm.setFieldErrors(FIRST, MSG.view_login_noLdap(), true);
+ Log.debug("Optional LDAP detail retrieval did not succeed. Registration prepopulation will not occur.");
+ }
+ });
+
+ IButton resetButton = new LocatableIButton(inputForm.extendLocatorId("Reset"), MSG.common_button_reset());
+ resetButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
+ //F5 refresh check? If they've reloaded the form for some reason then bail.
+ boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password
+ .trim().isEmpty()));
+ if (UserSessionManager.isLoggedOut() || credentialsEmpty) {
resetLogin(LoginView.this.extendLocatorId("Reset"));
+ return;
}
- });
- row.addMember(cancelButton);
- Label logoutLabel = new Label(MSG.view_login_registerLater());
- logoutLabel.setWrap(false);
- row.addMember(logoutLabel);
- column.addMember(row);
-
- window = new LocatableWindow(extendLocatorId("RegistrationWindow"));
- window.setWidth(670);
- window.setHeight(330);
- window.setTitle(MSG.view_login_registerUser());
- // forced focused, static size, can't close / dismiss
- window.setIsModal(true);
- window.setShowModalMask(true);
- window.setCanDragResize(false);
- window.setCanDragReposition(false);
- window.setShowCloseButton(false);
- window.setShowMinimizeButton(false);
- window.setAutoCenter(true);
-
- window.addItem(column);
- window.show();
- }
+ //clear out all validation messages.
+ {
+ String empty = " ";
+ first.setValue(empty);
+ last.setValue(empty);
+ email.setValue("test(a)test.com");
+ inputForm.validate();
+ }
+ first.clearValue();
+ last.clearValue();
+ email.clearValue();
+ phone.clearValue();
+ department.clearValue();
+ }
+ });
+ row.addMember(resetButton);
+
+ IButton cancelButton = new LocatableIButton(inputForm.extendLocatorId("Cancel"), MSG.common_button_cancel());
+ cancelButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
+ UserSessionManager.logout();
+ resetLogin(LoginView.this.extendLocatorId("Reset"));
+ }
+ });
+ row.addMember(cancelButton);
+ Label logoutLabel = new Label(MSG.view_login_registerLater());
+ logoutLabel.setWrap(false);
+ row.addMember(logoutLabel);
+ column.addMember(row);
+
+ window = new LocatableWindow(extendLocatorId("RegistrationWindow"));
+ window.setWidth(670);
+ window.setHeight(330);
+ window.setTitle(MSG.view_login_registerUser());
+
+ // forced focused, static size, can't close / dismiss
+ window.setIsModal(true);
+ window.setShowModalMask(true);
+ window.setCanDragResize(false);
+ window.setCanDragReposition(false);
+ window.setShowCloseButton(false);
+ window.setShowMinimizeButton(false);
+ window.setAutoCenter(true);
+
+ window.addItem(column);
+ window.show();
}
/** Go through steps of invalidating this login and piping them back to CoreGUI Login.
commit 9946f3e2b2b4b0a86ebe001594818f016a4c4130
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jan 26 17:19:43 2012 -0500
[BZ 784124] fix the issue where, on initial deployment of a bundle, we didn't clean out any files that happen to be in the deployment dir.
we need to remove them, they are in the way. we do back them up so they can be manually retrieved if the user screwed up.
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java
index 14ed3af..a78f6b2 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java
@@ -33,6 +33,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.ArrayList;
import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
@@ -102,6 +103,77 @@ public class FileUtil {
StreamUtil.copy(is, os);
}
+ public static void copyDirectory(File inDir, File outDir) throws IOException {
+ if (inDir.exists()) {
+ if (!inDir.isDirectory()) {
+ throw new IOException("Source directory [" + inDir + "] is not a directory");
+ }
+ } else {
+ throw new FileNotFoundException("Source directory [" + inDir + "] does not exist");
+ }
+
+ if (!outDir.mkdirs()) {
+ throw new IOException("Destination directory [" + outDir + "] failed to be created");
+ }
+
+ if (!canWrite(outDir)) {
+ throw new IOException("Cannot write to destination directory [" + outDir + "]");
+ }
+
+ // TODO do we care to restore the last mod time on the destination dir?
+ //outDir.setLastModified(inDir.lastModified());
+
+ File[] files = inDir.listFiles();
+ if (files == null) {
+ throw new IOException("Failed to get the list of files in source directory [" + inDir + "]");
+ }
+ for (File file : files) {
+ File copiedFile = new File(outDir, file.getName());
+ if (file.isDirectory()) {
+ copyDirectory(file, copiedFile);
+ } else {
+ copyFile(file, copiedFile);
+ }
+ }
+
+ files = null; // help GC
+ return;
+ }
+
+ /**
+ * Obtains the list of all files in the given directory and, recursively, all its subdirectories.
+ * Note that the returns list is only regular files - directory names are NOT in the list. Also,
+ * the names in the list are relative to the given directory.
+ * @param directory the directory whose files are to be returned
+ * @return list of files in the directory, not sorted in any particular order
+ * @throws IOException if directory does not exist or is not a directory
+ */
+ public static List<File> getDirectoryFiles(File directory) throws IOException {
+ ArrayList<File> files = new ArrayList<File>();
+ if (!directory.isDirectory()) {
+ throw new IOException("[" + directory + "] is not an existing directory");
+ }
+ getDirectoryFilesRecursive(directory, files, null);
+ return files;
+ }
+
+ private static void getDirectoryFilesRecursive(File directory, List<File> files, String relativeTo)
+ throws IOException {
+ File[] children = directory.listFiles();
+ if (children == null) {
+ throw new IOException("Cannot obtain files from directory [" + directory + "]");
+ }
+ for (File child : children) {
+ if (child.isDirectory()) {
+ getDirectoryFilesRecursive(child, files, ((relativeTo == null) ? "" : relativeTo) + child.getName()
+ + File.separatorChar);
+ } else {
+ files.add(new File(relativeTo, child.getName()));
+ }
+ }
+ return;
+ }
+
/**
* Copy a stream, using a buffer.
* @deprecated use {@link StreamUtil} for more methods like this - those are unit tested and used more
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
index 652bcda..40ce727 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
@@ -28,6 +28,8 @@ import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -301,9 +303,9 @@ public class Deployer {
return;
}
- debug("Estimated disk usage for this deployment is [", usage.getDiskUsage(), "] bytes (file count=[", usage
- .getFileCount(), "]). The maximum disk space currently usable is estimated to be [", usage
- .getMaxDiskUsable(), "] bytes.");
+ debug("Estimated disk usage for this deployment is [", usage.getDiskUsage(), "] bytes (file count=[",
+ usage.getFileCount(), "]). The maximum disk space currently usable is estimated to be [",
+ usage.getMaxDiskUsable(), "] bytes.");
if (usage.getDiskUsage() > usage.getMaxDiskUsable()) {
throw new Exception(
@@ -316,6 +318,31 @@ public class Deployer {
}
private FileHashcodeMap performInitialDeployment(DeployDifferences diff, boolean dryRun) throws Exception {
+ // If we are to fully manage the deployment dir, then we need to delete everything we find here.
+ // Any old files do not belong here - only our bundle files should live here now.
+ if (this.deploymentData.isManageRootDir()) {
+ File destDir = this.deploymentData.getDestinationDir();
+ log.info(buildLogMessage("Will be managing the deploy dir[", destDir,
+ "]; backing up and purging any obsolete content existing in there"));
+ if (destDir.isDirectory()) {
+ int deploymentId = this.deploymentData.getDeploymentProps().getDeploymentId();
+ backupFiles(diff, deploymentId, destDir, dryRun, null, true);
+ if (!dryRun) {
+ // we want to purge everything that is originally in here, but we backed up the files in here
+ // so make sure we don't delete our metadata directory, which is where the backed up files are
+ File[] doomedFiles = destDir.listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return !DeploymentsMetadata.METADATA_DIR.equals(name);
+ }
+ });
+ for (File doomedFile : doomedFiles) {
+ FileUtil.purge(doomedFile, true);
+ }
+ }
+ }
+ }
+
FileHashcodeMap newFileHashcodeMap = extractZipAndRawFiles(new HashMap<String, String>(0), diff, dryRun);
// this is an initial deployment, so we know every file is new - tell our diff about them all
@@ -340,8 +367,8 @@ public class Deployer {
// * if a current file is backed up
FileHashcodeMap original = this.deploymentsMetadata.getCurrentDeploymentFileHashcodes();
- ChangesFileHashcodeMap current = original.rescan(this.deploymentData.getDestinationDir(), this.deploymentData
- .getIgnoreRegex(), this.deploymentData.isManageRootDir());
+ ChangesFileHashcodeMap current = original.rescan(this.deploymentData.getDestinationDir(),
+ this.deploymentData.getIgnoreRegex(), this.deploymentData.isManageRootDir());
FileHashcodeMap newFiles = getNewDeploymentFileHashcodeMap();
if (current.getUnknownContent() != null) {
@@ -457,7 +484,8 @@ public class Deployer {
int backupDeploymentId = props.getDeploymentId();
debug("Backing up files as part of update deployment. dryRun=", dryRun);
for (String fileToBackupPath : currentFilesToBackup) {
- backupFile(diff, backupDeploymentId, fileToBackupPath, dryRun);
+ boolean toBeDeleted = currentFilesToDelete.remove(fileToBackupPath);
+ backupFile(diff, backupDeploymentId, fileToBackupPath, dryRun, toBeDeleted);
}
}
@@ -503,8 +531,8 @@ public class Deployer {
return newFileHashCodeMap;
}
- private void backupFile(DeployDifferences diff, int deploymentId, final String fileToBackupPath, boolean dryRun)
- throws Exception {
+ private void backupFile(DeployDifferences diff, int deploymentId, final String fileToBackupPath, boolean dryRun,
+ boolean removeFileToBackup) throws Exception {
File bakFile;
@@ -536,8 +564,8 @@ public class Deployer {
String destDirDriveLetter = FileUtil.stripDriveLetter(destDirAbsPathBuilder);
if (destDirDriveLetter == null || driveLetter.equals(destDirDriveLetter)) {
bakFile = new File(backupDir, fileToBackupPath);
- fileToBackup = new File(this.deploymentData.getDestinationDir(), fileToBackupPathNoDriveLetter
- .toString());
+ fileToBackup = new File(this.deploymentData.getDestinationDir(),
+ fileToBackupPathNoDriveLetter.toString());
} else {
throw new Exception("Cannot backup relative path [" + fileToBackupPath
+ "] whose drive letter is different than the destination directory ["
@@ -549,20 +577,77 @@ public class Deployer {
}
}
+ boolean deleted = false; // will be true if we were told to delete the file and we actually did delete it
+
if (!dryRun) {
bakFile.getParentFile().mkdirs();
- FileUtil.copyFile(fileToBackup, bakFile);
+ // try to do a rename first if we are to remove the file, since this is more likely
+ // much faster and more efficient.
+ // if it fails (perhaps because we are crossing file systems), try a true copy
+ if (removeFileToBackup) {
+ boolean movedSuccessfully = fileToBackup.renameTo(bakFile);
+ if (movedSuccessfully) {
+ deleted = true;
+ } else {
+ FileUtil.copyFile(fileToBackup, bakFile);
+ deleted = fileToBackup.delete();
+ if (deleted == false) {
+ // TODO: what should we do? is it a major failure if we can't remove files here?
+ debug("Failed to delete file [", fileToBackup, "] but it is backed up");
+ if (diff != null) {
+ diff.addError(fileToBackupPath, "File [" + fileToBackup.getAbsolutePath()
+ + "] did not delete");
+ }
+ }
+ }
+ } else {
+ FileUtil.copyFile(fileToBackup, bakFile);
+ }
+ } else {
+ deleted = removeFileToBackup; // this is a dry run, pretend we deleted it if we were asked to
}
debug("Backed up file [", fileToBackup, "] to [", bakFile, "]. dryRun=", dryRun);
+ if (deleted) {
+ debug("Deleted file [", fileToBackup, "] after backing it up. dryRun=", dryRun);
+ }
if (diff != null) {
diff.addBackedUpFile(fileToBackupPath, bakFile.getAbsolutePath());
+ if (deleted) {
+ diff.addDeletedFile(fileToBackupPath);
+ }
}
return;
}
+ private void backupFiles(DeployDifferences diff, int deploymentId, File dirToBackup, boolean dryRun,
+ String relativeTo, boolean removeSourceFiles) throws Exception {
+ File[] files = dirToBackup.listFiles();
+ if (files == null) {
+ throw new IOException("Failed to get the list of files in source directory [" + dirToBackup + "]");
+ }
+ if (files.length > 0) {
+ this.deploymentsMetadata.getMetadataDirectory().mkdirs(); // make sure we create this, might not be there yet
+ for (File file : files) {
+ if (file.isDirectory()) {
+ if (file.getName().equals(DeploymentsMetadata.METADATA_DIR)) {
+ continue; // skip the RHQ metadata directory, its where we are putting our backups!
+ }
+ backupFiles(diff, deploymentId, file, dryRun,
+ ((relativeTo == null) ? "" : relativeTo) + file.getName() + File.separatorChar,
+ removeSourceFiles);
+ } else {
+ backupFile(diff, deploymentId, ((relativeTo == null) ? "" : relativeTo) + file.getName(), dryRun,
+ removeSourceFiles);
+ }
+ }
+
+ files = null; // help GC
+ }
+ }
+
private FileHashcodeMap extractZipAndRawFiles(Map<String, String> currentFilesToLeaveAlone, DeployDifferences diff,
boolean dryRun) throws Exception {
@@ -615,8 +700,8 @@ public class Deployer {
ZipUtil.walkZipFile(zipFile, visitor);
// we have to compress the file again - our new compressed file will have the new realized files in them
if (!dryRun) {
- createZipFile(compressedFile, this.deploymentData.getDestinationDir(), visitor
- .getFileHashcodeMap());
+ createZipFile(compressedFile, this.deploymentData.getDestinationDir(),
+ visitor.getFileHashcodeMap());
}
}
@@ -1040,16 +1125,20 @@ public class Deployer {
private void debug(Object... objs) {
if (log.isDebugEnabled()) {
- String bundleName = this.deploymentData.getDeploymentProps().getBundleName();
- String bundleVersion = this.deploymentData.getDeploymentProps().getBundleVersion();
- int deploymentId = this.deploymentData.getDeploymentProps().getDeploymentId();
- StringBuilder str = new StringBuilder();
- str.append("Bundle [").append(bundleName).append(" v").append(bundleVersion).append(']');
- str.append("; Deployment [").append(deploymentId).append("]: ");
- for (Object o : objs) {
- str.append(o);
- }
- log.debug(str.toString());
+ log.debug(buildLogMessage(objs));
+ }
+ }
+
+ private String buildLogMessage(Object... objs) {
+ String bundleName = this.deploymentData.getDeploymentProps().getBundleName();
+ String bundleVersion = this.deploymentData.getDeploymentProps().getBundleVersion();
+ int deploymentId = this.deploymentData.getDeploymentProps().getDeploymentId();
+ StringBuilder str = new StringBuilder();
+ str.append("Bundle [").append(bundleName).append(" v").append(bundleVersion).append(']');
+ str.append("; Deployment [").append(deploymentId).append("]: ");
+ for (Object o : objs) {
+ str.append(o);
}
+ return str.toString();
}
}
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java b/modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java
index 31659bd..bb7ad34 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java
@@ -22,21 +22,92 @@
*/
package org.rhq.core.util.file;
+import static java.util.Arrays.asList;
+import static org.apache.commons.io.FileUtils.deleteDirectory;
+import static org.apache.commons.io.FileUtils.toFile;
+import static org.apache.commons.io.FileUtils.touch;
+import static org.rhq.test.AssertUtils.assertCollectionEqualsNoOrder;
+
+import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
import org.testng.annotations.Test;
-import static java.util.Arrays.asList;
-import static org.apache.commons.io.FileUtils.deleteDirectory;
-import static org.apache.commons.io.FileUtils.toFile;
-import static org.apache.commons.io.FileUtils.touch;
-import static org.rhq.test.AssertUtils.assertCollectionEqualsNoOrder;
+import org.rhq.core.util.stream.StreamUtil;
@Test
public class FileUtilTest {
+ public void testCopyDirectory() throws Exception {
+ try {
+ FileUtil.copyDirectory(new File("this.does.not.exist"), new File("dummy"));
+ assert false : "the source directory did not exist, this should have failed because of that";
+ } catch (Exception ok) {
+ }
+
+ // create a source directory and a destination directory. Make sure we start off
+ // with a non-existent destination directory - we want the copyDirectory to create it for us.
+ File outDir = FileUtil.createTempDirectory("fileUtilTestCopyDir", ".dest", null);
+ assert outDir.delete() : "failed to start out with a non-existent dest directory";
+ assert !outDir.exists() : "dest directory should not exist"; // yes, I am paranoid
+
+ File inDir = FileUtil.createTempDirectory("fileUtilTestCopyDir", ".src", null);
+ try {
+ // create some test files in our source directory
+ String testFilename0 = "file0.txt";
+ String testFilename1 = "subdir" + File.separatorChar + "subfile1.txt";
+ String testFilename2 = "subdir" + File.separatorChar + "subfile2.txt";
+
+ File testFile = new File(inDir, testFilename0);
+ StreamUtil.copy(new ByteArrayInputStream("0".getBytes()), new FileOutputStream(testFile));
+ assert "0".equals(new String(StreamUtil.slurp(new FileInputStream(testFile)))); // sanity check, make sure its there
+
+ testFile = new File(inDir, testFilename1);
+ testFile.getParentFile().mkdirs();
+ StreamUtil.copy(new ByteArrayInputStream("1".getBytes()), new FileOutputStream(testFile));
+ assert "1".equals(new String(StreamUtil.slurp(new FileInputStream(testFile)))); // sanity check, make sure its there
+ testFile = new File(inDir, testFilename2);
+ testFile.getParentFile().mkdirs();
+ StreamUtil.copy(new ByteArrayInputStream("2".getBytes()), new FileOutputStream(testFile));
+ assert "2".equals(new String(StreamUtil.slurp(new FileInputStream(testFile)))); // sanity check, make sure its there
+
+ // copy our source directory and confirm the copies are correct
+ FileUtil.copyDirectory(inDir, outDir);
+
+ testFile = new File(outDir, testFilename0);
+ assert testFile.exists() : "file did not get created: " + testFile;
+ assert "0".equals(new String(StreamUtil.slurp(new FileInputStream(testFile))));
+ testFile = new File(outDir, testFilename1);
+ assert testFile.exists() : "file did not get created: " + testFile;
+ assert "1".equals(new String(StreamUtil.slurp(new FileInputStream(testFile))));
+ testFile = new File(outDir, testFilename2);
+ assert testFile.exists() : "file did not get created: " + testFile;
+ assert "2".equals(new String(StreamUtil.slurp(new FileInputStream(testFile))));
+
+ // let's test getDirectoryFiles while we are here
+ List<File> outFiles = FileUtil.getDirectoryFiles(outDir);
+ assert outFiles != null : outFiles;
+ assert outFiles.size() == 3 : outFiles;
+ assert outFiles.contains(new File(testFilename0)) : outFiles;
+ assert outFiles.contains(new File(testFilename1)) : outFiles;
+ assert outFiles.contains(new File(testFilename2)) : outFiles;
+ } finally {
+ // clean up our test
+ try {
+ FileUtil.purge(inDir, true);
+ } catch (Exception ignore) {
+ }
+ try {
+ FileUtil.purge(outDir, true);
+ } catch (Exception ignore) {
+ }
+ }
+ }
+
public void testStripDriveLetter() {
StringBuilder str;
@@ -142,8 +213,7 @@ public class FileUtilTest {
}
});
- assertCollectionEqualsNoOrder(expectedFiles, actualFiles,
- "Expected to visit all files in directory");
+ assertCollectionEqualsNoOrder(expectedFiles, actualFiles, "Expected to visit all files in directory");
}
@Test
@@ -176,8 +246,7 @@ public class FileUtilTest {
}
});
- assertCollectionEqualsNoOrder(expectedFiles, actualFiles,
- "Expected to visit files in sub directories");
+ assertCollectionEqualsNoOrder(expectedFiles, actualFiles, "Expected to visit files in sub directories");
}
@Test
@@ -210,8 +279,7 @@ public class FileUtilTest {
}
});
- assertCollectionEqualsNoOrder(expectedFiles, actualFiles,
- "Expected to visit files in nested sub directories");
+ assertCollectionEqualsNoOrder(expectedFiles, actualFiles, "Expected to visit files in nested sub directories");
}
public void testGetPattern() {
@@ -222,8 +290,8 @@ public class FileUtilTest {
assert regex.matcher("/basedir/test1.txt").matches();
assert !regex.matcher("/basedir/test2.txt").matches();
- regex = assertPatternsRegex("(/basedir/easy\\.txt)|(/basedir/test\\.txt)",
- new PathFilter("/basedir/easy.txt", null), new PathFilter("/basedir/test.txt", null));
+ regex = assertPatternsRegex("(/basedir/easy\\.txt)|(/basedir/test\\.txt)", new PathFilter("/basedir/easy.txt",
+ null), new PathFilter("/basedir/test.txt", null));
assert regex.matcher("/basedir/easy.txt").matches();
assert regex.matcher("/basedir/test.txt").matches();
@@ -244,8 +312,8 @@ public class FileUtilTest {
assert !regex.matcher("/basedir/subdir/foo.txt").matches();
assert !regex.matcher("/basedir/foo.txt.swp").matches();
- regex = assertPatternsRegex("(/var/lib/([^/]*\\.war))|(/var/lib/([^/]*\\.ear))",
- new PathFilter("/var/lib", "*.war"), new PathFilter("/var/lib", "*.ear"));
+ regex = assertPatternsRegex("(/var/lib/([^/]*\\.war))|(/var/lib/([^/]*\\.ear))", new PathFilter("/var/lib",
+ "*.war"), new PathFilter("/var/lib", "*.ear"));
assert regex.matcher("/var/lib/myapp.war").matches();
assert regex.matcher("/var/lib/myapp.ear").matches();
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java b/modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java
index 69d6d53..a69931a 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java
@@ -230,12 +230,13 @@ public class DeployerTest {
final String file999 = "dir1" + fileSeparator + "file999";
try {
- if (ignore) {
- // create a file that will be retained because we will be ignoring it
- File ignoreDir = FileUtil.createTempDirectory("ignoreme", ".dir", tmpDir);
- fileToIgnore = new File(ignoreDir, "some-log.log");
- StreamUtil.copy(new ByteArrayInputStream("boo".getBytes()), new FileOutputStream(fileToIgnore));
- }
+ // this is a file that will be removed because our initial deployment is managing the root deploy dir
+ // later we will recreate it to see that we ignore it during the upgrade.
+ // note that during the initial deployment, we will still back it up.
+ File ignoreDir = FileUtil.createTempDirectory("ignoreme", ".dir", tmpDir);
+ fileToIgnore = new File(ignoreDir, "some-log.log");
+ StreamUtil.copy(new ByteArrayInputStream("boo".getBytes()), new FileOutputStream(fileToIgnore));
+ String fileToIgnorePath = ignoreDir.getName() + "/" + fileToIgnore.getName(); // yes, use /, even if we are on windows
File testZipFile1 = new File("target/test-classes/updater-test1.zip");
File testZipFile2 = new File("target/test-classes/updater-test2.zip");
@@ -267,15 +268,25 @@ public class DeployerTest {
deployer.deploy(diff);
- if (ignore) {
- assert "boo".equals(new String(StreamUtil.slurp(new FileInputStream(fileToIgnore))));
- assert diff.getIgnoredFiles().size() == 0 : "this was an initial deploy - nothing to ignore (ignore is only for updates)";
- }
+ // our initial deploy should have deleted this because we are managing the root dir
+ assert !fileToIgnore.exists() : "should have removed this file since we are managing the root dir";
+ assert !fileToIgnore.getParentFile().exists() : "should have removed this file since we are managing the root dir";
+ assert diff.getIgnoredFiles().size() == 0 : "this was an initial deploy - nothing to ignore (ignore is only for updates)";
assert diff.getAddedFiles().size() == 6 : diff;
- assert diff.getDeletedFiles().size() == 0 : diff;
+ assert diff.getDeletedFiles().size() == 1 : diff;
+ assert diff.getDeletedFiles().contains(fileToIgnorePath) : "should have deleted this unknown file" + diff;
assert diff.getChangedFiles().size() == 0 : diff;
assert diff.getRealizedFiles().size() == 0 : "No fileA to realize in this deployment: " + diff;
- assert diff.getBackedUpFiles().size() == 0 : "No fileA to realize in this deployment: " + diff;
+ assert diff.getBackedUpFiles().size() == 1 : diff;
+ assert diff.getBackedUpFiles().get(fileToIgnorePath) != null : "should have backed up this file" + diff;
+
+ if (ignore) {
+ // let's create this again to make sure we really do ignore it
+ ignoreDir = FileUtil.createTempDirectory("ignoreme", ".dir", tmpDir);
+ fileToIgnore = new File(ignoreDir, "some-log.log");
+ StreamUtil.copy(new ByteArrayInputStream("boo".getBytes()), new FileOutputStream(fileToIgnore));
+ fileToIgnorePath = ignoreDir.getName() + "/" + fileToIgnore.getName(); // yes, use /, even if we are on windows
+ }
StreamUtil.copy(new ByteArrayInputStream("X".getBytes()), new FileOutputStream(new File(tmpDir, file1)));
StreamUtil.copy(new ByteArrayInputStream("X".getBytes()), new FileOutputStream(updaterAabsolute));
@@ -295,7 +306,7 @@ public class DeployerTest {
templateEngine, ignoreRegex, true, null);
deployer = new Deployer(dd);
diff = new DeployDifferences();
- deployer.deploy(diff);
+ deployer.deploy(diff); // this is an upgrade
if (ignore) {
assert "boo".equals(new String(StreamUtil.slurp(new FileInputStream(fileToIgnore))));
@@ -396,11 +407,11 @@ public class DeployerTest {
assert diff.getChangedFiles().contains(fileB) : diff;
assert diff.getBackedUpFiles().size() == 4 : diff;
assert diff.getBackedUpFiles().containsKey(diff.convertPath(updaterAabsolute.getAbsolutePath())) : diff;
- assert diff.getBackedUpFiles().get(diff.convertPath(updaterAabsolute.getAbsolutePath())).equals(
- diff.convertPath(updaterAabsoluteBackupTo2)) : diff;
+ assert diff.getBackedUpFiles().get(diff.convertPath(updaterAabsolute.getAbsolutePath()))
+ .equals(diff.convertPath(updaterAabsoluteBackupTo2)) : diff;
assert diff.getBackedUpFiles().containsKey(diff.convertPath(updaterBabsolute.getAbsolutePath())) : diff;
- assert diff.getBackedUpFiles().get(diff.convertPath(updaterBabsolute.getAbsolutePath())).equals(
- diff.convertPath(updaterBabsoluteBackupTo2)) : diff;
+ assert diff.getBackedUpFiles().get(diff.convertPath(updaterBabsolute.getAbsolutePath()))
+ .equals(diff.convertPath(updaterBabsoluteBackupTo2)) : diff;
assert diff.getBackedUpFiles().containsKey(fileB) : diff;
assert diff.getBackedUpFiles().get(fileB).equals(diff.convertPath(fileBbackupTo2.getAbsolutePath())) : diff;
assert diff.getBackedUpFiles().containsKey(file999) : diff;
@@ -442,8 +453,8 @@ public class DeployerTest {
assert diff.getChangedFiles().contains(diff.convertPath(updaterBabsolute.getAbsolutePath())) : diff;
assert diff.getBackedUpFiles().size() == 1 : diff;
assert diff.getBackedUpFiles().containsKey(diff.convertPath(updaterBabsolute.getAbsolutePath())) : diff;
- assert diff.getBackedUpFiles().get(diff.convertPath(updaterBabsolute.getAbsolutePath())).equals(
- diff.convertPath(updaterBabsoluteBackupTo3)) : diff;
+ assert diff.getBackedUpFiles().get(diff.convertPath(updaterBabsolute.getAbsolutePath()))
+ .equals(diff.convertPath(updaterBabsoluteBackupTo3)) : diff;
if (realize) {
assert diff.getRealizedFiles().size() == 1 : diff;
assert diff.getRealizedFiles().containsKey(fileA) : diff;
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
index f875576..2736f16 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
@@ -205,7 +205,15 @@ public class SimpleDeployerTest {
baseNoNewWithCurrentDifferentThanOriginal(true);
}
- public void testWithSubdirectories() throws Exception {
+ public void testWithSubdirectoriesManageRootDir() throws Exception {
+ testWithSubdirectories(true);
+ }
+
+ public void testWithSubdirectoriesNoManageRootDir() throws Exception {
+ testWithSubdirectories(false);
+ }
+
+ private void testWithSubdirectories(boolean manageRootDir) throws Exception {
// this test is different than all the rest, start with clean tmp/dest dirs with no beforeMethod buildup
FileUtil.purge(this.tmpDir, false);
FileUtil.purge(this.deployDir, false);
@@ -227,14 +235,40 @@ public class SimpleDeployerTest {
this.originalZipFiles.add(originalZipFile);
this.originalDeployProps = new DeploymentProperties(1, "simple", "1.0", "original test deployment");
DeploymentData dd = new DeploymentData(originalDeployProps, originalZipFiles, null, tmpDir, deployDir, null,
- null, null, null, true, null);
+ null, null, null, manageRootDir, null);
+ this.diff = new DeployDifferences();
Deployer deployer = new Deployer(dd);
- this.originalFileHashcodeMap = deployer.deploy(null);
+ this.originalFileHashcodeMap = deployer.deploy(this.diff);
assert new File(this.deployDir, origFileName1).exists();
assert new File(this.deployDir, origFileName2).exists();
- assert unrelated1.exists() : "the deployment removed unrelated file1";
- assert unrelated2.getParentFile().isDirectory() : "the deployment removed an unrelated dir";
- assert unrelated2.exists() : "the deployment removed unrelated file2";
+ if (manageRootDir) {
+ assert !unrelated1.exists() : "the deployment should have removed unrelated file1";
+ assert !unrelated2.getParentFile().isDirectory() : "the deployment should have removed an unrelated dir";
+ assert !unrelated2.exists() : "the deployment should have removed unrelated file2";
+
+ assert this.diff.getBackedUpFiles().size() == 2 : this.diff;
+ assert new File(this.diff.getBackedUpFiles().get(unrelatedFileName1)).exists() : this.diff;
+ assert new File(this.diff.getBackedUpFiles().get(unrelatedFileName2)).exists() : this.diff;
+ assert this.diff.getDeletedFiles().size() == 2 : this.diff;
+ assert this.diff.getDeletedFiles().contains(unrelatedFileName1) : this.diff;
+ assert this.diff.getDeletedFiles().contains(unrelatedFileName2) : this.diff;
+ } else {
+ assert this.diff.getBackedUpFiles().size() == 0 : this.diff;
+ assert this.diff.getDeletedFiles().size() == 0 : this.diff;
+ assert unrelated1.exists() : "the deployment removed unrelated file1";
+ assert unrelated2.getParentFile().isDirectory() : "the deployment removed an unrelated dir";
+ assert unrelated2.exists() : "the deployment removed unrelated file2";
+ }
+
+ assert this.diff.getAddedFiles().size() == 2 : this.diff;
+ assert this.diff.getAddedFiles().contains(origFileName1) : this.diff;
+ assert this.diff.getAddedFiles().contains(origFileName2) : this.diff;
+ assert this.diff.getChangedFiles().isEmpty() : this.diff;
+ assert this.diff.getIgnoredFiles().isEmpty() : this.diff;
+ assert this.diff.getRealizedFiles().isEmpty() : this.diff;
+ assert this.diff.getRestoredFiles().isEmpty() : this.diff;
+ assert !this.diff.wasCleaned() : this.diff;
+ assert this.diff.getErrors().isEmpty() : this.diff;
// deploy new content
this.newDeployProps = new DeploymentProperties(2, "simple", "2.0", "new test deployment");
@@ -246,19 +280,36 @@ public class SimpleDeployerTest {
new String[] { newFileName1, newFileName2 });
HashSet<File> newZipFiles = new HashSet<File>(1);
newZipFiles.add(newZipFile);
- dd = new DeploymentData(newDeployProps, newZipFiles, null, tmpDir, deployDir, null, null, null, null, true,
- null);
+ dd = new DeploymentData(newDeployProps, newZipFiles, null, tmpDir, deployDir, null, null, null, null,
+ manageRootDir, null);
deployer = new Deployer(dd);
FileHashcodeMap newFileHashcodeMap = deployer.deploy(this.diff);
+ assert newFileHashcodeMap != null;
assert new File(this.deployDir, newFileName1).exists();
assert new File(this.deployDir, newFileName2).exists();
assert !new File(this.deployDir, origFileName1).exists();
assert !new File(this.deployDir, origFileName2).exists();
- assert !unrelated1.exists() : "the deployment did not remove unrelated file1";
- assert !unrelated2.exists() : "the deployment did not remove unrelated file1";
- assert this.diff.getBackedUpFiles().size() == 2 : this.diff;
- assert new File(this.diff.getBackedUpFiles().get(unrelatedFileName1)).exists() : this.diff;
- assert new File(this.diff.getBackedUpFiles().get(unrelatedFileName2)).exists() : this.diff;
+ if (manageRootDir) {
+ assert !unrelated1.exists() : "the deployment did not remove unrelated file1";
+ assert !unrelated2.exists() : "the deployment did not remove unrelated file1";
+ } else {
+ assert unrelated1.exists() : "the deployment removed unrelated file1 but we aren't managing the root dir";
+ assert unrelated2.exists() : "the deployment removed unrelated file1 but we aren't managing the root dir";
+ }
+
+ assert this.diff.getAddedFiles().size() == 2 : this.diff;
+ assert this.diff.getAddedFiles().contains(newFileName1) : this.diff;
+ assert this.diff.getAddedFiles().contains(newFileName2) : this.diff;
+ assert this.diff.getDeletedFiles().size() == 2 : this.diff;
+ assert this.diff.getDeletedFiles().contains(origFileName1) : this.diff;
+ assert this.diff.getDeletedFiles().contains(origFileName2) : this.diff;
+ assert this.diff.getChangedFiles().isEmpty() : this.diff;
+ assert this.diff.getBackedUpFiles().isEmpty() : this.diff;
+ assert this.diff.getIgnoredFiles().isEmpty() : this.diff;
+ assert this.diff.getRealizedFiles().isEmpty() : this.diff;
+ assert this.diff.getRestoredFiles().isEmpty() : this.diff;
+ assert !this.diff.wasCleaned() : this.diff;
+ assert this.diff.getErrors().isEmpty() : this.diff;
}
private void baseX_X_X(boolean dryRun) throws Exception {
diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index a772ef0..d712401 100644
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@ -231,11 +231,17 @@ public class AntBundlePluginComponentTest {
upgrade(true);
}
+ @Test(enabled = true)
+ public void testAntBundleInitialInstall() throws Exception {
+ doAntBundleInitialInstall(true);
+ }
+
/**
* Test deployment of an RHQ bundle recipe with archive file and raw file
+ * @param startClean if true, the destination directory will be non-existent and thus clean
+ * if false, this will put some junk files in the dest directory
*/
- @Test(enabled = true)
- public void testAntBundleInitialInstall() throws Exception {
+ private void doAntBundleInitialInstall(boolean startClean) throws Exception {
ResourceType resourceType = new ResourceType("testSimpleBundle2Type", "plugin", ResourceCategory.SERVER, null);
BundleType bundleType = new BundleType("testSimpleBundle2BType", resourceType);
Repo repo = new Repo("test-bundle-two");
@@ -273,6 +279,25 @@ public class AntBundlePluginComponentTest {
props.store(outputStream, "test.properties comment");
outputStream.close();
+ // if we are not to start clean, create some junk files that will need to be backed up and moved away
+ if (startClean == false) {
+ this.destDir.mkdirs();
+ File junk1 = new File(this.destDir, "junk1.properties");
+ Properties junkProps = new Properties();
+ junkProps.setProperty("junk1", "wot gorilla?");
+ FileOutputStream os = new FileOutputStream(junk1);
+ junkProps.store(os, "junk1.properties comment");
+ os.close();
+
+ File junk2 = new File(this.destDir, "junksubdir" + File.separatorChar + "junk2.properties");
+ junk2.getParentFile().mkdirs();
+ junkProps = new Properties();
+ junkProps.setProperty("junk2", "more junk");
+ os = new FileOutputStream(junk2);
+ junkProps.store(os, "junk2.properties comment");
+ os.close();
+ }
+
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(this.bundleFilesDir);
request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
@@ -501,8 +526,129 @@ public class AntBundlePluginComponentTest {
assert "2".equals(props.getProperty("external2")) : "bundle purge removed our unmanaged file 2";
}
+ /**
+ * Test deployment of an RHQ bundle recipe where the deploy directory is to be fully managed.
+ * This is the typical use-case and the default behavior.
+ */
+ @Test(enabled = true)
+ public void testAntBundleManageRootDir() throws Exception {
+ ResourceType resourceType = new ResourceType("testManageRootDirBundle", "plugin", ResourceCategory.SERVER, null);
+ BundleType bundleType = new BundleType("testManageRootDirBundle", resourceType);
+ Repo repo = new Repo("testManageRootDirBundle");
+ PackageType packageType = new PackageType("testManageRootDirBundle", resourceType);
+ Bundle bundle = new Bundle("testManageRootDirBundle", bundleType, repo, packageType);
+ BundleVersion bundleVersion = new BundleVersion("testManageRootDirBundle", "1.0", bundle,
+ getRecipeFromFile("test-bundle-manage-root-dir.xml"));
+ BundleDestination destination = new BundleDestination(bundle, "testManageRootDirBundle", new ResourceGroup(
+ "testManageRootDirBundle"), DEST_BASE_DIR_NAME, this.destDir.getAbsolutePath());
+ Configuration config = new Configuration();
+
+ BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
+ deployment.setBundleVersion(bundleVersion);
+ deployment.setConfiguration(config);
+ deployment.setDestination(destination);
+
+ // create bundle test files
+ File file0 = new File(this.bundleFilesDir, "zero.properties");
+ Properties props = new Properties();
+ props.setProperty("zero", "0");
+ FileOutputStream outputStream = new FileOutputStream(file0);
+ props.store(outputStream, "zero file");
+ outputStream.close();
+
+ File file1 = new File(this.bundleFilesDir, "one.properties");
+ props.clear();
+ props.setProperty("one", "1");
+ outputStream = new FileOutputStream(file1);
+ props.store(outputStream, "one file");
+ outputStream.close();
+
+ File file2 = new File(this.bundleFilesDir, "two.properties");
+ props.clear();
+ props.setProperty("two", "2");
+ outputStream = new FileOutputStream(file2);
+ props.store(outputStream, "two file");
+ outputStream.close();
+
+ // create some external test files that don't belong to the bundle but are in the dest dir (which is to be managed by the bundle)
+ this.destDir.mkdirs();
+ File external1 = new File(this.destDir, "external1.properties");
+ props.clear();
+ props.setProperty("external1", "1");
+ outputStream = new FileOutputStream(external1);
+ props.store(outputStream, "external1 file");
+ outputStream.close();
+
+ File external2 = new File(this.destDir, "extdir/external2.properties");
+ external2.getParentFile().mkdirs();
+ props.clear();
+ props.setProperty("external2", "2");
+ outputStream = new FileOutputStream(external2);
+ props.store(outputStream, "external2 file");
+ outputStream.close();
+
+ // deploy the bundle
+ BundleDeployRequest request = new BundleDeployRequest();
+ request.setBundleFilesLocation(this.bundleFilesDir);
+ request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
+ request.setBundleManagerProvider(new MockBundleManagerProvider());
+ request.setAbsoluteDestinationDirectory(this.destDir);
+
+ BundleDeployResult results = plugin.deployBundle(request);
+
+ assertResultsSuccess(results);
+
+ // test that files were deployed in the proper place
+ props.clear();
+ loadProperties(props, new FileInputStream(new File(this.destDir, "zero.properties")));
+ assert "0".equals(props.getProperty("zero")) : "did not deploy bundle correctly 0";
+ loadProperties(props, new FileInputStream(new File(this.destDir, "subdir1/one.properties")));
+ assert "1".equals(props.getProperty("one")) : "did not deploy bundle correctly 1";
+ loadProperties(props, new FileInputStream(new File(this.destDir, "subdir2/two.properties")));
+ assert "2".equals(props.getProperty("two")) : "did not deploy bundle correctly 2";
+
+ DeploymentsMetadata metadata = new DeploymentsMetadata(this.destDir);
+ assert metadata.isManaged() == true : "missing metadata directory";
+ assert metadata.getCurrentDeploymentProperties().getManageRootDir() == true : "should be managing root dir";
+
+ // make sure our external files/directories were removed because
+ // they aren't part of the bundle and we are fully managing the dest dir
+ props.clear();
+ try {
+ loadProperties(props, new FileInputStream(new File(this.destDir, "external1.properties")));
+ assert false : "bundle deployment did not remove our managed file 1";
+ } catch (Exception ok) {
+ }
+ try {
+ loadProperties(props, new FileInputStream(new File(this.destDir, "extdir/external2.properties")));
+ assert false : "bundle deployment did not remove our managed file 2";
+ } catch (Exception ok) {
+ }
+
+ // now purge the bundle - this should purge everything in the deploy dir because we are fully managing it
+ BundlePurgeRequest purgeRequest = new BundlePurgeRequest();
+ purgeRequest.setLiveResourceDeployment(new BundleResourceDeployment(deployment, null));
+ purgeRequest.setBundleManagerProvider(new MockBundleManagerProvider());
+ purgeRequest.setAbsoluteDestinationDirectory(this.destDir);
+
+ BundlePurgeResult purgeResults = plugin.purgeBundle(purgeRequest);
+ assertResultsSuccess(purgeResults);
+
+ // make sure our bundle files have been completely purged; the metadata directory should have been purged too
+ assert new File(this.destDir, "zero.properties").exists() == false;
+ assert new File(this.destDir, "subdir1/one.properties").exists() == false;
+ assert new File(this.destDir, "subdir2/two.properties").exists() == false;
+ assert new File(this.destDir, "subdir1").exists() == false;
+ assert new File(this.destDir, "subdir2").exists() == false;
+ assert this.destDir.exists() == false : "deploy dir should not exist, we were told to fully manage it";
+
+ metadata = new DeploymentsMetadata(this.destDir);
+ assert metadata.getMetadataDirectory().exists() == false : "metadata directory should not exist";
+ }
+
private void upgrade(boolean clean) throws Exception {
- testAntBundleInitialInstall(); // install a bundle first
+ doAntBundleInitialInstall(clean); // install a bundle first
cleanPluginDirs(); // clean everything but the dest dir - we want to upgrade the destination
prepareBeforeTestMethod(); // prepare for our new test
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-bundle-manage-root-dir.xml b/modules/plugins/ant-bundle/src/test/resources/test-bundle-manage-root-dir.xml
new file mode 100644
index 0000000..9b77dd8
--- /dev/null
+++ b/modules/plugins/ant-bundle/src/test/resources/test-bundle-manage-root-dir.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<project name="simple-build" default="main"
+ xmlns:rhq="antlib:org.rhq.bundle">
+
+ <rhq:bundle name="testManageRootDirBundle" version="1.0">
+ <rhq:deployment-unit name="simulated-war" manageRootDir="true">
+ <rhq:file name="zero.properties" destinationFile="zero.properties"/>
+ <rhq:file name="one.properties" destinationFile="subdir1/one.properties"/>
+ <rhq:file name="two.properties" destinationFile="subdir2/two.properties"/>
+ </rhq:deployment-unit>
+ </rhq:bundle>
+
+ <target name="main"/>
+
+</project>
\ No newline at end of file
commit bfa42ba7f59974382e9c79f652926327f3efc28e
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Jan 26 15:23:25 2012 -0600
Add code to reset and reinstall the database after an overwrite or upgrade test is run.
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
index 6633cb7..e4fb711 100644
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
+++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
@@ -27,6 +27,7 @@ import java.io.File;
import java.net.URL;
import java.util.Properties;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -67,6 +68,12 @@ public class DBInstallationTest {
installer.setLogDirectory(new File(LOG_DIRECTORY));
}
+ @AfterMethod
+ public void afterInstallation() throws Exception {
+ recreateTestDatabase();
+ installer.createNewDatabaseSchema(getInstallProperties());
+ }
+
@Test
public void overwriteJON230Schema() throws Exception {
installSchemaAndData("2.3.0");
commit 3f948097a57f7d20105474f2d2cc9a0e6e9dd892
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Jan 26 11:03:40 2012 -0600
Revert "DBInstallationTest needs to use its own dedicated database"
This reverts commit cf001e9bc410896e57b7767164711fd8f819ccd8.
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index bd1474a..7f79832 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -35,8 +35,6 @@
<product.help.guide.agent>Running+the+RHQ+Agent</product.help.guide.agent>
<product.help.FAQ>FAQ</product.help.FAQ>
<product.help.config.props>http://support.rhq-project.org/display/JOPR2/Startup+Properties#Configuring…</product.help.config.props>
-
- <rhq.db.installation.test.db-name>rhq_installer_test_db</rhq.db.installation.test.db-name>
</properties>
<dependencies>
@@ -151,8 +149,6 @@
<rhq.db.admin.password>${rhq.db.admin.password}</rhq.db.admin.password>
<rhq.test.ds.user-name>${rhq.test.ds.user-name}</rhq.test.ds.user-name>
<rhq.test.ds.password>${rhq.test.ds.password}</rhq.test.ds.password>
- <rhq.db.installation.test.db-name>${rhq.db.installation.test.db-name}</rhq.db.installation.test.db-name>
- <rhq.db.installation.test.connection-url>jdbc:postgresql://${rhq.test.ds.server-name}:5432/${rhq.db.installation.test.db-name}</rhq.db.installation.test.connection-url>
</systemPropertyVariables>
</configuration>
</plugin>
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
index 3bff054..6633cb7 100644
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
+++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
@@ -23,15 +23,18 @@
package org.rhq.enterprise.installer;
-import org.rhq.core.db.reset.DBReset;
-import org.rhq.core.db.setup.DBSetup;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
import java.io.File;
import java.net.URL;
import java.util.Properties;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import org.rhq.core.db.reset.DBReset;
+import org.rhq.core.db.setup.DBSetup;
+import org.rhq.enterprise.installer.ServerInformation;
+import org.rhq.enterprise.installer.ServerProperties;
+
/**
* The tests in this class exercise the dbsetup/dbupgrade code that is run in the installer. The tests currently only
* run against postgresql. Support needs to be added for oracle. The tests do not do any post-install/upgrade
@@ -43,12 +46,12 @@ import java.util.Properties;
public class DBInstallationTest {
private final String LOG_DIRECTORY = System.getProperty("java.io.tmpdir", "rhq/installer-test");
- private final String DB_NAME = System.getProperty("rhq.db.installation.test.db-name", "rhq_installer_test_db");
+ private final String DB_NAME = System.getProperty("rhq.test.ds.db-name", "rhq_installer_test_db");
private final String USERNAME = System.getProperty("rhq.test.ds.user-name", "rhqadmin");
private final String PASSWORD = System.getProperty("rhq.test.ds.password", "rhqadmin");
private final String SERVER = System.getProperty("rhq.test.ds.server-name", "127.0.0.1");
- private final String DB_URL = System.getProperty("rhq.db.installation.test.connection-url",
- "jdbc:postgresql://" + SERVER + ":5432/" + DB_NAME);
+ private final String DB_URL = System.getProperty("rhq.test.ds.connection-url", "jdbc:postgresql://" + SERVER
+ + ":5432/" + DB_NAME);
private final String ADMIN_USERNAME = System.getProperty("rhq.db.admin.username", "postgres");
private final String ADMIN_PASSWORD = System.getProperty("rhq.db.admin.password", "postgres");
private static final String DB_TYPE_MAPPING = System.getProperty("rhq.test.ds.type-mapping", "PostgreSQL");
commit c1aa992c86006933eb955dc6d90ff9728f897863
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Jan 26 11:02:28 2012 -0600
Revert "Updating the installer test to:"
This reverts commit 842ad5f20b752884d19e55d8f87e0e7252f78154.
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index c1dd476..bd1474a 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -145,13 +145,14 @@
<systemPropertyVariables>
<rhq.test.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.test.ds.type-mapping>
<rhq.test.ds.server-name>${rhq.test.ds.server-name}</rhq.test.ds.server-name>
- <rhq.test.ds.port>${rhq.test.ds.port}</rhq.test.ds.port>
- <rhq.db.installation.test.db-name>${rhq.db.installation.test.db-name}</rhq.db.installation.test.db-name>
+ <rhq.test.ds.db-name>${rhq.test.ds.db-name}</rhq.test.ds.db-name>
<rhq.test.ds.connection-url>${rhq.test.ds.connection-url}</rhq.test.ds.connection-url>
<rhq.db.admin.username>${rhq.db.admin.username}</rhq.db.admin.username>
<rhq.db.admin.password>${rhq.db.admin.password}</rhq.db.admin.password>
<rhq.test.ds.user-name>${rhq.test.ds.user-name}</rhq.test.ds.user-name>
<rhq.test.ds.password>${rhq.test.ds.password}</rhq.test.ds.password>
+ <rhq.db.installation.test.db-name>${rhq.db.installation.test.db-name}</rhq.db.installation.test.db-name>
+ <rhq.db.installation.test.connection-url>jdbc:postgresql://${rhq.test.ds.server-name}:5432/${rhq.db.installation.test.db-name}</rhq.db.installation.test.connection-url>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -340,8 +341,8 @@
<id>oracle</id>
<activation>
<property>
- <name>rhq.test.ds.type-mapping</name>
- <value>Oracle10g</value>
+ <name>rhq.test.db.type</name>
+ <value>oracle</value>
</property>
</activation>
<build>
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
index 81c5664..3bff054 100644
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
+++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
@@ -47,9 +47,8 @@ public class DBInstallationTest {
private final String USERNAME = System.getProperty("rhq.test.ds.user-name", "rhqadmin");
private final String PASSWORD = System.getProperty("rhq.test.ds.password", "rhqadmin");
private final String SERVER = System.getProperty("rhq.test.ds.server-name", "127.0.0.1");
- private final String PORT = System.getProperty("rhq.test.ds.port", "5432");
- private final String DB_URL = System.getProperty("rhq.test.ds.connection-url", "jdbc:postgresql://" + SERVER
- + ":" + PORT + "/" + DB_NAME);
+ private final String DB_URL = System.getProperty("rhq.db.installation.test.connection-url",
+ "jdbc:postgresql://" + SERVER + ":5432/" + DB_NAME);
private final String ADMIN_USERNAME = System.getProperty("rhq.db.admin.username", "postgres");
private final String ADMIN_PASSWORD = System.getProperty("rhq.db.admin.password", "postgres");
private static final String DB_TYPE_MAPPING = System.getProperty("rhq.test.ds.type-mapping", "PostgreSQL");
commit 04cd6df03ec0dd2bdd6093c313c55a4ff3cb3110
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jan 26 21:56:13 2012 +0100
First cut at content-based (re-)deployment
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 6fa678b..9651be2 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -51,6 +51,8 @@ public class ASConnection {
private ObjectMapper mapper;
public static boolean verbose = false; // This is a variable on purpose, so devs can switch it on in the debugger or in the agent
Authenticator passwordAuthenticator ;
+ private String host;
+ private int port;
/**
* Construct an ASConnection object. The real "physical" connection is done in
@@ -61,6 +63,8 @@ public class ASConnection {
* @param password password needed for authentication
*/
public ASConnection(String host, int port, String user, String password) {
+ this.host = host;
+ this.port = port;
try {
url = new URL("http", host, port, MANAGEMENT);
@@ -258,5 +262,11 @@ public class ASConnection {
}
}
+ public String getHost() {
+ return host;
+ }
+ public int getPort() {
+ return port;
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
index a5b8bdd..ff5aa94 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
@@ -66,8 +66,15 @@ public class ASUploadConnection {
public ASUploadConnection(String dcHost, int port, String user, String password) {
this.host = dcHost;
this.port = port;
- passwordAuthenticator = new AS7Authenticator(user,password);
- Authenticator.setDefault(passwordAuthenticator);
+ if (user!=null) {
+ passwordAuthenticator = new AS7Authenticator(user,password);
+ Authenticator.setDefault(passwordAuthenticator);
+ }
+ }
+
+ public ASUploadConnection(ASConnection asConnection) {
+ this.host=asConnection.getHost();
+ this.port=asConnection.getPort();
}
public OutputStream getOutputStream(String fileName) {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index e4fa0e4..7510a8f 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -70,7 +70,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-public class BaseComponent<T extends ResourceComponent<?>> implements ResourceComponent<T>, MeasurementFacet, ConfigurationFacet, DeleteResourceFacet,
+public class BaseComponent<T extends ResourceComponent<?>> implements ResourceComponent<T>, MeasurementFacet, ConfigurationFacet,
+ DeleteResourceFacet,
CreateChildResourceFacet, OperationFacet
{
private static final String INTERNAL = "_internal:";
@@ -341,13 +342,18 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
if (fileName.startsWith("C:\\fakepath\\")) { // TODO this is a hack as the server adds the fake path somehow
fileName=fileName.substring("C:\\fakepath\\".length());
}
-
- String tmpName = fileName; // TODO figure out the tmp-name biz with the AS guys
+ String runtimeName = fileName;
+ PropertySimple rtNameProp = report.getPackageDetails().getDeploymentTimeConfiguration().getSimple("runtimeName");
+ if (rtNameProp != null) {
+ String rtn = rtNameProp.getStringValue();
+ if (rtn!=null && !rtn.isEmpty())
+ runtimeName = rtn;
+ }
JsonNode resultNode = uploadResult.get("result");
String hash = resultNode.get("BYTES_VALUE").getTextValue();
- return runDeploymentMagicOnServer(report, fileName, tmpName, hash);
+ return runDeploymentMagicOnServer(report, runtimeName, fileName, hash);
}
/**
@@ -367,7 +373,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
ASConnection connection = getASConnection();
- Operation step1 = new Operation("add","deployment",deploymentName);
+ Operation step1 = new Operation("add","deployment",runtimeName);
// step1.addAdditionalProperty("hash", new PROPERTY_VALUE("BYTES_VALUE", hash));
List<Object> content = new ArrayList<Object>(1);
Map<String,Object> contentValues = new HashMap<String,Object>();
@@ -429,6 +435,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
report.setStatus(CreateResourceStatus.SUCCESS);
report.setResourceName(runtimeName);
report.setResourceKey(resourceKey);
+ report.getPackageDetails().setSHA256(hash);
+ report.getPackageDetails().setInstallationTimestamp(System.currentTimeMillis());
log.info(" ... with success and key [" + resourceKey + "]" );
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
index 56eee84..2e6163d 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -1,18 +1,46 @@
package org.rhq.modules.plugins.jbossas7;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.codehaus.jackson.JsonNode;
+
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.content.PackageDetailsKey;
+import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.transfer.ContentResponseResult;
+import org.rhq.core.domain.content.transfer.DeployPackageStep;
+import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
+import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.content.ContentFacet;
+import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.pluginapi.inventory.CreateResourceReport;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
+import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.ComplexResult;
import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
+import org.rhq.modules.plugins.jbossas7.json.ReadChildrenResources;
import org.rhq.modules.plugins.jbossas7.json.Result;
/**
* Deal with deployments
* @author Heiko W. Rupp
*/
-public class DeploymentComponent extends BaseComponent implements OperationFacet{
+public class DeploymentComponent extends BaseComponent implements OperationFacet, ContentFacet {
+
+ private boolean verbose = ASConnection.verbose;
@Override
public AvailabilityType getAvailability() {
@@ -21,7 +49,7 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet
if (!res.isSuccess())
return AvailabilityType.DOWN;
- if (!(Boolean)(res.getResult()))
+ if (res.getResult()== null || !(Boolean)(res.getResult()))
return AvailabilityType.DOWN;
return AvailabilityType.UP;
@@ -50,4 +78,121 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet
return result;
}
+
+
+ @Override
+ public List<DeployPackageStep> generateInstallationSteps(ResourcePackageDetails packageDetails) {
+ return new ArrayList<DeployPackageStep>();
+ }
+
+ @Override
+ public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> packages,
+ ContentServices contentServices) {
+
+ DeployPackagesResponse response = new DeployPackagesResponse();
+
+ if (packages.size()!=1) {
+ response.setOverallRequestResult(ContentResponseResult.FAILURE);
+ response.setOverallRequestErrorMessage("Can only deploy one package at a time");
+ }
+
+ ResourcePackageDetails detail = packages.iterator().next();
+
+ ASUploadConnection uploadConnection = new ASUploadConnection(getASConnection());
+ OutputStream out = uploadConnection.getOutputStream(detail.getFileName());
+ ResourceType resourceType = context.getResourceType();
+
+ log.info("trying " + resourceType.getName() + ", " + detail.getKey() );
+
+ contentServices.downloadPackageBits(context.getContentContext(),
+ detail.getKey(), out, true);
+
+ JsonNode uploadResult = uploadConnection.finishUpload();
+ if (verbose)
+ log.info(uploadResult);
+
+ if (ASUploadConnection.isErrorReply(uploadResult)) {
+ response.setOverallRequestResult(ContentResponseResult.FAILURE);
+ response.setOverallRequestErrorMessage(ASUploadConnection.getFailureDescription(uploadResult));
+
+ return response;
+ }
+ JsonNode resultNode = uploadResult.get("result");
+ String hash = resultNode.get("BYTES_VALUE").getTextValue();
+
+
+ CreateResourceReport report1 = new CreateResourceReport("", resourceType, new Configuration(),
+ new Configuration(), detail);
+ //CreateResourceReport report = runDeploymentMagicOnServer(report1,detail.getKey().getName(),hash, hash);
+
+ try {
+ redeployOnServer(detail.getKey().getName(), hash);
+ response.setOverallRequestResult(ContentResponseResult.SUCCESS);
+ }
+ catch (Exception e) {
+ response.setOverallRequestResult(ContentResponseResult.FAILURE);
+ }
+
+
+ return response;
+ }
+
+ private void redeployOnServer(String name, String hash) throws Exception {
+
+ Operation op = new Operation("full-replace-deployment", new Address());
+ op.addAdditionalProperty("name",name);
+ List<Object> content = new ArrayList<Object>(1);
+ Map<String,Object> contentValues = new HashMap<String,Object>();
+ contentValues.put("hash",new PROPERTY_VALUE("BYTES_VALUE",hash));
+ content.add(contentValues);
+ op.addAdditionalProperty("content",content);
+ Result result = getASConnection().execute(op);
+ if (result.isRolledBack())
+ throw new Exception(result.getFailureDescription());
+ }
+
+ @Override
+ public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) {
+ return null; // TODO: Customise this generated block
+ }
+
+ @Override
+ public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) {
+
+ Set<ResourcePackageDetails> details = new HashSet<ResourcePackageDetails>();
+
+ // PackageType = "Deployment"
+ Address address1 = getAddress().getParent();
+ Operation op = new ReadChildrenResources(address1,"deployment");
+ ComplexResult cres = getASConnection().executeComplex(op);
+
+ if (!cres.isSuccess())
+ return details;
+
+ Map<String,Object> deployments = cres.getResult();
+ for (String key : deployments.keySet()) {
+ Map<String,Object> deployment = (Map<String, Object>) deployments.get(key);
+
+ List<Map> contentList = (List<Map>) deployment.get("content");
+ Map<String,Map> hashMap = contentList.get(0);
+ Map<String,String> bvMap = hashMap.get("hash");
+ String content = bvMap.get("BYTES_VALUE");
+ PackageDetailsKey pdKey = new PackageDetailsKey(key,
+ content, // no way to obtain the user defined version from the server
+ type.getName(),
+ "noarch"
+ );
+ ResourcePackageDetails detail = new ResourcePackageDetails(pdKey);
+ detail.setSHA256(content);
+
+ details.add(detail);
+ }
+
+ return details;
+ }
+
+ @Override
+ public InputStream retrievePackageBits(ResourcePackageDetails packageDetails) {
+ return null; // TODO: Customise this generated block
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index b044848..fdebf0a 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -185,8 +185,6 @@
displayType="summary" measurementType="dynamic" description="Max time for a request since last metric get" units="milliseconds"
displayName="Maximum request time"/>
- <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
- displayType="summary"/>
<metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
<metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
<metric property="product-name" dataType="trait" displayName="Name of the product"/>
@@ -1108,17 +1106,13 @@
description="The number of times that statements from the cache were used"/>
<metric property="AverageBlockingTime" units="milliseconds"
description="The average time spent blocking for a connection"/>
- <metric property="MaxWaitTime" units="milliseconds"
- description="The maximum wait time for a connection" displayType="summary"/>
<metric property="ActiveCount"
description="The active count"/>
<metric property="CreatedCount" description="The created count" measurementType="trendsup"/>
<metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/>
- <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection" units="milliseconds" displayType="summary"/>
<metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/>
<metric property="AvailableCount" description="The available count" units="milliseconds"/>
<metric property="MaxUsedCount" description="The maximum number of connections used"/>
- <metric property="TimedOut" description="The timed out count" measurementType="trendsup" displayType="summary"/>
<metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/>
<metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/>
<metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/>
@@ -2155,7 +2149,7 @@ working area for individual server instances</li></ul>"/>
<content name="file" category="deployable" isCreationType="true" description="Deployments on this server group">
<configuration>
<c:group name="deployment" displayName="Deployment Options">
- <c:simple-property name="runtimeName" required="false"/>
+ <c:simple-property name="runtimeName" required="false" description="Runtime name of the uploaded file (e.g. 'my.war'). If not present, the file name is used."/>
</c:group>
</configuration>
</content>
commit 9586f50ca5fa7b8ab9046ee50a29223c2a6d0608
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jan 26 12:09:16 2012 +0100
BZ 766284 - Follow the type renaming from the plugin descriptor to again correctly detect server state.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
index 0352765..8fdb02e 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
@@ -18,13 +18,10 @@
*/
package org.rhq.modules.plugins.jbossas7;
-import java.util.ArrayList;
-import java.util.List;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.Operation;
-import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
import org.rhq.modules.plugins.jbossas7.json.Result;
@@ -44,13 +41,13 @@ public class ManagedASComponent extends BaseComponent {
@Override
public AvailabilityType getAvailability() {
- if (context.getResourceType().getName().equals("JBossAS7 Managed Server")) {
+ if (context.getResourceType().getName().equals("Managed Server")) {
Address theAddress = new Address();
String host = pluginConfiguration.getSimpleValue("domainHost","local");
theAddress.add("host",host);
theAddress.add("server-config", myServerName);
Operation getStatus = new ReadAttribute(theAddress,"status");
- Result result = null;
+ Result result;
try {
result = connection.execute(getStatus);
} catch (Exception e) {
commit 667e32201f8701e6e0ebf04e2b57ff5f1570505b
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jan 26 11:38:30 2012 +0100
Add a getParent() method to addresses.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
index 51fc3a2..ad0d6cf 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
@@ -195,4 +195,23 @@ public class Address {
PROPERTY_VALUE property_value = path.get(n);
return property_value.getKey() + "=" + property_value.getValue();
}
+
+ /**
+ * Return the parent Address of the current one. That is the address with one
+ * path segment less.
+ * If the current address is empty (the root), an empty address is returned.
+ * @return parent Address
+ */
+ public Address getParent() {
+ Address tmp = new Address();
+ int l = path.size();
+ if (l<1)
+ return tmp;
+
+ for (int i = 0; i < l-1 ; i++) {
+ tmp.path.add(path.get(i));
+ }
+
+ return tmp;
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java
index 113bc53..882d377 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java
@@ -60,4 +60,31 @@ public class PathHandlingTest {
assert a.size()==3 : "Size was not 3, but "+ a.size();
assert !a.isEmpty();
}
+
+ public void getParent1() throws Exception {
+ String path = "subsystem=jms,profile=default,queue=foo";
+ Address a = new Address(path);
+ Address b = a.getParent();
+ assert b!=null;
+ assert b.size()==2;
+ assert b.get(0).equals("subsystem=jms");
+ assert b.get(1).equals("profile=default");
+ }
+
+ public void getParent2() throws Exception {
+ Address a = new Address();
+ Address b = a.getParent();
+ assert b!=null;
+ assert b.isEmpty();
+ assert b.size()==0;
+ }
+
+ public void getParent3() throws Exception {
+ Address a = new Address("foo=bar");
+ Address b = a.getParent();
+ assert b!=null;
+ assert b.isEmpty();
+ assert b.size()==0;
+ }
+
}
commit 12f4bb20d501b49093710dd9b86e28e884618989
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jan 25 13:10:45 2012 +0100
If the result is not a string, try to convert it accordingly.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index 3f03e52..e4fa0e4 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -168,14 +168,14 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
continue;
}
- String val = (String) res.getResult();
+ Object val = res.getResult();
if (val==null) // One of the AS7 ways of telling "This is not implemented" See also AS7-1454
continue;
if (req.getDataType()== DataType.MEASUREMENT) {
if (!val.equals("no metrics available")) { // AS 7 returns this
try {
- Double d = Double.parseDouble(val);
+ Double d = Double.parseDouble((String)val);
MeasurementDataNumeric data = new MeasurementDataNumeric(req,d);
report.addData(data);
} catch (NumberFormatException e) {
@@ -183,7 +183,14 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
}
}
} else if (req.getDataType()== DataType.TRAIT) {
- MeasurementDataTrait data = new MeasurementDataTrait(req,val);
+
+ String realVal;
+ if (val instanceof String)
+ realVal = (String)val;
+ else
+ realVal = String.valueOf(val);
+
+ MeasurementDataTrait data = new MeasurementDataTrait(req,realVal);
report.addData(data);
}
}
commit 2967bf90637cc80e7d43484adfc7826bb7b9c033
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Jan 25 14:33:40 2012 -0600
Use a more direct approach to disable tests. The tests will now run only oracle-test profile is explictly invoked.
Also corrected property bindings for database connection settings.
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 9a1f93e..509a614 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -26,24 +26,11 @@
</dependencies>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ <profiles>
<profile>
<id>ojdbc-driver</id>
@@ -53,7 +40,7 @@
</property>
</activation>
- <!-- Make sure the Oracle JDBC jar gets included in the plugin jar's lib dir. -->
+ <!-- Make sure the Oracle JDBC jar gets included in the plugin jar's lib dir. -->
<build>
<plugins>
@@ -166,6 +153,11 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
+
+ <properties>
+ <skipTests>false</skipTests>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
@@ -181,15 +173,15 @@
<systemProperties>
<property>
<name>oracle.url</name>
- <value>${oracle.url}</value>
+ <value>${rhq.test.ds.connection-url}</value>
</property>
<property>
- <name>oracle.userid</name>
- <value>${oracle.userid}</value>
+ <name>oracle.username</name>
+ <value>${rhq.test.ds.user-name}</value>
</property>
<property>
<name>oracle.password</name>
- <value>${oracle.password}</value>
+ <value>${rhq.test.ds.password}</value>
</property>
</systemProperties>
<!-- The below is required for tests to run against Oracle.
@@ -209,6 +201,7 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
+
<build>
<plugins>
<plugin>
diff --git a/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java b/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java
index 949aaae..d9d2fb0 100644
--- a/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java
+++ b/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java
@@ -49,7 +49,7 @@ public class OracleServerComponentTest extends ComponentTest {
protected void setConfiguration(Configuration configuration, ResourceType resourceType) {
if (resourceType.getName().equals(ORACLE_SERVER)) {
log.info(configuration.getProperties());
- Pattern p = Pattern.compile("jdbc:.*:@(.*):(\\d+)/(\\w++)");
+ Pattern p = Pattern.compile("jdbc:.*:@(.*):(\\d+):(\\w++)");
String url = System.getProperty("oracle.url");
if (url == null)
throw new IllegalStateException("oracle.url system property not set");
commit 842ad5f20b752884d19e55d8f87e0e7252f78154
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Jan 25 13:23:25 2012 +0100
Updating the installer test to:
1) Not execute on Oracle
2) Support port specification (in case connection url is missing)
3) Pass the rhq.db.installation.test.db-name to the TestNG test
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index bd1474a..c1dd476 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -145,14 +145,13 @@
<systemPropertyVariables>
<rhq.test.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.test.ds.type-mapping>
<rhq.test.ds.server-name>${rhq.test.ds.server-name}</rhq.test.ds.server-name>
- <rhq.test.ds.db-name>${rhq.test.ds.db-name}</rhq.test.ds.db-name>
+ <rhq.test.ds.port>${rhq.test.ds.port}</rhq.test.ds.port>
+ <rhq.db.installation.test.db-name>${rhq.db.installation.test.db-name}</rhq.db.installation.test.db-name>
<rhq.test.ds.connection-url>${rhq.test.ds.connection-url}</rhq.test.ds.connection-url>
<rhq.db.admin.username>${rhq.db.admin.username}</rhq.db.admin.username>
<rhq.db.admin.password>${rhq.db.admin.password}</rhq.db.admin.password>
<rhq.test.ds.user-name>${rhq.test.ds.user-name}</rhq.test.ds.user-name>
<rhq.test.ds.password>${rhq.test.ds.password}</rhq.test.ds.password>
- <rhq.db.installation.test.db-name>${rhq.db.installation.test.db-name}</rhq.db.installation.test.db-name>
- <rhq.db.installation.test.connection-url>jdbc:postgresql://${rhq.test.ds.server-name}:5432/${rhq.db.installation.test.db-name}</rhq.db.installation.test.connection-url>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -341,8 +340,8 @@
<id>oracle</id>
<activation>
<property>
- <name>rhq.test.db.type</name>
- <value>oracle</value>
+ <name>rhq.test.ds.type-mapping</name>
+ <value>Oracle10g</value>
</property>
</activation>
<build>
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
index 3bff054..81c5664 100644
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
+++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
@@ -47,8 +47,9 @@ public class DBInstallationTest {
private final String USERNAME = System.getProperty("rhq.test.ds.user-name", "rhqadmin");
private final String PASSWORD = System.getProperty("rhq.test.ds.password", "rhqadmin");
private final String SERVER = System.getProperty("rhq.test.ds.server-name", "127.0.0.1");
- private final String DB_URL = System.getProperty("rhq.db.installation.test.connection-url",
- "jdbc:postgresql://" + SERVER + ":5432/" + DB_NAME);
+ private final String PORT = System.getProperty("rhq.test.ds.port", "5432");
+ private final String DB_URL = System.getProperty("rhq.test.ds.connection-url", "jdbc:postgresql://" + SERVER
+ + ":" + PORT + "/" + DB_NAME);
private final String ADMIN_USERNAME = System.getProperty("rhq.db.admin.username", "postgres");
private final String ADMIN_PASSWORD = System.getProperty("rhq.db.admin.password", "postgres");
private static final String DB_TYPE_MAPPING = System.getProperty("rhq.test.ds.type-mapping", "PostgreSQL");
commit 812590209506a08087bdd1127d0322367e36d2a1
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 24 16:31:12 2012 -0500
[BZ 703557] add support for building and running the jmx plugin on
Mac OS X / Apple JDK
(https://bugzilla.redhat.com/show_bug.cgi?id=703557)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh
index 45b99a2..19a0ae6 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -141,6 +141,10 @@ fi
# ----------------------------------------------------------------------
CLASSPATH="${RHQ_AGENT_HOME}/conf"
+if [ ! -d "${RHQ_AGENT_HOME}/lib" ]; then
+ echo "lib subdirectory does not exist under RHQ_AGENT_HOME directory: ${RHQ_AGENT_HOME}"
+ exit 1
+fi
_JAR_FILES=`cd "${RHQ_AGENT_HOME}/lib";ls -1 *.jar`
for _JAR in $_JAR_FILES ; do
_JAR="${RHQ_AGENT_HOME}/lib/${_JAR}"
@@ -151,7 +155,7 @@ for _JAR in $_JAR_FILES ; do
fi
debug_msg "CLASSPATH entry: $_JAR"
done
-for _TOOLS_JAR in "${RHQ_AGENT_JAVA_HOME}/lib/tools.jar" "${RHQ_AGENT_JAVA_HOME}/../lib/tools.jar"; do
+for _TOOLS_JAR in "${RHQ_AGENT_JAVA_HOME}/lib/tools.jar" "${RHQ_AGENT_JAVA_HOME}/../lib/tools.jar" "${RHQ_AGENT_JAVA_HOME}/Classes/classes.jar" "${RHQ_AGENT_JAVA_HOME}/../Classes/classes.jar"; do
if [ -f "${_TOOLS_JAR}" ]; then
debug_msg "CLASSPATH entry: ${_TOOLS_JAR}"
CLASSPATH="${CLASSPATH}:${_TOOLS_JAR}"
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 8780b32..bcf0cf1 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -23,14 +23,14 @@
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
- <!-- needed for the JVM Attach API. NOTE: we do not include tools.jar in the plugin jar's lib dir, because if it
+ <!-- needed for the JVM Attach API. NOTE: we do not package tools.jar in the plugin jar's lib dir, because if it
is available at runtime, rhq-agent.sh/rhq-agent.bat will add it to the Agent's classpath. -->
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.6.0</version>
<scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ <systemPath>${jdkToolsJar}</systemPath>
</dependency>
</dependencies>
@@ -64,6 +64,31 @@
</build>
<profiles>
+
+ <profile>
+ <id>sun_jdk</id>
+ <activation>
+ <file>
+ <exists>${java.home}/../lib/tools.jar</exists>
+ </file>
+ </activation>
+ <properties>
+ <jdkToolsJar>${java.home}/../lib/tools.jar</jdkToolsJar>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>osx_jdk</id>
+ <activation>
+ <file>
+ <exists>${java.home}/../Classes/classes.jar</exists>
+ </file>
+ </activation>
+ <properties>
+ <jdkToolsJar>${java.home}/../Classes/classes.jar</jdkToolsJar>
+ </properties>
+ </profile>
+
<profile>
<id>integration-tests</id>
<activation>
@@ -232,6 +257,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>cobertura-plugins</id>
<activation>
commit c862b9c470fe112c39f73215f807c39b1de034b6
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 24 22:11:07 2012 +0100
BZ 783507 - allow to enable/disable deployments on server-group level.
Availability follows enabled state.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
new file mode 100644
index 0000000..56eee84
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -0,0 +1,53 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.pluginapi.operation.OperationFacet;
+import org.rhq.core.pluginapi.operation.OperationResult;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
+import org.rhq.modules.plugins.jbossas7.json.Result;
+
+/**
+ * Deal with deployments
+ * @author Heiko W. Rupp
+ */
+public class DeploymentComponent extends BaseComponent implements OperationFacet{
+
+ @Override
+ public AvailabilityType getAvailability() {
+ Operation op = new ReadAttribute(getAddress(),"enabled");
+ Result res = getASConnection().execute(op);
+ if (!res.isSuccess())
+ return AvailabilityType.DOWN;
+
+ if (!(Boolean)(res.getResult()))
+ return AvailabilityType.DOWN;
+
+ return AvailabilityType.UP;
+ }
+
+ @Override
+ public OperationResult invokeOperation(String name,
+ Configuration parameters) throws InterruptedException, Exception {
+
+ String action;
+ if (name.equals("enable")) {
+ action = "deploy";
+ } else if (name.equals("disable")) {
+ action = "undeploy";
+ } else {
+ return super.invokeOperation(name, parameters);
+ }
+
+ Operation op = new Operation(action,getAddress());
+ Result res = getASConnection().execute(op);
+ OperationResult result = new OperationResult();
+ if (res.isSuccess())
+ result.setSimpleResult("Success");
+ else
+ result.setErrorMessage(res.getFailureDescription());
+
+ return result;
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index f80ac3c..b044848 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -141,7 +141,7 @@
<operation name="managed-server:remove" displayName="Remove managed server" description="Remove a managed server">
<parameters>
<c:simple-property name="servername" displayName="Name of the server to remove" required="true">
- <c:option-source target="resource" expression="type=JBossAS7 Managed Server"/>
+ <c:option-source target="resource" expression="type=Managed Server"/>
</c:simple-property>
<c:simple-property name="hostname" displayName="Name of the host where the server is on" required="true">
<c:option-source target="resource" expression="type=^Host$ plugin=jboss-as-7"/>
@@ -563,7 +563,7 @@
description="Information about the underlying JVM"
singleton="true">
<runs-inside>
- <parent-resource-type name="JBossAS7 Managed Server" plugin="jboss-as-7"/>
+ <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
@@ -2126,7 +2126,7 @@ working area for individual server instances</li></ul>"/>
</service>
<service name="Deployment"
- class="BaseComponent"
+ class="DeploymentComponent"
discovery="SubsystemDiscovery"
createDeletePolicy="both"
creationDataType="content">
@@ -2135,11 +2135,23 @@ working area for individual server instances</li></ul>"/>
<runs-inside>
<parent-resource-type name="ServerGroup" plugin="jboss-as-7"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
+ <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" default="deployment" readOnly="true"/>
</plugin-configuration>
+ <operation name="enable">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="disable">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+
<content name="file" category="deployable" isCreationType="true" description="Deployments on this server group">
<configuration>
<c:group name="deployment" displayName="Deployment Options">
commit fe55609882928da8855f0d4382b4a8509430e5bb
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 24 16:46:06 2012 +0100
BZ 782780, BZ 766284 - properly detect management ports on the HC, move managed hosts below HC in the resource tree,
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
index 0e58078..c464e4b 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
@@ -127,9 +127,20 @@ public class AbstractBaseDiscovery {
String portString;
String interfaceExpession;
- String socketBindingName = obtainXmlPropertyViaXPath(
+ String socketBindingName;
+
+ socketBindingName = obtainXmlPropertyViaXPath(
"//management/management-interfaces/http-interface/socket-binding/@http");
- if (socketBindingName==null || socketBindingName.isEmpty()) {
+ String socketInterface = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/socket/@interface");
+
+ if (!socketInterface.isEmpty()) {
+ interfaceExpession = obtainXmlPropertyViaXPath(
+ "//interfaces/interface[@name='" + socketInterface + "']/inet-address/@value");
+ portString = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/socket/@port");
+ }
+ else if (socketBindingName.isEmpty()) {
// old AS7.0, early 7.1 style
portString = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@port");
String interfaceName = obtainXmlPropertyViaXPath(
@@ -138,7 +149,7 @@ public class AbstractBaseDiscovery {
"/server/interfaces/interface[@name='" + interfaceName + "']/inet-address/@value");
}
else {
- // later AS7.1 and EAP6
+ // later AS7.1 and EAP6 standalone.xml
portString = obtainXmlPropertyViaXPath(
"/server/socket-binding-group/socket-binding[@name='" + socketBindingName + "']/@port");
String interfaceName = obtainXmlPropertyViaXPath(
@@ -152,13 +163,13 @@ public class AbstractBaseDiscovery {
HostPort hp = new HostPort();
if (!interfaceExpession.isEmpty())
- hp.host = replaceDollarExpression(interfaceExpession, commandLine);
+ hp.host = replaceDollarExpression(interfaceExpession, commandLine, "localhost");
else
hp.host = "localhost"; // Fallback
if (portString!=null && !portString.isEmpty()) {
- String tmp = replaceDollarExpression(portString,commandLine);
+ String tmp = replaceDollarExpression(portString,commandLine, "9990");
hp.port = Integer.valueOf(tmp);
}
else
@@ -172,17 +183,19 @@ public class AbstractBaseDiscovery {
* try to resolve it. Resolution is done by looking at the command line to see if
* there are -bmanagement or -Djboss.bind.address.management arguments present
*
+ *
* @param value a hostname or hostname expression
* @param commandLine The command line from the process
+ * @param lastResort
* @return resolved value
*/
- private String replaceDollarExpression(String value, String[] commandLine) {
+ private String replaceDollarExpression(String value, String[] commandLine, String lastResort) {
if (!value.contains("${"))
return value;
// remove ${ }
value = value.substring(2,value.length()-1);
- String fallback = "localhost";
+ String fallback = lastResort;
String expression;
if (value.contains(":")) {
int i = value.indexOf(":");
@@ -202,16 +215,19 @@ public class AbstractBaseDiscovery {
*/
String ret=null;
- for (String line: commandLine) {
+ for (int i = 0, commandLineLength = commandLine.length; i < commandLineLength; i++) {
+ String line = commandLine[i];
if (expression.contains("address")) {
if (line.contains("-bmanagement") || line.contains("jboss.bind.address.management")) {
- ret = line.substring(line.indexOf("=")+1);
+ if (line.contains("="))
+ ret = line.substring(line.indexOf("=") + 1); // -bmanagement=1.2.3.4
+ else
+ ret = commandLine[i+1]; // -bmanagement 1.2.3.4
break;
}
- }
- else if (expression.contains("port")) {
+ } else if (expression.contains("port")) {
if (line.contains(expression)) {
- ret = line.substring(line.indexOf("=")+1);
+ ret = line.substring(line.indexOf("=") + 1);
break;
}
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
index f4fa473..f21e598 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
@@ -39,6 +39,10 @@ public class HostControllerComponent extends BaseServerComponent implements Oper
private final Log log = LogFactory.getLog(HostControllerComponent.class);
+ public Configuration getHCConfig() {
+ return pluginConfiguration;
+ }
+
@Override
public OperationResult invokeOperation(String name,
Configuration parameters) throws InterruptedException, Exception {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
index 53afe21..050aef0 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
@@ -20,14 +20,11 @@ package org.rhq.modules.plugins.jbossas7;
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
@@ -37,200 +34,156 @@ import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ProcessScanResult;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-import org.rhq.core.system.ProcessInfo;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.ComplexResult;
import org.rhq.modules.plugins.jbossas7.json.Operation;
-import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
+import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
+import org.rhq.modules.plugins.jbossas7.json.ReadChildrenNames;
import org.rhq.modules.plugins.jbossas7.json.ReadResource;
+import org.rhq.modules.plugins.jbossas7.json.Result;
/**
* Discovery class for managed AS 7 instances.
*
* @author Heiko W. Rupp
*/
-@SuppressWarnings("unused")
public class ManagedASDiscovery extends AbstractBaseDiscovery implements ResourceDiscoveryComponent
{
+ private HostControllerComponent parentComponent;
+
/**
* Run the auto-discovery
*/
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext discoveryContext) throws Exception {
Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>();
- List<ProcessScanResult> scans = discoveryContext.getAutoDiscoveredProcesses();
-
- for (ProcessScanResult psr : scans) {
-
- try {
- // get the HostController, as this is an indicator for managed AS
- String psName = psr.getProcessScan().getName();
- if (!psName.equals("HostController"))
- continue;
-
- // Now we have the host controller, lets get the host.xml file
- // and obtain the servers from there.
- ProcessInfo processInfo = psr.getProcessInfo();
- readStandaloneOrHostXml(processInfo, true);
- String hostName = findHostName();
- HostPort managementHostPort = getManagementPortFromHostXml(processInfo.getCommandLine());
-
- List<ServerInfo> serverNames = getServersFromHostXml();
- for (ServerInfo serverInfo : serverNames) {
-
- Configuration config = discoveryContext.getDefaultPluginConfiguration();
- config.put(new PropertySimple("domainHost", hostName));
- config.put(new PropertySimple("group", serverInfo.group));
- config.put(new PropertySimple("port", managementHostPort.port));
- config.put(new PropertySimple("hostname", managementHostPort.host));
- if (serverInfo.bindingGroup != null) {
- config.put(new PropertySimple("socket-binding-group", serverInfo.bindingGroup));
- config.put(new PropertySimple("socket-binding-port-offset", serverInfo.portOffset));
- } else {
- HostPort dcHP = getDomainControllerFromHostXml();
- if (dcHP.port == 9999)
- dcHP.port = 9990; // TODO Hack until JBAS-9306 is solved
-
- ServerInfo dcInfo = getBindingsFromDC(dcHP, serverInfo.group);
- config.put(new PropertySimple("socket-binding-group", dcInfo.bindingGroup));
- config.put(new PropertySimple("socket-binding-port-offset", dcInfo.portOffset));
- }
- config.put(new PropertySimple("socket-binding-port-offset", serverInfo.portOffset));
-
- String path = "host=" + hostName + ",server-config=" + serverInfo.name;
- config.put(new PropertySimple("path", path));
-
- // TODO this fails for the downed servers.
- // get from the domain or other place as soon as the domain provides it.
- String homeDir = getHomeDirFromCommandLine(processInfo.getCommandLine());
- initLogFile(scans, serverInfo.name, config, homeDir);
-
- String version = determineServerVersionFromHomeDir(homeDir);
- String resourceDescription;
-
- String resourceName = serverInfo.name;
-
- if (homeDir.contains("eap")) {
- version = "EAP " + version;
- resourceDescription = "Managed JBoss Enterprise Application Platform 6 server";
- resourceName = "EAP " + resourceName;
- }
- else {
- resourceDescription = "Managed AS7 server";
- }
-
- DiscoveredResourceDetails detail = new DiscoveredResourceDetails(discoveryContext.getResourceType(), // ResourceType
+ parentComponent = (HostControllerComponent) discoveryContext.getParentResourceComponent();
+ Configuration hcConfig = parentComponent.getHCConfig();
+ String hostName = hcConfig.getSimpleValue("domainHost", "master"); // TODO good default?
+
+ HostInfo hostInfo = getHostInfo(hostName);
+ if (hostInfo==null)
+ return discoveredResources;
+
+
+ try {
+ // get the HostController, as this is an indicator for managed AS
+
+ // Now we have the host controller, lets get the host.xml file
+ // and obtain the servers from there.
+
+ List<ServerInfo> serverNames;
+ serverNames = getManagedServers(hostName);
+ for (ServerInfo serverInfo : serverNames) {
+
+ Configuration config = discoveryContext.getDefaultPluginConfiguration();
+ config.put(new PropertySimple("domainHost", hostName));
+ config.put(new PropertySimple("group", serverInfo.group));
+ if (serverInfo.bindingGroup != null) {
+ config.put(new PropertySimple("socket-binding-group", serverInfo.bindingGroup));
+ } else {
+ String group = resolveSocketBindingGroup(serverInfo.group);
+ config.put(new PropertySimple("socket-binding-group",group));
+
+ }
+ config.put(new PropertySimple("socket-binding-port-offset", serverInfo.portOffset));
+
+ String path = "host=" + hostName + ",server-config=" + serverInfo.name;
+ config.put(new PropertySimple("path", path));
+
+ // get from the domain or other place as soon as the domain provides it.
+ String serverLog = hcConfig.getSimpleValue("baseDir","/tmp")+File.separator+"domain/servers/"+serverInfo.name+"/log/server.log";
+ initLogEventSourcesConfigProp(serverLog,config);
+
+ String version;
+ String resourceDescription;
+
+ String resourceName = serverInfo.name;
+
+ if (hostInfo.productName.equalsIgnoreCase("eap")) {
+ version = "EAP " + hostInfo.productVersion;
+ resourceDescription = "Managed JBoss Enterprise Application Platform 6 server";
+ resourceName = "EAP " + resourceName;
+ }
+ else if (hostInfo.productName.equalsIgnoreCase("EDG")) {
+ version = "EDG " + hostInfo.productVersion;
+ resourceDescription = "Managed JBoss Enterprise Data Grid 6 server";
+ }
+ else {
+ resourceDescription = "Managed AS7 server";
+ version = hostInfo.releaseVersion;
+ }
+
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(discoveryContext.getResourceType(), // ResourceType
hostName + "/" + serverInfo.name, // key
resourceName, // Name
version, // TODO get from Domain as soon as it is provided
- resourceDescription, // Description
+ resourceDescription, // Description
config, null);
- // Add to return values
- discoveredResources.add(detail);
- log.info("Discovered new ... " + discoveryContext.getResourceType() + ", " + serverInfo);
- }
- } catch (Exception e) {
- log.warn("Discovery for a " + discoveryContext.getResourceType() + " failed for process " + psr + " :" + e.getMessage());
+ // Add to return values
+ discoveredResources.add(detail);
+ log.info("Discovered new ... " + discoveryContext.getResourceType() + ", " + serverInfo);
}
+ } catch (Exception e) {
+ log.warn("Discovery for a " + discoveryContext.getResourceType() + " failed for process " + " :" + e.getMessage());
}
return discoveredResources;
}
- private ServerInfo getBindingsFromDC(HostPort domainController, String serverGroup) {
- ASConnection dcConnection = new ASConnection(domainController.host, domainController.port, "-TODO-", "-TODO-"); // TODO where do we get these from?
- List<PROPERTY_VALUE> address = new ArrayList<PROPERTY_VALUE>();
- Address theAddress = new Address("server-group", serverGroup);
- Operation op = new ReadResource(theAddress);
- ComplexResult res = (ComplexResult) dcConnection.execute(op, true);
- if (res!=null && res.isSuccess()) {
- if (res.getResult().containsKey("socket-binding-group")) {
- String sbg = (String) res.getResult().get("socket-binding-group");
-
- ServerInfo serverInfo = new ServerInfo();
- serverInfo.bindingGroup = sbg;
- return serverInfo;
- }
- }
-
- return new ServerInfo();
+ private String resolveSocketBindingGroup(String serverGroup) {
+ Address address = new Address("server-group",serverGroup);
+ Operation operation = new ReadAttribute(address,"socket-binding-group");
+ Result result = parentComponent.getASConnection().execute(operation);
+ return (String) result.getResult();
}
- /**
- * Loop through the Process scans for ManagedAS and if found extract the logfile path.
- * @param scans process scan results
- * @param name server name to look for
- * @param config config to put the info in
- * @param basePath
- */
- private void initLogFile(List<ProcessScanResult> scans, String name, Configuration config, String basePath) {
-
- for (ProcessScanResult psr : scans) {
- if (!psr.getProcessScan().getName().equals("ManagedAS"))
- continue;
-
- String[] commandLine = psr.getProcessInfo().getCommandLine();
-
- //preload server.log file for event log monitoring
- String bootLogFile = getLogFileFromCommandLine(commandLine);
- String logFile = bootLogFile.substring(0, bootLogFile.lastIndexOf("/")) + File.separator + "server.log";
-
- if (logFile.contains(name))
- initLogEventSourcesConfigProp(logFile, config);
+ private List<ServerInfo> getManagedServers(String domainHost) {
+ Address address = new Address("host",domainHost);
+ Operation operation = new ReadChildrenNames(address,"server-config");
+ ASConnection connection = parentComponent.getASConnection();
+ Result res = connection.execute(operation);
+ List<String> servers = (List<String>) res.getResult();
+ List<ServerInfo> ret = new ArrayList<ServerInfo>(servers.size());
+ for (String server : servers) {
+ ServerInfo info = new ServerInfo();
+ info.name = server;
+ ret.add(info);
+
+ address= new Address("host",domainHost);
+ address.add("server-config",server);
+ operation = new ReadResource(address);
+ ComplexResult cres = connection.executeComplex(operation);
+ Map<String,Object> map = cres.getResult();
+ info.group = (String) map.get("group");
+ info.autoStart = (Boolean)map.get("auto-start");
+ Integer offset = (Integer) map.get("socket-binding-port-offset");
+ if (offset!=null)
+ info.portOffset = offset;
+ info.bindingGroup = (String) map.get("socket-binding-group");
}
+
+ return ret;
}
- private List<ServerInfo> getServersFromHostXml() {
+ private HostInfo getHostInfo(String domainHost) {
+ Address address = new Address("host",domainHost);
+ Operation operation = new ReadResource(address);
+ HostInfo info = new HostInfo();
- Element host = hostXml.getDocumentElement();
- NodeList serversElement = host.getElementsByTagName("servers");
- if (serversElement == null || serversElement.getLength() == 0) {
- log.warn("No <servers> found in host.xml");
- return Collections.emptyList();
- }
- NodeList servers = serversElement.item(0).getChildNodes();
- if (servers == null || servers.getLength() == 0) {
- log.warn("No <server> found in host.xml");
- return Collections.emptyList();
- }
- List<ServerInfo> result = new ArrayList<ServerInfo>();
- for (int i = 0; i < servers.getLength(); i++) {
- if (!(servers.item(i) instanceof Element))
- continue;
-
- ServerInfo info = new ServerInfo();
- Element server = (Element) servers.item(i);
- info.name = server.getAttribute("name");
- info.group = server.getAttribute("group");
- String autoStart = server.getAttribute("autoStart");
- if (autoStart == null || autoStart.isEmpty())
- autoStart = "false";
- info.autoStart = Boolean.getBoolean(autoStart);
-
- // Look for <socket-binding-group ref="standard-sockets" port-offset="250"/>
- NodeList sbgs = server.getChildNodes();
- if (sbgs != null) {
- for (int j = 0; j < sbgs.getLength(); j++) {
- if (!(sbgs.item(j) instanceof Element))
- continue;
-
- Element sbg = (Element) sbgs.item(j);
- if (!sbg.getNodeName().equals("socket-binding-group"))
- continue;
-
- info.bindingGroup = sbg.getAttribute("ref");
- String portOffset = sbg.getAttribute("port-offset");
- if (portOffset != null && !portOffset.isEmpty())
- info.portOffset = Integer.parseInt(portOffset);
+ ComplexResult cres = parentComponent.getASConnection().executeComplex(operation);
+ if (!cres.isSuccess())
+ return null;
- }
- }
- result.add(info);
- }
+ Map<String,Object> map = cres.getResult();
+ info.releaseCodeName = (String) map.get("release-codename");
+ info.releaseVersion = (String)map.get("release-version");
+ info.productName = (String) map.get("product-name");
+ info.productVersion = (String)map.get("product-version");
- return result;
+ return info;
}
private void initLogEventSourcesConfigProp(String fileName, Configuration pluginConfiguration) {
@@ -266,4 +219,11 @@ public class ManagedASDiscovery extends AbstractBaseDiscovery implements Resourc
}
}
+ private static class HostInfo {
+ String name;
+ String productVersion;
+ String releaseVersion;
+ String productName;
+ String releaseCodeName;
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 0474772..f80ac3c 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -328,6 +328,45 @@
</resource-configuration>
</server>
+ <server name="Managed Server"
+ discovery="ManagedASDiscovery"
+ class="ManagedASComponent"
+ >
+ <plugin-configuration>
+ <c:simple-property name="hostname" default="localhost" displayName="Management host" required="true"/>
+ <c:simple-property name="port" default="9990" type="integer" displayName="Management port" required="true"/>
+ <c:simple-property name="domainHost" readOnly="true" description="Hostname in the domain"/>
+ <c:simple-property name="group" readOnly="true" displayName="Server Group" description="Server Group this instance belongs to."/>
+ <c:simple-property name="socket-binding-group" readOnly="true" displayName="Socket binding group" description="Socket bindings to use" required="false"/>
+ <c:simple-property name="socket-binding-port-offset" readOnly="true" displayName="Port Offset" type="integer" default="0" description="Offset to the base ports"/>
+ <c:simple-property name="path" readOnly="true" />
+
+ &logSources;
+ </plugin-configuration>
+
+ <operation name="server:start" description="Start this server instance." displayName="Start">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="server:stop" description="Stop this server instance." displayName="Stop">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="server:restart" description="Restart this server instance." displayName="Restart">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+
+ <metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
+ displayType="summary"/>
+
+ <event name="logEntry" description="an entry in a log file"/>
+
+ </server>
+
<service name="DomainDeployment"
class="BaseComponent"
discovery="SubsystemDiscovery"
@@ -517,83 +556,6 @@
</server>
- <server name="JBossAS7 Managed Server"
- discovery="ManagedASDiscovery"
- class="ManagedASComponent"
- >
- <plugin-configuration>
- <c:simple-property name="hostname" default="localhost" displayName="Management host" required="true"/>
- <c:simple-property name="port" default="9990" type="integer" displayName="Management port" required="true"/>
- <c:simple-property name="domainHost" readOnly="true" description="Hostname in the domain"/>
- <c:simple-property name="group" readOnly="true" displayName="Server Group" description="Server Group this instance belongs to."/>
- <c:simple-property name="socket-binding-group" readOnly="true" displayName="Socket binding group" description="Socket bindings to use"/>
- <c:simple-property name="socket-binding-port-offset" readOnly="true" displayName="Port Offset" type="integer" default="0" description="Offset to the base ports"/>
- <c:simple-property name="path" readOnly="true" />
-
- &logSources;
- <c:group name="event" displayName="Events">
- <c:list-property name="logEventSources">
- <c:map-property name="logEventSource">
- <c:simple-property name="logFilePath" type="file" summary="true"
- description="The absolute path to the source log file."/>
- <c:simple-property name="enabled" type="boolean" summary="true"
- description="A flag indicating whether of not this log Event source is currently
- enabled (i.e. whether the associated log file should be tailed for
- new entries)."/>
- <c:simple-property name="dateFormat" required="false"
- description="The date format to use when parsing the dates in log entries. The
- format must be in the syntax defined by the Java SimpleDateFormat
- class. If not specified, the three date formats that are predefined
- by Log4J (ISO8601, DATE, and ABSOLUTE) will be tried."/>
- <c:simple-property name="includesPattern" required="false"
- description="A regular expression against which a log entry's detail is matched
- to determine if an Event should be fired for that entry. If not
- specified, no filtering of log entries will be done based on their
- detail."/>
- <c:simple-property name="minimumSeverity" required="false" default="error"
- description="The minimum severity of Events that should be collected for this
- source. If not specified, there is no minimum severity (i.e. all
- events will be collected).">
- <c:property-options>
- <c:option name="debug" value="debug"/>
- <c:option name="info" value="info"/>
- <c:option name="warn" value="warn"/>
- <c:option name="error" value="error"/>
- <c:option name="fatal" value="fatal"/>
- </c:property-options>
- </c:simple-property>
- </c:map-property>
- </c:list-property>
- </c:group>
- </plugin-configuration>
-
- <!-- Scan for host controller is intentional -->
- <process-scan name="HostController" query="process|basename|match=^java.*,arg|org.jboss.as.host-controller|match=.*"/>
- <process-scan name="ManagedAS" query="process|basename|match=^java.*,arg|org.jboss.as.server|match=.*"/>
-
- <operation name="server:start" description="Start this server instance." displayName="Start">
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
- <operation name="server:stop" description="Stop this server instance." displayName="Stop">
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
- <operation name="server:restart" description="Restart this server instance." displayName="Restart">
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
-
- <metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
- displayType="summary"/>
-
- <event name="logEntry" description="an entry in a log file"/>
-
- </server>
-
<server name="JVM"
discovery="SubsystemDiscovery"
commit f300158a2d31739222ca21a43cf6284891de7c10
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 23 11:32:56 2012 +0100
Add product-release and product-version traits (relates to BZ 734488).
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 7198463..0474772 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -189,6 +189,8 @@
displayType="summary"/>
<metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
<metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
+ <metric property="product-name" dataType="trait" displayName="Name of the product"/>
+ <metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/>
<event name="logEntry" description="an entry in a log file"/>
@@ -471,6 +473,8 @@
displayType="summary"/>
<metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
<metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
+ <metric property="product-name" dataType="trait" displayName="Name of the product"/>
+ <metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/>
<event name="logEntry" description="an entry in a log file"/>
commit 4db65364eba2f3327a0d8f13c7ac079497718388
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 23 17:49:51 2012 +0100
[BZ 767170] - The permissions are already known, don't try to fetch them
asynchronously again in the role and user views.
This simplifies the rendering of those views tremendously making them work
reliably and without possible race conditions.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 53bd86d..7d4810b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -117,13 +117,13 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildSecuritySection() {
NavigationItem usersItem = new NavigationItem(UsersView.VIEW_ID, "global/User_16.png", new ViewFactory() {
public Canvas createView() {
- return new UsersView(extendLocatorId("Users"));
+ return new UsersView(extendLocatorId("Users"), getGlobalPermissions().contains(Permission.MANAGE_SECURITY));
}
});
NavigationItem rolesItem = new NavigationItem(RolesView.VIEW_ID, "global/Role_16.png", new ViewFactory() {
public Canvas createView() {
- return new RolesView(extendLocatorId("Roles"));
+ return new RolesView(extendLocatorId("Roles"), getGlobalPermissions().contains(Permission.MANAGE_SECURITY));
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
index 3c3e91d..91f2c2f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.admin.roles;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.widgets.Canvas;
@@ -29,10 +28,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.CellClickEvent;
import com.smartgwt.client.widgets.grid.events.CellClickHandler;
-import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
-import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
-import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
@@ -46,7 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
* @author Greg Hinkle
* @author Ian Springer
*/
-public class RolesView extends TableSection<RolesDataSource> implements BookmarkableView {
+public class RolesView extends TableSection<RolesDataSource> {
public static final ViewName VIEW_ID = new ViewName("Roles", MSG.common_title_roles());
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
@@ -55,22 +51,18 @@ public class RolesView extends TableSection<RolesDataSource> implements Bookmark
private static final String HEADER_ICON = "global/Role_24.png";
private boolean hasManageSecurity;
- private boolean initialized;
- public RolesView(String locatorId) {
+ public RolesView(String locatorId, boolean hasManageSecurity) {
super(locatorId, MSG.common_title_roles());
final RolesDataSource datasource = RolesDataSource.getInstance();
setDataSource(datasource);
setHeaderIcon(HEADER_ICON);
setEscapeHtmlInDetailsLinkColumn(true);
+
+ this.hasManageSecurity = hasManageSecurity;
}
-
- @Override
- protected void onDraw() {
- fetchManageSecurityPermissionAsync();
- }
-
+
@Override
protected void configureTable() {
updateSelectionStyle();
@@ -156,31 +148,12 @@ public class RolesView extends TableSection<RolesDataSource> implements Bookmark
};
}
- private void fetchManageSecurityPermissionAsync() {
- new PermissionsLoader().loadExplicitGlobalPermissions(new PermissionsLoadedListener() {
- public void onPermissionsLoaded(Set<Permission> permissions) {
- if (permissions != null) {
- hasManageSecurity = permissions.contains(Permission.MANAGE_SECURITY);
- refreshTableInfo();
- } else {
- hasManageSecurity = false;
- }
- if (!initialized) {
- RolesView.super.onDraw();
- }
- initialized = true;
- }
- });
- }
-
private void updateSelectionStyle() {
- if (initialized) {
- if (!hasManageSecurity) {
- getListGrid().deselectAllRecords();
- }
- SelectionStyle selectionStyle = hasManageSecurity ? getDefaultSelectionStyle() : SelectionStyle.NONE;
- getListGrid().setSelectionType(selectionStyle);
+ if (!hasManageSecurity) {
+ getListGrid().deselectAllRecords();
}
+ SelectionStyle selectionStyle = hasManageSecurity ? getDefaultSelectionStyle() : SelectionStyle.NONE;
+ getListGrid().setSelectionType(selectionStyle);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
index a8b35fd..18213f1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.admin.users;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.SelectionStyle;
@@ -32,8 +31,6 @@ import com.smartgwt.client.widgets.grid.events.CellClickHandler;
import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
-import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
@@ -61,9 +58,8 @@ public class UsersView extends TableSection<UsersDataSource> {
private static final String HEADER_ICON = "global/User_24.png";
private boolean hasManageSecurity;
- private boolean initialized;
- public UsersView(String locatorId) {
+ public UsersView(String locatorId, boolean hasManageSecurity) {
super(locatorId, MSG.common_title_users());
final UsersDataSource dataSource = UsersDataSource.getInstance();
@@ -71,8 +67,8 @@ public class UsersView extends TableSection<UsersDataSource> {
setDataSource(dataSource);
setHeaderIcon(HEADER_ICON);
setEscapeHtmlInDetailsLinkColumn(true);
-
- fetchManageSecurityPermissionAsync();
+
+ this.hasManageSecurity = hasManageSecurity;
}
@Override
@@ -101,28 +97,12 @@ public class UsersView extends TableSection<UsersDataSource> {
updateSelectionStyle();
}
- private void fetchManageSecurityPermissionAsync() {
- new PermissionsLoader().loadExplicitGlobalPermissions(new PermissionsLoadedListener() {
- public void onPermissionsLoaded(Set<Permission> permissions) {
- if (permissions != null) {
- hasManageSecurity = permissions.contains(Permission.MANAGE_SECURITY);
- refreshTableInfo();
- } else {
- hasManageSecurity = false;
- }
- initialized = true;
- }
- });
- }
-
private void updateSelectionStyle() {
- if (initialized) {
- if (!hasManageSecurity) {
- getListGrid().deselectAllRecords();
- }
- SelectionStyle selectionStyle = hasManageSecurity ? getDefaultSelectionStyle() : SelectionStyle.NONE;
- getListGrid().setSelectionType(selectionStyle);
+ if (!hasManageSecurity) {
+ getListGrid().deselectAllRecords();
}
+ SelectionStyle selectionStyle = hasManageSecurity ? getDefaultSelectionStyle() : SelectionStyle.NONE;
+ getListGrid().setSelectionType(selectionStyle);
}
private List<ListGridField> createFields() {
commit f585a36371486dd5d2aa2639f6c17be53e33e0a1
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 23 17:45:46 2012 +0100
Added some clarification to the javadocs of InitializableView to lower
the expectations one might have about it.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java
index b5fc3b9..f503d99 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java
@@ -33,7 +33,12 @@ public interface InitializableView {
/**
* Return true if this widget's {@link BaseWidget#init() initialization} has completed, or false otherwise.
- *
+ * <p>
+ * Don't expect this to work automagically if the result of this method is dependent on some asynchronous call.
+ * The consumers of this method need in that case loop and check this method periodically. If you cannot guarantee
+ * all the callers of this method on your instance actually do that, you can't assume that the results of
+ * the asynchronous call will be taken into account correctly.
+ *
* @return true if this widget's {@link BaseWidget#init() initialization} has completed, or false otherwise
*/
boolean isInitialized();
commit 5c0202533709fe382b7db4d10c7d55834f9400c4
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 23 21:20:11 2012 -0500
if an exception occurs when discoverResource() calls ProcessComponent.getProcessForConfiguration(), include it as the cause of the RuntimeException that is thrown, rather than swallowing it; set a description on the details object returned by discoverResource()
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessDiscoveryComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessDiscoveryComponent.java
index f30f923..1f506aa 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessDiscoveryComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessDiscoveryComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -52,22 +52,25 @@ public class ProcessDiscoveryComponent implements ResourceDiscoveryComponent, Ma
resourceDiscoveryContext.getSystemInformation());
}
catch (Exception e) {
- throw new RuntimeException("Failed to create process based on plugin config: " + pluginConfig);
+ throw new RuntimeException("Failed to manually add process Resource based on plugin config: "
+ + pluginConfig.toString(true), e);
}
String type = pluginConfig.getSimpleValue("type", "pidFile");
String resourceKey = pluginConfig.getSimpleValue(type, null);
if (resourceKey == null || resourceKey.length() == 0) {
- throw new InvalidPluginConfigurationException("Invalid type [" + type + "] value [" + resourceKey + "]");
+ throw new InvalidPluginConfigurationException("Invalid type [" + type + "] value: [" + resourceKey + "]");
}
ResourceType resourceType = resourceDiscoveryContext.getResourceType();
String resourceName = processInfo.getBaseName();
String resourceVersion = null;
- String resourceDescription = null;
+ String resourceDescription = processInfo.getBaseName() + " process with "
+ + (type.equals("pidFile") ? "PID file" : "PIQL expression") + " [" + resourceKey + "]";
DiscoveredResourceDetails detail = new DiscoveredResourceDetails(resourceType, resourceKey, resourceName,
resourceVersion, resourceDescription, pluginConfig, processInfo);
return detail;
}
+
}
commit dbe929c0ce98c4acb513a9c35dd94113f309a7ea
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 23 21:17:18 2012 -0500
fix generics-related compiler warning
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformDiscoveryComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformDiscoveryComponent.java
index d7e9ef9..e795810 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformDiscoveryComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformDiscoveryComponent.java
@@ -1,4 +1,4 @@
- /*
+/*
* RHQ Management Platform
* Copyright (C) 2005-2008 Red Hat, Inc.
* All rights reserved.
@@ -51,7 +51,7 @@ public abstract class PlatformDiscoveryComponent implements ResourceDiscoveryCom
*/
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) {
if (!isPlatformSupported(context)) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
SystemInfo systemInfo = context.getSystemInformation();
commit 459fa871d3808fc03c56bc7930c827a29ade6587
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 23 15:04:02 2012 -0500
change the line endings back to Windows format (CRLF) (IntelliJ
converted them to Unix format (LF) on my last commit)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.bat b/modules/enterprise/agent/src/etc/rhq-agent.bat
index fc8bdf1..005e535 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent.bat
@@ -1,227 +1,227 @@
-@echo off
-
-rem ===========================================================================
-rem RHQ Agent Windows Startup Script
-rem
-rem This file is used to execute the RHQ Agent on a Windows platform.
-rem Run this script with the --help option for the runtime options.
-rem
-rem Note that this script can also be used to simply set environment variables
-rem that define the agent's environment but it will not actually run the agent.
-rem Pass in _SETENV_ONLY as the first argument to this script if you want this
-rem behavior.
-rem
-rem This script is customizable by setting certain environment variables, which
-rem are described in comments in rhq-agent-env.bat. The variables can also be
-rem set via rhq-agent-env.bat, which is sourced by this script.
-rem
-rem If the embedded JRE is to be used but is not available, the fallback
-rem JRE to be used will be determined by the JAVA_HOME environment variable.
-rem ===========================================================================
-
-setlocal
-
-if "%1"=="_SETENV_ONLY" (
- set _SETENV_ONLY=true
-) else (
- title RHQ Agent
-)
-
-rem if debug variable is set, it is assumed to be on, unless its value is false
-if "%RHQ_AGENT_DEBUG%" == "false" (
- set RHQ_AGENT_DEBUG=
-)
-
-rem ----------------------------------------------------------------------
-rem Change directory so the current directory is the Agent home.
-rem Here we assume this script is a child directory of the Agent home
-rem We also assume our custom environment script is located in the same
-rem place as this script.
-rem ----------------------------------------------------------------------
-
-set RHQ_AGENT_BIN_DIR_PATH=%~dp0
-
-if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" (
- if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
- call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %*
-) else (
- if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
-)
-
-rem if debug variable is set, it is assumed to be on, unless its value is false
-if "%RHQ_AGENT_DEBUG%" == "false" (
- set RHQ_AGENT_DEBUG=
-)
-
-rem if sigar debug variable is set, it is assumed to be on, unless its value is false
-if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" (
- set RHQ_AGENT_SIGAR_DEBUG=
-)
-
-if not defined RHQ_AGENT_HOME (
- cd "%RHQ_AGENT_BIN_DIR_PATH%\.."
-) else (
- cd "%RHQ_AGENT_HOME%" || (
- echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME%
- exit /B 1
- )
-)
-
-set RHQ_AGENT_HOME=%CD%
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME%
-
-rem ----------------------------------------------------------------------
-rem Find the Java executable and verify we have a VM available
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
- if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre
-)
-
-if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
- set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe
-)
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME%
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH%
-
-if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" (
- echo There is no JVM available.
- echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately.
- exit /B 1
-)
-
-rem ----------------------------------------------------------------------
-rem Prepare the classpath
-rem ----------------------------------------------------------------------
-
-set CLASSPATH=
-call :append_classpath "%RHQ_AGENT_HOME%\conf"
-for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do (
- call :append_classpath "%%G"
- if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
-)
-for %%G in ("%RHQ_AGENT_JAVA_HOME%\lib\tools.jar" "%RHQ_AGENT_JAVA_HOME%\..\lib\tools.jar") do (
- if exist "%%G" (
- call :append_classpath "%%G"
- if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
- goto end_classpath
- )
-)
-:end_classpath
-
-rem ----------------------------------------------------------------------
-rem Prepare the VM command line options to be passed in
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_AGENT_JAVA_OPTS (
- set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
-)
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS%
-
-if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" (
- if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs
- goto :skip_java_endorsed_dirs
-)
-if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS%
-set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%"
-:skip_java_endorsed_dirs
-
-if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" (
- if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path
- goto :skip_java_library_path
-)
-if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH%
-set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%"
-:skip_java_library_path
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
-
-rem ----------------------------------------------------------------------
-rem Prepare the command line arguments passed to the RHQ Agent
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_AGENT_CMDLINE_OPTS (
- set RHQ_AGENT_CMDLINE_OPTS=%*
-)
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS%
-
-rem ----------------------------------------------------------------------
-rem Execute the VM which starts the agent
-rem ----------------------------------------------------------------------
-
-if defined RHQ_AGENT_DEBUG (
- set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true
-) else (
- set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml
-)
-
-rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var
-if defined RHQ_AGENT_SIGAR_DEBUG (
- set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true
-)
-
-rem to support other agents/plugin containers, allow the caller to override the main classname
-if not defined RHQ_AGENT_MAINCLASS (
- set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
-)
-
-set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
-
-if not defined _SETENV_ONLY (
- rem log4j 1.2.8 does not create the directory for us (later versions do)
- if not exist "%RHQ_AGENT_HOME%\logs" (
- mkdir "%RHQ_AGENT_HOME%\logs"
- )
- if defined RHQ_AGENT_DEBUG (
- echo Executing the agent with this command line:
- echo %CMD%
- )
- cmd.exe /S /C "%CMD%"
-)
-
-goto :done
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that appends the first argument to CLASSPATH
-rem ----------------------------------------------------------------------
-
-:append_classpath
-set _entry=%1
-if not defined CLASSPATH (
- set CLASSPATH=%_entry:"=%
-) else (
- set CLASSPATH=%CLASSPATH%;%_entry:"=%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that prepares to use the embedded JRE
-rem ----------------------------------------------------------------------
-
-:prepare_embedded_jre
-set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre
-if defined RHQ_AGENT_DEBUG echo Using the embedded JRE
-if not exist "%RHQ_AGENT_JAVA_HOME%" (
- if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
- set RHQ_AGENT_JAVA_HOME=%JAVA_HOME%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that exits this script normally
-rem ----------------------------------------------------------------------
-
-:done
-if defined RHQ_AGENT_DEBUG echo %0 done.
-if defined _SETENV_ONLY (
-endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%"
-) else (
-endlocal
-)
-
-exit /B 0
+@echo off
+
+rem ===========================================================================
+rem RHQ Agent Windows Startup Script
+rem
+rem This file is used to execute the RHQ Agent on a Windows platform.
+rem Run this script with the --help option for the runtime options.
+rem
+rem Note that this script can also be used to simply set environment variables
+rem that define the agent's environment but it will not actually run the agent.
+rem Pass in _SETENV_ONLY as the first argument to this script if you want this
+rem behavior.
+rem
+rem This script is customizable by setting certain environment variables, which
+rem are described in comments in rhq-agent-env.bat. The variables can also be
+rem set via rhq-agent-env.bat, which is sourced by this script.
+rem
+rem If the embedded JRE is to be used but is not available, the fallback
+rem JRE to be used will be determined by the JAVA_HOME environment variable.
+rem ===========================================================================
+
+setlocal
+
+if "%1"=="_SETENV_ONLY" (
+ set _SETENV_ONLY=true
+) else (
+ title RHQ Agent
+)
+
+rem if debug variable is set, it is assumed to be on, unless its value is false
+if "%RHQ_AGENT_DEBUG%" == "false" (
+ set RHQ_AGENT_DEBUG=
+)
+
+rem ----------------------------------------------------------------------
+rem Change directory so the current directory is the Agent home.
+rem Here we assume this script is a child directory of the Agent home
+rem We also assume our custom environment script is located in the same
+rem place as this script.
+rem ----------------------------------------------------------------------
+
+set RHQ_AGENT_BIN_DIR_PATH=%~dp0
+
+if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" (
+ if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
+ call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %*
+) else (
+ if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
+)
+
+rem if debug variable is set, it is assumed to be on, unless its value is false
+if "%RHQ_AGENT_DEBUG%" == "false" (
+ set RHQ_AGENT_DEBUG=
+)
+
+rem if sigar debug variable is set, it is assumed to be on, unless its value is false
+if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" (
+ set RHQ_AGENT_SIGAR_DEBUG=
+)
+
+if not defined RHQ_AGENT_HOME (
+ cd "%RHQ_AGENT_BIN_DIR_PATH%\.."
+) else (
+ cd "%RHQ_AGENT_HOME%" || (
+ echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME%
+ exit /B 1
+ )
+)
+
+set RHQ_AGENT_HOME=%CD%
+
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME%
+
+rem ----------------------------------------------------------------------
+rem Find the Java executable and verify we have a VM available
+rem ----------------------------------------------------------------------
+
+if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
+ if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre
+)
+
+if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
+ set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe
+)
+
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME%
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH%
+
+if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" (
+ echo There is no JVM available.
+ echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately.
+ exit /B 1
+)
+
+rem ----------------------------------------------------------------------
+rem Prepare the classpath
+rem ----------------------------------------------------------------------
+
+set CLASSPATH=
+call :append_classpath "%RHQ_AGENT_HOME%\conf"
+for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do (
+ call :append_classpath "%%G"
+ if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
+)
+for %%G in ("%RHQ_AGENT_JAVA_HOME%\lib\tools.jar" "%RHQ_AGENT_JAVA_HOME%\..\lib\tools.jar") do (
+ if exist "%%G" (
+ call :append_classpath "%%G"
+ if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
+ goto end_classpath
+ )
+)
+:end_classpath
+
+rem ----------------------------------------------------------------------
+rem Prepare the VM command line options to be passed in
+rem ----------------------------------------------------------------------
+
+if not defined RHQ_AGENT_JAVA_OPTS (
+ set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
+)
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS%
+
+if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" (
+ if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs
+ goto :skip_java_endorsed_dirs
+)
+if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS%
+set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%"
+:skip_java_endorsed_dirs
+
+if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" (
+ if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path
+ goto :skip_java_library_path
+)
+if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH%
+set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%"
+:skip_java_library_path
+
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
+
+rem ----------------------------------------------------------------------
+rem Prepare the command line arguments passed to the RHQ Agent
+rem ----------------------------------------------------------------------
+
+if not defined RHQ_AGENT_CMDLINE_OPTS (
+ set RHQ_AGENT_CMDLINE_OPTS=%*
+)
+
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS%
+
+rem ----------------------------------------------------------------------
+rem Execute the VM which starts the agent
+rem ----------------------------------------------------------------------
+
+if defined RHQ_AGENT_DEBUG (
+ set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true
+) else (
+ set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml
+)
+
+rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var
+if defined RHQ_AGENT_SIGAR_DEBUG (
+ set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true
+)
+
+rem to support other agents/plugin containers, allow the caller to override the main classname
+if not defined RHQ_AGENT_MAINCLASS (
+ set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
+)
+
+set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
+
+if not defined _SETENV_ONLY (
+ rem log4j 1.2.8 does not create the directory for us (later versions do)
+ if not exist "%RHQ_AGENT_HOME%\logs" (
+ mkdir "%RHQ_AGENT_HOME%\logs"
+ )
+ if defined RHQ_AGENT_DEBUG (
+ echo Executing the agent with this command line:
+ echo %CMD%
+ )
+ cmd.exe /S /C "%CMD%"
+)
+
+goto :done
+
+rem ----------------------------------------------------------------------
+rem CALL subroutine that appends the first argument to CLASSPATH
+rem ----------------------------------------------------------------------
+
+:append_classpath
+set _entry=%1
+if not defined CLASSPATH (
+ set CLASSPATH=%_entry:"=%
+) else (
+ set CLASSPATH=%CLASSPATH%;%_entry:"=%
+)
+goto :eof
+
+rem ----------------------------------------------------------------------
+rem CALL subroutine that prepares to use the embedded JRE
+rem ----------------------------------------------------------------------
+
+:prepare_embedded_jre
+set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre
+if defined RHQ_AGENT_DEBUG echo Using the embedded JRE
+if not exist "%RHQ_AGENT_JAVA_HOME%" (
+ if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
+ set RHQ_AGENT_JAVA_HOME=%JAVA_HOME%
+)
+goto :eof
+
+rem ----------------------------------------------------------------------
+rem CALL subroutine that exits this script normally
+rem ----------------------------------------------------------------------
+
+:done
+if defined RHQ_AGENT_DEBUG echo %0 done.
+if defined _SETENV_ONLY (
+endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%"
+) else (
+endlocal
+)
+
+exit /B 0
commit 4673ea4fd280f1073bd92d2aed26ea34c8c23474
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 23 14:20:29 2012 -0500
[BZ 703557] when possible, auto-discover JVM's not exposing JMX Remoting; as part of this, include the JDK tools.jar in the Agent's classpath when it's available from the Agent's JDK (https://bugzilla.redhat.com/show_bug.cgi?id=703557)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.bat b/modules/enterprise/agent/src/etc/rhq-agent.bat
index 59b7676..fc8bdf1 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent.bat
@@ -1,219 +1,227 @@
-@echo off
-
-rem ===========================================================================
-rem RHQ Agent Windows Startup Script
-rem
-rem This file is used to execute the RHQ Agent on a Windows platform.
-rem Run this script with the --help option for the runtime options.
-rem
-rem Note that this script can also be used to simply set environment variables
-rem that define the agent's environment but it will not actually run the agent.
-rem Pass in _SETENV_ONLY as the first argument to this script if you want this
-rem behavior.
-rem
-rem This script is customizable by setting certain environment variables, which
-rem are described in comments in rhq-agent-env.bat. The variables can also be
-rem set via rhq-agent-env.bat, which is sourced by this script.
-rem
-rem If the embedded JRE is to be used but is not available, the fallback
-rem JRE to be used will be determined by the JAVA_HOME environment variable.
-rem ===========================================================================
-
-setlocal
-
-if "%1"=="_SETENV_ONLY" (
- set _SETENV_ONLY=true
-) else (
- title RHQ Agent
-)
-
-rem if debug variable is set, it is assumed to be on, unless its value is false
-if "%RHQ_AGENT_DEBUG%" == "false" (
- set RHQ_AGENT_DEBUG=
-)
-
-rem ----------------------------------------------------------------------
-rem Change directory so the current directory is the Agent home.
-rem Here we assume this script is a child directory of the Agent home
-rem We also assume our custom environment script is located in the same
-rem place as this script.
-rem ----------------------------------------------------------------------
-
-set RHQ_AGENT_BIN_DIR_PATH=%~dp0
-
-if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" (
- if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
- call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %*
-) else (
- if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
-)
-
-rem if debug variable is set, it is assumed to be on, unless its value is false
-if "%RHQ_AGENT_DEBUG%" == "false" (
- set RHQ_AGENT_DEBUG=
-)
-
-rem if sigar debug variable is set, it is assumed to be on, unless its value is false
-if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" (
- set RHQ_AGENT_SIGAR_DEBUG=
-)
-
-if not defined RHQ_AGENT_HOME (
- cd "%RHQ_AGENT_BIN_DIR_PATH%\.."
-) else (
- cd "%RHQ_AGENT_HOME%" || (
- echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME%
- exit /B 1
- )
-)
-
-set RHQ_AGENT_HOME=%CD%
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME%
-
-rem ----------------------------------------------------------------------
-rem Find the Java executable and verify we have a VM available
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
- if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre
-)
-
-if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
- set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe
-)
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME%
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH%
-
-if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" (
- echo There is no JVM available.
- echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately.
- exit /B 1
-)
-
-rem ----------------------------------------------------------------------
-rem Prepare the classpath
-rem ----------------------------------------------------------------------
-
-set CLASSPATH=
-call :append_classpath "%RHQ_AGENT_HOME%\conf"
-for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do (
- call :append_classpath "%%G"
- if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
-)
-
-rem ----------------------------------------------------------------------
-rem Prepare the VM command line options to be passed in
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_AGENT_JAVA_OPTS (
- set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
-)
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS%
-
-if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" (
- if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs
- goto :skip_java_endorsed_dirs
-)
-if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS%
-set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%"
-:skip_java_endorsed_dirs
-
-if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" (
- if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path
- goto :skip_java_library_path
-)
-if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH%
-set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%"
-:skip_java_library_path
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
-
-rem ----------------------------------------------------------------------
-rem Prepare the command line arguments passed to the RHQ Agent
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_AGENT_CMDLINE_OPTS (
- set RHQ_AGENT_CMDLINE_OPTS=%*
-)
-
-if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS%
-
-rem ----------------------------------------------------------------------
-rem Execute the VM which starts the agent
-rem ----------------------------------------------------------------------
-
-if defined RHQ_AGENT_DEBUG (
- set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true
-) else (
- set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml
-)
-
-rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so its got its own debug var
-if defined RHQ_AGENT_SIGAR_DEBUG (
- set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true
-)
-
-rem to support other agents/plugin containers, allow the caller to override the main classname
-if not defined RHQ_AGENT_MAINCLASS (
- set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
-)
-
-set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
-
-if not defined _SETENV_ONLY (
- rem log4j 1.2.8 does not create the directory for us (later versions do)
- if not exist "%RHQ_AGENT_HOME%\logs" (
- mkdir "%RHQ_AGENT_HOME%\logs"
- )
- if defined RHQ_AGENT_DEBUG (
- echo Executing the agent with this command line:
- echo %CMD%
- )
- cmd.exe /S /C "%CMD%"
-)
-
-goto :done
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that appends the first argument to CLASSPATH
-rem ----------------------------------------------------------------------
-
-:append_classpath
-set _entry=%1
-if not defined CLASSPATH (
- set CLASSPATH=%_entry:"=%
-) else (
- set CLASSPATH=%CLASSPATH%;%_entry:"=%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that prepares to use the embedded JRE
-rem ----------------------------------------------------------------------
-
-:prepare_embedded_jre
-set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre
-if defined RHQ_AGENT_DEBUG echo Using the embedded JRE
-if not exist "%RHQ_AGENT_JAVA_HOME%" (
- if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
- set RHQ_AGENT_JAVA_HOME=%JAVA_HOME%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that exits this script normally
-rem ----------------------------------------------------------------------
-
-:done
-if defined RHQ_AGENT_DEBUG echo %0 done.
-if defined _SETENV_ONLY (
-endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%"
-) else (
-endlocal
-)
-
-exit /B 0
+@echo off
+
+rem ===========================================================================
+rem RHQ Agent Windows Startup Script
+rem
+rem This file is used to execute the RHQ Agent on a Windows platform.
+rem Run this script with the --help option for the runtime options.
+rem
+rem Note that this script can also be used to simply set environment variables
+rem that define the agent's environment but it will not actually run the agent.
+rem Pass in _SETENV_ONLY as the first argument to this script if you want this
+rem behavior.
+rem
+rem This script is customizable by setting certain environment variables, which
+rem are described in comments in rhq-agent-env.bat. The variables can also be
+rem set via rhq-agent-env.bat, which is sourced by this script.
+rem
+rem If the embedded JRE is to be used but is not available, the fallback
+rem JRE to be used will be determined by the JAVA_HOME environment variable.
+rem ===========================================================================
+
+setlocal
+
+if "%1"=="_SETENV_ONLY" (
+ set _SETENV_ONLY=true
+) else (
+ title RHQ Agent
+)
+
+rem if debug variable is set, it is assumed to be on, unless its value is false
+if "%RHQ_AGENT_DEBUG%" == "false" (
+ set RHQ_AGENT_DEBUG=
+)
+
+rem ----------------------------------------------------------------------
+rem Change directory so the current directory is the Agent home.
+rem Here we assume this script is a child directory of the Agent home
+rem We also assume our custom environment script is located in the same
+rem place as this script.
+rem ----------------------------------------------------------------------
+
+set RHQ_AGENT_BIN_DIR_PATH=%~dp0
+
+if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" (
+ if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
+ call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %*
+) else (
+ if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat
+)
+
+rem if debug variable is set, it is assumed to be on, unless its value is false
+if "%RHQ_AGENT_DEBUG%" == "false" (
+ set RHQ_AGENT_DEBUG=
+)
+
+rem if sigar debug variable is set, it is assumed to be on, unless its value is false
+if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" (
+ set RHQ_AGENT_SIGAR_DEBUG=
+)
+
+if not defined RHQ_AGENT_HOME (
+ cd "%RHQ_AGENT_BIN_DIR_PATH%\.."
+) else (
+ cd "%RHQ_AGENT_HOME%" || (
+ echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME%
+ exit /B 1
+ )
+)
+
+set RHQ_AGENT_HOME=%CD%
+
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME%
+
+rem ----------------------------------------------------------------------
+rem Find the Java executable and verify we have a VM available
+rem ----------------------------------------------------------------------
+
+if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
+ if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre
+)
+
+if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
+ set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe
+)
+
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME%
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH%
+
+if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" (
+ echo There is no JVM available.
+ echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately.
+ exit /B 1
+)
+
+rem ----------------------------------------------------------------------
+rem Prepare the classpath
+rem ----------------------------------------------------------------------
+
+set CLASSPATH=
+call :append_classpath "%RHQ_AGENT_HOME%\conf"
+for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do (
+ call :append_classpath "%%G"
+ if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
+)
+for %%G in ("%RHQ_AGENT_JAVA_HOME%\lib\tools.jar" "%RHQ_AGENT_JAVA_HOME%\..\lib\tools.jar") do (
+ if exist "%%G" (
+ call :append_classpath "%%G"
+ if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G
+ goto end_classpath
+ )
+)
+:end_classpath
+
+rem ----------------------------------------------------------------------
+rem Prepare the VM command line options to be passed in
+rem ----------------------------------------------------------------------
+
+if not defined RHQ_AGENT_JAVA_OPTS (
+ set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
+)
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS%
+
+if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" (
+ if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs
+ goto :skip_java_endorsed_dirs
+)
+if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS%
+set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%"
+:skip_java_endorsed_dirs
+
+if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" (
+ if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path
+ goto :skip_java_library_path
+)
+if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH%
+set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%"
+:skip_java_library_path
+
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
+
+rem ----------------------------------------------------------------------
+rem Prepare the command line arguments passed to the RHQ Agent
+rem ----------------------------------------------------------------------
+
+if not defined RHQ_AGENT_CMDLINE_OPTS (
+ set RHQ_AGENT_CMDLINE_OPTS=%*
+)
+
+if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS%
+
+rem ----------------------------------------------------------------------
+rem Execute the VM which starts the agent
+rem ----------------------------------------------------------------------
+
+if defined RHQ_AGENT_DEBUG (
+ set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true
+) else (
+ set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml
+)
+
+rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var
+if defined RHQ_AGENT_SIGAR_DEBUG (
+ set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true
+)
+
+rem to support other agents/plugin containers, allow the caller to override the main classname
+if not defined RHQ_AGENT_MAINCLASS (
+ set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
+)
+
+set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
+
+if not defined _SETENV_ONLY (
+ rem log4j 1.2.8 does not create the directory for us (later versions do)
+ if not exist "%RHQ_AGENT_HOME%\logs" (
+ mkdir "%RHQ_AGENT_HOME%\logs"
+ )
+ if defined RHQ_AGENT_DEBUG (
+ echo Executing the agent with this command line:
+ echo %CMD%
+ )
+ cmd.exe /S /C "%CMD%"
+)
+
+goto :done
+
+rem ----------------------------------------------------------------------
+rem CALL subroutine that appends the first argument to CLASSPATH
+rem ----------------------------------------------------------------------
+
+:append_classpath
+set _entry=%1
+if not defined CLASSPATH (
+ set CLASSPATH=%_entry:"=%
+) else (
+ set CLASSPATH=%CLASSPATH%;%_entry:"=%
+)
+goto :eof
+
+rem ----------------------------------------------------------------------
+rem CALL subroutine that prepares to use the embedded JRE
+rem ----------------------------------------------------------------------
+
+:prepare_embedded_jre
+set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre
+if defined RHQ_AGENT_DEBUG echo Using the embedded JRE
+if not exist "%RHQ_AGENT_JAVA_HOME%" (
+ if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
+ set RHQ_AGENT_JAVA_HOME=%JAVA_HOME%
+)
+goto :eof
+
+rem ----------------------------------------------------------------------
+rem CALL subroutine that exits this script normally
+rem ----------------------------------------------------------------------
+
+:done
+if defined RHQ_AGENT_DEBUG echo %0 done.
+if defined _SETENV_ONLY (
+endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%"
+) else (
+endlocal
+)
+
+exit /B 0
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh
index e0122bd..45b99a2 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -151,6 +151,13 @@ for _JAR in $_JAR_FILES ; do
fi
debug_msg "CLASSPATH entry: $_JAR"
done
+for _TOOLS_JAR in "${RHQ_AGENT_JAVA_HOME}/lib/tools.jar" "${RHQ_AGENT_JAVA_HOME}/../lib/tools.jar"; do
+ if [ -f "${_TOOLS_JAR}" ]; then
+ debug_msg "CLASSPATH entry: ${_TOOLS_JAR}"
+ CLASSPATH="${CLASSPATH}:${_TOOLS_JAR}"
+ break
+ fi
+done
# ----------------------------------------------------------------------
# Prepare the VM command line options to be passed in
@@ -236,7 +243,7 @@ if [ "x$RHQ_AGENT_DEBUG" != "x" ]; then
fi
fi
-# if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so its got its own debug var
+# if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var
if [ "x$RHQ_AGENT_SIGAR_DEBUG" != "x" ]; then
if [ "$RHQ_AGENT_SIGAR_DEBUG" != "false" ]; then
_LOG_CONFIG="$_LOG_CONFIG -Dsigar.nativeLogging=true"
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index e92eb21..8780b32 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -16,11 +16,23 @@
<description>a plugin for managing a generic JMX-enabled application</description>
<dependencies>
+
<dependency>
<groupId>mc4j</groupId>
<artifactId>org-mc4j-ems</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
+
+ <!-- needed for the JVM Attach API. NOTE: we do not include tools.jar in the plugin jar's lib dir, because if it
+ is available at runtime, rhq-agent.sh/rhq-agent.bat will add it to the Agent's classpath. -->
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.6.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+
</dependencies>
<build>
@@ -48,8 +60,8 @@
</execution>
</executions>
</plugin>
-</plugins>
- </build>
+ </plugins>
+ </build>
<profiles>
<profile>
@@ -146,28 +158,7 @@
</plugins>
</build>
-</profile>
- <!-- This includes the tools.jar in the system classpath to avoid the unsatisfied link error on
- tools.jar dependencies that EMS was trying to load multiple times. -->
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
+ </profile>
<profile>
<id>dev</id>
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
index ce8631a..a61208d 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -23,37 +23,84 @@
package org.rhq.plugins.jmx;
import java.io.File;
-import java.io.FilenameFilter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import javax.management.MBeanServerConnection;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.hyperic.sigar.NetConnection;
+import org.hyperic.sigar.NetFlags;
+import org.hyperic.sigar.Sigar;
+import org.hyperic.sigar.SigarException;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.resource.ResourceUpgradeReport;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ManualAddFacet;
import org.rhq.core.pluginapi.inventory.ProcessScanResult;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-import org.rhq.core.pluginapi.inventory.ManualAddFacet;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext;
+import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.plugins.jmx.util.ConnectionProviderFactory;
+import org.rhq.plugins.jmx.util.JvmResourceKey;
+import org.rhq.plugins.jmx.util.JvmUtility;
+import org.rhq.plugins.jmx.util.Socket;
+
+import org.mc4j.ems.connection.EmsConnection;
+import org.mc4j.ems.connection.bean.EmsBean;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+import org.mc4j.ems.connection.support.ConnectionProvider;
+import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor;
/**
- * This component will discover JDK 5 agents running locally that have active JSR-160 connectors defined via system
- * properties.
+ * This component will discover JVM processes that appear to be long-running (i.e. "servers"). Specifically, it will
+ * discover java processes that:
+ * <ul>
+ * <li>have enabled JMX Remoting (JSR-160) via com.sun.management.jmxremote* system properties on their command lines, or</li>
+ * <li>are Sun/Oracle-compatible java processes accessible via the com.sun.tools.attach API AND specify the
+ * org.rhq.resourceKey system property on their command lines (e.g. -Dorg.rhq.resourceKey=FOO); the attach API uses IPC
+ * under the covers, so for a process to be accessible, it either must be running as the same user as the RHQ Agent,
+ * or the Agent must be running as root<li>
+ * </ul>
+ * Some other java processes that do not meet these criteria can be manually added if they expose JMX remotely in
+ * another supported form (WebLogic, WebSphere, etc.).
*
* @author Greg Hinkle
+ * @author Ian Springer
*/
-public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, ManualAddFacet { //, ClassLoaderFacet {
+public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, ManualAddFacet, ResourceUpgradeFacet { //, ClassLoaderFacet {
+
private static final Log log = LogFactory.getLog(JMXDiscoveryComponent.class);
- public static final String VMID_CONFIG_PROPERTY = "vmid";
+ // our own private SIGAR
+ // TODO (ips, 01/05/12): enhance native-system API, then use that instead of using SIGAR directly
+ private static Sigar SIGAR;
+ static {
+ try {
+ SIGAR = new Sigar();
+ } catch (RuntimeException re) {
+ SIGAR = null;
+ }
+ }
public static final String COMMAND_LINE_CONFIG_PROPERTY = "commandLine";
@@ -67,120 +114,162 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
public static final String ADDITIONAL_CLASSPATH_ENTRIES = "additionalClassPathEntries";
- /* Ignore certain processes that are managed by their own plugin. For example, the Tomcat plugin will
+ private static final String SYSPROP_JMXREMOTE_PORT = "com.sun.management.jmxremote.port";
+ private static final String SYSPROP_RHQ_JMXPLUGIN_PROCESS_FILTERS = "rhq.jmxplugin.process-filters";
+ public static final String SYSPROP_RHQ_RESOURCE_KEY = "org.rhq.resourceKey";
+ private static final String SYSPROP_JAVA_VERSION = "java.version";
+
+ /*
+ * Ignore certain processes that are managed by their own plugin. For example, the Tomcat plugin will
* handle Tomcat processes configured for JMX management.
*/
- private static final String[] PROCESS_FILTERS;
-
- static {
- String[] processFilters = new String[] { "catalina.startup.Bootstrap", "org.jboss.Main" };
- try {
- String env = System.getProperty("rhq.jmxplugin.process-filters");
- if (env != null) {
- processFilters = env.split(",");
- }
- } catch (Throwable t) {
- log.error("Can't determine process filters; using default... Cause: " + t);
- } finally {
- PROCESS_FILTERS = processFilters;
- }
- }
+ private static final String[] DEFAULT_PROCESS_EXCLUDES = new String[]{"org.jboss.Main", "catalina.startup.Bootstrap"};
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) {
+ Set<DiscoveredResourceDetails> discoveredResources = new LinkedHashSet<DiscoveredResourceDetails>();
+ Map<String, List<DiscoveredResourceDetails>> duplicatesByKey = new LinkedHashMap<String, List<DiscoveredResourceDetails>>();
- Set<DiscoveredResourceDetails> found = new HashSet<DiscoveredResourceDetails>();
-
- // This model of discovery is of questionable usefulness since if you restart your process you'll get a new resource
- // Works only on JDK6 and maybe some 64 bit JDK5 See JBNADM-3332.
- //
- // Map<Integer, LocalVirtualMachine> vms;
- //
- // try {
- // vms = LocalVMFinder.getManageableVirtualMachines();
- // } catch (Exception e) {
- // log.info("JMX Platform Autodiscovery only supported on JDK6 and above");
- // return null;
- // }
- //
- // if (vms != null) {
- // for (LocalVirtualMachine vm : vms.values()) {
- // // TODO: Might want to limit to vms already managed as the other kind are temporary connector addresses
- // String resourceKey = (vm.getCommandLine() != null) ? vm.getCommandLine() : vm.getConnectorAddress();
- // DiscoveredResourceDetails s = new DiscoveredResourceDetails(context.getResourceType(), resourceKey,
- // "Java VM [" + vm.getVmid() + "]", System.getProperty("java.version"), // TODO Get the vm's version
- // vm.getCommandLine(), null, null);
- //
- // Configuration configuration = s.getPluginConfiguration();
- // configuration.setNotes("Auto-discovered");
- // configuration.put(new PropertySimple(VMID_CONFIG_PROPERTY, String.valueOf(vm.getVmid())));
- // configuration.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, String.valueOf(vm
- // .getConnectorAddress())));
- // configuration
- // .put(new PropertySimple(COMMAND_LINE_CONFIG_PROPERTY, String.valueOf(vm.getCommandLine())));
- // configuration.put(new PropertySimple(CONNECTION_TYPE, LocalVMTypeDescriptor.class.getName()));
- //
- // found.add(s);
- // }
- //
- // /* GH: Disabling discovery of the internal VM... Other plugins should probably embed via the internal
- // * component above
- // * DiscoveredResourceDetails localVM = new DiscoveredResourceDetails(context.getResourceType(),
- // * "InternalVM",
- // * "Internal Java VM",
- // * System.getProperty("java.version"), "VM of
- // * plugin container", null, null); Configuration configuration = localVM.getPluginConfiguration();
- // * configuration.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, "Local Connection"));
- // * configuration.put(new PropertySimple(CONNECTION_TYPE, InternalVMTypeDescriptor.class.getName()));
- // *
- // *found.add(localVM);*/
- // }
-
- try {
- List<ProcessScanResult> processes = context.getAutoDiscoveredProcesses();
+ // Filter out JBoss, Tomcat, etc. processes, which will be represented by more specific types of Resources
+ // discovered by other plugins.
+ List<ProcessScanResult> nonExcludedProcesses = getNonExcludedJavaProcesses(context);
- for (ProcessScanResult process : processes) {
+ for (ProcessScanResult process : nonExcludedProcesses) {
+ try {
ProcessInfo processInfo = process.getProcessInfo();
- DiscoveredResourceDetails details = discoverProcess(context, processInfo);
+ DiscoveredResourceDetails details = discoverResourceDetails(context, processInfo);
if (details != null) {
- boolean isFiltered = false;
- for (String filter : PROCESS_FILTERS) {
- if (details.getResourceName().contains(filter)) {
- isFiltered = true;
- break;
+ if (discoveredResources.contains(details)) {
+ List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(details.getResourceKey());
+ if (duplicates == null) {
+ duplicates = new ArrayList<DiscoveredResourceDetails>();
+ duplicatesByKey.put(details.getResourceKey(), duplicates);
}
- }
- if (!isFiltered) {
- found.add(details);
- }
+ duplicates.add(details);
+ }
+ discoveredResources.add(details);
+ }
+ } catch (RuntimeException re) {
+ // Don't let a runtime exception for a particular ProcessInfo cause the entire discovery scan to fail.
+ if (log.isDebugEnabled()) {
+ log.debug("Error when trying to discover JVM process [" + process + "].", re);
+ } else {
+ log.warn("Error when trying to discover JVM process [" + process + "] (enable DEBUG for stack trace): " + re);
}
}
- } catch (Exception e) {
- if (log.isDebugEnabled()) {
- log.debug("Unable to complete base JMX server discovery.", e);
+ }
+
+ for (String duplicateKey : duplicatesByKey.keySet()) {
+ List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(duplicateKey);
+ log.error("Multiple Resources with the same key (" + duplicateKey
+ + ") were discovered - none will be reported to the plugin container! This most likely means that there are multiple java processes running with the same value for the "
+ + SYSPROP_RHQ_RESOURCE_KEY + " system property specified on their command lines. Here is the list of Resources: "
+ + duplicates);
+ discoveredResources.remove(duplicates.get(0));
+ }
+
+ return discoveredResources;
+ }
+
+ private List<ProcessScanResult> getNonExcludedJavaProcesses(ResourceDiscoveryContext context) {
+ // This is the list of all currently running java processes.
+ List<ProcessScanResult> javaProcesses = context.getAutoDiscoveredProcesses();
+
+ List<ProcessScanResult> nonExcludedJavaProcesses = new ArrayList<ProcessScanResult>();
+ Set<String> processExcludes = getProcessExcludes();
+ for (ProcessScanResult javaProcess : javaProcesses) {
+ if (javaProcess.getProcessInfo().equals(context.getSystemInformation().getThisProcess())) {
+ // If the process is our own process (i.e. the RHQ Agent JVM), then skip it, since the rhq-agent
+ // plugin will handle discovering that.
+ continue;
+ }
+ String[] args = javaProcess.getProcessInfo().getCommandLine();
+ StringBuilder buffer = new StringBuilder();
+ for (String arg : args) {
+ buffer.append(arg).append(" ");
+ }
+ String commandLine = buffer.toString();
+ if (!isExcluded(commandLine, processExcludes)) {
+ nonExcludedJavaProcesses.add(javaProcess);
} else {
- log.warn("Unable to complete base JMX server discovery (enable DEBUG for stack): " + e);
+ if (log.isDebugEnabled()) {
+ log.debug("Process [" + javaProcess.getProcessInfo()
+ + "] excluded since its command line contains one of the following: " + processExcludes);
+ }
+ }
+ }
+ return nonExcludedJavaProcesses;
+ }
+
+ private boolean isExcluded(String commandLine, Set<String> processExcludes) {
+ for (String processExclude : processExcludes) {
+ if (commandLine.contains(processExclude)) {
+ return true;
}
}
+ return false;
+ }
- return found;
+ protected Set<String> getProcessExcludes() {
+ Set<String> processExcludes;
+ String overrideProcessExcludes = System.getProperty(SYSPROP_RHQ_JMXPLUGIN_PROCESS_FILTERS);
+ if (overrideProcessExcludes != null) {
+ processExcludes = new HashSet<String>(Arrays.asList(overrideProcessExcludes.split(",")));
+ } else {
+ processExcludes = new HashSet<String>(Arrays.asList(DEFAULT_PROCESS_EXCLUDES));
+ }
+ return processExcludes;
}
+ // MANUAL ADD
public DiscoveredResourceDetails discoverResource(Configuration pluginConfig,
ResourceDiscoveryContext discoveryContext)
throws InvalidPluginConfigurationException {
- // TODO: Connect to the remote JVM to verify the user-specified conn props are valid, and if connecting
- // fails, throw an exception.
- String resourceKey = pluginConfig.getSimpleValue(CONNECTOR_ADDRESS_CONFIG_PROPERTY, null);
- String connectionType = pluginConfig.getSimpleValue(CONNECTION_TYPE, null);
+
+ String connectorAddress = pluginConfig.getSimpleValue(CONNECTOR_ADDRESS_CONFIG_PROPERTY, null);
+ if (connectorAddress == null) {
+ throw new InvalidPluginConfigurationException("A connector address must be specified when manually adding a JMX Server.");
+ }
+
+ ConnectionProvider connectionProvider;
+ EmsConnection connection;
+ try {
+ connectionProvider = ConnectionProviderFactory.createConnectionProvider(pluginConfig, null,
+ discoveryContext.getParentResourceContext().getTemporaryDirectory());
+ connection = connectionProvider.connect();
+ connection.loadSynchronous(false);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to connection to connector address [" + connectorAddress + "].", e);
+ }
+
+ String key = connectorAddress;
+ String name = connectorAddress;
- // TODO (ips, 09/04/09): We should connect to the remote JVM in order to obtain its version.
- String version = null;
+ String version = getJavaVersion(connection);
+ if (version == null) {
+ log.warn("Unable to determine version of JVM with connector address [" + connectorAddress + "].");
+ }
+
+ String connectionType = pluginConfig.getSimpleValue(CONNECTION_TYPE, null);
+ String description = connectionType + " JVM (" + connectorAddress + ")";
DiscoveredResourceDetails resourceDetails = new DiscoveredResourceDetails(discoveryContext.getResourceType(),
- resourceKey, "Java VM", version, connectionType + " [" + resourceKey + "]", pluginConfig, null);
+ key, name, version, description, pluginConfig, null);
return resourceDetails;
}
+ private String getJavaVersion(EmsConnection connection) {
+ String version = null;
+ EmsBean runtimeMXBean = connection.getBean(ManagementFactory.RUNTIME_MXBEAN_NAME);
+ if (runtimeMXBean != null) {
+ EmsAttribute systemPropertiesAttribute = runtimeMXBean.getAttribute("systemProperties");
+ if (systemPropertiesAttribute != null) {
+ Map<String, String> systemProperties = (Map<String, String>) systemPropertiesAttribute.getValue();
+ version = systemProperties.get("java.version");
+ }
+ }
+ return version;
+ }
+
// For now, this method is not used. This method is the ClassLoaderFacet method, but I commented
// out the fact that this class implements that interface. As of today, 7/20/2009, I'm not sure we really
// need to implement the classloader facet since EMS's ability to use additionalClasspathEntries in its
@@ -191,11 +280,10 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
// be changed other than to add "implements ClassLoaderFacet" to the class definition).
// For now, since we don't want the additional overhead of calling into this method when we currently have
// no need for it, we do not implement the ClassLoaderFacet.
- public List<URL> getAdditionalClasspathUrls(ResourceDiscoveryContext context, DiscoveredResourceDetails details)
- throws Exception {
-
- List<File> jars = getAdditionalJarsFromConfig(details.getPluginConfiguration());
- if (jars == null || jars.size() == 0) {
+ public List<URL> getAdditionalClasspathUrls(ResourceDiscoveryContext<ResourceComponent<?>> context,
+ DiscoveredResourceDetails details) throws Exception {
+ List<File> jars = ConnectionProviderFactory.getAdditionalJarsFromConfig(details.getPluginConfiguration());
+ if (jars == null || jars.isEmpty()) {
return null;
}
@@ -207,113 +295,256 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
return urls;
}
- protected DiscoveredResourceDetails discoverProcess(ResourceDiscoveryContext context, ProcessInfo process) {
- String portProp = "com.sun.management.jmxremote.port";
+ @Override
+ public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource) {
+ JvmResourceKey oldKey = JvmResourceKey.valueOf(inventoriedResource.getResourceKey());
+ JvmResourceKey.Type oldKeyType = oldKey.getType();
+ if (oldKeyType == JvmResourceKey.Type.Legacy || oldKeyType == JvmResourceKey.Type.JmxRemotingPort) {
+ if (!inventoriedResource.getSystemInformation().isNative()) {
+ log.warn("Cannot attempt to upgrade Resource key [" + inventoriedResource.getResourceKey()
+ + "] of JVM Resource, because this Agent is not running with native system info support (i.e. SIGAR).");
+ return null;
+ }
- String port = null;
- for (String argument : process.getCommandLine()) {
- String cmdLineArg = "-D" + portProp + "=";
- if (argument.startsWith(cmdLineArg)) {
- port = argument.substring(cmdLineArg.length());
- break;
+ Configuration pluginConfig = inventoriedResource.getPluginConfiguration();
+ String connectorAddress = pluginConfig.getSimpleValue(CONNECTOR_ADDRESS_CONFIG_PROPERTY, null);
+ JMXServiceURL jmxServiceURL;
+ try {
+ jmxServiceURL = new JMXServiceURL(connectorAddress);
+ } catch (MalformedURLException e) {
+ throw new RuntimeException("Failed to parse connector address: " + connectorAddress, e);
+ }
+
+ Long pid;
+ try {
+ JMXConnector jmxConnector = JMXConnectorFactory.connect(jmxServiceURL);
+ MBeanServerConnection mbeanServerConnection = jmxConnector.getMBeanServerConnection();
+ RuntimeMXBean runtimeMXBean = ManagementFactory.newPlatformMXBeanProxy(mbeanServerConnection,
+ ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class);
+ pid = getJvmPid(runtimeMXBean);
+ if (pid == null) {
+ throw new RuntimeException("Failed to determine JVM pid by parsing JVM name.");
+ }
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to determine JVM pid.", e);
}
- }
- if (port == null) {
- port = process.getEnvironmentVariable(portProp);
+ List<ProcessInfo> processes = inventoriedResource.getSystemInformation().getProcesses(
+ "process|pid|match=" + pid);
+ if (processes.size() != 1) {
+ throw new IllegalStateException("Failed to find process with PID [" + pid + "].");
+ }
+ ProcessInfo process = processes.get(0);
+ String mainClassName = getJavaMainClassName(process);
+ String explicitKeyValue = getSystemPropertyValue(process, SYSPROP_RHQ_RESOURCE_KEY);
+ if (oldKeyType == JvmResourceKey.Type.Legacy || explicitKeyValue != null) {
+ // We need to upgrade the key.
+ JvmResourceKey newKey;
+ if (explicitKeyValue != null) {
+ newKey = JvmResourceKey.fromExplicitValue(mainClassName, explicitKeyValue);
+ } else {
+ newKey = JvmResourceKey.fromJmxRemotingPort(mainClassName, oldKey.getJmxRemotingPort());
+ }
+
+ ResourceUpgradeReport resourceUpgradeReport = new ResourceUpgradeReport();
+ resourceUpgradeReport.setNewResourceKey(newKey.toString());
+ return resourceUpgradeReport;
+ }
}
- DiscoveredResourceDetails details = null;
- if (port != null) {
+ return null;
+ }
- String name = "JMX Server";
- for (int i = 1; i < process.getCommandLine().length; i++) {
- String arg = process.getCommandLine()[i];
+ private static Long getJvmPid(RuntimeMXBean runtimeMXBean) {
+ Long pid;
+ String jvmName = runtimeMXBean.getName();
+ int atIndex = jvmName.indexOf('@');
+ pid = (atIndex != -1) ? Long.valueOf(jvmName.substring(0, atIndex)) : null;
+ return pid;
+ }
- if (!arg.startsWith("-")) {
- if (arg.length() <= 200) {
- name = arg;
- } else {
- // Truncate it if it's really long for a more palatable Resource name.
- name = arg.substring(arg.length() - 200);
- }
- break;
- } else if (arg.equals("-cp") || arg.equals("-classpath")) {
- // Skip the next arg - it's the classpath, and we don't want that as the name.
- i++;
+ protected DiscoveredResourceDetails discoverResourceDetails(ResourceDiscoveryContext context, ProcessInfo process) {
+ Integer jmxRemotingPort = getJmxRemotingPort(process);
+ JMXServiceURL jmxServiceURL;
+ Set<Socket> serverSockets;
+ if (jmxRemotingPort != null) {
+ // Use JMX Remoting when possible, since it doesn't require the RHQ Agent to have OS-level permissions to
+ // communicate with the remote JVM via IPC.
+ try {
+ jmxServiceURL = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://127.0.0.1:" + jmxRemotingPort + "/jmxrmi");
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ // If JMX Remoting is not enabled, it's required that a Resource key is explicitly specified via the org.rhq.resourceKey sysprop.
+ String keyString = getSystemPropertyValue(process, SYSPROP_RHQ_RESOURCE_KEY);
+ if (keyString == null || keyString.equals("")) {
+ serverSockets = getServerSockets(process);
+ if (!serverSockets.isEmpty()) {
+ log.info("Server JVM process [" + process.getPid() + "] with command line ["
+ + Arrays.asList(process.getCommandLine())
+ + "] cannot be discovered, because it does not specify either of the following system properties: -D"
+ + SYSPROP_JMXREMOTE_PORT + "=JMX_REMOTING_PORT, -D" + SYSPROP_RHQ_RESOURCE_KEY + "=UNIQUE_KEY");
+ return null;
}
}
- name += " (" + port + ")";
+ // Start up a JMX agent within the JVM via the Sun Attach API, and return a URL that can be used to connect
+ // to that agent.
+ // Note, this will only work if the remote JVM is Java 6 or later, and maybe some 64 bit Java 5 - see
+ // JBNADM-3332. Also, the RHQ Agent will have to be running on a JDK, not a JRE, so that we can access
+ // the JDK's tools.jar, which contains the Sun JVM Attach API classes.
+ jmxServiceURL = JvmUtility.extractJMXServiceURL(process.getPid());
+ }
- Configuration config = context.getDefaultPluginConfiguration();
- config.put(new PropertySimple(CONNECTION_TYPE,
- "org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor"));
- config.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, "service:jmx:rmi:///jndi/rmi://localhost:"
- + port + "/jmxrmi"));
- // config.put(new PropertySimple(INSTALL_URI, process.getCurrentWorkingDirectory()));
+ if (jmxServiceURL != null) {
+ log.debug("JMX service URL for process [" + process + "] is [" + jmxServiceURL + "].");
+ return buildResourceDetails(context, process, jmxServiceURL, jmxRemotingPort);
+ } else {
+ return null;
+ }
+ }
- // TODO (ips, 09/04/09): I think we should connect to the remote JVM in order to obtain its version.
- String version = null;
+ protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContext context, ProcessInfo process,
+ JMXServiceURL jmxServiceURL, Integer jmxRemotingPort) {
+ JvmResourceKey key;
+ String mainClassName = getJavaMainClassName(process);
+ String value = getSystemPropertyValue(process, SYSPROP_RHQ_RESOURCE_KEY);
+ if (value != null && !value.equals("")) {
+ log.debug("Using explicitly specified Resource key: [" + value + "]...");
+ key = JvmResourceKey.fromExplicitValue(mainClassName, value);
+ } else {
+ if (jmxRemotingPort != null) {
+ log.debug("Using JMX remoting port [" + jmxRemotingPort + "] as Resource key...");
+ key = JvmResourceKey.fromJmxRemotingPort(mainClassName, jmxRemotingPort);
+ } else {
+ log.info("Process [" + process.getPid() + "] with command line [" + Arrays.asList(process.getCommandLine()) + "] cannot be discovered, because it does not specify either of the following system properties: -Dcom.sun.management.jmxremote, -D" + SYSPROP_RHQ_RESOURCE_KEY + "=UNIQUE_KEY");
+ return null;
+ }
+ }
+
+ String name = buildResourceName(key);
- details = new DiscoveredResourceDetails(context.getResourceType(), port, name, version,
- "Standalone JVM Process", config, null);
+ String version;
+ try {
+ JMXConnector jmxConnector = JMXConnectorFactory.connect(jmxServiceURL);
+ MBeanServerConnection mbeanServerConnection = jmxConnector.getMBeanServerConnection();
+ RuntimeMXBean runtimeMXBean = ManagementFactory.newPlatformMXBeanProxy(mbeanServerConnection,
+ ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class);
+ version = runtimeMXBean.getSystemProperties().get(SYSPROP_JAVA_VERSION);
+ if (version == null) {
+ throw new IllegalStateException("System property " + SYSPROP_JAVA_VERSION + " is not defined.");
+ }
+ } catch (Exception e) {
+ log.error("Failed to determine JVM version.", e);
+ version = null;
}
- return details;
+ String description = "JVM, monitored via " + ((jmxRemotingPort != null) ? "JMX Remoting" : "Sun JVM Attach API");
+
+ Configuration pluginConfig = context.getDefaultPluginConfiguration();
+ pluginConfig.put(new PropertySimple(CONNECTION_TYPE, J2SE5ConnectionTypeDescriptor.class.getName()));
+ if (jmxRemotingPort != null) {
+ pluginConfig.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, jmxServiceURL));
+ }
+
+ return new DiscoveredResourceDetails(context.getResourceType(), key.toString(), name, version, description,
+ pluginConfig, process);
}
- /**
- * Examines the plugin configuration and if it defines additional classpath entries, this
- * will return a list of files that point to all the jars that need to be added to a classloader
- * to support the managed JMX resource.
- *
- * Note: this is package static scoped so the resource component can use this method.
- *
- * @param pluginConfiguration
- *
- * @return list of files pointing to additional jars; will be empty if no additional jars are to be added
- */
- static List<File> getAdditionalJarsFromConfig(Configuration pluginConfiguration) {
- List<File> jarFiles = new ArrayList<File>();
-
- // get the plugin config setting that contains comma-separated list of files/dirs to additional jars
- // if no additional classpath entries are specified, we'll return an empty list
- PropertySimple prop = pluginConfiguration.getSimple(JMXDiscoveryComponent.ADDITIONAL_CLASSPATH_ENTRIES);
- if (prop == null || prop.getStringValue() == null || prop.getStringValue().trim().length() == 0) {
- return jarFiles;
- }
- String[] paths = prop.getStringValue().trim().split(",");
- if (paths == null || paths.length == 0) {
- return jarFiles;
+ private String buildResourceName(JvmResourceKey key) {
+ StringBuilder name = new StringBuilder();
+ String mainClassName = key.getMainClassName();
+ if (mainClassName != null) {
+ if (mainClassName.length() <= 200) {
+ name.append(mainClassName);
+ } else {
+ // Truncate it if it's really long for a more palatable Resource name.
+ name.append(mainClassName.substring(mainClassName.length() - 200));
+ }
}
- // Get all additional classpath entries which can be listed as jar filenames or directories.
- // If a directory has "/*.jar" at the end, all jar files found in that directory will be added
- // as class path entries.
- final class JarFilenameFilter implements FilenameFilter {
- public boolean accept(File dir, String name) {
- return name.endsWith(".jar");
- }
+ switch (key.getType()) {
+ case JmxRemotingPort:
+ name.append(':').append(key.getJmxRemotingPort()); break;
+ case Explicit:
+ name.append(' ').append(key.getExplicitValue()); break;
+ default:
+ throw new IllegalStateException("Unsupported key type: " + key.getType());
}
- for (String path : paths) {
- path = path.trim();
- if (path.length() > 0) {
- if (path.endsWith("*.jar")) {
- path = path.substring(0, path.length() - 5);
- File dir = new File(path);
- File[] jars = dir.listFiles(new JarFilenameFilter());
- if (jars != null && jars.length > 0) {
- jarFiles.addAll(Arrays.asList(jars));
+ return name.toString();
+ }
+
+ private Set<Socket> getServerSockets(ProcessInfo process) {
+ Set<Socket> serverSockets = new HashSet<Socket>();
+ if (SIGAR != null) {
+ // Only request the type of connections we are interested in - TCP and UDP listen sockets.
+ int netFlags = (NetFlags.CONN_TCP | NetFlags.CONN_UDP | NetFlags.CONN_SERVER);
+ NetConnection[] connections;
+ try {
+ connections = SIGAR.getNetConnectionList(netFlags);
+ } catch (SigarException e) {
+ log.debug("Failed to get net connections.", e);
+ connections = new NetConnection[0];
+ }
+ for (NetConnection connection : connections) {
+ if (connection.getState() == NetFlags.TCP_LISTEN) {
+ try {
+ long pid = SIGAR.getProcPort(connection.getType(), connection.getLocalPort());
+ if (pid == process.getPid()) {
+ Socket.Protocol protocol = (connection.getType() == NetFlags.CONN_UDP) ?
+ Socket.Protocol.UDP : Socket.Protocol.TCP;
+ serverSockets.add(new Socket(protocol, connection.getLocalAddress(),
+ connection.getLocalPort()));
+ }
+ } catch (SigarException e) {
+ log.debug("Failed to get pid for connection [" + connection + "].", e);
}
- } else {
- File pathFile = new File(path);
- jarFiles.add(pathFile);
}
}
}
+ return serverSockets;
+ }
- return jarFiles;
+ protected String getJavaMainClassName(ProcessInfo process) {
+ String className = null;
+ for (int i = 1; i < process.getCommandLine().length; i++) {
+ String arg = process.getCommandLine()[i];
+
+ if (!arg.startsWith("-")) {
+ className = arg;
+ break;
+ } else if (arg.equals("-cp") || arg.equals("-classpath")) {
+ // The next arg is the classpath - skip it.
+ i++;
+ }
+ }
+ return className;
}
+
+ protected Integer getJmxRemotingPort(ProcessInfo process) {
+ String value = getSystemPropertyValue(process, SYSPROP_JMXREMOTE_PORT);
+ if (value != null) {
+ try {
+ return Integer.valueOf(value);
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ } else {
+ return null;
+ }
+ }
+
+ protected String getSystemPropertyValue(ProcessInfo process, String systemPropertyName) {
+ for (String argument : process.getCommandLine()) {
+ String prefix = "-D" + systemPropertyName + "=";
+ if (argument.startsWith(prefix)) {
+ return argument.substring(prefix.length());
+ }
+ }
+ return null;
+ }
+
+
}
\ No newline at end of file
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java
index 1f77f48..a5a7a13 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -22,30 +22,17 @@
*/
package org.rhq.plugins.jmx;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.mc4j.ems.connection.ConnectionFactory;
+
import org.mc4j.ems.connection.EmsConnection;
-import org.mc4j.ems.connection.local.LocalVMFinder;
-import org.mc4j.ems.connection.local.LocalVirtualMachine;
-import org.mc4j.ems.connection.settings.ConnectionSettings;
import org.mc4j.ems.connection.support.ConnectionProvider;
-import org.mc4j.ems.connection.support.metadata.ConnectionTypeDescriptor;
-import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor;
-import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor;
import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.plugins.jmx.util.ConnectionProviderFactory;
/**
* The generic JMX server component used to create and cache a connection to a local or
@@ -61,124 +48,50 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
* @author John Mazzitelli
*/
public class JMXServerComponent<T extends ResourceComponent<?>> implements JMXComponent<T> {
+
private static Log log = LogFactory.getLog(JMXServerComponent.class);
private EmsConnection connection;
private ConnectionProvider connectionProvider;
/**
- * Access to this is deprecated, use #getResourceContext() instead.
+ * The context of a component that is started. Note, other classes should use #getResourceContext(), rather than
+ * this field.
*/
ResourceContext context;
public void start(ResourceContext context) throws Exception {
this.context = context;
- log.info("Starting connection to JMX Server " + context.getResourceKey());
+ log.debug("Starting connection to " + context.getResourceType() + "[" + context.getResourceKey() + "]...");
+ // If connecting to the EMS fails, log a warning but still succeed in starting. getAvailablity() will keep
+ // trying to connect each time it is called.
try {
internalStart();
} catch (Exception e) {
- log.warn("JMX Plugin connection failure", e);
- // The new model is to always succeed in starting, but warn about the errors (we only do this the first request)
- /*throw new Exception("Unable to connect to Java VM ["
- + configuration.getSimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY).getStringValue()
- + "]", e);*/
+ log.warn("Failed to connect to " + context.getResourceType() + "[" + context.getResourceKey() + "].", e);
+
}
if (connection == null) {
- log.warn("Unable to connect to JMX Server " + context.getResourceKey());
+ log.warn("Unable to connect to " + context.getResourceType() + "[" + context.getResourceKey() + "].");
}
}
protected void internalStart() throws Exception {
- Configuration configuration = context.getPluginConfiguration();
-
- String connectionTypeDescriptorClass = configuration.getSimple(JMXDiscoveryComponent.CONNECTION_TYPE)
+ Configuration pluginConfig = context.getPluginConfiguration();
+ String connectionTypeDescriptorClassName = pluginConfig.getSimple(JMXDiscoveryComponent.CONNECTION_TYPE)
.getStringValue();
-
- if (LocalVMTypeDescriptor.class.getName().equals(connectionTypeDescriptorClass)) {
- String commandLine = configuration.getSimple(JMXDiscoveryComponent.COMMAND_LINE_CONFIG_PROPERTY)
- .getStringValue();
-
- Map<Integer, LocalVirtualMachine> vms = LocalVMFinder.getManageableVirtualMachines();
- if (vms != null) {
- for (LocalVirtualMachine vm : vms.values()) {
- if (vm.getCommandLine().equals(commandLine)) {
- connectLocal(vm.getVmid());
- }
- }
- }
- } else if (JMXDiscoveryComponent.PARENT_TYPE.equals(connectionTypeDescriptorClass)) {
- // We're embedded in another jmx server component without jmxremoting set so just use the parent's connection
+ if (JMXDiscoveryComponent.PARENT_TYPE.equals(connectionTypeDescriptorClassName)) {
+ // Our parent is itself a JMX component, so just reuse its connection.
this.connection = ((JMXComponent) context.getParentResourceComponent()).getEmsConnection();
this.connectionProvider = this.connection.getConnectionProvider();
- } else if (J2SE5ConnectionTypeDescriptor.class.getName().equals(connectionTypeDescriptorClass)) {
- // We're embedded in a J2SE VM with jmxremote defined (e.g. for jconsole usage)
- String principal = null;
- String credentials = null;
- PropertySimple o = configuration.getSimple(JMXComponent.PRINCIPAL_CONFIG_PROP);
- if (o != null) {
- principal = o.getStringValue();
- }
- o = configuration.getSimple(JMXComponent.CREDENTIALS_CONFIG_PROP);
- if (o != null) {
- credentials = o.getStringValue();
- }
-
- ConnectionSettings settings = new ConnectionSettings();
- J2SE5ConnectionTypeDescriptor desc = new J2SE5ConnectionTypeDescriptor();
- settings.setConnectionType(desc);
- settings.setServerUrl(configuration.getSimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY)
- .getStringValue());
- if (principal != null) {
- settings.setPrincipal(principal);
- }
- if (credentials != null) {
- settings.setCredentials(credentials);
- }
-
- prepareConnection(settings);
-
} else {
- // This can handle internal connections (within the same vm as the plugin container) as well as
- // any remote connections
- ConnectionSettings settings = new ConnectionSettings();
-
- String principal = null;
- String credentials = null;
- PropertySimple o = configuration.getSimple(JMXComponent.PRINCIPAL_CONFIG_PROP);
- if (o != null) {
- principal = o.getStringValue();
- }
- o = configuration.getSimple(JMXComponent.CREDENTIALS_CONFIG_PROP);
- if (o != null) {
- credentials = o.getStringValue();
- }
-
- settings.initializeConnectionType((ConnectionTypeDescriptor) Class.forName(connectionTypeDescriptorClass)
- .newInstance());
-
- settings.setConnectionType((ConnectionTypeDescriptor) Class.forName(connectionTypeDescriptorClass)
- .newInstance());
- settings.setServerUrl(configuration.getSimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY)
- .getStringValue());
-
- String installPath = configuration.getSimpleValue(JMXDiscoveryComponent.INSTALL_URI, null);
- if (installPath != null) {
- settings.setLibraryURI(configuration.getSimple(JMXDiscoveryComponent.INSTALL_URI).getStringValue());
- }
-
- if (principal != null) {
- settings.setPrincipal(principal);
- }
- if (credentials != null) {
- settings.setCredentials(credentials);
- }
- prepareConnection(settings);
+ this.connectionProvider = ConnectionProviderFactory.createConnectionProvider(pluginConfig,
+ this.context.getNativeProcess(), this.context.getTemporaryDirectory());
+ this.connection = this.connectionProvider.connect();
+ this.connection.loadSynchronous(false);
}
-
- this.connection.loadSynchronous(false);
-
}
public void stop() {
@@ -192,28 +105,6 @@ public class JMXServerComponent<T extends ResourceComponent<?>> implements JMXCo
}
}
- protected void connectLocal(int vmid) {
- // TODO GH: Refactor ems to also accept the vm itself
- ConnectionSettings settings = new ConnectionSettings();
- settings.setConnectionType(new LocalVMTypeDescriptor());
- settings.setServerUrl(String.valueOf(vmid));
- prepareConnection(settings);
- }
-
- protected void prepareConnection(ConnectionSettings settings) {
- settings.getControlProperties().setProperty(ConnectionFactory.COPY_JARS_TO_TEMP, String.valueOf(Boolean.TRUE));
- settings.getControlProperties().setProperty(ConnectionFactory.JAR_TEMP_DIR,
- this.context.getTemporaryDirectory().getAbsolutePath());
-
- addAdditionalJarsToConnectionSettings(settings);
-
- ConnectionFactory cf = new ConnectionFactory();
- cf.discoverServerClasses(settings);
-
- this.connectionProvider = cf.getConnectionProvider(settings);
- this.connection = this.connectionProvider.connect();
- }
-
public EmsConnection getEmsConnection() {
return this.connection;
}
@@ -223,8 +114,8 @@ public class JMXServerComponent<T extends ResourceComponent<?>> implements JMXCo
try {
internalStart();
} catch (Exception e) {
- log.debug("Still unable to reconnect resource: " + context.getResourceKey() + " due to error: "
- + e.getMessage());
+ log.debug("Still unable to reconnect to " + context.getResourceType() + "[" + context.getResourceKey()
+ + "] due to error: " + e);
}
}
@@ -236,32 +127,4 @@ public class JMXServerComponent<T extends ResourceComponent<?>> implements JMXCo
return this.context;
}
- public List<Resource> discoverServices(ResourceType type, Configuration defaultPluginConfiguration) {
- defaultPluginConfiguration.getSimple("objectName").getStringValue();
-
- return null;
- }
-
- private void addAdditionalJarsToConnectionSettings(ConnectionSettings settings) {
- // get the additional jars from the config
- Configuration pluginConfiguration = getResourceContext().getPluginConfiguration();
- List<File> additionalEntries = JMXDiscoveryComponent.getAdditionalJarsFromConfig(pluginConfiguration);
- if (additionalEntries == null || additionalEntries.size() == 0) {
- return; // nothing to do, there are no additional entries to add
- }
-
- // get the setting's current list of classpath entries - we are going to add to these
- List<File> settingsEntries = settings.getClassPathEntries();
- if (settingsEntries == null) {
- settingsEntries = new ArrayList<File>();
- }
-
- // append the additional entries to the end of the setting's current entries
- settingsEntries.addAll(additionalEntries);
-
- // now that we've appended our additional jars, tell the connection settings about the new list
- settings.setClassPathEntries(settingsEntries);
-
- return;
- }
}
\ No newline at end of file
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java
new file mode 100644
index 0000000..5c29673
--- /dev/null
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java
@@ -0,0 +1,218 @@
+package org.rhq.plugins.jmx.util;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.management.remote.JMXServiceURL;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.system.ProcessInfo;
+import org.rhq.plugins.jmx.JMXComponent;
+import org.rhq.plugins.jmx.JMXDiscoveryComponent;
+
+import org.mc4j.ems.connection.ConnectionFactory;
+import org.mc4j.ems.connection.local.LocalVMFinder;
+import org.mc4j.ems.connection.local.LocalVirtualMachine;
+import org.mc4j.ems.connection.settings.ConnectionSettings;
+import org.mc4j.ems.connection.support.ConnectionProvider;
+import org.mc4j.ems.connection.support.metadata.ConnectionTypeDescriptor;
+import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor;
+import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor;
+
+/**
+ * A factory that can construct an EMS {@link ConnectionProvider} for a JMX Server Resource from that Resource's plugin
+ * configuration.
+ *
+ * @author Ian Springer
+ */
+public class ConnectionProviderFactory {
+
+ public static ConnectionProvider createConnectionProvider(Configuration pluginConfig, ProcessInfo process,
+ File tempDir) throws Exception {
+ String connectionTypeDescriptorClassName = pluginConfig.getSimple(JMXDiscoveryComponent.CONNECTION_TYPE)
+ .getStringValue();
+
+ Class<?> connectionTypeDescriptorClass;
+ try {
+ connectionTypeDescriptorClass = Class.forName(connectionTypeDescriptorClassName);
+ } catch (ClassNotFoundException e) {
+ throw new InvalidPluginConfigurationException("Invalid connection type - class [" + connectionTypeDescriptorClassName
+ + "] not found.");
+ }
+ if (!(ConnectionTypeDescriptor.class.isAssignableFrom(connectionTypeDescriptorClass))) {
+ throw new InvalidPluginConfigurationException("Invalid connection type - class [" + connectionTypeDescriptorClassName
+ + "] does not implement the " + ConnectionTypeDescriptor.class.getName() + " interface.");
+ }
+ ConnectionTypeDescriptor connectionTypeDescriptor;
+ try {
+ connectionTypeDescriptor = (ConnectionTypeDescriptor) connectionTypeDescriptorClass.newInstance();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to instantiate connection type descriptor of type [" + connectionTypeDescriptorClassName + "].", e);
+ }
+
+ ConnectionSettings settings = new ConnectionSettings();
+ settings.initializeConnectionType(connectionTypeDescriptor);
+
+ // Set principal and credentials.
+ String principal = pluginConfig.getSimpleValue(JMXComponent.PRINCIPAL_CONFIG_PROP, null);
+ settings.setPrincipal(principal);
+ String credentials = pluginConfig.getSimpleValue(JMXComponent.CREDENTIALS_CONFIG_PROP, null);
+ settings.setCredentials(credentials);
+
+ if (connectionTypeDescriptor instanceof LocalVMTypeDescriptor) {
+ // NOTE (ips, 01/19/12): This is not very reliable for long-term management of a JVM, since it uses the
+ // command line from the time the JVM was originally discovered, which may have changed.
+ String commandLine = pluginConfig.getSimpleValue(JMXDiscoveryComponent.COMMAND_LINE_CONFIG_PROPERTY, null);
+ if (commandLine == null) {
+ throw new InvalidPluginConfigurationException("A command line is required for the "
+ + connectionTypeDescriptorClassName + " connection type.");
+ }
+
+ Map<Integer, LocalVirtualMachine> vms = LocalVMFinder.getManageableVirtualMachines();
+ LocalVirtualMachine targetVm = null;
+ if (vms != null) {
+ for (LocalVirtualMachine vm : vms.values()) {
+ if (vm.getCommandLine().equals(commandLine)) {
+ targetVm = vm;
+ break;
+ }
+ }
+ }
+ if (targetVm == null) {
+ // This could just be because the JVM is not currently running.
+ throw new Exception("JVM with command line [" + commandLine + "] not found.");
+ }
+ String vmId = String.valueOf(targetVm.getVmid());
+ settings.setServerUrl(vmId);
+ } else if (connectionTypeDescriptor instanceof J2SE5ConnectionTypeDescriptor) {
+ // Connect via JMX Remoting, using the JVM Attach API to start up a JMX Remoting Agent if necessary.
+ String jmxConnectorAddress = getJmxConnectorAddress(pluginConfig, process);
+ settings.setServerUrl(jmxConnectorAddress);
+ } else {
+ // Handle internal connections (InternalVMTypeDescriptor) (i.e. the RHQ plugin container's own JVM), as
+ // well as miscellaneous types of remote connections - WebSphere, WebLogic, etc.
+ String connectorAddress = pluginConfig.getSimpleValue(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY,
+ null);
+ if (connectorAddress == null) {
+ throw new InvalidPluginConfigurationException("A connector address is required for the "
+ + connectionTypeDescriptorClassName + " connection type.");
+ }
+ settings.setServerUrl(connectorAddress);
+ String installURI = pluginConfig.getSimpleValue(JMXDiscoveryComponent.INSTALL_URI, null);
+ settings.setLibraryURI(installURI);
+ }
+
+ addAdditionalJarsToConnectionSettings(settings, pluginConfig);
+
+ return createConnectionProvider(settings, tempDir);
+ }
+
+ private static ConnectionProvider createConnectionProvider(ConnectionSettings settings, File tempDir) {
+ settings.getControlProperties().setProperty(ConnectionFactory.COPY_JARS_TO_TEMP, String.valueOf(Boolean.TRUE));
+ settings.getControlProperties().setProperty(ConnectionFactory.JAR_TEMP_DIR,
+ tempDir.getAbsolutePath());
+
+ ConnectionFactory connectionFactory = new ConnectionFactory();
+ connectionFactory.discoverServerClasses(settings);
+
+ return connectionFactory.getConnectionProvider(settings);
+ }
+
+ private static void addAdditionalJarsToConnectionSettings(ConnectionSettings settings, Configuration pluginConfig) {
+
+ List<File> additionalEntries = getAdditionalJarsFromConfig(pluginConfig);
+ if (additionalEntries == null || additionalEntries.size() == 0) {
+ return; // nothing to do, there are no additional entries to add
+ }
+
+ // get the setting's current list of classpath entries - we are going to add to these
+ List<File> settingsEntries = settings.getClassPathEntries();
+ if (settingsEntries == null) {
+ settingsEntries = new ArrayList<File>();
+ }
+
+ // append the additional entries to the end of the setting's current entries
+ settingsEntries.addAll(additionalEntries);
+
+ // now that we've appended our additional jars, tell the connection settings about the new list
+ settings.setClassPathEntries(settingsEntries);
+ }
+
+ private static String getJmxConnectorAddress(Configuration pluginConfig, ProcessInfo process) throws Exception {
+ String connectorAddress = pluginConfig.getSimpleValue(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY,
+ null);
+ if (connectorAddress == null) {
+ // No JMX connector address defined - try to connect via Attach API.
+ if (process == null) {
+ throw new Exception("Could not find java process for JVM.");
+ }
+ JMXServiceURL jmxServiceURL = JvmUtility.extractJMXServiceURL(process.getPid());
+ if (jmxServiceURL == null) {
+ throw new Exception("Could not obtain JMX service URL via Attach API for JVM [" + process + "].");
+ }
+ connectorAddress = jmxServiceURL.toString();
+ }
+ return connectorAddress;
+ }
+
+ /**
+ * Examines the plugin configuration and if it defines additional classpath entries, this
+ * will return a list of files that point to all the jars that need to be added to a classloader
+ * to support the managed JMX resource.
+ *
+ * Note: this is package static scoped so the resource component can use this method.
+ *
+ * @param pluginConfiguration
+ *
+ * @return list of files pointing to additional jars; will be empty if no additional jars are to be added
+ */
+ public static List<File> getAdditionalJarsFromConfig(Configuration pluginConfiguration) {
+ List<File> jarFiles = new ArrayList<File>();
+
+ // get the plugin config setting that contains comma-separated list of files/dirs to additional jars
+ // if no additional classpath entries are specified, we'll return an empty list
+ PropertySimple prop = pluginConfiguration.getSimple(JMXDiscoveryComponent.ADDITIONAL_CLASSPATH_ENTRIES);
+ if (prop == null || prop.getStringValue() == null || prop.getStringValue().trim().length() == 0) {
+ return jarFiles;
+ }
+ String[] paths = prop.getStringValue().trim().split(",");
+ if (paths == null || paths.length == 0) {
+ return jarFiles;
+ }
+
+ // Get all additional classpath entries which can be listed as jar file names or directories.
+ // If a directory has ".jar" at the end, all jar files found in that directory will be added
+ // as class path entries.
+ final class JarFilenameFilter implements FilenameFilter {
+ public boolean accept(File dir, String name) {
+ return name.endsWith(".jar");
+ }
+ }
+
+ for (String path : paths) {
+ path = path.trim();
+ if (path.length() > 0) {
+ if (path.endsWith("*.jar")) {
+ path = path.substring(0, path.length() - 5);
+ File dir = new File(path);
+ File[] jars = dir.listFiles(new JarFilenameFilter());
+ if (jars != null && jars.length > 0) {
+ jarFiles.addAll(Arrays.asList(jars));
+ }
+ } else {
+ File pathFile = new File(path);
+ jarFiles.add(pathFile);
+ }
+ }
+ }
+
+ return jarFiles;
+ }
+
+}
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java
new file mode 100644
index 0000000..70053cb
--- /dev/null
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java
@@ -0,0 +1,179 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jmx.util;
+
+/**
+ * @author Ian Springer
+ */
+public class JvmResourceKey {
+
+ private String mainClassName;
+ private String explicitValue;
+ private Integer jmxRemotingPort;
+ private String connectorAddress;
+ private transient Type type;
+
+ public static JvmResourceKey fromExplicitValue(String mainClassName, String explicitValue) {
+ JvmResourceKey instance = new JvmResourceKey(mainClassName);
+ instance.explicitValue = explicitValue;
+ instance.type = Type.Explicit;
+ return instance;
+ }
+
+ public static JvmResourceKey fromJmxRemotingPort(String mainClassName, int jmxRemotingPort) {
+ JvmResourceKey instance = new JvmResourceKey(mainClassName);
+ instance.jmxRemotingPort = jmxRemotingPort;
+ instance.type = (mainClassName != null) ? Type.JmxRemotingPort : Type.Legacy;
+ return instance;
+ }
+
+ public static JvmResourceKey fromConnectorAddress(String connectorAddress) {
+ JvmResourceKey instance = new JvmResourceKey(null);
+ instance.connectorAddress = connectorAddress;
+ instance.type = Type.ConnectorAddress;
+ return instance;
+ }
+
+ public static JvmResourceKey valueOf(String string) {
+ JvmResourceKey instance;
+ if (string.contains("{") && string.endsWith("}")) {
+ String mainClassName = string.substring(0, string.indexOf('{'));
+ String explicitValue = string.substring(string.indexOf('{') + 1, string.length() - 1);
+ instance = JvmResourceKey.fromExplicitValue(mainClassName, explicitValue);
+ } else if (string.contains("(") && string.endsWith(")")) {
+ String mainClassName = string.substring(0, string.indexOf('('));
+ String value = string.substring(string.indexOf('(') + 1, string.length() - 1);
+ int jmxRemotingPort = Integer.parseInt(value);
+ instance = JvmResourceKey.fromJmxRemotingPort(mainClassName, jmxRemotingPort);
+ } else {
+
+ try {
+ int jmxRemotingPort = Integer.parseInt(string);
+ // It's a legacy key, e.g. "9999".
+ instance = JvmResourceKey.fromJmxRemotingPort(null, jmxRemotingPort);
+ } catch (NumberFormatException e) {
+ // At this point, assume it's a connector address, e.g.
+ // "service:jmx:iiop://127.0.0.1:7001/jndi/weblogic.management.mbeanservers.runtime".
+ instance = JvmResourceKey.fromConnectorAddress(string);
+ }
+ }
+ return instance;
+ }
+
+ public String getMainClassName() {
+ return mainClassName;
+ }
+
+ public String getExplicitValue() {
+ return explicitValue;
+ }
+
+ public Integer getJmxRemotingPort() {
+ return jmxRemotingPort;
+ }
+
+ public String getConnectorAddress() {
+ return connectorAddress;
+ }
+
+ public Type getType() {
+ return type;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ JvmResourceKey that = (JvmResourceKey) o;
+
+ if (connectorAddress != null ? !connectorAddress.equals(that.connectorAddress) : that.connectorAddress != null)
+ return false;
+ if (explicitValue != null ? !explicitValue.equals(that.explicitValue) : that.explicitValue != null)
+ return false;
+ if (jmxRemotingPort != null ? !jmxRemotingPort.equals(that.jmxRemotingPort) : that.jmxRemotingPort != null)
+ return false;
+ if (mainClassName != null ? !mainClassName.equals(that.mainClassName) : that.mainClassName != null)
+ return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = mainClassName != null ? mainClassName.hashCode() : 0;
+ result = 31 * result + (explicitValue != null ? explicitValue.hashCode() : 0);
+ result = 31 * result + (jmxRemotingPort != null ? jmxRemotingPort.hashCode() : 0);
+ result = 31 * result + (connectorAddress != null ? connectorAddress.hashCode() : 0);
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ String string;
+ switch (this.type) {
+ case Legacy:
+ string = this.jmxRemotingPort.toString();
+ break;
+ case ConnectorAddress:
+ string = this.connectorAddress;
+ break;
+ case JmxRemotingPort:
+ string = this.mainClassName + "(" + this.jmxRemotingPort + ")";
+ break;
+ case Explicit:
+ string = this.mainClassName + "{" + this.explicitValue + "}";
+ break;
+ default:
+ throw new IllegalStateException("Unsupported key type: " + this.type);
+ }
+ return string;
+ }
+
+ public enum Type {
+ /**
+ * The legacy format is a simple integer representing the JVM's JMX remoting port, e.g. "9999"
+ */
+ Legacy,
+ /**
+ * Manually added JVM's use the JMX connector address as the key, e.g.
+ * "service:jmx:iiop://127.0.0.1:7001/jndi/weblogic.management.mbeanservers.runtime"
+ */
+ ConnectorAddress,
+ /**
+ * The successor of the legacy format; includes the main class name in addition to the JMX remoting port,
+ * e.g. "org.example.Main(9999)"
+ */
+ JmxRemotingPort,
+ /**
+ * This format is used when a key is explicitly specified on the JVM's command line via the org.rhq.resourceKey
+ * sysprop; the main class name is also included, e.g. "org.example.Main{foo}"
+ */
+ Explicit
+ }
+
+ private JvmResourceKey(String mainClassName) {
+ this.mainClassName = mainClassName;
+ }
+
+}
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java
new file mode 100644
index 0000000..c4c93b3
--- /dev/null
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java
@@ -0,0 +1,118 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jmx.util;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.management.remote.JMXServiceURL;
+
+import com.sun.tools.attach.VirtualMachine;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.rhq.plugins.jmx.MBeanResourceComponent;
+
+/**
+ * @author Ian Springer
+ */
+public class JvmUtility {
+
+ private static final Log LOG = LogFactory.getLog(MBeanResourceComponent.class);
+
+ private static final String AGENT_PROP_JMXREMOTE_LOCAL_CONNECTOR_ADDRESS =
+ "com.sun.management.jmxremote.localConnectorAddress";
+
+ private static boolean attachApiAvailable;
+
+ static {
+ try {
+ Class.forName("com.sun.tools.attach.VirtualMachine");
+ attachApiAvailable = true;
+ } catch (ClassNotFoundException e) {
+ LOG.warn("JDK tools.jar not found on system classpath - cannot discover JVMs using Sun JVM Attach API; "
+ + "to fix this, run the RHQ Agent on a JDK, rather than a JRE.");
+ }
+ }
+
+ /**
+ * TODO
+ *
+ * @param pid the process ID of a JVM (java*) process
+ *
+ * @return
+ *
+ * @throws Exception
+ */
+ public static JMXServiceURL extractJMXServiceURL(long pid) {
+ if (!attachApiAvailable) {
+ LOG.debug("Returning null since the Attach API is not available...");
+ return null;
+ }
+ LOG.debug("Attaching to JVM for java process with PID [" + pid + "]...");
+ JMXServiceURL url;
+ try {
+ VirtualMachine vm = VirtualMachine.attach(String.valueOf(pid));
+ LOG.debug("Attached to JVM [" + vm + "].");
+
+ String jmxConnectorAddress = vm.getAgentProperties().getProperty(AGENT_PROP_JMXREMOTE_LOCAL_CONNECTOR_ADDRESS);
+ LOG.debug("Connector address for JVM [" + vm + "] is [" + jmxConnectorAddress + "].");
+ if (jmxConnectorAddress == null) {
+ // java.home always points to the jre dir (e.g. /usr/java/default/jre).
+ String jreDir = vm.getSystemProperties().getProperty("java.home");
+ // management-agent.jar is included with the v6 JRE, so we can rely on it always being there.
+ File jmxAgentJarFile = new File(jreDir, "lib/management-agent.jar");
+ String jmxAgentJar = jmxAgentJarFile.getCanonicalPath();
+ try {
+ vm.loadAgent(jmxAgentJar);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to load JVM agent from [" + jmxAgentJar + "].", e);
+ }
+
+ // JMX agent is started - get the connector address.
+ LOG.debug("JMX agent started - getting the connector address...");
+ jmxConnectorAddress = vm.getAgentProperties().getProperty(AGENT_PROP_JMXREMOTE_LOCAL_CONNECTOR_ADDRESS);
+ if (jmxConnectorAddress == null) {
+ throw new RuntimeException("Failed to determine JMX connector address.");
+ }
+ }
+
+ try {
+ vm.detach();
+ } catch (Exception e) {
+ // We already succeeded in obtaining the connector address, so just log this, rather than throwing an exception.
+ LOG.error("Failed to detach from JVM [" + vm + "].", e);
+ }
+
+ url = new JMXServiceURL(jmxConnectorAddress);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to extract JMX service URL for process with PID [" + pid + "].", e);
+ }
+
+ LOG.debug("JMX service URL for java process with PID [" + pid + "]: " + url);
+ return url;
+ }
+
+ private JvmUtility() {
+ }
+
+}
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/Socket.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/Socket.java
new file mode 100644
index 0000000..142cf1c
--- /dev/null
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/Socket.java
@@ -0,0 +1,120 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.rhq.plugins.jmx.util;
+
+/**
+ * @author Ian Springer
+ */
+public class Socket implements Comparable<Socket> {
+
+ private static final String STRING_DELIMITER = "/";
+
+ private Protocol protocol;
+ private String host; // either an IP address or a host name
+ private long port;
+
+ public static Socket valueOf(String string) {
+ String[] values = string.split(STRING_DELIMITER);
+ Protocol protocol = Protocol.valueOf(values[0]);
+ String host = values[1];
+ long port = Long.valueOf(values[2]);
+
+ return new Socket(protocol, host, port);
+ }
+
+ public Socket(Protocol protocol, String host, long port) {
+ if (protocol == null) {
+ throw new IllegalArgumentException("protocol must be non-null.");
+ }
+ if (host == null) {
+ throw new IllegalArgumentException("host must be non-null.");
+ }
+ if (port < 0 || port > 65535) {
+ throw new IllegalArgumentException("invalid port: " + port);
+ }
+
+ this.protocol = protocol;
+ this.host = host;
+ this.port = port;
+ }
+
+ public Protocol getProtocol() {
+ return protocol;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public long getPort() {
+ return port;
+ }
+
+ public enum Protocol { TCP, UDP }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Socket that = (Socket) o;
+
+ if (port != that.port) return false;
+ if (!host.equals(that.host)) return false;
+ if (protocol != that.protocol) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = protocol.hashCode();
+ result = 31 * result + host.hashCode();
+ result = 31 * result + (int) (port ^ (port >>> 32));
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return this.protocol + STRING_DELIMITER + this.host + STRING_DELIMITER + this.port;
+ }
+
+ @Override
+ public int compareTo(Socket that) {
+ if (this == that) {
+ return 0;
+ }
+
+ int result = this.protocol.compareTo(that.protocol);
+ if (result == 0) {
+ result = this.host.compareTo(that.host);
+ if (result == 0) {
+ result = Long.valueOf(this.port).compareTo(that.port);
+
+ }
+ }
+ return result;
+ }
+
+}
diff --git a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
index 791a578..ee172ba 100644
--- a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
+++ b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,13 +28,22 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.ServerSocket;
+import java.net.Socket;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.plugins.jmx.JMXDiscoveryComponent;
+import org.rhq.plugins.jmx.util.JvmResourceKey;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
@@ -61,38 +70,38 @@ import org.rhq.core.pluginapi.operation.OperationFacet;
* Integration test for the JMX plugin.
*
* @author Greg Hinkle
+ * @author Ian Springer
*/
public class JMXPluginTest {
- static final String PROGRAM_CLASS = "org.rhq.plugins.jmx.test.JMXPluginTest$TestProgram";
- static final String MONITORABLE = "-Dcom.sun.management.jmxremote.port=9921 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false";
- static final String MBEAN_SERVER_ADDRESS = "service:jmx:rmi:///jndi/rmi://localhost:9921/jmxrmi";
- static final String PROJECT_ARTIFACT_ID_SYSPROP = "project.artifactId";
- static final String PROJECT_VERSION_SYSPROP = "project.version";
+ private static final int JMX_REMOTING_PORT1 = 9921;
+ private static final int JMX_REMOTING_PORT2 = 9922;
- private Process testProgram;
- private InventoryManager inventoryManager;
private static final String PLUGIN_NAME = "JMX";
+ private static final String SERVER_TYPE_NAME = "JMX Server";
+ private static final String EXPLICIT_RESOURCE_KEY1 = "foo1";
+ private static final String EXPLICIT_RESOURCE_KEY2 = "foo2";
+ private List<Process> testServerJvms = new ArrayList<Process>();
+
+ private InventoryManager inventoryManager;
+
@BeforeSuite
public void start() {
try {
- String javaHome = System.getProperty("java.home");
- String javaCmd = javaHome + "/bin/java";
+ // Start the test server JVMs.
+ this.testServerJvms.add(startTestServerJvm("-Dcom.sun.management.jmxremote.port=" + JMX_REMOTING_PORT1,
+ "-Dcom.sun.management.jmxremote.ssl=false", "-Dcom.sun.management.jmxremote.authenticate=false"));
- ProcessBuilder processBuilder = new ProcessBuilder(javaCmd, "-cp", "target/test-classes",
- "-Dcom.sun.management.jmxremote.port=9921", "-Dcom.sun.management.jmxremote.ssl=false",
- "-Dcom.sun.management.jmxremote.authenticate=false", PROGRAM_CLASS);
- processBuilder.redirectErrorStream(true);
- testProgram = processBuilder.start();
+ this.testServerJvms.add(startTestServerJvm("-D" + JMXDiscoveryComponent.SYSPROP_RHQ_RESOURCE_KEY + "="
+ + EXPLICIT_RESOURCE_KEY1));
- OutputReader or = new OutputReader(testProgram.getInputStream());
- Thread ort = new Thread(or);
- ort.setDaemon(true);
- ort.start();
+ this.testServerJvms.add(startTestServerJvm("-Dcom.sun.management.jmxremote.port=" + JMX_REMOTING_PORT2,
+ "-Dcom.sun.management.jmxremote.ssl=false", "-Dcom.sun.management.jmxremote.authenticate=false",
+ "-D" + JMXDiscoveryComponent.SYSPROP_RHQ_RESOURCE_KEY + "=" + EXPLICIT_RESOURCE_KEY2));
- // Give it time to start
- Thread.sleep(2000);
+ // Give them time to fully start.
+ Thread.sleep(3000);
File pluginDir = new File("target/itest/plugins");
PluginContainerConfiguration pcConfig = new PluginContainerConfiguration();
@@ -102,10 +111,9 @@ public class JMXPluginTest {
PluginContainer.getInstance().setConfiguration(pcConfig);
PluginContainer.getInstance().initialize();
- System.out.println("PC Started");
- for (String plugin : PluginContainer.getInstance().getPluginManager().getMetadataManager().getPluginNames()) {
- System.out.println("PLUGIN: " + plugin);
- }
+
+ Set<String> pluginNames = PluginContainer.getInstance().getPluginManager().getMetadataManager().getPluginNames();
+ System.out.println("PC started with plugins " + pluginNames + ".");
this.inventoryManager = PluginContainer.getInstance().getInventoryManager();
} catch (Throwable t) {
@@ -116,17 +124,43 @@ public class JMXPluginTest {
}
}
+ private Process startTestServerJvm(String... jvmArgs) throws IOException {
+ String javaHome = System.getProperty("java.home");
+ String javaCmd = javaHome + "/bin/java";
+
+ List<String> args = new ArrayList<String>();
+ args.add(javaCmd);
+ args.add("-cp");
+ args.add("target/test-classes");
+ args.addAll(Arrays.asList(jvmArgs));
+ args.add(TestProgram.class.getName());
+
+ ProcessBuilder processBuilder = new ProcessBuilder(args);
+ processBuilder.redirectErrorStream(true);
+ Process process = processBuilder.start();
+
+ OutputReader outputReader = new OutputReader(process.getInputStream());
+ Thread outputReaderThread = new Thread(outputReader);
+ outputReaderThread.setDaemon(true);
+ outputReaderThread.start();
+
+ return process;
+ }
+
@AfterSuite
- public void stop() {
+ public void stop() {
PluginContainer.getInstance().shutdown();
- testProgram.destroy();
+
+ for (Process process : this.testServerJvms) {
+ process.destroy();
+ }
}
@Test
public void testPluginLoad() {
PluginManager pluginManager = PluginContainer.getInstance().getPluginManager();
PluginEnvironment pluginEnvironment = pluginManager.getPlugin(PLUGIN_NAME);
- assert pluginEnvironment != null : "Null environment, plugin not loaded";
+ assert (pluginEnvironment != null) : "Null environment, plugin not loaded";
assert (pluginEnvironment.getPluginName().equals(PLUGIN_NAME));
}
@@ -135,9 +169,43 @@ public class JMXPluginTest {
InventoryReport report = PluginContainer.getInstance().getInventoryManager().executeServerScanImmediately();
assert report != null;
System.out.println("Discovery took: " + (report.getEndTime() - report.getStartTime()) + "ms");
+
Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform();
- Set<Resource> servers = platform.getChildResources();
- System.out.println("Found " + servers.size() + " servers");
+
+ Set<Resource> jmxServers = getChildResourcesOfType(platform, new ResourceType(SERVER_TYPE_NAME, PLUGIN_NAME,
+ ResourceCategory.SERVER, null));
+ System.out.println("Found " + jmxServers.size() + " JMX Servers:");
+
+ boolean foundJmxRemotingServer = false;
+ boolean foundExplicitKey1Server = false;
+ boolean foundExplicitKey2Server = false;
+ for (Resource jmxServer : jmxServers) {
+ System.out.println(" * " + jmxServer);
+ JvmResourceKey key = JvmResourceKey.valueOf(jmxServer.getResourceKey());
+ switch (key.getType()) {
+ case Explicit:
+ if (key.getExplicitValue().equals(EXPLICIT_RESOURCE_KEY1)) {
+ assert key.getMainClassName().equals(TestProgram.class.getName());
+ foundExplicitKey1Server = true;
+ } else if (key.getExplicitValue().equals(EXPLICIT_RESOURCE_KEY2)) {
+ assert key.getMainClassName().equals(TestProgram.class.getName());
+ foundExplicitKey2Server = true;
+ }
+ break;
+ case JmxRemotingPort:
+ if (key.getMainClassName().equals(TestProgram.class.getName()) &&
+ key.getJmxRemotingPort().equals(JMX_REMOTING_PORT1)) {
+ assert key.getMainClassName().equals(TestProgram.class.getName());
+ foundJmxRemotingServer = true;
+ }
+ break;
+ default:
+ throw new IllegalStateException("Unsupported key type: " + key.getType());
+ }
+ }
+ assert foundJmxRemotingServer : "JMX Remoting server not found.";
+ assert foundExplicitKey1Server : "Explicit key server not found.";
+ assert foundExplicitKey2Server : "JMX Remoting + explicit key server not found.";
}
@Test(dependsOnMethods = "testServerDiscovery")
@@ -147,27 +215,20 @@ public class JMXPluginTest {
Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform();
assert platform != null;
- Set<Resource> childResources = platform.getChildResources();
- assert childResources != null;
-
- /*System.out.println("RUNTIME SERVERS: " + childResources.size());
- * for (Resource server : platform.getChildResources()) { System.out.println("Server: " + server.toString());
- * System.out.println("Found with " + server.getChildResources().size() + " child services");}*/
- InventoryPrinter.outputInventory(new PrintWriter(System.out), false);
- }
- @Test(dependsOnMethods = "testServerDiscovery")
- public void testNumberOfServers() throws Exception {
- InventoryReport report = PluginContainer.getInstance().getInventoryManager().executeServiceScanImmediately();
- assert report != null;
- Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform();
+ Set<Resource> jmxServers = getChildResourcesOfType(platform, new ResourceType(SERVER_TYPE_NAME, PLUGIN_NAME,
+ ResourceCategory.SERVER, null));
- assert platform != null;
- Set<Resource> childResources = platform.getChildResources();
- assert childResources != null;
+ for (Resource jmxServer : jmxServers) {
+ Set<Resource> childResources = jmxServer.getChildResources();
+ // Each JMX Server should have exactly six singleton child Resources with the following types:
+ // Operating System, Threading, VM Class Loading System, VM Compilation System, VM Memory System, and
+ // java.util.logging.
+ assert childResources.size() == 6 : jmxServer + " does not have 6 child Resources - child Resources: "
+ + childResources;
+ }
- // TODO GH: ccrouch... why would this be two now?
- //assert childResources.size() == 2 : "Not all Server instances were found.";
+ InventoryPrinter.outputInventory(new PrintWriter(System.out), false);
}
@Test(dependsOnMethods = "testServiceDiscovery")
@@ -198,8 +259,6 @@ public class JMXPluginTest {
@Test(dependsOnMethods = "testServiceDiscovery")
public void testOperation() throws Exception {
- // TODO GH: Test only runs when tested on JDK 6 as the JVM services aren't detected
- // currently for the test platform
Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform();
for (Resource server : platform.getChildResources()) {
List<Resource> services = new ArrayList<Resource>(server.getChildResources());
@@ -253,6 +312,19 @@ public class JMXPluginTest {
* } }
*/
+ private static Set<Resource> getChildResourcesOfType(Resource platform, ResourceType resourceType) {
+ Set<Resource> childResources = platform.getChildResources();
+ Set<Resource> results = new HashSet<Resource>();
+ for (Resource resource : childResources) {
+ ResourceType childResourceType = resource.getResourceType();
+ if (childResourceType.getPlugin().equals(resourceType.getPlugin()) &&
+ childResourceType.getName().equals(resourceType.getName())) {
+ results.add(resource);
+ }
+ }
+ return results;
+ }
+
public static class OutputReader implements Runnable {
InputStream inputStream;
@@ -262,10 +334,10 @@ public class JMXPluginTest {
public void run() {
try {
- BufferedReader r = new BufferedReader(new InputStreamReader(inputStream));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
String line;
- while ((line = r.readLine()) != null) {
+ while ((line = reader.readLine()) != null) {
System.out.println("__" + line);
}
} catch (IOException e) {
@@ -277,8 +349,35 @@ public class JMXPluginTest {
public static class TestProgram implements Runnable {
long started = System.currentTimeMillis();
- public static void main(String[] args) {
- System.out.println("Test program running...");
+ public static void main(String[] args) {
+ final ServerSocket serverSocket;
+ try {
+ serverSocket = new ServerSocket(0);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
+ String jvmName = runtimeMXBean.getName();
+ int atIndex = jvmName.indexOf('@');
+ String pid = (atIndex != -1) ? jvmName.substring(0, atIndex) : "?";
+
+ System.out.println("Test server JVM with pid [" + pid + "] listening on port ["
+ + serverSocket.getLocalPort() + "]...");
+ Runnable runnable = new Runnable() {
+ public void run() {
+ Socket socket;
+ try {
+ while ((socket = serverSocket.accept()) != null) {
+ socket.close();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ };
+ runnable.run();
+
TestProgram tp = new TestProgram();
tp.run();
}
@@ -289,8 +388,10 @@ public class JMXPluginTest {
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
+ // ignore
}
}
}
}
-}
\ No newline at end of file
+
+}
commit f83f9b96e135f7f6e4dbc505c24218103847835c
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 23 14:12:11 2012 -0500
move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed files from earlier commit); minor code cleanup in InternalJMXServerDiscoveryComponent
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java
index fcd16fc..ca5e5e5 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -25,8 +25,6 @@ package org.rhq.plugins.jmx;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor;
import org.rhq.core.domain.configuration.Configuration;
@@ -34,24 +32,32 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jmx.util.ParentDefinedJMXServerNamingUtility;
+/**
+ * Discovers a singleton Resource representing the local JVM (i.e. the JVM in which the RHQ Plugin Container is running).
+ */
public class InternalJMXServerDiscoveryComponent implements ResourceDiscoveryComponent {
- private static final Log log = LogFactory.getLog(InternalJMXServerDiscoveryComponent.class);
+
+ private static final String RESOURCE_KEY = "InternalVM";
+ private static final String DEFAULT_RESOURCE_DESCRIPTION = "JVM of RHQ Plugin Container";
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) {
- Set<DiscoveredResourceDetails> found = new HashSet<DiscoveredResourceDetails>();
+ Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>(1);
- DiscoveredResourceDetails localVM = new DiscoveredResourceDetails(context.getResourceType(), "InternalVM",
- ParentDefinedJMXServerNamingUtility.getJVMName(context), System.getProperty("java.version"),
- "VM of plugin container", null, null);
+ String name = ParentDefinedJMXServerNamingUtility.getJVMName(context);
+ String version = System.getProperty("java.version");
+ DiscoveredResourceDetails localVM = new DiscoveredResourceDetails(context.getResourceType(), RESOURCE_KEY,
+ name, version, DEFAULT_RESOURCE_DESCRIPTION, context.getDefaultPluginConfiguration(),
+ context.getSystemInformation().getThisProcess());
Configuration configuration = localVM.getPluginConfiguration();
configuration.put(new PropertySimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY,
"Local Connection"));
configuration.put(new PropertySimple(JMXDiscoveryComponent.CONNECTION_TYPE, InternalVMTypeDescriptor.class
.getName()));
+ discoveredResources.add(localVM);
- found.add(localVM);
-
- return found;
+ return discoveredResources;
}
-}
\ No newline at end of file
+
+}
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java
index 471dcbe..8cf89de 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java
@@ -38,6 +38,7 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
* This is meant to be a generic discovery component for MBeans. In order to use it you configure your resource
@@ -87,8 +88,9 @@ public class MBeanResourceDiscoveryComponent<T extends JMXComponent<?>> implemen
// Public --------------------------------------------
/**
- * Same as {@link discoverResources(ResourceDiscoveryContext<T>)} with additional param.
- * @param skipUnknownProps Should we skip over MBeans that have unknown properties in their ObjectName
+ * Same as {@link #discoverResources(ResourceDiscoveryContext<T>)} with additional param.
+ *
+ * @param skipUnknownProps if true, skip over MBeans that have unknown properties in their ObjectName
*/
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<T> context,
boolean skipUnknownProps) {
commit 01eb02937bb322f4efb53224bbd7889498f9df2d
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 23 12:12:21 2012 -0500
add 'commandLine' prop to plugin config def for JMX Server type (this prop was already being used in the plugin's code)
diff --git a/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml
index 5572bf0..97a4025 100644
--- a/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml
@@ -6,7 +6,6 @@
description="Supports management of JMX MBean Servers via various remoting systems."
pluginLifecycleListener="JMXPluginLifecycleListener"
ampsVersion="2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
@@ -40,11 +39,12 @@
</c:property-options>
</c:simple-property>
- <c:simple-property name="connectorAddress" required="true" type="string" description="The connection url in the form of a JMXServiceURL"/>
- <c:simple-property name="installURI" required="false" type="string" description="The installation path for the selected server type which will be used to find client libraries (if appropriate)."/>
+ <c:simple-property name="connectorAddress" required="false" type="string" description="The connection url in the form of a JMXServiceURL - this should only be set if the JVM has JMX Remoting enabled"/>
+ <c:simple-property name="installURI" required="false" type="string" description="The installation path for the selected server type which will be used to find client libraries (if appropriate)"/>
<c:simple-property name="principal" required="false" description="The login principal/username"/>
<c:simple-property name="credentials" required="false" type="password" description="The login credentials/password"/>
<c:simple-property name="additionalClassPathEntries" required="false" type="string" description="Comma-separated list of directories and filenames that contain resources and classes needed to communicate with the JMX Server and its MBeans. If you specify 'some/directory/*.jar', all jars found in the given directory will be added."/>
+ <c:simple-property name="commandLine" required="false" type="string" description="the command line of the JVM at the time it was discovered - only used by JVMs with type Local; if the command line of the JVM changes, this property's value will need to be updated accordingly in order for RHQ to connect to the JVM"/>
<c:template name="JDK 5" description="Connect to JDK 5">
<c:simple-property name="type" default="org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor"/>
@@ -79,7 +79,7 @@
In order to do this, you must pass in some system properties when starting your application's Java virtual
machine.</p>
- <p> To run a JVM with JMX remoting enabled without authentication, you must pass in the following system
+ <p>To run a JVM with JMX remoting enabled without authentication, you must pass in the following system
properties:</p>
<ul>
commit c56e22e9227dd87f5411ef7dbd17c03833dbea8c
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 23 12:10:57 2012 -0500
move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed file from earlier commit)
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java
index 4b48067..58f7698 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java
@@ -37,6 +37,7 @@ import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.plugins.jmx.util.ParentDefinedJMXServerNamingUtility;
/**
* This discovery component can be used to include JVM information under a parent Process oriented server that supports
commit ebe55c758809eb79b4fd6bbbf01413ae76aef646
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jan 20 17:48:30 2012 -0500
cosmetic: minor tweak to comment
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
index 219d828..04600b7 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
@@ -844,7 +844,7 @@ public class ResourceType implements Serializable, Comparable<ResourceType> {
// NOTE: It's vital that compareTo() is consistent with equals(), otherwise TreeSets containing ResourceTypes, or
// TreeMaps with ResourceTypes as keys, will not work reliably. See the Javadoc for Comparable for a precise
- // definition of consistent with equals().
+ // definition of "consistent with equals()".
@Override
public int compareTo(ResourceType that) {
if (this.name == null) {
commit e80d575b40ee51b6bf81e4525d853b728f0ced71
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jan 20 17:47:49 2012 -0500
make Resource's compareTo impl consistent with its equals() impl, so Resources can be reliably added to TreeSets and TreeMaps; update "inventory" Agent prompt command to sort sibling Resources by type and then by name, rather than just by name - this makes the output much more readable
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index c90ed4e..a403cd4 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -1789,8 +1789,29 @@ public class Resource implements Comparable<Resource>, Serializable {
driftDefinition.setResource(this);
}
+ // NOTE: It's vital that compareTo() is consistent with equals(), otherwise TreeSets containing Resources, or
+ // TreeMaps with Resources as keys, will not work reliably. See the Javadoc for Comparable for a precise
+ // definition of "consistent with equals()".
+ @Override
public int compareTo(Resource that) {
- return this.name.compareTo(that.getName());
+ if (this == that) {
+ return 0;
+ }
+ int result;
+ if (this.name != null) {
+ result = (that.name != null) ? this.name.compareTo(that.name) : -1;
+ } else {
+ result = (that.name == null) ? 0 : 1;
+ }
+ if (result == 0) {
+ // The names are equal - compare the UUIDs to break the tie.
+ if (this.uuid != null) {
+ result = (that.uuid != null) ? this.uuid.compareTo(that.uuid) : -1;
+ } else {
+ result = (that.uuid == null) ? 0 : 1;
+ }
+ }
+ return result;
}
@Override
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java
index e02cd34..4b1fe14 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -24,11 +24,12 @@ package org.rhq.core.pc.util;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeSet;
import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.measurement.AvailabilityType;
@@ -282,7 +283,17 @@ public class InventoryPrinter {
}
if (recurseChildren) {
- Set<Resource> children = new HashSet(resource.getChildResources()); // wrap in new HashSet to avoid CCMEs
+ Set<Resource> children = new TreeSet<Resource>(new Comparator<Resource>() {
+ public int compare(Resource o1, Resource o2) {
+ int result = o1.getResourceType().compareTo(o2.getResourceType());
+ if (result == 0) {
+ // The types are the same - let the Resource.compareTo() break the tie.
+ result = o1.compareTo(o2);
+ }
+ return result;
+ }
+ }); // wrap in new TreeSet to avoid CCMEs and to sort by type
+ children.addAll(resource.getChildResources());
for (Resource child : children) {
ResourceContainer childContainer;
commit 4e2594029b4d3368b671b6eef722ede8f7e62efa
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jan 20 17:44:53 2012 -0500
move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed this file in my last commit)
diff --git a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java
index e9849b7..a7e9f77 100644
--- a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java
+++ b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java
@@ -27,11 +27,11 @@ import java.util.Collections;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
import org.testng.annotations.Test;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
public class ObjectNameQueryUtilityTest {
@Test
commit d06bde3ab789c06f603836525d7281e7a96bad85
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jan 20 17:43:25 2012 -0500
move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java
index 4d1d19d..3de8057 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java
@@ -38,7 +38,7 @@ import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.plugins.jmx.JMXComponent;
import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
* Abstract base class to discover JBossMessaging and JBossMQ related stuff
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
index 9cc19bc..3169376 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
@@ -114,7 +114,7 @@ import org.rhq.plugins.jbossas.util.JarContentDelegate;
import org.rhq.plugins.jbossas.util.XMLConfigurationEditor;
import org.rhq.plugins.jmx.JMXComponent;
import org.rhq.plugins.jmx.JMXDiscoveryComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
* Resource component for managing JBoss AS 3.2.3 through 4.2.x, and JBoss EAP and SOA-P 4.x.
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java
index 30068e8..0adc4db 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java
@@ -40,7 +40,7 @@ import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.plugins.jmx.JMXComponent;
import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
* Plugin discovery component for JBoss Web (embedded Tomcat) connectors. The bulk of the discovery is performed by the
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java
index b3d218c..1993e7b 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java
@@ -24,13 +24,9 @@ package org.rhq.plugins.jbossas;
import java.io.File;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.commons.logging.Log;
@@ -57,9 +53,9 @@ import org.rhq.core.pluginapi.util.ResponseTimeLogParser;
import org.rhq.plugins.jbossas.util.DeploymentUtility;
import org.rhq.plugins.jbossas.util.WarDeploymentInformation;
import org.rhq.plugins.jbossas.util.WarDiscoveryHelper;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
-/**
+ /**
* A resource component for managing a web application (WAR) deployed to a JBossAS server.
*
* @author Ian Springer
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java
index d915ff0..0a8e8c8 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java
@@ -48,9 +48,9 @@ import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.mc4j.ems.connection.bean.operation.EmsOperation;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
-/**
+ /**
* Accesses the MainDeployer mbean to find the deployment files behind services.
*
* @author Greg Hinkle
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java
index 964223f..48d4c46 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java
@@ -42,6 +42,8 @@ import org.apache.commons.logging.LogFactory;
import org.mc4j.ems.connection.EmsConnection;
import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
import org.xml.sax.InputSource;
import org.rhq.core.domain.configuration.Configuration;
@@ -53,7 +55,6 @@ import org.rhq.plugins.jbossas.JBossASServerComponent;
import org.rhq.plugins.jbossas.WarComponent;
import org.rhq.plugins.jbossas.WarDiscoveryComponent;
import org.rhq.plugins.jmx.MBeanResourceComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
/**
* Provides helper methods that are used by both {@link WarDiscoveryComponent} and {@link EmbeddedWarDiscoveryComponent}
diff --git a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java
index 86bd02f..bfc3fc4 100644
--- a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java
+++ b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java
@@ -40,7 +40,7 @@ import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.plugins.jbossas5.ProfileServiceComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
*
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java
index 3ec0276..68050e0 100644
--- a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java
+++ b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java
@@ -63,7 +63,7 @@ import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.plugins.jbossas.util.DeploymentUtility;
import org.rhq.plugins.jmx.JMXComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
* Get statistic for JBossCache instances
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java
deleted file mode 100644
index a3f46ed..0000000
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.plugins.jmx;
-
-import org.rhq.core.domain.configuration.Configuration;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * A utility class to help in querying object names and utilizing parts of the object name for setting configuration
- * values and changing string messages. A template that you'd build this utility with could look like
- * "foo:name=%myName%,type=myType". This will be "translated" into a valid JMX objectName Query of the form
- * "foo:type=myType,*". It will also detect that we've got a variable defined as "myName" that we'd like to later match
- * to.
- *
- * <p/>We can then find beans with the query and apply their objectName properties to the object and use those found
- * values to rewrite strings or setup configuration properities. For example, we've got a detected object name for the
- * above template "foo:name=bar,type=myType". We set its detected keys against this utility and we now have a variable
- * defined as the key "myName" and the value of "bar". Then I can call formatMessage with "A foo called {myName}" which
- * will be translated into "A foo called bar". This can be useful for naming resources and descriptions using parts of a
- * mapped ObjectName.
- *
- * @author Greg Hinkle
- */
-public class ObjectNameQueryUtility {
- private String queryTemplate;
-
- private Map<String, String> variableProperties = new HashMap<String, String>();
-
- private Map<String, String> variableValues = new HashMap<String, String>();
-
- private Set<String> nonVariableProperties = new HashSet<String>();
-
- private String translatedQuery;
-
- /**
- * Builds a mapped query utility object and finds the variables in the supplied object name query template.
- *
- * @param objectNameQueryTemplate string of form "a:b=%c%,d=e,f=%g%"
- */
- public ObjectNameQueryUtility(String objectNameQueryTemplate) {
- this.queryTemplate = objectNameQueryTemplate;
- buildMatchMap(queryTemplate);
- }
-
- /**
- * Builds a mapped query utility object and finds the variables in the supplied object name query template.
- * This version first translates the objectName template for defined values in provided configuration. This
- * is explicitly built for hierarchical objectName models to find the children of parents.
- *
- * @param objectNameQueryTemplate string of form "a:b=%c%,d=e,f=%g%,h={myParentsH}"
- * @param parentConfiguration the config holding the matched values for the object name key property variables
- */
- public ObjectNameQueryUtility(String objectNameQueryTemplate, Configuration parentConfiguration) {
-
- Pattern p = Pattern.compile("\\{([^\\{\\}]*)\\}");
- Matcher m = p.matcher(objectNameQueryTemplate);
- while (m.find()) {
- String objectNameKeyPropVariableName = m.group(1);
- String value = parentConfiguration.getSimple(objectNameKeyPropVariableName).getStringValue();
- objectNameQueryTemplate = objectNameQueryTemplate.replaceAll("\\{" + objectNameKeyPropVariableName + "\\}", value);
- }
-
- this.queryTemplate = objectNameQueryTemplate;
- buildMatchMap(this.queryTemplate);
- }
-
- /**
- * Set values for properties from an objectName. These are first translated into the "real" keys. e.g. foo:bar=%baz%
- * In this case, the property of the bar objectName property will be set into the properties keyed against "baz"
- * which is the real key.
- *
- * @param keyProperties properties from the found objectName to apply
- *
- * @return true if the objectName properties contained all variable properties or false if some where missing (e.g.
- * foo:A=%a%,B=%b% is the queryTemplate but objectName found is foo:A=alpha)
- */
- public boolean setMatchedKeyValues(Map<String, String> keyProperties) {
- for (String key : keyProperties.keySet()) {
- if (this.variableProperties.containsKey(key)) {
- String realKey = this.variableProperties.get(key);
- String value = keyProperties.get(key);
-
- this.variableValues.put(realKey, value);
- }
- }
-
- // Return true if there are key properties for every variable in the template and false otherwise
- return (keyProperties.keySet().containsAll(this.variableProperties.keySet()));
- }
-
- /**
- * Format a message with {<key>} formatted replacement keys.
- *
- * @param message the message to format
- *
- * @return the formatted text with variables replaced
- */
- public String formatMessage(String message) {
- for (String key : variableValues.keySet()) {
- message = message.replaceAll("\\{" + key + "\\}", this.variableValues.get(key));
- }
-
- return message;
- }
-
- /**
- * Clears out variables so that a new found bean can be used against the same utility object again.
- */
- public void resetVariables() {
- this.variableValues.clear();
- }
-
- public String getQueryTemplate() {
- return queryTemplate;
- }
-
- public Map<String, String> getVariableProperties() {
- return variableProperties;
- }
-
- public Map<String, String> getVariableValues() {
- return variableValues;
- }
-
- public String getTranslatedQuery() {
- return translatedQuery;
- }
-
- /**
- * Detects the mapped variable object name properties and the resulting object name query that can find matching
- * beans.
- *
- * @param objectNameQueryTemplate a template of the form foo:bar=%baz%
- */
- private void buildMatchMap(String objectNameQueryTemplate) {
- StringBuilder queryBuilder = new StringBuilder();
-
- Pattern p = Pattern.compile("^([^:]*\\:)(.*)$");
- Matcher m = p.matcher(objectNameQueryTemplate);
- if (!m.find()) {
- assert false : "ObjectName did not match expected regular expression: " + objectNameQueryTemplate;
- }
-
- queryBuilder.append(m.group(1));
- String keyProps = m.group(2);
- String[] keys = keyProps.split(",");
-
- boolean firstVar = true;
- boolean onlyVar = true;
- for (String key : keys) {
- Pattern p2 = Pattern.compile("^([^=]*)=\\%(.*)\\%$");
- Matcher m2 = p2.matcher(key);
- if (m2.find()) {
- variableProperties.put(m2.group(1), m2.group(2));
- } else {
- Pattern p3 = Pattern.compile("^([^=]*)=(.*)$");
- Matcher m3 = p3.matcher(key);
- if (m3.find()) {
- nonVariableProperties.add(m3.group(1));
- }
-
- onlyVar = false;
- if (firstVar) {
- firstVar = false;
- } else {
- queryBuilder.append(",");
- }
-
- queryBuilder.append(key);
- }
- }
-
- if (variableProperties.size() > 0) {
- if (!onlyVar) {
- queryBuilder.append(",");
- }
-
- queryBuilder.append("*");
- }
-
- this.translatedQuery = queryBuilder.toString();
- }
-
- public boolean isContainsExtraKeyProperties(Set<String> strings) {
- for (String key : strings) {
- if (!nonVariableProperties.contains(key) && !variableProperties.containsKey(key)) {
- return true;
- }
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java
deleted file mode 100644
index 8817fa7..0000000
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-package org.rhq.plugins.jmx;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-
-/**
- * A simple utility class to extract the name of a JMX server from the parent resource's plugin configuration.
- *
- * @author Lukas Krejci
- */
-public class ParentDefinedJMXServerNamingUtility {
- public static final String PROPERTY_CHILD_JMX_SERVER_NAME = "childJmxServerName";
-
- /**
- * Checks if the parent resource's plugin configuration contains a property called {@link #PROPERTY_CHILD_JMX_SERVER_NAME}.
- * If such property exists and its value is non-empty, its value is returned. Otherwise the name of the provided
- * resource type is returned.
- *
- * @param context the discovery context to get the parent plugin configuration and current resource type from.
- * @return the name that can be used for the JVM
- */
- public static String getJVMName(ResourceDiscoveryContext<?> context) {
- Configuration parentPluginConfiguration = context.getParentResourceContext().getPluginConfiguration();
- PropertySimple nameProperty = parentPluginConfiguration.getSimple(PROPERTY_CHILD_JMX_SERVER_NAME);
- if (nameProperty == null || nameProperty.getStringValue() == null
- || nameProperty.getStringValue().trim().length() == 0) {
-
- return context.getResourceType().getName();
- } else {
- return nameProperty.getStringValue();
- }
- }
-}
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java
new file mode 100644
index 0000000..b8454d7
--- /dev/null
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java
@@ -0,0 +1,218 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jmx.util;
+
+import org.rhq.core.domain.configuration.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * A utility class to help in querying object names and utilizing parts of the object name for setting configuration
+ * values and changing string messages. A template that you'd build this utility with could look like
+ * "foo:name=%myName%,type=myType". This will be "translated" into a valid JMX objectName Query of the form
+ * "foo:type=myType,*". It will also detect that we've got a variable defined as "myName" that we'd like to later match
+ * to.
+ *
+ * <p/>We can then find beans with the query and apply their objectName properties to the object and use those found
+ * values to rewrite strings or setup configuration properties. For example, we've got a detected object name for the
+ * above template "foo:name=bar,type=myType". We set its detected keys against this utility and we now have a variable
+ * defined as the key "myName" and the value of "bar". Then I can call formatMessage with "A foo called {myName}" which
+ * will be translated into "A foo called bar". This can be useful for naming resources and descriptions using parts of a
+ * mapped ObjectName.
+ *
+ * @author Greg Hinkle
+ */
+public class ObjectNameQueryUtility {
+ private String queryTemplate;
+
+ private Map<String, String> variableProperties = new HashMap<String, String>();
+
+ private Map<String, String> variableValues = new HashMap<String, String>();
+
+ private Set<String> nonVariableProperties = new HashSet<String>();
+
+ private String translatedQuery;
+
+ /**
+ * Builds a mapped query utility object and finds the variables in the supplied object name query template.
+ *
+ * @param objectNameQueryTemplate string of form "a:b=%c%,d=e,f=%g%"
+ */
+ public ObjectNameQueryUtility(String objectNameQueryTemplate) {
+ this.queryTemplate = objectNameQueryTemplate;
+ buildMatchMap(queryTemplate);
+ }
+
+ /**
+ * Builds a mapped query utility object and finds the variables in the supplied object name query template.
+ * This version first translates the objectName template for defined values in provided configuration. This
+ * is explicitly built for hierarchical objectName models to find the children of parents.
+ *
+ * @param objectNameQueryTemplate string of form "a:b=%c%,d=e,f=%g%,h={myParentsH}"
+ * @param parentConfiguration the config holding the matched values for the object name key property variables
+ */
+ public ObjectNameQueryUtility(String objectNameQueryTemplate, Configuration parentConfiguration) {
+
+ Pattern p = Pattern.compile("\\{([^\\{\\}]*)\\}");
+ Matcher m = p.matcher(objectNameQueryTemplate);
+ while (m.find()) {
+ String objectNameKeyPropVariableName = m.group(1);
+ String value = parentConfiguration.getSimple(objectNameKeyPropVariableName).getStringValue();
+ objectNameQueryTemplate = objectNameQueryTemplate.replaceAll("\\{" + objectNameKeyPropVariableName + "\\}", value);
+ }
+
+ this.queryTemplate = objectNameQueryTemplate;
+ buildMatchMap(this.queryTemplate);
+ }
+
+ /**
+ * Set values for properties from an objectName. These are first translated into the "real" keys. e.g. foo:bar=%baz%
+ * In this case, the property of the bar objectName property will be set into the properties keyed against "baz"
+ * which is the real key.
+ *
+ * @param keyProperties properties from the found objectName to apply
+ *
+ * @return true if the objectName properties contained all variable properties or false if some where missing (e.g.
+ * foo:A=%a%,B=%b% is the queryTemplate but objectName found is foo:A=alpha)
+ */
+ public boolean setMatchedKeyValues(Map<String, String> keyProperties) {
+ for (String key : keyProperties.keySet()) {
+ if (this.variableProperties.containsKey(key)) {
+ String realKey = this.variableProperties.get(key);
+ String value = keyProperties.get(key);
+
+ this.variableValues.put(realKey, value);
+ }
+ }
+
+ // Return true if there are key properties for every variable in the template and false otherwise
+ return (keyProperties.keySet().containsAll(this.variableProperties.keySet()));
+ }
+
+ /**
+ * Format a message with {<key>} formatted replacement keys.
+ *
+ * @param message the message to format
+ *
+ * @return the formatted text with variables replaced
+ */
+ public String formatMessage(String message) {
+ for (String key : variableValues.keySet()) {
+ message = message.replaceAll("\\{" + key + "\\}", this.variableValues.get(key));
+ }
+
+ return message;
+ }
+
+ /**
+ * Clears out variables so that a new found bean can be used against the same utility object again.
+ */
+ public void resetVariables() {
+ this.variableValues.clear();
+ }
+
+ public String getQueryTemplate() {
+ return queryTemplate;
+ }
+
+ public Map<String, String> getVariableProperties() {
+ return variableProperties;
+ }
+
+ public Map<String, String> getVariableValues() {
+ return variableValues;
+ }
+
+ public String getTranslatedQuery() {
+ return translatedQuery;
+ }
+
+ /**
+ * Detects the mapped variable object name properties and the resulting object name query that can find matching
+ * beans.
+ *
+ * @param objectNameQueryTemplate a template of the form foo:bar=%baz%
+ */
+ private void buildMatchMap(String objectNameQueryTemplate) {
+ StringBuilder queryBuilder = new StringBuilder();
+
+ Pattern p = Pattern.compile("^([^:]*\\:)(.*)$");
+ Matcher m = p.matcher(objectNameQueryTemplate);
+ if (!m.find()) {
+ assert false : "ObjectName did not match expected regular expression: " + objectNameQueryTemplate;
+ }
+
+ queryBuilder.append(m.group(1));
+ String keyProps = m.group(2);
+ String[] keys = keyProps.split(",");
+
+ boolean firstVar = true;
+ boolean onlyVar = true;
+ for (String key : keys) {
+ Pattern p2 = Pattern.compile("^([^=]*)=\\%(.*)\\%$");
+ Matcher m2 = p2.matcher(key);
+ if (m2.find()) {
+ variableProperties.put(m2.group(1), m2.group(2));
+ } else {
+ Pattern p3 = Pattern.compile("^([^=]*)=(.*)$");
+ Matcher m3 = p3.matcher(key);
+ if (m3.find()) {
+ nonVariableProperties.add(m3.group(1));
+ }
+
+ onlyVar = false;
+ if (firstVar) {
+ firstVar = false;
+ } else {
+ queryBuilder.append(",");
+ }
+
+ queryBuilder.append(key);
+ }
+ }
+
+ if (variableProperties.size() > 0) {
+ if (!onlyVar) {
+ queryBuilder.append(",");
+ }
+
+ queryBuilder.append("*");
+ }
+
+ this.translatedQuery = queryBuilder.toString();
+ }
+
+ public boolean isContainsExtraKeyProperties(Set<String> strings) {
+ for (String key : strings) {
+ if (!nonVariableProperties.contains(key) && !variableProperties.containsKey(key)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java
new file mode 100644
index 0000000..118debc
--- /dev/null
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java
@@ -0,0 +1,57 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.rhq.plugins.jmx.util;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+/**
+ * A simple utility class to extract the name of a JMX server from the parent resource's plugin configuration.
+ *
+ * @author Lukas Krejci
+ */
+public class ParentDefinedJMXServerNamingUtility {
+ public static final String PROPERTY_CHILD_JMX_SERVER_NAME = "childJmxServerName";
+
+ /**
+ * Checks if the parent resource's plugin configuration contains a property called {@link #PROPERTY_CHILD_JMX_SERVER_NAME}.
+ * If such property exists and its value is non-empty, its value is returned. Otherwise the name of the provided
+ * resource type is returned.
+ *
+ * @param context the discovery context to get the parent plugin configuration and current resource type from.
+ * @return the name that can be used for the JVM
+ */
+ public static String getJVMName(ResourceDiscoveryContext<?> context) {
+ Configuration parentPluginConfiguration = context.getParentResourceContext().getPluginConfiguration();
+ PropertySimple nameProperty = parentPluginConfiguration.getSimple(PROPERTY_CHILD_JMX_SERVER_NAME);
+ if (nameProperty == null || nameProperty.getStringValue() == null
+ || nameProperty.getStringValue().trim().length() == 0) {
+
+ return context.getResourceType().getName();
+ } else {
+ return nameProperty.getStringValue();
+ }
+ }
+}
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java
index 4f334a4..ab3e829 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java
@@ -45,7 +45,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.plugins.jmx.MBeanResourceComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
* Plugin component for representing Tomcat connectors. Much of the functionality is left to the super class,
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java
index 0940910..e6e95ee 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java
@@ -39,7 +39,7 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
* JON plugin discovery component for Tomcat connectors. The bulk of the discovery is performed by the super class. This
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
index d1c0f59..75f8e92 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
@@ -74,7 +74,7 @@ import org.rhq.core.util.ZipUtil;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.core.util.file.JarContentFileInfo;
import org.rhq.plugins.jmx.MBeanResourceComponent;
-import org.rhq.plugins.jmx.ObjectNameQueryUtility;
+import org.rhq.plugins.jmx.util.ObjectNameQueryUtility;
/**
* A resource component for managing a web application (WAR) deployed to a Tomcat server.
commit 55d2403c5e1c0dceab624242e849cdda9b65f9dc
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jan 20 17:39:10 2012 -0500
improve javadoc
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java
index b695290..3f6da9a 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java
@@ -76,8 +76,9 @@ public interface ResourceDiscoveryComponent<T extends ResourceComponent<?>> {
*
* @return a set of discovered resource details that were discovered and can be imported/merged into inventory
*
- * @throws InvalidPluginConfigurationException if a plugin configuration found in the context was somehow invalid
- * and thus caused a failure to connect to a resource
+ * @throws InvalidPluginConfigurationException (used only be the deprecated manual add API) if the plugin
+ * configuration found in the context was somehow invalid and thus
+ * caused a failure to connect to a managed resource
* @throws Exception if a generic error occurred that caused the discovery to abort
*/
Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<T> context)
commit 1189549551b1c290e8ff6989ba3a23719eb0a1b8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Jan 23 12:09:18 2012 -0500
[BZ 784006] rename agent option to --fullcleanconfig and change the error you get so the user knows the command line argument to pass to set the token.
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
index c7e0cfc..805d280 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
@@ -2917,7 +2917,7 @@ public class AgentMain {
new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'),
new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'),
new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'),
- new LongOpt("cleanallconfig", LongOpt.NO_ARGUMENT, null, 'L'),
+ new LongOpt("fullcleanconfig", LongOpt.NO_ARGUMENT, null, 'L'),
new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'),
new LongOpt("setup", LongOpt.NO_ARGUMENT, null, 's'),
new LongOpt("nostart", LongOpt.NO_ARGUMENT, null, 'n'),
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
index 0b41bb7..8ba3100 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
@@ -614,7 +614,7 @@ public interface AgentI18NResourceKeys {
+ "\\ -h, --help Shows this help message (default)\\n\\\n"
+ "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n"
+ "\\ -l, --cleanconfig Clears out existing configuration and data files, except for the security token.\\n\\\n"
- + "\\ -L, --cleanallconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
+ + "\\ -L, --fullcleanconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
+ "\\ -n, --nostart If specified, the agent will not be automatically started\\n\\\n"
+ "\\ -o, --output=<filename> Specifies a file to write all output (excluding log messages)\\n\\\n"
+ "\\ -p, --pref=<preferences name> Specifies the agent preferences name used to identify what configuration to use\\n\\\n"
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
index 75c4d65..9afc3b9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
@@ -135,9 +135,11 @@ public class CoreServerServiceImpl implements CoreServerService {
if (agentByName != null) {
// the agent request provided a name that already is in use by an agent. However, the request
// provided a security token that was not assigned to any agent! How can this be? Something is fishy.
- String msg = "The agent asking for registration under the name [" + request.getName()
+ String msg = "The agent asking for registration under the name ["
+ + request.getName()
+ "] provided an invalid security token. This request will fail. "
- + "Please consult an administrator to reconfigure this agent with its proper security token.";
+ + "Please consult an administrator to obtain the agent's proper security token "
+ + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\"";
throw new AgentRegistrationException(msg);
}
Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
@@ -172,9 +174,11 @@ public class CoreServerServiceImpl implements CoreServerService {
+ " and same security token.";
throw new AgentRegistrationException(msg);
} else {
- String msg = "The agent [" + request.getName()
+ String msg = "The agent ["
+ + request.getName()
+ "] is attempting to re-register without a security token. "
- + "Please consult an administrator to reconfigure this agent with its proper security token.";
+ + "Please consult an administrator to obtain the agent's proper security token "
+ + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\"";
throw new AgentRegistrationException(msg);
}
commit 37407916deff1159eae8b68c226af2a801a681cd
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Sat Jan 21 20:56:15 2012 -0500
back to testng 6.1.1, still issues with upgrading...
diff --git a/pom.xml b/pom.xml
index 4117cf0..3b77493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,9 @@
<jna.version>3.2.5</jna.version>
<twitter4j.version>2.2.4</twitter4j.version>
<commons-codec.version>1.4</commons-codec.version>
- <testng.version>6.3.1</testng.version>
+ <!-- NOTE (ips, 10/04/11): Upgrading testng to 6.2.x causes 10 server-jar tests to fail for an unknown reason. -->
+ <!-- NOTE (jshaughn, 01/20/12): With the latest work, the sserver-jar tests passed using testng to 6.3.1, so perhaps an upgrade is possible -->
+ <testng.version>6.1.1</testng.version>
<cobertura.version>1.9.4.1</cobertura.version>
<augeas.version>0.9.0</augeas.version>
<augeas.classifier>el5</augeas.classifier>
commit 171ca7ef13047426ab71a69d9fa110c2f01a7c60
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Sat Jan 21 19:35:09 2012 -0500
Try upping testng version from 6.1.1 to 6.3.1. This used to cause
problems, with the latest unit test work, let's see if we can run. If
not this commit will be reverted...
diff --git a/pom.xml b/pom.xml
index 3b77493..4117cf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,9 +91,7 @@
<jna.version>3.2.5</jna.version>
<twitter4j.version>2.2.4</twitter4j.version>
<commons-codec.version>1.4</commons-codec.version>
- <!-- NOTE (ips, 10/04/11): Upgrading testng to 6.2.x causes 10 server-jar tests to fail for an unknown reason. -->
- <!-- NOTE (jshaughn, 01/20/12): With the latest work, the sserver-jar tests passed using testng to 6.3.1, so perhaps an upgrade is possible -->
- <testng.version>6.1.1</testng.version>
+ <testng.version>6.3.1</testng.version>
<cobertura.version>1.9.4.1</cobertura.version>
<augeas.version>0.9.0</augeas.version>
<augeas.classifier>el5</augeas.classifier>
commit 9cc28466baff7e226f948b4227cf70f4ef14b078
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Sat Jan 21 17:27:50 2012 -0500
Put back the test group dependency which, I think, effectively disables
these tests. It is a dependency on a group defined in the itests module.
But without it we get server test jar build issues.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 89ff87b..9294ec8 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -77,6 +77,10 @@ import org.rhq.enterprise.server.util.LookupUtil;
* !!! configured drift server plugin. To enhance this to do that then you may need to model this
* !!! mode like BundleManagerBeanTest
*/
+// TODO: Figure out how to get this test class to run without causing issues in the test-jar generation. I don't
+// understand exactly what the deal is but removing this dependency on an itests group causes the server test jar to
+// not correctly generate the drift package contents.
+@Test(dependsOnGroups = "drift")
public class DriftManagerBeanTest extends AbstractEJB3Test {
private static final boolean ENABLE_TESTS = true;
commit 68a688bc7bf11d2d6cfe22b08a1ffb1d282eb804
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Jan 20 21:59:31 2012 -0500
More work to prevent server jar tests from stepping on each other, or
themselves.
- tests now pass with testng 6.1.1 (current version) and also 6.3.1,
latest version. Each version brought out different issues due to
different execution ordering and constraint checking.
- Avoid the use of DatabaseOperation.CLEAN_INSERT. This deletes all rows
in tables used by the data set. This does not play well with other modules.
Instead use DatabaseOperation.REFRESH and also clean up using
DatabaseOperation.DELETE. These options affect only the rows in the
data set. (see DeleteAlertsTest)
- Unless absolutely necessary, use Before|AfterMethod for database setup
and teardown. The perf hit is typically minimal but the risk of
test class conflict is high. (see DatabaseAndFilePluginDeloymentTest)
- Be more diligent to keep the database clean. For example, in addition to
DatabaseOperation.DELETE, there may be additional data created by the
tests. (see DiscoveryBossBeanTest)
- When possible, assertions should be narrowed to deal with only the data
relevant to the test or test class. Don't assume the database is
necessarily clean. This helps ensure that other test data does not cause
failures, or is not manipulated accidentally. Queries should try to be
qualified with the ids known to be relevant. (see InventoryManagerBeanTest)
- Prefer to use slsb calls to do cleanup, these calls are often better at
ensuring related data is also cleaned up. Hibernate cascading is often
not enough. And straight SQl requires even more diligence. Cleaning up
plugins is very important (see MetadataBeanTest).
- If a test does specific dbsetup make sure it also cleans it up, or move
it to Before|AfterMethod. (see PluginManagerBeanTest)
- Make sure your tests can executein any order, or add specific dependencies
to force ordering. (see ResourceMetadataManagerBean)
Other tips:
- Use unusua/varying ids for canned data. Always starting ids at id 1 is more likely to cause conflicts.
- Always run your test class twice in a row. It should work more than once. If
it doesn't it probably changed state of the db or other shared resource.
- Start your tests with a clean db (dbsetup) and manually inspect the
db to see if any data was left behind (or better, write atool to do it).
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/DeleteAlertsTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/DeleteAlertsTest.java
index f0ae1b5..487a0ea 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/DeleteAlertsTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/DeleteAlertsTest.java
@@ -27,7 +27,7 @@ import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.dataset.xml.FlatXmlProducer;
import org.dbunit.operation.DatabaseOperation;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.xml.sax.InputSource;
@@ -60,7 +60,7 @@ public class DeleteAlertsTest extends AbstractEJB3Test {
try {
connection = getConnection();
IDatabaseConnection dbUnitConnection = new DatabaseConnection(connection);
- DatabaseOperation.CLEAN_INSERT.execute(dbUnitConnection, getDataSet());
+ DatabaseOperation.REFRESH.execute(dbUnitConnection, getDataSet());
} finally {
if (connection != null) {
connection.close();
@@ -70,15 +70,15 @@ public class DeleteAlertsTest extends AbstractEJB3Test {
newResource = getEntityManager().find(Resource.class, 1);
}
- @AfterClass
- public void cleanupDB() throws Exception {
+ @AfterMethod(alwaysRun = true)
+ public void afterMethod() throws Exception {
if ("true".equals(System.getProperty("clean.db"))) {
Connection connection = null;
try {
connection = getConnection();
IDatabaseConnection dbUnitConnection = new DatabaseConnection(connection);
- DatabaseOperation.DELETE_ALL.execute(dbUnitConnection, getDataSet());
+ DatabaseOperation.DELETE.execute(dbUnitConnection, getDataSet());
} finally {
if (connection != null) {
connection.close();
@@ -103,17 +103,17 @@ public class DeleteAlertsTest extends AbstractEJB3Test {
int resourceTypeId = 1;
int deletedCount = alertManager.deleteAlertsByContext(superuser, EntityContext.forTemplate(resourceTypeId));
- List<AlertConditionLog> alertConditionLogs = getEntityManager().createQuery(
- "from AlertConditionLog log where log.id = :id").setParameter("id", 2).getResultList();
+ List<AlertConditionLog> alertConditionLogs = getEntityManager()
+ .createQuery("from AlertConditionLog log where log.id = :id").setParameter("id", 2).getResultList();
- List<AlertNotificationLog> notificationLogs = getEntityManager().createQuery(
- "from AlertNotificationLog log where log.id = :id").setParameter("id", 2).getResultList();
+ List<AlertNotificationLog> notificationLogs = getEntityManager()
+ .createQuery("from AlertNotificationLog log where log.id = :id").setParameter("id", 2).getResultList();
assertEquals("Failed to delete alerts by template", 1, deletedCount);
- assertEquals("Failed to delete alert condition logs when deleting alerts by template", 0, alertConditionLogs
- .size());
- assertEquals("Failed to delete alert notification logs when deleting alerts by template", 0, notificationLogs
- .size());
+ assertEquals("Failed to delete alert condition logs when deleting alerts by template", 0,
+ alertConditionLogs.size());
+ assertEquals("Failed to delete alert notification logs when deleting alerts by template", 0,
+ notificationLogs.size());
}
public void testAlertDeleteInRange() {
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
index c539a44..c6180fc 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java
@@ -110,6 +110,128 @@ public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
// | 1.0-feb-2 | | | | one of the files gets deleted
// --------------------------------------------------------------------------
+ @BeforeClass
+ public void beforeClass() throws Exception {
+ Calendar cal = Calendar.getInstance();
+ cal.set(2009, Calendar.FEBRUARY, 1, 1, 0, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ Date febDate = cal.getTime();
+ cal.set(2009, Calendar.JUNE, 1, 1, 0, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ Date juneDate = cal.getTime();
+ testTimestamps.put(TESTPLUGIN_1_0_FEB, febDate);
+ testTimestamps.put(TESTPLUGIN_1_0_JUN, juneDate);
+ testTimestamps.put(TESTPLUGIN_1_1_FEB, febDate);
+ testTimestamps.put(TESTPLUGIN_1_1_JUN, juneDate);
+ testTimestamps.put(TESTPLUGIN_1_0_FEB2, febDate);
+
+ pluginMgr = LookupUtil.getPluginManager();
+ subjectManager = LookupUtil.getSubjectManager();
+
+ File deployDir = new File(DEPLOY_LOCATION);
+ deployDir.mkdirs();
+ assert deployDir.isDirectory();
+
+ File jarsDir = new File(JARS_LOCATION);
+ jarsDir.mkdirs();
+ assert jarsDir.isDirectory();
+
+ testPluginFiles.put(TESTPLUGIN_1_0_FEB, new File(jarsDir, TESTPLUGIN_1_0_FEB + ".jar"));
+ testPluginFiles.put(TESTPLUGIN_1_0_JUN, new File(jarsDir, TESTPLUGIN_1_0_JUN + ".jar"));
+ testPluginFiles.put(TESTPLUGIN_1_1_FEB, new File(jarsDir, TESTPLUGIN_1_1_FEB + ".jar"));
+ testPluginFiles.put(TESTPLUGIN_1_1_JUN, new File(jarsDir, TESTPLUGIN_1_1_JUN + ".jar"));
+ testPluginFiles.put(TESTPLUGIN_1_0_FEB2, new File(jarsDir, TESTPLUGIN_1_0_FEB2 + ".jar"));
+
+ for (Map.Entry<String, File> entry : testPluginFiles.entrySet()) {
+ File descriptorFile = new File(DESCRIPTORS_LOCATION, entry.getKey() + ".xml");
+ File file = entry.getValue();
+ buildPluginJar(descriptorFile, file);
+ assert file.exists();
+
+ PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(file.toURI().toURL());
+ testPluginDescriptors.put(entry.getKey(), descriptor);
+
+ Plugin pluginPojo = new Plugin(PLUGIN_NAME, file.getName());
+ pluginPojo.setVersion(descriptor.getVersion());
+ pluginPojo.setMd5(MessageDigestGenerator.getDigestString(file));
+ pluginPojo.setMtime(testTimestamps.get(entry.getKey()).getTime());
+ testPlugins.put(entry.getKey(), pluginPojo);
+ }
+
+ return;
+ }
+
+ @AfterClass(alwaysRun = true)
+ public void afterClass() throws Exception {
+ for (Map.Entry<String, File> entry : testPluginFiles.entrySet()) {
+ File doomed = entry.getValue();
+ doomed.delete();
+ }
+ File jarsDir = new File(JARS_LOCATION);
+ jarsDir.delete();
+
+ File deployDir = new File(DEPLOY_LOCATION);
+ emptyDirectory(deployDir);
+ deployDir.delete();
+
+ return;
+ }
+
+ @BeforeMethod
+ public void beforeMethod() throws Exception {
+ afterMethod(); // we clean up before and after, just to be sure we're clean
+
+ File deployDir = new File(DEPLOY_LOCATION);
+ deployDir.mkdirs();
+ assert deployDir.isDirectory();
+
+ File jarsDir = new File(JARS_LOCATION);
+ jarsDir.mkdirs();
+ assert jarsDir.isDirectory();
+
+ for (Map.Entry<String, File> entry : testPluginFiles.entrySet()) {
+ File descriptorFile = new File(DESCRIPTORS_LOCATION, entry.getKey() + ".xml");
+ File file = entry.getValue();
+ buildPluginJar(descriptorFile, file);
+ assert file.exists();
+
+ PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(file.toURI().toURL());
+ testPluginDescriptors.put(entry.getKey(), descriptor);
+
+ Plugin pluginPojo = new Plugin(PLUGIN_NAME, file.getName());
+ pluginPojo.setVersion(descriptor.getVersion());
+ pluginPojo.setMd5(MessageDigestGenerator.getDigestString(file));
+ pluginPojo.setMtime(testTimestamps.get(entry.getKey()).getTime());
+ testPlugins.put(entry.getKey(), pluginPojo);
+ }
+
+ }
+
+ @AfterMethod(alwaysRun = true)
+ @SuppressWarnings("unchecked")
+ public void afterMethod() throws Exception {
+
+ emptyDirectory(new File(DEPLOY_LOCATION));
+
+ TransactionManager tm = getTransactionManager();
+ tm.begin();
+ EntityManager em = getEntityManager();
+ try {
+ Query q = em.createNamedQuery(Plugin.QUERY_FIND_BY_NAME);
+ q.setParameter("name", PLUGIN_NAME);
+ List<Plugin> doomedPlugins = q.getResultList();
+ for (Plugin doomedPlugin : doomedPlugins) {
+ em.remove(em.find(Plugin.class, doomedPlugin.getId()));
+ }
+ } catch (NoResultException ignore) {
+ } finally {
+ tm.commit();
+ em.close();
+ }
+
+ return;
+ }
+
public void test0() throws Exception {
Plugin plugin10feb = deployPluginJarToFilesystem(TESTPLUGIN_1_0_FEB);
deployPluginJarToDatabase(TESTPLUGIN_1_0_FEB);
@@ -327,102 +449,6 @@ public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
return;
}
- @BeforeClass
- public void beforeClass() throws Exception {
- Calendar cal = Calendar.getInstance();
- cal.set(2009, Calendar.FEBRUARY, 1, 1, 0, 0);
- cal.set(Calendar.MILLISECOND, 0);
- Date febDate = cal.getTime();
- cal.set(2009, Calendar.JUNE, 1, 1, 0, 0);
- cal.set(Calendar.MILLISECOND, 0);
- Date juneDate = cal.getTime();
- testTimestamps.put(TESTPLUGIN_1_0_FEB, febDate);
- testTimestamps.put(TESTPLUGIN_1_0_JUN, juneDate);
- testTimestamps.put(TESTPLUGIN_1_1_FEB, febDate);
- testTimestamps.put(TESTPLUGIN_1_1_JUN, juneDate);
- testTimestamps.put(TESTPLUGIN_1_0_FEB2, febDate);
-
- pluginMgr = LookupUtil.getPluginManager();
- subjectManager = LookupUtil.getSubjectManager();
-
- File deployDir = new File(DEPLOY_LOCATION);
- deployDir.mkdirs();
- assert deployDir.isDirectory();
-
- File jarsDir = new File(JARS_LOCATION);
- jarsDir.mkdirs();
- assert jarsDir.isDirectory();
-
- testPluginFiles.put(TESTPLUGIN_1_0_FEB, new File(jarsDir, TESTPLUGIN_1_0_FEB + ".jar"));
- testPluginFiles.put(TESTPLUGIN_1_0_JUN, new File(jarsDir, TESTPLUGIN_1_0_JUN + ".jar"));
- testPluginFiles.put(TESTPLUGIN_1_1_FEB, new File(jarsDir, TESTPLUGIN_1_1_FEB + ".jar"));
- testPluginFiles.put(TESTPLUGIN_1_1_JUN, new File(jarsDir, TESTPLUGIN_1_1_JUN + ".jar"));
- testPluginFiles.put(TESTPLUGIN_1_0_FEB2, new File(jarsDir, TESTPLUGIN_1_0_FEB2 + ".jar"));
-
- for (Map.Entry<String, File> entry : testPluginFiles.entrySet()) {
- File descriptorFile = new File(DESCRIPTORS_LOCATION, entry.getKey() + ".xml");
- File file = entry.getValue();
- buildPluginJar(descriptorFile, file);
- assert file.exists();
-
- PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(file.toURI().toURL());
- testPluginDescriptors.put(entry.getKey(), descriptor);
-
- Plugin pluginPojo = new Plugin(PLUGIN_NAME, file.getName());
- pluginPojo.setVersion(descriptor.getVersion());
- pluginPojo.setMd5(MessageDigestGenerator.getDigestString(file));
- pluginPojo.setMtime(testTimestamps.get(entry.getKey()).getTime());
- testPlugins.put(entry.getKey(), pluginPojo);
- }
-
- return;
- }
-
- @AfterClass
- public void afterClass() throws Exception {
- for (Map.Entry<String, File> entry : testPluginFiles.entrySet()) {
- File doomed = entry.getValue();
- doomed.delete();
- }
- File jarsDir = new File(JARS_LOCATION);
- jarsDir.delete();
-
- File deployDir = new File(DEPLOY_LOCATION);
- emptyDirectory(deployDir);
- deployDir.delete();
-
- return;
- }
-
- @BeforeMethod
- public void beforeMethod() throws Exception {
- afterMethod(); // we clean up before and after, just to be sure we're clean
- }
-
- @AfterMethod
- @SuppressWarnings("unchecked")
- public void afterMethod() throws Exception {
- emptyDirectory(new File(DEPLOY_LOCATION));
-
- TransactionManager tm = getTransactionManager();
- tm.begin();
- EntityManager em = getEntityManager();
- try {
- Query q = em.createNamedQuery(Plugin.QUERY_FIND_BY_NAME);
- q.setParameter("name", PLUGIN_NAME);
- List<Plugin> doomedPlugins = q.getResultList();
- for (Plugin doomedPlugin : doomedPlugins) {
- em.remove(em.find(Plugin.class, doomedPlugin.getId()));
- }
- } catch (NoResultException ignore) {
- } finally {
- tm.commit();
- em.close();
- }
-
- return;
- }
-
private void assertSamePlugin(Plugin p1, Plugin p2) throws Exception {
assert p1.getName().equals(p2.getName()) : "NAME: " + p1 + "!=" + p2;
assert p1.getMd5().equals(p2.getMd5()) : "MD5: " + p1 + "!=" + p2;
@@ -568,6 +594,9 @@ public class DatabaseAndFilePluginDeploymentTest extends AbstractEJB3Test {
}
private void emptyDirectory(File dirToEmpty) {
+ if (!dirToEmpty.isDirectory()) {
+ return;
+ }
File[] doomedFiles = dirToEmpty.listFiles();
for (File doomedFile : doomedFiles) {
doomedFile.delete();
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
index 630b778..6bda968 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
@@ -23,10 +23,13 @@ import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.sql.Connection;
+import java.util.List;
import java.util.Random;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.DatabaseConnection;
@@ -54,11 +57,13 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.server.core.comm.ServerCommunicationsService;
import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
+import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
public class DiscoveryBossBeanTest extends AbstractEJB3Test {
private DiscoveryBossLocal discoveryBoss;
+ private ResourceManagerLocal resourceManager;
private MBeanServer dummyJBossMBeanServer;
private ResourceType platformType;
@@ -84,6 +89,7 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
ServerCommunicationsServiceMBean.OBJECT_NAME);
initDB();
+
platformType = getEntityManager().find(ResourceType.class, 1);
serverType = getEntityManager().find(ResourceType.class, 2);
serviceType1 = getEntityManager().find(ResourceType.class, 3);
@@ -94,6 +100,8 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
@AfterMethod(alwaysRun = true)
public void afterMethod() throws Exception {
MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
+
+ cleanDB();
}
@Test(groups = "integration.ejb3")
@@ -180,7 +188,51 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
connection = getConnection();
IDatabaseConnection dbUnitConnection = new DatabaseConnection(connection);
setDbType(dbUnitConnection);
- DatabaseOperation.CLEAN_INSERT.execute(dbUnitConnection, getDataSet());
+ DatabaseOperation.REFRESH.execute(dbUnitConnection, getDataSet());
+ } finally {
+ if (connection != null) {
+ connection.close();
+ }
+ }
+ }
+
+ public void cleanDB() throws Exception {
+ Connection connection = null;
+ EntityManager em = null;
+
+ try {
+ getTransactionManager().begin();
+ em = getEntityManager();
+
+ Query q;
+ List<?> doomed;
+ q = em.createQuery("SELECT r FROM Resource r WHERE r.resourceType.id <= 4 ORDER BY r.id DESC");
+ doomed = q.getResultList();
+ for (Object removeMe : doomed) {
+ em.remove(em.getReference(Resource.class, ((Resource) removeMe).getId()));
+ }
+ em.flush();
+ getTransactionManager().commit();
+ em.close();
+ em = null;
+ } catch (Exception e) {
+ try {
+ System.out.println("CANNOT CLEAN UP TEST: Cause: " + e);
+ getTransactionManager().rollback();
+ } catch (Exception ignore) {
+ }
+ } finally {
+ if (null != em) {
+ em.close();
+ }
+ }
+
+ try {
+ connection = getConnection();
+
+ IDatabaseConnection dbUnitConnection = new DatabaseConnection(connection);
+ setDbType(dbUnitConnection);
+ DatabaseOperation.DELETE.execute(dbUnitConnection, getDataSet());
} finally {
if (connection != null) {
connection.close();
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.java
index 6aa8c4d..dcf83fe 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.java
@@ -17,7 +17,8 @@ import org.dbunit.ext.oracle.Oracle10DataTypeFactory;
import org.dbunit.ext.oracle.OracleDataTypeFactory;
import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory;
import org.dbunit.operation.DatabaseOperation;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.xml.sax.InputSource;
@@ -29,48 +30,49 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class InventoryManagerBeanTest extends AbstractEJB3Test {
- @BeforeClass
- public void deleteResourceTypes() throws Exception {
+ private static List<Integer> deletedTypeIds = asList(1, 2, 3, 4, 5);
+
+ @BeforeMethod
+ public void beforeMethod() throws Exception {
initDB();
getTransactionManager().begin();
- List<Integer> resourceTypeIds = asList(1, 2, 3, 4, 5);
-
+
InventoryManagerLocal inventoryMgr = LookupUtil.getInventoryManager();
- inventoryMgr.markTypesDeleted(resourceTypeIds);
+ inventoryMgr.markTypesDeleted(deletedTypeIds);
getTransactionManager().commit();
}
+ @AfterMethod(alwaysRun = true)
+ public void afterMethod() throws Exception {
+ cleanDB();
+ }
+
@SuppressWarnings("unchecked")
@Test
public void markTypesAndTheirChildTypesForDeletion() {
- List<ResourceType> resourceTypes = getEntityManager().createQuery(
- "from ResourceType t where t.id in (:resourceTypeIds)")
- .setParameter("resourceTypeIds", asList(1, 2, 3, 4, 5))
- .getResultList();
+ List<ResourceType> resourceTypes = getEntityManager()
+ .createQuery("from ResourceType t where t.id in (:resourceTypeIds)")
+ .setParameter("resourceTypeIds", deletedTypeIds).getResultList();
assertEquals("Failed to retrieve all resource types", 5, resourceTypes.size());
List<Integer> typesNotDeleted = new ArrayList<Integer>();
for (ResourceType type : resourceTypes) {
- if (!type.isDeleted()) {
- typesNotDeleted.add(type.getId());
- }
+ if (!type.isDeleted()) {
+ typesNotDeleted.add(type.getId());
+ }
}
- assertEquals(
- "Failed to mark for deletion resource types with the following ids: " + typesNotDeleted + ".",
- 0,
- typesNotDeleted.size()
- );
+ assertEquals("Failed to mark for deletion resource types with the following ids: " + typesNotDeleted + ".", 0,
+ typesNotDeleted.size());
}
@SuppressWarnings("unchecked")
@Test
public void uninventoryResourcesOfTypesMarkedForDeletion() {
List<Resource> resources = getEntityManager().createQuery("from Resource r where r.id in (:resourceIds)")
- .setParameter("resourceIds", asList(1, 2))
- .getResultList();
+ .setParameter("resourceIds", asList(1, 2)).getResultList();
assertEquals("Failed to retrieve all resources", 2, resources.size());
@@ -82,11 +84,8 @@ public class InventoryManagerBeanTest extends AbstractEJB3Test {
}
assertEquals(
- "Resources of types marked for deletion should be uninventoried. Resources with the following ids " +
- "should have been uninventoried: " + resourcesNotDeleted + ".",
- 0,
- resourcesNotDeleted.size()
- );
+ "Resources of types marked for deletion should be uninventoried. Resources with the following ids "
+ + "should have been uninventoried: " + resourcesNotDeleted + ".", 0, resourcesNotDeleted.size());
}
@Test
@@ -94,7 +93,16 @@ public class InventoryManagerBeanTest extends AbstractEJB3Test {
InventoryManagerLocal inventoryMgr = LookupUtil.getInventoryManager();
List<ResourceType> deletedTypes = inventoryMgr.getDeletedTypes();
- assertEquals("Expected to get back five deleted resource types", 5, deletedTypes.size());
+ // protect against other db detritus, just look for the ones we expect
+ int resultSize = deletedTypes.size();
+ assertTrue("Expected at least five deleted types", resultSize >= 5);
+ List<Integer> resultIds = new ArrayList(resultSize);
+ for (ResourceType rt : deletedTypes) {
+ resultIds.add(rt.getId());
+ }
+ for (Integer id : deletedTypeIds) {
+ assert (resultIds.contains(id));
+ }
}
@Test
@@ -111,7 +119,7 @@ public class InventoryManagerBeanTest extends AbstractEJB3Test {
ResourceType resourceType = getEntityManager().find(ResourceType.class, 6);
assertFalse(resourceType + " is not ready for removal because it is not deleted.",
- inventoryMgr.isReadyForPermanentRemoval(resourceType));
+ inventoryMgr.isReadyForPermanentRemoval(resourceType));
}
public void initDB() throws Exception {
@@ -121,7 +129,22 @@ public class InventoryManagerBeanTest extends AbstractEJB3Test {
connection = getConnection();
IDatabaseConnection conn = new DatabaseConnection(connection);
setDbType(conn);
- DatabaseOperation.CLEAN_INSERT.execute(conn, getDataSet());
+ DatabaseOperation.REFRESH.execute(conn, getDataSet());
+ } finally {
+ if (connection != null) {
+ connection.close();
+ }
+ }
+ }
+
+ public void cleanDB() throws Exception {
+ Connection connection = null;
+
+ try {
+ connection = getConnection();
+ IDatabaseConnection conn = new DatabaseConnection(connection);
+ setDbType(conn);
+ DatabaseOperation.DELETE.execute(conn, getDataSet());
} finally {
if (connection != null) {
connection.close();
@@ -146,13 +169,13 @@ public class InventoryManagerBeanTest extends AbstractEJB3Test {
}
if (type != null) {
- dbConfig.setProperty("http://www.dbunit.org/properties/datatypeFactory",type);
+ dbConfig.setProperty("http://www.dbunit.org/properties/datatypeFactory", type);
}
}
IDataSet getDataSet() throws Exception {
FlatXmlProducer xmlProducer = new FlatXmlProducer(new InputSource(getClass().getResourceAsStream(
- getDataSetFile())));
+ getDataSetFile())));
xmlProducer.setColumnSensing(true);
return new FlatXmlDataSet(xmlProducer);
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
index fac9251..d4249eb 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
@@ -24,13 +24,14 @@ import org.dbunit.dataset.datatype.IDataTypeFactory;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.dataset.xml.FlatXmlProducer;
import org.dbunit.operation.DatabaseOperation;
-import org.testng.annotations.AfterGroups;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeGroups;
import org.testng.annotations.BeforeMethod;
import org.xml.sax.InputSource;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
+import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceTypeCriteria;
import org.rhq.core.domain.plugin.Plugin;
import org.rhq.core.domain.resource.ResourceType;
@@ -38,12 +39,14 @@ import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.bundle.TestBundleServerPluginService;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
+import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob;
+import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
public class MetadataBeanTest extends AbstractEJB3Test {
- private static List<String> plugins = new ArrayList<String>();
+ private List<Integer> pluginIds = new ArrayList<Integer>();
@Override
protected boolean isDBResetNeeded() {
@@ -60,12 +63,14 @@ public class MetadataBeanTest extends AbstractEJB3Test {
* at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
* however removes the generated plugin files during each test run.
*/
- @AfterGroups(alwaysRun = true, groups = { "plugin.metadata" })
- void afterGroups() throws Exception {
- getTransactionManager().begin();
- getEntityManager().createQuery("delete from Plugin p where p.name in (:plugins)")
- .setParameter("plugins", plugins).executeUpdate();
- getTransactionManager().commit();
+ @AfterClass(alwaysRun = true, groups = { "plugin.metadata" })
+ void afterClass() throws Exception {
+ PluginManagerLocal pluginMgr = LookupUtil.getPluginManager();
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+ pluginMgr.deletePlugins(overlord, pluginIds);
+ pluginMgr.markPluginsForPurge(overlord, pluginIds);
+ new PurgePluginsJob().executeJobCode(null);
+ new PurgeResourceTypesJob().executeJobCode(null);
}
@BeforeMethod(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
@@ -94,7 +99,9 @@ public class MetadataBeanTest extends AbstractEJB3Test {
connection = getConnection();
DatabaseConnection dbunitConnection = new DatabaseConnection(connection);
setDbType(dbunitConnection);
- DatabaseOperation.CLEAN_INSERT.execute(dbunitConnection, getDataSet());
+ // note - this info should already be in the db as part of dbsetup, but just in case
+ // perform the refresh. Do not DELETE this data set as it may be assumed in other tests.
+ DatabaseOperation.REFRESH.execute(dbunitConnection, getDataSet());
} finally {
if (connection != null) {
connection.close();
@@ -151,7 +158,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
pluginMgr.registerPlugin(subjectMgr.getOverlord(), plugin, pluginDescriptor, null, true);
- plugins.add(plugin.getName());
+ pluginIds.add(plugin.getId());
}
private URL getDescriptorURL(String descriptor) {
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
index a12d7a8..4ccad7f 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
@@ -1,5 +1,7 @@
package org.rhq.enterprise.server.resource.metadata;
+import static java.util.Arrays.asList;
+
import java.util.List;
import javax.ejb.EJBException;
@@ -11,27 +13,23 @@ import org.rhq.core.domain.plugin.PluginStatusType;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
-import static java.util.Arrays.asList;
-
public class PluginManagerBeanTest extends MetadataBeanTest {
SubjectManagerLocal subjectMgr;
PluginManagerLocal pluginMgr;
- @Test(groups = {"plugin.metadata", "PluginManagerBean"})
+ @Test(groups = { "plugin.metadata", "PluginManagerBean" })
public void registerPlugins() throws Exception {
subjectMgr = LookupUtil.getSubjectManager();
pluginMgr = LookupUtil.getPluginManager();
- setupDB();
-
createPlugin("test-plugin1", "1.0", "plugin_1.xml");
createPlugin("test-plugin2", "1.0", "plugin_2.xml");
createPlugin("test-plugin3", "1.0", "plugin_3.xml");
}
- @Test(groups = {"plugin.metadata", "PluginManagerBean"}, dependsOnMethods = {"registerPlugins"})
+ @Test(groups = { "plugin.metadata", "PluginManagerBean" }, dependsOnMethods = { "registerPlugins" })
public void disablePlugin() throws Exception {
Plugin plugin = getPlugin("PluginManagerBeanTestPlugin3");
@@ -41,7 +39,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
assertFalse("Failed to disable plugin", plugin.isEnabled());
}
- @Test(groups = {"plugin.metadata", "PluginManagerBean"}, dependsOnMethods = {"registerPlugins"})
+ @Test(groups = { "plugin.metadata", "PluginManagerBean" }, dependsOnMethods = { "registerPlugins" })
public void doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() throws Exception {
Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1");
EJBException exception = null;
@@ -54,14 +52,11 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
assertNotNull("Expected exception to be thrown when trying to disable a plugin that has dependent plugins",
exception);
- assertTrue(
- "Expected an IllegalArgumentException when trying to disable a plugin with dependent plugins",
- exception.getCausedByException() instanceof IllegalArgumentException
- );
+ assertTrue("Expected an IllegalArgumentException when trying to disable a plugin with dependent plugins",
+ exception.getCausedByException() instanceof IllegalArgumentException);
}
- @Test(groups = {"plugin.metadata", "PluginManagerBean"},
- dependsOnMethods = {"doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled"})
+ @Test(groups = { "plugin.metadata", "PluginManagerBean" }, dependsOnMethods = { "doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled" })
public void disablePluginAndDependentPlugins() throws Exception {
Plugin plugin1 = getPlugin("PluginManagerBeanTestPlugin1");
Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
@@ -75,7 +70,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
assertFalse("Failed to disable plugin", plugin2.isEnabled());
}
- @Test(groups = {"plugin.metadata", "PluginManagerBean"}, dependsOnMethods = {"disablePluginAndDependentPlugins"})
+ @Test(groups = { "plugin.metadata", "PluginManagerBean" }, dependsOnMethods = { "disablePluginAndDependentPlugins" })
public void enablePlugins() throws Exception {
Plugin plugin1 = getPlugin("PluginManagerBeanTestPlugin1");
Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
@@ -89,7 +84,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
assertTrue("Failed to enable plugin", plugin2.isEnabled());
}
- @Test(groups = {"plugin.metadata", "PluginManagerBean"}, dependsOnMethods = {"enablePlugins"})
+ @Test(groups = { "plugin.metadata", "PluginManagerBean" }, dependsOnMethods = { "enablePlugins" })
public void doNotDeletePluginIfDependentPluginIsNotAlsoDeleted() throws Exception {
Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1");
EJBException exception = null;
@@ -102,14 +97,11 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
assertNotNull("Expected exception to be thrown when trying to delete a plugin that has dependent plugins",
exception);
- assertTrue(
- "Expected an IllegalArgumentException when trying to delete a plugin with dependent plugins",
- exception.getCausedByException() instanceof IllegalArgumentException
- );
- }
-
- @Test(groups = {"plugin.metadata", "PluginManagerBean"},
- dependsOnMethods = {"doNotDeletePluginIfDependentPluginIsNotAlsoDeleted"})
+ assertTrue("Expected an IllegalArgumentException when trying to delete a plugin with dependent plugins",
+ exception.getCausedByException() instanceof IllegalArgumentException);
+ }
+
+ @Test(groups = { "plugin.metadata", "PluginManagerBean" }, dependsOnMethods = { "doNotDeletePluginIfDependentPluginIsNotAlsoDeleted" })
public void deletePlugins() throws Exception {
Plugin plugin1 = getPlugin("PluginManagerBeanTestPlugin1");
Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
@@ -123,7 +115,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
assertTrue("Expected plugin status to be set to DELETED", plugin2.getStatus() == PluginStatusType.DELETED);
}
- @Test(enabled = false, groups = {"plugin.metadata", "PluginManagerBean"}, dependsOnMethods = {"deletePlugins"})
+ @Test(enabled = false, groups = { "plugin.metadata", "PluginManagerBean" }, dependsOnMethods = { "deletePlugins" })
public void purgePlugins() throws Exception {
Plugin plugin1 = getPlugin("PluginManagerBeanTestPlugin1",
"Deleting a plugin should not remove it from the database");
@@ -144,8 +136,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
Plugin getPlugin(String name, String msg) {
List<Plugin> plugins = getEntityManager().createQuery("from Plugin where name = :name")
- .setParameter("name", name)
- .getResultList();
+ .setParameter("name", name).getResultList();
assertTrue("Failed to find plugin <$name>: $msg", plugins.size() == 1);
return plugins.get(0);
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index 415eb99..7155c3d 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -1,5 +1,7 @@
package org.rhq.enterprise.server.resource.metadata;
+import static java.util.Arrays.asList;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -22,7 +24,6 @@ import org.rhq.core.domain.bundle.ResourceTypeBundleConfiguration;
import org.rhq.core.domain.bundle.ResourceTypeBundleConfiguration.BundleDestinationBaseDirectory;
import org.rhq.core.domain.bundle.ResourceTypeBundleConfiguration.BundleDestinationBaseDirectory.Context;
import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
import org.rhq.core.domain.content.Package;
import org.rhq.core.domain.content.PackageType;
import org.rhq.core.domain.criteria.OperationDefinitionCriteria;
@@ -49,8 +50,6 @@ import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
-import static java.util.Arrays.asList;
-
public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(groups = { "plugin.metadata", "NewPlugin" })
@@ -118,7 +117,8 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
}
}
- @Test(groups = { "plugin.metadata", "NewPlugin" })
+ @Test(dependsOnMethods = { "registerPluginWithDuplicateDriftDefinitions" }, groups = { "plugin.metadata",
+ "NewPlugin" })
public void registerPlugin() throws Exception {
createPlugin("test-plugin.jar", "1.0", "plugin_v1.xml");
}
@@ -146,8 +146,8 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.metadata", "NewPlugin" })
public void persistEventDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "eventDefinitions", asList("logAEntry",
- "logBEntry"));
+ assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "eventDefinitions",
+ asList("logAEntry", "logBEntry"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.metadata", "NewPlugin" })
@@ -246,8 +246,8 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.metadata", "NewPlugin" })
public void persistPackageTypes() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "packageTypes", asList("ServerA.Content.1",
- "ServerA.Content.2"));
+ assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "packageTypes",
+ asList("ServerA.Content.1", "ServerA.Content.2"));
}
@Test(groups = { "plugin.metadata", "UpgradePlugin" }, dependsOnGroups = { "NewPlugin" })
@@ -257,8 +257,8 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.metadata", "UpgradePlugin" })
public void upgradeOperationDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "operationDefinitions", asList("start",
- "shutdown", "restart"));
+ assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "operationDefinitions",
+ asList("start", "shutdown", "restart"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.metadata", "UpgradePlugin" })
@@ -273,8 +273,8 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.metadata", "UpgradePlugin" })
public void upgradeEventDefinitions() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "eventDefinitions", asList("logAEntry",
- "logCEntry"));
+ assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "eventDefinitions",
+ asList("logAEntry", "logCEntry"));
}
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.metadata", "UpgradePlugin" })
@@ -349,8 +349,8 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "upgradePlugin" }, groups = { "plugin.metadata", "UpgradePlugin" })
public void upgradePackageTypes() throws Exception {
- assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "packageTypes", asList("ServerA.Content.1",
- "ServerA.Content.3"));
+ assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "packageTypes",
+ asList("ServerA.Content.1", "ServerA.Content.3"));
}
@Test(groups = { "RemoveTypes" }, dependsOnGroups = { "UpgradePlugin" })
@@ -375,17 +375,17 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
criteria.addFilterResourceTypeName("ServerC");
criteria.addFilterName("run");
- List<OperationDefinition> operationDefs = operationMgr.findOperationDefinitionsByCriteria(subjectMgr
- .getOverlord(), criteria);
+ List<OperationDefinition> operationDefs = operationMgr.findOperationDefinitionsByCriteria(
+ subjectMgr.getOverlord(), criteria);
assertEquals("The operation definition should have been deleted", 0, operationDefs.size());
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deleteEventDefsForRemovedType() throws Exception {
- List<?> results = getEntityManager().createQuery(
- "from EventDefinition e where e.name = :ename and e.resourceType.name = :rname").setParameter("ename",
- "serverCEvent").setParameter("rname", "ServerC").getResultList();
+ List<?> results = getEntityManager()
+ .createQuery("from EventDefinition e where e.name = :ename and e.resourceType.name = :rname")
+ .setParameter("ename", "serverCEvent").setParameter("rname", "ServerC").getResultList();
assertEquals("The event definition(s) should have been deleted", 0, results.size());
}
@@ -425,29 +425,30 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deleteTypeAndAllItsDescedantTypes() throws Exception {
- List<?> typesNotRemoved = getEntityManager().createQuery(
- "from ResourceType t where t.plugin = :plugin and t.name in (:resourceTypes)").setParameter("plugin",
- "RemoveTypesPlugin").setParameter("resourceTypes",
- asList("ServerE", "ServerE1", "ServerE2", "ServerE3", "ServerE4")).getResultList();
+ List<?> typesNotRemoved = getEntityManager()
+ .createQuery("from ResourceType t where t.plugin = :plugin and t.name in (:resourceTypes)")
+ .setParameter("plugin", "RemoveTypesPlugin")
+ .setParameter("resourceTypes", asList("ServerE", "ServerE1", "ServerE2", "ServerE3", "ServerE4"))
+ .getResultList();
assertEquals("Failed to delete resource type or one or more of its descendant types", 0, typesNotRemoved.size());
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deleteProcessScans() {
- List<?> processScans = getEntityManager().createQuery(
- "from ProcessScan p where p.name = :name1 or p.name = :name2").setParameter("name1", "scan1").setParameter(
- "name2", "scan2").getResultList();
+ List<?> processScans = getEntityManager()
+ .createQuery("from ProcessScan p where p.name = :name1 or p.name = :name2").setParameter("name1", "scan1")
+ .setParameter("name2", "scan2").getResultList();
assertEquals("The process scans should have been deleted", 0, processScans.size());
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deleteSubcategories() {
- List<?> subcategories = getEntityManager().createQuery(
- "from ResourceSubCategory r where r.name = :name1 or r.name = :name2 or r.name = :name3").setParameter(
- "name1", "ServerC.Category1").setParameter("name2", "ServerC.Category2").setParameter("name3",
- "ServerC.NestedCategory1").getResultList();
+ List<?> subcategories = getEntityManager()
+ .createQuery("from ResourceSubCategory r where r.name = :name1 or r.name = :name2 or r.name = :name3")
+ .setParameter("name1", "ServerC.Category1").setParameter("name2", "ServerC.Category2")
+ .setParameter("name3", "ServerC.NestedCategory1").getResultList();
assertEquals("The subcategories should have been deleted", 0, subcategories.size());
}
@@ -462,8 +463,8 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
List<Resource> resources = resourceMgr.findResourcesByCriteria(subjectMgr.getOverlord(), criteria);
- assertTrue("Did not expect to find any more that three resources. Database might need to be reset", resources
- .size() < 4);
+ assertTrue("Did not expect to find any more that three resources. Database might need to be reset",
+ resources.size() < 4);
// We won't do anything more rigorous that making sure the resources were marked uninventoried.
// Resource deletion is an expensive, time-consuming process; consequently, it is carried out
@@ -471,57 +472,57 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
// quickly as it is basically just updates the the inventory status to UNINVENTORIED for the
// resources to be deleted.
for (Resource resource : resources) {
- assertEquals("The resource should have been marked for deletion", InventoryStatus.UNINVENTORIED == resource
- .getInventoryStatus());
+ assertEquals("The resource should have been marked for deletion",
+ InventoryStatus.UNINVENTORIED == resource.getInventoryStatus());
}
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deleteBundles() {
- List<?> bundles = getEntityManager().createQuery("from Bundle b where b.bundleType.name = :name").setParameter(
- "name", "Test Bundle").getResultList();
+ List<?> bundles = getEntityManager().createQuery("from Bundle b where b.bundleType.name = :name")
+ .setParameter("name", "Test Bundle").getResultList();
assertEquals("Failed to delete the bundles", 0, bundles.size());
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deleteBundleTypes() {
- List<?> bundleTypes = getEntityManager().createQuery("from BundleType b where b.name = :name").setParameter(
- "name", "Test Bundle").getResultList();
+ List<?> bundleTypes = getEntityManager().createQuery("from BundleType b where b.name = :name")
+ .setParameter("name", "Test Bundle").getResultList();
assertEquals("The bundle type should have been deleted", 0, bundleTypes.size());
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deletePackages() {
- List<?> packages = getEntityManager().createQuery("from Package p where p.name = :name").setParameter("name",
- "ServerC::test-package").getResultList();
+ List<?> packages = getEntityManager().createQuery("from Package p where p.name = :name")
+ .setParameter("name", "ServerC::test-package").getResultList();
assertEquals("All packages should have been deleted", 0, packages.size());
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deletePackageTypes() {
- List<?> packageTypes = getEntityManager().createQuery("from PackageType p where p.name = :name").setParameter(
- "name", "ServerC.Content").getResultList();
+ List<?> packageTypes = getEntityManager().createQuery("from PackageType p where p.name = :name")
+ .setParameter("name", "ServerC.Content").getResultList();
assertEquals("All package types should have been deleted", 0, packageTypes.size());
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deleteResourceGroups() {
- List<?> groups = getEntityManager().createQuery(
- "from ResourceGroup g where g.name = :name and g.resourceType.name = :typeName").setParameter("name",
- "ServerC Group").setParameter("typeName", "ServerC").getResultList();
+ List<?> groups = getEntityManager()
+ .createQuery("from ResourceGroup g where g.name = :name and g.resourceType.name = :typeName")
+ .setParameter("name", "ServerC Group").setParameter("typeName", "ServerC").getResultList();
assertEquals("All resource groups should have been deleted", 0, groups.size());
}
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.metadata", "RemoveTypes" })
public void deleteAlertTemplates() {
- List<?> templates = getEntityManager().createQuery(
- "from AlertDefinition a where a.name = :name and a.resourceType.name = :typeName").setParameter("name",
- "ServerC Alert Template").setParameter("typeName", "ServerC").getResultList();
+ List<?> templates = getEntityManager()
+ .createQuery("from AlertDefinition a where a.name = :name and a.resourceType.name = :typeName")
+ .setParameter("name", "ServerC Alert Template").setParameter("typeName", "ServerC").getResultList();
assertEquals("Alert templates should have been deleted.", 0, templates.size());
}
@@ -576,9 +577,9 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
List<Resource> resources = new ArrayList<Resource>();
for (int i = 0; i < count; ++i) {
- resources.add(new ResourceBuilder().createServer().withResourceType(resourceType).withName(
- resourceType.getName() + "--" + i).withUuid(resourceType.getName()).withRandomResourceKey(
- resourceType.getName() + "--" + i).build());
+ resources.add(new ResourceBuilder().createServer().withResourceType(resourceType)
+ .withName(resourceType.getName() + "--" + i).withUuid(resourceType.getName())
+ .withRandomResourceKey(resourceType.getName() + "--" + i).build());
}
getTransactionManager().begin();
diff --git a/pom.xml b/pom.xml
index 7e390f8..3b77493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@
<twitter4j.version>2.2.4</twitter4j.version>
<commons-codec.version>1.4</commons-codec.version>
<!-- NOTE (ips, 10/04/11): Upgrading testng to 6.2.x causes 10 server-jar tests to fail for an unknown reason. -->
+ <!-- NOTE (jshaughn, 01/20/12): With the latest work, the sserver-jar tests passed using testng to 6.3.1, so perhaps an upgrade is possible -->
<testng.version>6.1.1</testng.version>
<cobertura.version>1.9.4.1</cobertura.version>
<augeas.version>0.9.0</augeas.version>
commit b295126d93d63138c31a4e9df4429d56bc6aa902
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jan 19 14:58:43 2012 -0500
Re-enable and update this test class. Seems to work now.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 1ff724a..89ff87b 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -54,6 +54,7 @@ import org.rhq.core.domain.drift.DriftChangeSet;
import org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext;
import org.rhq.core.domain.drift.DriftDefinition;
import org.rhq.core.domain.drift.DriftDefinition.BaseDirectory;
+import org.rhq.core.domain.drift.DriftDefinitionTemplate;
import org.rhq.core.domain.drift.DriftFile;
import org.rhq.core.domain.drift.DriftFileStatus;
import org.rhq.core.domain.resource.Agent;
@@ -76,14 +77,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
* !!! configured drift server plugin. To enhance this to do that then you may need to model this
* !!! mode like BundleManagerBeanTest
*/
-// Tests in this class **must** be run after the drift-template group. More specifically,
-// tests in this class need to be run after DriftTemplateManagerBeanTest. If test methods
-// in this class run first, for reasons I have yet to understand, DriftTemplateManagerBeanTest.initDB
-// will fail with a ClassNotFoundException for an anonymous inner class that is created in
-// the initDB method.
-//
-// - jsanda
-@Test(dependsOnGroups = "drift")
public class DriftManagerBeanTest extends AbstractEJB3Test {
private static final boolean ENABLE_TESTS = true;
@@ -345,7 +338,13 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
try {
ResourceType resourceType = new ResourceType("plat" + System.currentTimeMillis(), "test",
ResourceCategory.PLATFORM, null);
-
+ DriftDefinitionTemplate template = new DriftDefinitionTemplate();
+ template.setName("test-template");
+ DriftDefinition templateDef = new DriftDefinition(new Configuration());
+ templateDef.setName("test-template-def");
+ template.setTemplateDefinition(templateDef);
+ template.setUserDefined(true);
+ resourceType.addDriftDefinitionTemplate(template);
em.persist(resourceType);
Agent agent = new Agent("testagent", "testaddress", 1, "", "testtoken");
commit 24d89dc93ac47178812ce63c213d176fa265e915
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jan 19 13:06:11 2012 -0500
It seems we didn't really understand how testng was executing tests
when we submitted many test classes in a run. For example, when we
submit the server jar tests we assumed that the test classes would
be run sequentially, in perhaps some random order, and that each would
have its Before/AfterClass methods executed atthe start and end of each
test class execution.
That is not true.
Although testng seems to run most tests from a test class together, it does
not seem to make that guarantee. From latest traces it seems that the
test classes are, toa degree, pooled and:
1) you can not assume that all test methods for a test class will execute
before execution of test methods from another test class.
2) you can not assume that multiple BeforeClass methods will not execute
prior to an AfterClass. For example, this can happen:
Class1:BeforeClass
Class2:BeforeClass
Class1:AfterClass
Class2:AfterClass
Put another way: You can only assume that BeforeClass and AfterClass
execute in order, for a single test class. You can not predict the
execution order of all Before|AfterClass methods for all test classes.
3) The same rules as described in 2 apply to Before|AfterGroups
What this means is that you must be very careful with what is done in
Before|AfterClass and BeforeAfter|Groups. The work must not conflict
with work done in other test classes that will execute in the same test
suite.
This is very important when multiple test classes are sharing some sort
of test resource.
In general, it is much safer, although perhaps a bit slower, to use
@BeforeMethod() and @AfterMethod(alwaysRun=true).
This misunderstanding was particularly bad for us in the server jar tests,
where many test classes extend AbstractEJB3Test and utilize the jboss
mbean server under the covers, in the prepareXXX methods. This caused
clashes described above.
So, for server jar testing this reworks things to better share the mbean
server, even among tests in the same class. And migrates all
AbstractEJB3Test.prepare/unprepare calls from Before|AfterClass|Groups to
Before|After|Method.
also - remove/suppress IDE warnings from touched test classes
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java
index adab2c8..5fa92b9 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java
@@ -109,7 +109,8 @@ public class DriftServerTest extends AbstractEJB3Test {
private void shutDownDriftServer() throws Exception {
unprepareServerPluginService();
- driftServerPluginService.stopMasterPluginContainer();
+ //already done by the above call
+ //driftServerPluginService.stopMasterPluginContainer();
}
private void shutDownAgentServices() {
@@ -178,9 +179,9 @@ public class DriftServerTest extends AbstractEJB3Test {
protected void deleteEntity(Class<?> clazz, String name, EntityManager em) {
try {
- Object entity = em.createQuery(
- "select entity from " + clazz.getSimpleName() + " entity where entity.name = :name").setParameter(
- "name", name).getSingleResult();
+ Object entity = em
+ .createQuery("select entity from " + clazz.getSimpleName() + " entity where entity.name = :name")
+ .setParameter("name", name).getSingleResult();
em.remove(entity);
} catch (NoResultException e) {
// we can ignore no results because this code will run when the db
@@ -203,8 +204,8 @@ public class DriftServerTest extends AbstractEJB3Test {
}
protected void initResource() {
- resource = new ResourceBuilder().createResource().withId(0).withName(RESOURCE_NAME).withResourceKey(
- RESOURCE_NAME).withRandomUuid().withResourceType(resourceType).build();
+ resource = new ResourceBuilder().createResource().withId(0).withName(RESOURCE_NAME)
+ .withResourceKey(RESOURCE_NAME).withRandomUuid().withResourceType(resourceType).build();
}
protected Subject getOverlord() {
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
index 40a0168..587bdfb 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
@@ -37,9 +37,7 @@ import javax.persistence.Query;
import javax.transaction.TransactionManager;
import org.hibernate.LazyInitializationException;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -94,7 +92,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author John Mazzitelli
* @author Jay Shaughnessy
*/
-@SuppressWarnings( { "unused" })
+@SuppressWarnings({ "unused" })
@Test
public class BundleManagerBeanTest extends AbstractEJB3Test {
@@ -115,19 +113,11 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
private Subject overlord;
TestServerCommunicationsService agentServiceContainer;
- @BeforeClass
- public void beforeClass() {
+ @BeforeMethod
+ public void beforeMethod() throws Exception {
agentServiceContainer = prepareForTestAgents();
agentServiceContainer.bundleService = new TestAgentClient(null, agentServiceContainer);
- }
- @AfterClass
- public void afterClass() throws Exception {
- unprepareForTestAgents();
- }
-
- @BeforeMethod
- public void beforeMethod() throws Exception {
this.ps = new TestBundleServerPluginService();
prepareCustomServerPluginService(this.ps);
bundleManager = LookupUtil.getBundleManager();
@@ -141,9 +131,14 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
@AfterMethod(alwaysRun = true)
public void afterMethod() throws Exception {
- cleanupDatabase();
- unprepareServerPluginService();
- this.ps = null;
+ unprepareForTestAgents();
+
+ try {
+ this.ps = null;
+ cleanupDatabase();
+ } finally {
+ unprepareServerPluginService();
+ }
}
private void cleanupDatabase() {
@@ -189,8 +184,7 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
+ TEST_PREFIX + "%'");
doomed = q.getResultList();
for (Object removeMe : doomed) {
- em.remove(em
- .getReference(BundleResourceDeployment.class, ((BundleResourceDeployment) removeMe).getId()));
+ em.remove(em.getReference(BundleResourceDeployment.class, ((BundleResourceDeployment) removeMe).getId()));
}
// remove any orphaned bds
q = em.createQuery("SELECT bd FROM BundleDeployment bd WHERE bd.description LIKE '" + TEST_PREFIX + "%'");
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
index 6b95388..29e9e58 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import javax.persistence.EntityManager;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -86,13 +85,6 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test {
servers = new ArrayList<Server>();
agents = new ArrayList<Agent>();
newAgents = new ArrayList<Agent>();
-
- prepareForTestAgents();
- }
-
- @AfterClass
- public void afterClass() throws Exception {
- this.unprepareForTestAgents();
}
@BeforeMethod
@@ -100,9 +92,11 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test {
servers.clear();
agents.clear();
newAgents.clear();
+
+ prepareForTestAgents();
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void afterMethod() throws Exception {
try {
getTransactionManager().begin();
@@ -151,6 +145,8 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test {
}
throw e;
+ } finally {
+ this.unprepareForTestAgents();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
index 1dfd79a..3645d77 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
@@ -26,8 +26,6 @@ import java.util.Map;
import javax.persistence.EntityManager;
-import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -48,6 +46,7 @@ import org.rhq.core.domain.configuration.PluginConfigurationUpdate;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate;
+import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
import org.rhq.core.domain.discovery.AvailabilityReport;
import org.rhq.core.domain.discovery.MergeResourceResponse;
import org.rhq.core.domain.discovery.ResourceSyncInfo;
@@ -70,6 +69,7 @@ import org.rhq.enterprise.server.util.SessionTestHelper;
* Tests the configuration manager.
*/
@Test
+@SuppressWarnings("all")
public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
private static final boolean ENABLE_TESTS = true;
@@ -97,32 +97,27 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
configurationManager = LookupUtil.getConfigurationManager();
resourceManager = LookupUtil.getResourceManager();
overlord = LookupUtil.getSubjectManager().getOverlord();
-
- TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
- TestServices testServices = new TestServices();
- agentServiceContainer.configurationService = testServices;
- agentServiceContainer.discoveryService = testServices;
- }
-
- @AfterClass
- public void afterClass() throws Exception {
- unprepareForTestAgents();
}
@BeforeMethod
public void beforeMethod() throws Exception {
prepareScheduler();
+ TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
+ TestServices testServices = new TestServices();
+ agentServiceContainer.configurationService = testServices;
+ agentServiceContainer.discoveryService = testServices;
+
getTransactionManager().begin();
EntityManager em = getEntityManager();
try {
compatibleGroup = SessionTestHelper.createNewCompatibleGroupForRole(em, null, // no role necessary here
"compat");
- newResource1 = SessionTestHelper.createNewResourceForGroup(em, compatibleGroup, "res"
- + System.currentTimeMillis());
- newResource2 = SessionTestHelper.createNewResourceForGroup(em, compatibleGroup, "res"
- + System.currentTimeMillis());
+ newResource1 = SessionTestHelper.createNewResourceForGroup(em, compatibleGroup,
+ "res" + System.currentTimeMillis());
+ newResource2 = SessionTestHelper.createNewResourceForGroup(em, compatibleGroup,
+ "res" + System.currentTimeMillis());
// set one resource as the child of another, so that they don't both look like platforms under the agent
newResource1.addChildResource(newResource2);
@@ -145,7 +140,7 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
}
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void afterMethod() throws Exception {
try {
// perform in-band and out-of-band work in quick succession
@@ -202,6 +197,7 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
} finally {
unprepareScheduler();
+ unprepareForTestAgents();
}
}
@@ -425,18 +421,18 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
configuration2.put(new PropertySimple("fail", "false"));
/* begin simple checks */
- PluginConfigurationUpdate update1 = configurationManager.updatePluginConfiguration(overlord, resource1
- .getId(), configuration1);
+ PluginConfigurationUpdate update1 = configurationManager.updatePluginConfiguration(overlord,
+ resource1.getId(), configuration1);
assert update1.getErrorMessage() == null : "We weren't expecting a failure here";
- PluginConfigurationUpdate update2 = configurationManager.updatePluginConfiguration(overlord, resource2
- .getId(), configuration2);
+ PluginConfigurationUpdate update2 = configurationManager.updatePluginConfiguration(overlord,
+ resource2.getId(), configuration2);
assert update2.getErrorMessage() == null : "We weren't expecting a failure here";
- Configuration updatedConfiguration1 = configurationManager.getPluginConfiguration(overlord, resource1
- .getId());
- Configuration updatedConfiguration2 = configurationManager.getPluginConfiguration(overlord, resource2
- .getId());
+ Configuration updatedConfiguration1 = configurationManager.getPluginConfiguration(overlord,
+ resource1.getId());
+ Configuration updatedConfiguration2 = configurationManager.getPluginConfiguration(overlord,
+ resource2.getId());
assert updatedConfiguration1.equals(configuration1) : "configuration1 was: " + updatedConfiguration1 + ", "
+ "expected was: " + configuration1;
@@ -487,8 +483,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
Map<Integer, Configuration> memberConfigs = new HashMap<Integer, Configuration>();
memberConfigs.put(resource1.getId(), configuration1);
memberConfigs.put(resource2.getId(), configuration2);
- int groupUpdateId = configurationManager.scheduleGroupPluginConfigurationUpdate(overlord, compatibleGroup
- .getId(), memberConfigs);
+ int groupUpdateId = configurationManager.scheduleGroupPluginConfigurationUpdate(overlord,
+ compatibleGroup.getId(), memberConfigs);
// instead of sleeping, let's directly execute what would normally be scheduled
//configurationManager.completeGroupPluginConfigurationUpdate(groupUpdateId);
@@ -713,8 +709,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
criteria.addFilterResourceIds(resource.getId());
criteria.fetchConfiguration(true);
criteria.addSortCreatedTime(PageOrdering.ASC);
- List<ResourceConfigurationUpdate> history =
- configurationManager.findResourceConfigurationUpdatesByCriteria(overlord, criteria);
+ List<ResourceConfigurationUpdate> history = configurationManager.findResourceConfigurationUpdatesByCriteria(
+ overlord, criteria);
assert history != null;
assert history.size() == 3;
@@ -1011,8 +1007,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
} else {
mybool.setErrorMessage(ThrowableUtil.getStackAsString(new IllegalArgumentException(
"Not a valid boolean")));
- response = new ConfigurationUpdateResponse(request.getConfigurationUpdateId(), request
- .getConfiguration(), new NullPointerException("This simulates a failed update"));
+ response = new ConfigurationUpdateResponse(request.getConfigurationUpdateId(),
+ request.getConfiguration(), new NullPointerException("This simulates a failed update"));
}
LookupUtil.getConfigurationManager().completeResourceConfigurationUpdate(response);
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java
index 6f75197..ea48c65 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -146,23 +145,15 @@ public class ContentManagerBeanTest extends AbstractEJB3Test {
contentManager = LookupUtil.getContentManager();
subjectManager = LookupUtil.getSubjectManager();
- TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
- agentServiceContainer.contentService = contentAgentService;
-
populateResponseSteps();
}
- @AfterClass
- public void teardownAfterClass() throws Exception {
- unprepareForTestAgents();
- }
-
@BeforeMethod
public void setupBeforeMethod() throws Exception {
setupTestEnvironment();
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDownAfterMethod() throws Exception {
tearDownTestEnvironment();
}
@@ -316,8 +307,8 @@ public class ContentManagerBeanTest extends AbstractEJB3Test {
report.addDeployedPackage(package3);
// Package where entire package does not exist
- PackageDetailsKey key4 = new PackageDetailsKey("PackageX", "1.0.0", packageType4.getName(), architecture1
- .getName());
+ PackageDetailsKey key4 = new PackageDetailsKey("PackageX", "1.0.0", packageType4.getName(),
+ architecture1.getName());
ResourcePackageDetails package4 = new ResourcePackageDetails(key4);
// Fully populate this version to make sure the translation from details -> domain model works
@@ -1385,6 +1376,9 @@ public class ContentManagerBeanTest extends AbstractEJB3Test {
// Private --------------------------------------------
private void setupTestEnvironment() throws Exception {
+ TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
+ agentServiceContainer.contentService = contentAgentService;
+
getTransactionManager().begin();
EntityManager em = getEntityManager();
@@ -1567,6 +1561,7 @@ public class ContentManagerBeanTest extends AbstractEJB3Test {
}
} finally {
em.close();
+ unprepareForTestAgents();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 5a702ff..8c356f1 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -29,8 +29,9 @@ import java.util.Properties;
import javax.management.MBeanServer;
import javax.persistence.Query;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.clientapi.server.core.AgentRegistrationException;
@@ -92,7 +93,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
// J. testAttemptToChangeAgentName
// 1) register agent "newName" but with Z's host/port/token. In effect, this is trying to change the agent's name. (REJECT - you are not allowed to rename agents)
-@Test
+@Test(groups = { "core.agent-registration" })
public class CoreServerServiceImplTest extends AbstractEJB3Test {
private static final String TEST_AGENT_NAME_PREFIX = "CoreServerServiceImplTest.Agent";
private static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name";
@@ -109,6 +110,80 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
private static final int B_PORT = 22222;
private static final String B_HOST = "hostB";
+ @AfterGroups(groups = { "core.agent-registration" })
+ public void afterGroup() throws Exception {
+ // clean up any agents we might have created
+ Query q = getEntityManager().createQuery(
+ "select a from Agent a where name like '" + TEST_AGENT_NAME_PREFIX + "%'");
+ List<Agent> doomed = (List<Agent>) q.getResultList();
+ for (Agent deleteMe : doomed) {
+ LookupUtil.getAgentManager().deleteAgent(deleteMe);
+ }
+ }
+
+ @BeforeMethod
+ public void prepare() throws Exception {
+ // mock the name of our server via the sysprop (in production, this is normally set in rhq-server.properties)
+ oldServerNamePropertyValue = System.getProperty(RHQ_SERVER_NAME_PROPERTY);
+ String newServerNamePropertyValue = "CoreServerServiceImplTest.Server";
+ System.setProperty(RHQ_SERVER_NAME_PROPERTY, newServerNamePropertyValue);
+
+ // mock up our core server MBean that provides information about where the jboss home dir is
+ MBeanServer mbs = getJBossMBeanServer();
+ DummyCoreServer mbean = new DummyCoreServer();
+ mbs.registerMBean(mbean, CoreServerMBean.OBJECT_NAME);
+
+ // in order to register, we need to mock out the agent version file used by the server
+ // to determine the agent version it supports.
+ agentVersion = new AgentVersion("1.2.3", "12345");
+ File agentVersionFile = new File(mbean.getJBossServerHomeDir(),
+ "deploy/rhq.ear/rhq-downloads/rhq-agent/rhq-server-agent-versions.properties");
+ agentVersionFile.getParentFile().mkdirs();
+ agentVersionFile.delete();
+ Properties agentVersionProps = new Properties();
+ agentVersionProps.put("rhq-agent.latest.version", agentVersion.getVersion());
+ agentVersionProps.put("rhq-agent.latest.build-number", agentVersion.getBuild());
+ FileOutputStream fos = new FileOutputStream(agentVersionFile);
+ try {
+ agentVersionProps.store(fos, "This file was created by " + CoreServerServiceImplTest.class.getName());
+ } finally {
+ fos.close();
+ }
+
+ // this mocks out the endpoint ping - the server will think the agent that is registering is up and pingable
+ prepareForTestAgents();
+
+ // mock our server
+ server = new Server();
+ server.setName(newServerNamePropertyValue);
+ server.setAddress("CoreServerServiceImplTest.localhost");
+ server.setPort(12345);
+ server.setSecurePort(12346);
+ server.setOperationMode(OperationMode.NORMAL);
+ int serverId = LookupUtil.getServerManager().create(server);
+ server.setId(serverId);
+ }
+
+ @AfterMethod
+ public void unprepare() throws Exception {
+
+ // cleanup our test server
+ LookupUtil.getCloudManager().updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN);
+ LookupUtil.getCloudManager().deleteServer(server.getId());
+
+ // shutdown our mock mbean server
+ MBeanServer mbs = getJBossMBeanServer();
+ mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
+
+ unprepareForTestAgents();
+
+ // in case this was set before our tests, put it back the way it was
+ if (oldServerNamePropertyValue != null) {
+ System.setProperty(RHQ_SERVER_NAME_PROPERTY, oldServerNamePropertyValue);
+ }
+ }
+
+ @Test
public void testNewAgentRegistrationWithOldToken() throws Exception {
// this tests the case where someone purged an agent from the DB, but then
// changed their mind and want to re-run that agent and re-register it again.
@@ -125,6 +200,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
LookupUtil.getAgentManager().deleteAgent(agent);
}
+ @Test
public void testChangeAddressPort() throws Exception {
CoreServerServiceImpl service = new CoreServerServiceImpl();
AgentRegistrationRequest request;
@@ -379,75 +455,6 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
}
}
- @BeforeClass
- public void prepare() throws Exception {
- // mock the name of our server via the sysprop (in production, this is normally set in rhq-server.properties)
- oldServerNamePropertyValue = System.getProperty(RHQ_SERVER_NAME_PROPERTY);
- String newServerNamePropertyValue = "CoreServerServiceImplTest.Server";
- System.setProperty(RHQ_SERVER_NAME_PROPERTY, newServerNamePropertyValue);
-
- // mock up our core server MBean that provides information about where the jboss home dir is
- MBeanServer mbs = getJBossMBeanServer();
- DummyCoreServer mbean = new DummyCoreServer();
- mbs.registerMBean(mbean, CoreServerMBean.OBJECT_NAME);
-
- // in order to register, we need to mock out the agent version file used by the server
- // to determine the agent version it supports.
- agentVersion = new AgentVersion("1.2.3", "12345");
- File agentVersionFile = new File(mbean.getJBossServerHomeDir(),
- "deploy/rhq.ear/rhq-downloads/rhq-agent/rhq-server-agent-versions.properties");
- agentVersionFile.getParentFile().mkdirs();
- agentVersionFile.delete();
- Properties agentVersionProps = new Properties();
- agentVersionProps.put("rhq-agent.latest.version", agentVersion.getVersion());
- agentVersionProps.put("rhq-agent.latest.build-number", agentVersion.getBuild());
- FileOutputStream fos = new FileOutputStream(agentVersionFile);
- try {
- agentVersionProps.store(fos, "This file was created by " + CoreServerServiceImplTest.class.getName());
- } finally {
- fos.close();
- }
-
- // this mocks out the endpoint ping - the server will think the agent that is registering is up and pingable
- prepareForTestAgents();
-
- // mock our server
- server = new Server();
- server.setName(newServerNamePropertyValue);
- server.setAddress("CoreServerServiceImplTest.localhost");
- server.setPort(12345);
- server.setSecurePort(12346);
- server.setOperationMode(OperationMode.NORMAL);
- int serverId = LookupUtil.getServerManager().create(server);
- server.setId(serverId);
- }
-
- @AfterClass
- public void unprepare() throws Exception {
- // clean up any agents we might have created
- Query q = getEntityManager().createQuery(
- "select a from Agent a where name like '" + TEST_AGENT_NAME_PREFIX + "%'");
- List<Agent> doomed = (List<Agent>) q.getResultList();
- for (Agent deleteMe : doomed) {
- LookupUtil.getAgentManager().deleteAgent(deleteMe);
- }
-
- // cleanup our test server
- LookupUtil.getCloudManager().updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN);
- LookupUtil.getCloudManager().deleteServer(server.getId());
-
- // shutdown our mock mbean server
- MBeanServer mbs = getJBossMBeanServer();
- mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
-
- unprepareForTestAgents();
-
- // in case this was set before our tests, put it back the way it was
- if (oldServerNamePropertyValue != null) {
- System.setProperty(RHQ_SERVER_NAME_PROPERTY, oldServerNamePropertyValue);
- }
- }
-
interface DummyCoreServerMBean extends CoreServerMBean {
};
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
index 082bd6b..630b778 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
@@ -39,7 +39,7 @@ import org.dbunit.ext.oracle.Oracle10DataTypeFactory;
import org.dbunit.ext.oracle.OracleDataTypeFactory;
import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory;
import org.dbunit.operation.DatabaseOperation;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -74,20 +74,15 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
@BeforeClass
public void beforeClass() throws Exception {
discoveryBoss = LookupUtil.getDiscoveryBoss();
+ }
+ @BeforeMethod
+ public void setupTestData() throws Exception {
dummyJBossMBeanServer = MBeanServerFactory.createMBeanServer("jboss");
MBeanServerLocator.setJBoss(dummyJBossMBeanServer);
dummyJBossMBeanServer.registerMBean(new ServerCommunicationsService(),
- ServerCommunicationsServiceMBean.OBJECT_NAME);
- }
-
- @AfterClass
- public void afterClass() {
- MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
- }
+ ServerCommunicationsServiceMBean.OBJECT_NAME);
- @BeforeMethod
- public void setupTestData() throws Exception {
initDB();
platformType = getEntityManager().find(ResourceType.class, 1);
serverType = getEntityManager().find(ResourceType.class, 2);
@@ -96,6 +91,11 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
agent = getEntityManager().find(Agent.class, 1);
}
+ @AfterMethod(alwaysRun = true)
+ public void afterMethod() throws Exception {
+ MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
+ }
+
@Test(groups = "integration.ejb3")
public void testBasicInventoryReport() throws Exception {
InventoryReport inventoryReport = new InventoryReport(agent);
@@ -211,7 +211,7 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
IDataSet getDataSet() throws Exception {
FlatXmlProducer xmlProducer = new FlatXmlProducer(new InputSource(getClass().getResourceAsStream(
- getDataSetFile())));
+ getDataSetFile())));
xmlProducer.setColumnSensing(true);
return new FlatXmlDataSet(xmlProducer);
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index f7152a9..1ff724a 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -46,7 +46,6 @@ import org.rhq.core.clientapi.server.drift.DriftServerService;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.criteria.GenericDriftChangeSetCriteria;
import org.rhq.core.domain.criteria.JPADriftChangeSetCriteria;
import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.drift.Drift;
@@ -109,19 +108,18 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
overlord = LookupUtil.getSubjectManager().getOverlord();
driftServerService = new DriftServerServiceImpl();
-
- TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
- agentServiceContainer.driftService = new TestDefService();
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public void afterClass() {
driftServerService = null;
- unprepareForTestAgents();
}
@BeforeMethod
public void beforeMethod() throws Exception {
+ TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
+ agentServiceContainer.driftService = new TestDefService();
+
prepareScheduler();
deleteDriftFiles();
@@ -134,6 +132,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
try {
deleteNewResource(newResource);
} finally {
+ unprepareForTestAgents();
unprepareScheduler();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
index f068ead..bce9bad 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
@@ -35,8 +35,8 @@ import org.testng.annotations.Test;
import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.clientapi.agent.operation.CancelResults;
-import org.rhq.core.clientapi.agent.operation.OperationAgentService;
import org.rhq.core.clientapi.agent.operation.CancelResults.InterruptedState;
+import org.rhq.core.clientapi.agent.operation.OperationAgentService;
import org.rhq.core.clientapi.server.operation.OperationServerService;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.configuration.Configuration;
@@ -108,19 +108,18 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
overlord = LookupUtil.getSubjectManager().getOverlord();
operationServerService = new OperationServerServiceImpl();
-
- TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
- agentServiceContainer.operationService = new TestConfigService();
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public void afterClass() {
operationServerService = null;
- unprepareForTestAgents();
}
@BeforeMethod
public void beforeMethod() throws Exception {
+ TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
+ agentServiceContainer.operationService = new TestConfigService();
+
prepareScheduler();
simulatedOperation_Sleep = 500L;
@@ -137,6 +136,7 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
try {
deleteNewResource(newResource);
} finally {
+ unprepareForTestAgents();
unprepareScheduler();
}
}
@@ -226,8 +226,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
.getGroup().getId());
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 0;
// should be no resource histories that belong to it
@@ -290,8 +290,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert list.size() == 0;
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 0;
// should be no resource histories that belong to it
@@ -336,14 +336,14 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(9000L); // wait for it to be triggered and finish
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 1 : "Expected 1 result, but got " + results.size();
operationManager.deleteOperationHistory(overlord, results.get(0).getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 0;
// purging group history purges all resource histories that belong to it
@@ -375,8 +375,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// wait for it to be triggered so we get a history item
for (int i = 0; i < 5; i++) {
Thread.sleep(1000L);
- results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
if ((results != null) && (results.size() > 0)) {
break; // operation was triggered - got the history item
}
@@ -406,8 +406,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// cancel the group history - which cancels all the resource histories
operationManager.cancelOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
assert results.get(0).getStatus() == OperationRequestStatus.CANCELED : results.get(0);
@@ -426,8 +426,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// purge the group history
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -460,8 +460,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// wait for it to be triggered so we get a history item
for (int i = 0; i < 5; i++) {
Thread.sleep(1000L);
- results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
if ((results != null) && (results.size() > 0)) {
break; // operation was triggered - got the history item
}
@@ -474,8 +474,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// get the one resource history from the group
PageList<ResourceOperationHistory> results2;
- results2 = operationManager.findPendingResourceOperationHistories(overlord, newResource.getId(), PageControl
- .getUnlimitedInstance());
+ results2 = operationManager.findPendingResourceOperationHistories(overlord, newResource.getId(),
+ PageControl.getUnlimitedInstance());
assert results2.size() == 1 : "Should have had 1 resource history result: " + results2;
ResourceOperationHistory rHistory = results2.get(0);
@@ -485,28 +485,28 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// this doesn't actually cancel the FINISHED resource operation. This simulates the fact that
// the agent couldn't cancel the resource op since it already finished.
operationManager.cancelOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 1;
assert results.get(0).getStatus() == OperationRequestStatus.CANCELED : results.get(0);
- results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 0;
// still pending - our operation wasn't really canceled - waiting for the agent to tell us its finished
results2 = operationManager.findCompletedResourceOperationHistories(overlord, newResource.getId(), null, null,
PageControl.getUnlimitedInstance());
assert results2.size() == 0;
- results2 = operationManager.findPendingResourceOperationHistories(overlord, newResource.getId(), PageControl
- .getUnlimitedInstance());
+ results2 = operationManager.findPendingResourceOperationHistories(overlord, newResource.getId(),
+ PageControl.getUnlimitedInstance());
assert results2.size() == 1;
assert results2.get(0).getStatus() == OperationRequestStatus.INPROGRESS : results2.get(0);
// purge the group history (note we tell it to even purge those in progress)
operationManager.deleteOperationHistory(overlord, history.getId(), true);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -536,8 +536,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(4000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
GroupOperationHistory history = results.get(0);
@@ -573,8 +573,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -607,8 +607,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(8000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
// the group job executed twice
assert results != null;
@@ -663,8 +663,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
operationManager.deleteOperationHistory(overlord, history0.getId(), false);
operationManager.deleteOperationHistory(overlord, history1.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0 : results; // none left, we purged the two group histories
@@ -710,8 +710,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(4000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
GroupOperationHistory history = results.get(0);
@@ -742,8 +742,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
// parameters and results are lazily loaded in the paginated queries, but are eagerly individually
- rHistory = (ResourceOperationHistory) operationManager.getOperationHistoryByHistoryId(overlord, rHistory
- .getId());
+ rHistory = (ResourceOperationHistory) operationManager.getOperationHistoryByHistoryId(overlord,
+ rHistory.getId());
assert rHistory.getResults() != null;
assert rHistory.getResults().getSimple("param1echo") != null;
assert rHistory.getResults().getSimple("param1echo").getStringValue().equals("group-test");
@@ -751,8 +751,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getParameters().getId() != history.getParameters().getId() : "params should be copies - not shared";
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -781,8 +781,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(4000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1 : "Did not get 1 result back, but " + results.size();
GroupOperationHistory history = results.get(0);
@@ -810,8 +810,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -840,8 +840,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(4000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
GroupOperationHistory history = results.get(0);
@@ -869,8 +869,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -1174,8 +1174,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// wait for it to be triggered so we get a history item
for (int i = 0; i < 5; i++) {
Thread.sleep(1000L);
- results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(),
+ PageControl.getUnlimitedInstance());
if ((results != null) && (results.size() > 0)) {
break; // operation was triggered - got the history item
}
@@ -1233,8 +1233,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// wait for it to be triggered so we get a history item
for (int i = 0; i < 5; i++) {
Thread.sleep(1000L);
- results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(),
+ PageControl.getUnlimitedInstance());
if ((results != null) && (results.size() > 0)) {
break; // operation was triggered - got the history item
}
@@ -1254,8 +1254,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert results.size() == 0;
// still pending - our operation wasn't really canceled - waiting for the agent to tell us its finished
- results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
history = results.get(0);
@@ -1308,8 +1308,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert history.getSubjectName().equals(overlord.getName()) : history;
PageList<ResourceOperationLastCompletedComposite> list;
- list = operationManager.findRecentlyCompletedResourceOperations(overlord, null, PageControl
- .getUnlimitedInstance());
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
assert list.size() == 1;
assert list.get(0).getOperationHistoryId() == history.getId();
assert list.get(0).getResourceId() == resource.getId();
@@ -1322,8 +1322,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert results != null;
assert results.size() == 0;
- list = operationManager.findRecentlyCompletedResourceOperations(overlord, null, PageControl
- .getUnlimitedInstance());
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
assert list.size() == 0;
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
index d0beddc..dd72437 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Set;
import javax.persistence.EntityManager;
-import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.testng.annotations.AfterMethod;
@@ -121,58 +120,60 @@ public class ContentProviderManagerSyncContentProviderTest extends AbstractEJB3T
@AfterMethod
public void tearDownAfterMethod() throws Exception {
- // Transactional stuff
- TransactionManager tx = getTransactionManager();
- tx.begin();
- EntityManager entityManager = getEntityManager();
-
- RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
- Subject overlord = subjectManager.getOverlord();
-
- // Delete the repo relationships
- entityManager.createNamedQuery(RepoRepoRelationship.DELETE_BY_REPO_ID).setParameter("repoId", repoId)
- .executeUpdate();
-
- entityManager.createNamedQuery(RepoRelationship.DELETE_BY_RELATED_REPO_ID).setParameter("relatedRepoId",
- relatedRepoId).executeUpdate();
+ try {
+ // Transactional stuff
+ TransactionManager tx = getTransactionManager();
+ tx.begin();
+ EntityManager entityManager = getEntityManager();
- // Delete any repos that were created in this test
- for (Integer repoId : reposToDelete) {
- repoManager.deleteRepo(overlord, repoId);
- }
- reposToDelete.clear();
+ RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
+ SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ Subject overlord = subjectManager.getOverlord();
- // Delete any repo groups that were created in this test
- for (Integer repoGroupId : repoGroupsToDelete) {
- repoManager.deleteRepoGroup(overlord, repoGroupId);
+ // Delete the repo relationships
+ entityManager.createNamedQuery(RepoRepoRelationship.DELETE_BY_REPO_ID).setParameter("repoId", repoId)
+ .executeUpdate();
+
+ entityManager.createNamedQuery(RepoRelationship.DELETE_BY_RELATED_REPO_ID)
+ .setParameter("relatedRepoId", relatedRepoId).executeUpdate();
+
+ // Delete any repos that were created in this test
+ for (Integer repoId : reposToDelete) {
+ repoManager.deleteRepo(overlord, repoId);
+ }
+ reposToDelete.clear();
+
+ // Delete any repo groups that were created in this test
+ for (Integer repoGroupId : repoGroupsToDelete) {
+ repoManager.deleteRepoGroup(overlord, repoGroupId);
+ }
+ repoGroupsToDelete.clear();
+
+ // First disassociate packages from the content source
+ entityManager.createNamedQuery(PackageVersionContentSource.DELETE_BY_CONTENT_SOURCE_ID)
+ .setParameter("contentSourceId", syncSource.getId()).executeUpdate();
+
+ // Delete the existing repos
+ nonCandidateOnOtherSource = entityManager.find(Repo.class, nonCandidateOnOtherSource.getId());
+ entityManager.remove(nonCandidateOnOtherSource);
+
+ // Delete the source that was created
+ syncSource = entityManager.find(ContentSource.class, syncSource.getId());
+ entityManager.remove(syncSource);
+
+ nonSyncSource = entityManager.find(ContentSource.class, nonSyncSource.getId());
+ entityManager.remove(nonSyncSource);
+
+ // Delete the fake source type
+ testSourceType = entityManager.find(ContentSourceType.class, testSourceType.getId());
+ entityManager.remove(testSourceType);
+
+ tx.commit();
+ } finally {
+ // Plugin service teardown
+ unprepareServerPluginService();
+ unprepareScheduler();
}
- repoGroupsToDelete.clear();
-
- // First disassociate packages from the content source
- entityManager.createNamedQuery(PackageVersionContentSource.DELETE_BY_CONTENT_SOURCE_ID).setParameter(
- "contentSourceId", syncSource.getId()).executeUpdate();
-
- // Delete the existing repos
- nonCandidateOnOtherSource = entityManager.find(Repo.class, nonCandidateOnOtherSource.getId());
- entityManager.remove(nonCandidateOnOtherSource);
-
- // Delete the source that was created
- syncSource = entityManager.find(ContentSource.class, syncSource.getId());
- entityManager.remove(syncSource);
-
- nonSyncSource = entityManager.find(ContentSource.class, nonSyncSource.getId());
- entityManager.remove(nonSyncSource);
-
- // Delete the fake source type
- testSourceType = entityManager.find(ContentSourceType.class, testSourceType.getId());
- entityManager.remove(testSourceType);
-
- tx.commit();
-
- // Plugin service teardown
- unprepareServerPluginService();
- unprepareScheduler();
}
@Test
@@ -210,12 +211,13 @@ public class ContentProviderManagerSyncContentProviderTest extends AbstractEJB3T
previousRepo.addContentSource(syncSource);
repoManager.createRepo(overlord, previousRepo);
- // Test
- // --------------------------------------------
- // TestContentProviderManager providerManager = new TestContentProviderManager();
+ // Test
+ // --------------------------------------------
+ // TestContentProviderManager providerManager = new TestContentProviderManager();
pluginService.getContentProviderManager().testConnection(syncSource.getId());
- boolean completed = pluginService.getContentProviderManager().synchronizeContentProvider(syncSource.getId());
+ boolean completed = pluginService.getContentProviderManager()
+ .synchronizeContentProvider(syncSource.getId());
assert completed;
// Verify RepoGroups
@@ -303,7 +305,7 @@ public class ContentProviderManagerSyncContentProviderTest extends AbstractEJB3T
assert retrievedRepos.size() == 0;
getTransactionManager().commit();
- } catch(Throwable t) {
+ } catch (Throwable t) {
getTransactionManager().rollback();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
index 22d65e2..65154bb 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
@@ -167,76 +167,79 @@ public class ContentProviderManagerSyncRepoTest extends AbstractEJB3Test {
@AfterMethod
public void tearDownAfterMethod() throws Exception {
+ try {
- TransactionManager tx = getTransactionManager();
- tx.begin();
- EntityManager entityManager = getEntityManager();
+ TransactionManager tx = getTransactionManager();
+ tx.begin();
+ EntityManager entityManager = getEntityManager();
- Query query;
+ Query query;
- ContentSourceManagerLocal contentSourceManagerLocal = LookupUtil.getContentSourceManager();
- RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
- DistributionManagerLocal distroManager = LookupUtil.getDistributionManagerLocal();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
- Subject overlord = subjectManager.getOverlord();
+ ContentSourceManagerLocal contentSourceManagerLocal = LookupUtil.getContentSourceManager();
+ RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
+ DistributionManagerLocal distroManager = LookupUtil.getDistributionManagerLocal();
+ SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ Subject overlord = subjectManager.getOverlord();
- // Delete all distributions
- distroManager.deleteDistributionMappingsForRepo(overlord, repoToSync.getId());
+ // Delete all distributions
+ distroManager.deleteDistributionMappingsForRepo(overlord, repoToSync.getId());
- for (String distroLabel : TestContentProvider.DISTRIBUTIONS.keySet()) {
- Distribution distro = distroManager.getDistributionByLabel(distroLabel);
- if (distro != null) {
- // Delete the files
- query = entityManager.createNamedQuery(DistributionFile.DELETE_BY_DIST_ID);
- query.setParameter("distId", distro.getId());
- query.executeUpdate();
+ for (String distroLabel : TestContentProvider.DISTRIBUTIONS.keySet()) {
+ Distribution distro = distroManager.getDistributionByLabel(distroLabel);
+ if (distro != null) {
+ // Delete the files
+ query = entityManager.createNamedQuery(DistributionFile.DELETE_BY_DIST_ID);
+ query.setParameter("distId", distro.getId());
+ query.executeUpdate();
- // Delete the actual distro
- distroManager.deleteDistributionByDistId(overlord, distro.getId());
+ // Delete the actual distro
+ distroManager.deleteDistributionByDistId(overlord, distro.getId());
+ }
}
- }
- // Delete all package version <-> content source mappings
- for (ContentSource source : repoContentSources) {
- contentSourceManagerLocal.deleteContentSource(overlord, source.getId());
- }
- repoContentSources.clear();
+ // Delete all package version <-> content source mappings
+ for (ContentSource source : repoContentSources) {
+ contentSourceManagerLocal.deleteContentSource(overlord, source.getId());
+ }
+ repoContentSources.clear();
- // Delete the repo
- repoManager.deleteRepo(overlord, repoToSync.getId());
+ // Delete the repo
+ repoManager.deleteRepo(overlord, repoToSync.getId());
- // Delete any packages that were created
- for (ContentProviderPackageDetails details : TestContentProvider.PACKAGES.values()) {
- String packageName = details.getContentProviderPackageDetailsKey().getName();
+ // Delete any packages that were created
+ for (ContentProviderPackageDetails details : TestContentProvider.PACKAGES.values()) {
+ String packageName = details.getContentProviderPackageDetailsKey().getName();
- query = entityManager.createNamedQuery(Package.QUERY_FIND_BY_NAME_PKG_TYPE_ID);
- query.setParameter("name", packageName);
- query.setParameter("packageTypeId", packageType.getId());
+ query = entityManager.createNamedQuery(Package.QUERY_FIND_BY_NAME_PKG_TYPE_ID);
+ query.setParameter("name", packageName);
+ query.setParameter("packageTypeId", packageType.getId());
- Package p = (Package) query.getSingleResult();
- entityManager.remove(p);
- }
+ Package p = (Package) query.getSingleResult();
+ entityManager.remove(p);
+ }
- // Delete the package type
- packageType = entityManager.find(PackageType.class, packageType.getId());
- entityManager.remove(packageType);
+ // Delete the package type
+ packageType = entityManager.find(PackageType.class, packageType.getId());
+ entityManager.remove(packageType);
- resourceType = entityManager.find(ResourceType.class, resourceType.getId());
- entityManager.remove(resourceType);
+ resourceType = entityManager.find(ResourceType.class, resourceType.getId());
+ entityManager.remove(resourceType);
- // Delete the content source type
- contentSourceType = entityManager.find(ContentSourceType.class, contentSourceType.getId());
- entityManager.remove(contentSourceType);
+ // Delete the content source type
+ contentSourceType = entityManager.find(ContentSourceType.class, contentSourceType.getId());
+ entityManager.remove(contentSourceType);
- tx.commit();
+ tx.commit();
- // Cleanup providers between tests
- contentProvider1.reset();
- contentProvider2.reset();
+ // Cleanup providers between tests
+ contentProvider1.reset();
+ contentProvider2.reset();
- // Plugin service teardown
- unprepareServerPluginService();
- unprepareScheduler();
+ } finally {
+ // Plugin service teardown
+ unprepareServerPluginService();
+ unprepareScheduler();
+ }
}
@Test(enabled = TESTS_ENABLED)
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java
index c4cfca5..78d23e8 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java
@@ -25,8 +25,9 @@ import java.util.Properties;
import javax.persistence.Query;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.common.SystemConfiguration;
@@ -65,6 +66,7 @@ import org.rhq.test.TransactionCallback;
* @author loleary
*
*/
+@SuppressWarnings("deprecation")
public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
/**
@@ -95,7 +97,7 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
private LdapGroupManagerLocal ldapGroupManager = null;
private SystemManagerLocal systemManager = null;
private TestServerPluginService testServerPluginService = null;
-
+
// private Subject overlord = null;
@BeforeClass
@@ -104,12 +106,15 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
// overlord = LookupUtil.getSubjectManager().getOverlord();
systemManager = LookupUtil.getSystemManager();
ldapGroupManager = LookupUtil.getLdapGroupManager();
+ }
+ @BeforeMethod
+ public void beforeMethod() throws Exception {
//we need this because the drift plugins are referenced from the system settings that we use in our tests
testServerPluginService = new TestServerPluginService();
prepareCustomServerPluginService(testServerPluginService);
testServerPluginService.startMasterPluginContainer();
-
+
// get our Maven properties for LDAP testing
java.net.URL url = LdapGroupManagerBeanTest.class.getClassLoader().getResource("test-ldap.properties");
Properties mvnProps = new Properties();
@@ -146,12 +151,11 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
this.setLdapGroupMemberAttribute("member");
}
- @AfterClass
- public void tearDown() throws Exception {
+ @AfterMethod(alwaysRun = true)
+ public void afterMethod() throws Exception {
unprepareServerPluginService();
- testServerPluginService.stopMasterPluginContainer();
}
-
+
/**
* Test {@link LdapGroupManagerBean#findAvailableGroupsFor(String)} method
* using a user who does not exist in the test LDAP instance.
@@ -485,21 +489,21 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
private void setLdapCtxFactory(final String name) throws Exception {
//this is a readonly system property that we are trying to override, so we
//need to be a little bit more persuasive...
- executeInTransaction(new TransactionCallback() {
+ executeInTransaction(new TransactionCallback() {
@Override
public void execute() throws Exception {
Query q = getEntityManager().createNamedQuery(SystemConfiguration.FIND_PROPERTY_BY_KEY);
q.setParameter("key", SystemSetting.LDAP_NAMING_FACTORY.getInternalName());
-
+
SystemConfiguration config = (SystemConfiguration) q.getSingleResult();
config.setPropertyValue(name);
-
+
getEntityManager().merge(config);
-
+
getEntityManager().flush();
}
});
-
+
//reload the system settings cache so that the new value is reflected there immediately
systemManager.loadSystemConfigurationCache();
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
index 07d320e..712606d 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
@@ -1,7 +1,7 @@
package org.rhq.enterprise.server.resource.metadata;
-import java.util.Arrays;
-import java.util.Collections;
+import static java.util.Arrays.asList;
+import static java.util.Collections.EMPTY_LIST;
import org.testng.annotations.Test;
@@ -10,62 +10,43 @@ import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.content.PackageType;
import org.rhq.core.domain.resource.ResourceType;
-import static java.util.Arrays.asList;
-import static java.util.Collections.EMPTY_LIST;
-
public class ContentMetadataManagerBeanTest extends MetadataBeanTest {
- @Test(groups = {"plugin.metadata", "Content.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.NewPlugin" })
public void registerContentPlugin() throws Exception {
createPlugin("content-test-plugin", "1.0", "plugin_v1.xml");
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnGroups = {"Content.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnGroups = { "Content.NewPlugin" })
public void upgradeContentPlugin() throws Exception {
createPlugin("content-test-plugin", "2.0", "plugin_v2.xml");
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void addPackageTypes() throws Exception {
- assertResourceTypeAssociationEquals(
- "ContentServer1",
- "ContentMetadataManagerBeanTestPlugin",
- "packageTypes",
- asList("ContentServer1.Content.1", "ContentServer1.Content.2")
- );
- }
-
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ assertResourceTypeAssociationEquals("ContentServer1", "ContentMetadataManagerBeanTestPlugin", "packageTypes",
+ asList("ContentServer1.Content.1", "ContentServer1.Content.2"));
+ }
+
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void deletePackageTypes() throws Exception {
- assertResourceTypeAssociationEquals(
- "ContentServer2",
- "ContentMetadataManagerBeanTestPlugin",
- "packageTypes",
- EMPTY_LIST
- );
+ assertResourceTypeAssociationEquals("ContentServer2", "ContentMetadataManagerBeanTestPlugin", "packageTypes",
+ EMPTY_LIST);
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void deletePackageTypesThatExistsInOldResourceTypeButNotInNewResourceType() throws Exception {
- assertResourceTypeAssociationEquals(
- "ContentServer3",
- "ContentMetadataManagerBeanTestPlugin",
- "packageTypes",
- asList("ContentServer3.Content.2", "ContentServer3.Content.3")
- );
+ assertResourceTypeAssociationEquals("ContentServer3", "ContentMetadataManagerBeanTestPlugin", "packageTypes",
+ asList("ContentServer3.Content.2", "ContentServer3.Content.3"));
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void addPackageThatAreAddedInNewResourceType() throws Exception {
- assertResourceTypeAssociationEquals(
- "ContentServer4",
- "ContentMetadataManagerBeanTestPlugin",
- "packageTypes",
- asList("ContentServer4.Content.1", "ContentServer4.Content.2")
- );
+ assertResourceTypeAssociationEquals("ContentServer4", "ContentMetadataManagerBeanTestPlugin", "packageTypes",
+ asList("ContentServer4.Content.1", "ContentServer4.Content.2"));
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void addNewDeploymentConfigurationDefinition() throws Exception {
PackageType packageType = loadPackageType("ContentServer", "ContentMetadataManagerBeanTestPlugin",
"ContentServer.Content.1");
@@ -74,67 +55,49 @@ public class ContentMetadataManagerBeanTest extends MetadataBeanTest {
assertNotNull(
"Failed to create new deployment configuration definition for package type that previously did not have one",
- deploymentConfigDef
- );
- assertEquals(
- "Expected to find 1 property definition in new deployment configuration definition",
- 1,
- deploymentConfigDef.getPropertyDefinitions().size()
- );
- assertNotNull(
- "Expected to find 1 property definition, <version>, in new deployment configuration definition",
- deploymentConfigDef.get("version")
- );
+ deploymentConfigDef);
+ assertEquals("Expected to find 1 property definition in new deployment configuration definition", 1,
+ deploymentConfigDef.getPropertyDefinitions().size());
+ assertNotNull("Expected to find 1 property definition, <version>, in new deployment configuration definition",
+ deploymentConfigDef.get("version"));
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void updateDeploymentConfigDefThatExistsInOldAndNewResourceType() throws Exception {
PackageType packageType = loadPackageType("ContentServer5", "ContentMetadataManagerBeanTestPlugin",
"ContentServer5.Content.1");
ConfigurationDefinition deploymentConfigDef = packageType.getDeploymentConfigurationDefinition();
assertNotNull("Failed to update deployment configuration definition for package type", deploymentConfigDef);
- assertEquals(
- "Expected to find 2 property definitions in updated deployment configuration definition",
- 2,
- deploymentConfigDef.getPropertyDefinitions().size()
- );
- assertNotNull(
- "Expected existing property definition to be retained across update",
- deploymentConfigDef.get("x")
- );
- assertNotNull(
- "Expected new property definition to be added during update",
- deploymentConfigDef.get("y")
- );
- }
+ assertEquals("Expected to find 2 property definitions in updated deployment configuration definition", 2,
+ deploymentConfigDef.getPropertyDefinitions().size());
+ assertNotNull("Expected existing property definition to be retained across update",
+ deploymentConfigDef.get("x"));
+ assertNotNull("Expected new property definition to be added during update", deploymentConfigDef.get("y"));
+ }
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void deleteDeploymentConfigDefThatIsRemovedInNewResourceType() {
PackageType packageType = loadPackageType("ContentServer5", "ContentMetadataManagerBeanTestPlugin",
"ContentServer5.Content.2");
assertNull(
"Expected deployment configuration definition to be removed since it was removed from new resource type",
- packageType.getDeploymentConfigurationDefinition()
- );
+ packageType.getDeploymentConfigurationDefinition());
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void updateBundleType() {
ResourceType resourceType = loadResourceTypeWithBundleType("ContentServer7",
"ContentMetadataManagerBeanTestPlugin");
BundleType bundleType = resourceType.getBundleType();
assertNotNull("Failed to upgrade bundle type", bundleType);
- assertEquals(
- "Failed to upgrade bundle type correctly. The bundle type name is wrong",
- "ContentServer.Bundle.2",
- bundleType.getName()
- );
+ assertEquals("Failed to upgrade bundle type correctly. The bundle type name is wrong",
+ "ContentServer.Bundle.2", bundleType.getName());
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void addBundleTypeThatOnlyExistsInNewResourceType() {
ResourceType resourceType = loadResourceTypeWithBundleType("ContentServer6",
"ContentMetadataManagerBeanTestPlugin");
@@ -146,23 +109,19 @@ public class ContentMetadataManagerBeanTest extends MetadataBeanTest {
}
PackageType loadPackageType(String resourceType, String plugin, String packageType) {
- return (PackageType) getEntityManager().createQuery(
- "from PackageType p left join fetch p.deploymentConfigurationDefinition " +
- "where p.name = :packageType and " +
- "p.resourceType.name = :resourceType and " +
- "p.resourceType.plugin = :plugin")
- .setParameter("packageType", packageType)
- .setParameter("plugin", plugin)
- .setParameter("resourceType", resourceType)
- .getSingleResult();
+ return (PackageType) getEntityManager()
+ .createQuery(
+ "from PackageType p left join fetch p.deploymentConfigurationDefinition "
+ + "where p.name = :packageType and " + "p.resourceType.name = :resourceType and "
+ + "p.resourceType.plugin = :plugin").setParameter("packageType", packageType)
+ .setParameter("plugin", plugin).setParameter("resourceType", resourceType).getSingleResult();
}
ResourceType loadResourceTypeWithBundleType(String resourceType, String plugin) {
- return (ResourceType) getEntityManager().createQuery(
- "from ResourceType t left join fetch t.bundleType where t.name = :resourceType and t.plugin = :plugin")
- .setParameter("resourceType", resourceType)
- .setParameter("plugin", plugin)
- .getSingleResult();
- }
+ return (ResourceType) getEntityManager()
+ .createQuery(
+ "from ResourceType t left join fetch t.bundleType where t.name = :resourceType and t.plugin = :plugin")
+ .setParameter("resourceType", resourceType).setParameter("plugin", plugin).getSingleResult();
+ }
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
index a8bb5e4..99e1e22 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
@@ -1,33 +1,26 @@
package org.rhq.enterprise.server.resource.metadata;
-import java.util.Arrays;
-import java.util.Collections;
+import static java.util.Arrays.asList;
+import static java.util.Collections.EMPTY_LIST;
import org.testng.annotations.Test;
import org.rhq.core.domain.event.EventDefinition;
-import static java.util.Arrays.asList;
-import static java.util.Collections.EMPTY_LIST;
-
public class EventMetadataManagerBeanTest extends MetadataBeanTest {
- @Test(groups = {"plugin.metadata", "Events.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.NewPlugin" })
public void registerEventsPlugin() throws Exception {
createPlugin("event-test-plugin", "1.0", "plugin_v1.xml");
}
- @Test(groups = {"plugin.metadata", "Events.NewPlugin"}, dependsOnMethods = {"registerEventsPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.NewPlugin" }, dependsOnMethods = { "registerEventsPlugin" })
public void persistNewEventDefs() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer1",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- asList("event1", "event2")
- );
+ assertResourceTypeAssociationEquals("EventServer1", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ asList("event1", "event2"));
}
- @Test(groups = {"plugin.metadata", "Events.NewPlugin"}, dependsOnMethods = {"persistNewEventDefs"})
+ @Test(groups = { "plugin.metadata", "Events.NewPlugin" }, dependsOnMethods = { "persistNewEventDefs" })
public void persistNewEventDefProperties() {
EventDefinition eventDef = loadEventDef("event1", "EventServer1");
@@ -35,60 +28,42 @@ public class EventMetadataManagerBeanTest extends MetadataBeanTest {
assertEquals("Failed to set EventDefinition.description", "Event 1", eventDef.getDescription());
}
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnGroups = {"Events.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnGroups = { "Events.NewPlugin" })
public void upgradeEventsPlugin() throws Exception {
createPlugin("event-test-plugin", "2.0", "plugin_v2.xml");
}
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnMethods = {"upgradeEventsPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnMethods = { "upgradeEventsPlugin" })
public void retainEventDefsOfTypeThatIsNotChangedDuringUpgrade() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer1",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- asList("event1", "event2")
- );
+ assertResourceTypeAssociationEquals("EventServer1", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ asList("event1", "event2"));
}
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnMethods = {"upgradeEventsPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnMethods = { "upgradeEventsPlugin" })
public void addNewEventDefs() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer2",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- asList("event1", "event2")
- );
+ assertResourceTypeAssociationEquals("EventServer2", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ asList("event1", "event2"));
}
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnMethods = {"upgradeEventsPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnMethods = { "upgradeEventsPlugin" })
public void deleteEventDefsThatHaveBeenRemovedInUpgradedType() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer3",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- EMPTY_LIST
- );
- }
-
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnMethods = {"upgradeEventsPlugin"})
+ assertResourceTypeAssociationEquals("EventServer3", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ EMPTY_LIST);
+ }
+
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnMethods = { "upgradeEventsPlugin" })
public void updateExistingEventDefs() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer4",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- asList("event1", "event3")
- );
+ assertResourceTypeAssociationEquals("EventServer4", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ asList("event1", "event3"));
EventDefinition eventDef = loadEventDef("event1", "EventServer4");
assertEquals("The description property should have been updated", "EVENT ONE", eventDef.getDescription());
}
EventDefinition loadEventDef(String name, String resourceType) {
- return (EventDefinition) getEntityManager().createQuery(
- "from EventDefinition e where e.name = :name and e.resourceType.name = :resourceType")
- .setParameter("name", name)
- .setParameter("resourceType", resourceType)
- .getSingleResult();
+ return (EventDefinition) getEntityManager()
+ .createQuery("from EventDefinition e where e.name = :name and e.resourceType.name = :resourceType")
+ .setParameter("name", name).setParameter("resourceType", resourceType).getSingleResult();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
index 7ffacbf..fac9251 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
@@ -1,5 +1,7 @@
package org.rhq.enterprise.server.resource.metadata;
+import static org.rhq.core.clientapi.shared.PluginDescriptorUtil.loadPluginDescriptor;
+
import java.io.File;
import java.net.URL;
import java.sql.Connection;
@@ -23,7 +25,9 @@ import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.dataset.xml.FlatXmlProducer;
import org.dbunit.operation.DatabaseOperation;
import org.testng.annotations.AfterGroups;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.BeforeMethod;
import org.xml.sax.InputSource;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
@@ -37,8 +41,6 @@ import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
-import static org.rhq.core.clientapi.shared.PluginDescriptorUtil.loadPluginDescriptor;
-
public class MetadataBeanTest extends AbstractEJB3Test {
private static List<String> plugins = new ArrayList<String>();
@@ -49,9 +51,25 @@ public class MetadataBeanTest extends AbstractEJB3Test {
}
@BeforeGroups(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
- public void startMBeanServer() throws Exception {
+ public void beforeGroups() throws Exception {
setupDB();
+ }
+ /**
+ * Need to delete rows from RHQ_PLUGINS because subsequent tests in server/jar would otherwise fail. Some tests look
+ * at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
+ * however removes the generated plugin files during each test run.
+ */
+ @AfterGroups(alwaysRun = true, groups = { "plugin.metadata" })
+ void afterGroups() throws Exception {
+ getTransactionManager().begin();
+ getEntityManager().createQuery("delete from Plugin p where p.name in (:plugins)")
+ .setParameter("plugins", plugins).executeUpdate();
+ getTransactionManager().commit();
+ }
+
+ @BeforeMethod(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
+ public void beforeMethod() throws Exception {
TestBundleServerPluginService bundleService = new TestBundleServerPluginService();
prepareCustomServerPluginService(bundleService);
bundleService.startMasterPluginContainerWithoutSchedulingJobs();
@@ -63,14 +81,10 @@ public class MetadataBeanTest extends AbstractEJB3Test {
* at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
* however removes the generated plugin files during each test run.
*/
- @AfterGroups(groups = { "plugin.metadata" })
- void removePluginsFromDB() throws Exception {
+ @AfterMethod(alwaysRun = true, groups = { "plugin.metadata" })
+ void afterMethod() throws Exception {
+ unprepareServerPluginService();
unprepareScheduler();
-
- getTransactionManager().begin();
- getEntityManager().createQuery("delete from Plugin p where p.name in (:plugins)").setParameter("plugins",
- plugins).executeUpdate();
- getTransactionManager().commit();
}
protected void setupDB() throws Exception {
@@ -145,6 +159,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
return getClass().getResource(dir + "/" + descriptor);
}
+ @SuppressWarnings("unused")
private String getPluginWorkDir() throws Exception {
return getCurrentWorkingDir() + "/work";
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index 535fd06..f381318 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -37,7 +37,7 @@ import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService;
@@ -77,8 +77,18 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected static ResourceTypeManagerLocal resourceTypeManager;
protected static ResourceManagerLocal resourceManager;
+ @AfterClass
+ public void afterClass() throws Exception {
+ cleanupTest();
+ }
+
@BeforeMethod
protected void init() {
+ agentServiceContainer = prepareForTestAgents();
+ prepareMockAgentServiceContainer();
+
+ prepareScheduler();
+
try {
pluginMgr = LookupUtil.getPluginManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
@@ -91,25 +101,16 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
}
}
- @BeforeClass
- public void beforeClass() {
- agentServiceContainer = prepareForTestAgents();
- prepareMockAgentServiceContainer();
-
- prepareScheduler();
+ @AfterMethod(alwaysRun = true)
+ public void afterMethod() throws Exception {
+ unprepareForTestAgents();
+ unprepareScheduler();
}
protected void prepareMockAgentServiceContainer() {
agentServiceContainer.measurementService = new MockMeasurementAgentService();
}
- @AfterClass
- public void afterClass() throws Exception {
- unprepareForTestAgents();
- unprepareScheduler();
- cleanupTest();
- }
-
protected ResourceType getResourceType(String typeName) {
return getResourceType(typeName, PLUGIN_NAME);
}
@@ -225,8 +226,8 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected int getPluginId(EntityManager entityManager) throws NoResultException {
Plugin existingPlugin;
try {
- existingPlugin = (Plugin) entityManager.createNamedQuery(Plugin.QUERY_FIND_BY_NAME).setParameter("name",
- PLUGIN_NAME).getSingleResult();
+ existingPlugin = (Plugin) entityManager.createNamedQuery(Plugin.QUERY_FIND_BY_NAME)
+ .setParameter("name", PLUGIN_NAME).getSingleResult();
int plugin1Id = existingPlugin.getId();
return plugin1Id;
} catch (NoResultException nre) {
@@ -247,8 +248,8 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected Agent getAgent(EntityManager entityManager) throws NoResultException {
Agent existingAgent;
try {
- existingAgent = (Agent) entityManager.createNamedQuery(Agent.QUERY_FIND_BY_NAME).setParameter("name",
- AGENT_NAME).getSingleResult();
+ existingAgent = (Agent) entityManager.createNamedQuery(Agent.QUERY_FIND_BY_NAME)
+ .setParameter("name", AGENT_NAME).getSingleResult();
return existingAgent;
} catch (NoResultException nre) {
throw nre;
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java
index f38c1a4..fdb6607 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java
@@ -26,9 +26,6 @@ import java.util.Set;
import javax.persistence.EntityManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -68,8 +65,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test {
// Attributes --------------------------------------------
- private final Log log = LogFactory.getLog(ResourceFactoryManagerBeanTest.class);
-
private ResourceFactoryManagerLocal resourceFactoryManager;
private ResourceManagerLocal resourceManager;
private Subject overlord;
@@ -89,7 +84,10 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test {
resourceFactoryManager = LookupUtil.getResourceFactoryManager();
resourceManager = LookupUtil.getResourceManager();
overlord = LookupUtil.getSubjectManager().getOverlord();
+ }
+ @BeforeMethod
+ public void setupBeforeMethod() throws Exception {
prepareScheduler();
TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
agentServiceContainer.resourceFactoryService = mockAgentService;
@@ -98,22 +96,16 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test {
StandardServerPluginService serverPluginService = new StandardServerPluginService();
prepareCustomServerPluginService(serverPluginService);
serverPluginService.startMasterPluginContainer();
+
+ setupResourceEnvironment();
}
- @AfterClass
- public void teardownAfterClass() throws Exception {
+ @AfterMethod(alwaysRun = true)
+ public void teardownAfterMethod() throws Exception {
unprepareForTestAgents();
unprepareScheduler();
unprepareServerPluginService();
- }
- @BeforeMethod
- public void setupBeforeMethod() throws Exception {
- setupResourceEnvironment();
- }
-
- @AfterMethod
- public void teardownAfterMethod() throws Exception {
teardownResourceEnvironment();
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
index e3f52f5..7506aaa 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
@@ -36,9 +36,7 @@ import javax.transaction.SystemException;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.quartz.JobListener;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -94,27 +92,19 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class DataPurgeJobTest extends AbstractEJB3Test {
private Resource newResource;
+ @SuppressWarnings("unused")
private int agentId;
private int resourceTypeId;
private TestServerPluginService testServerPluginService;
-
- @BeforeClass
- public void setup() {
- //we need this because the drift plugins are referenced from the system settings that we use in our tests
- testServerPluginService = new TestServerPluginService();
- prepareCustomServerPluginService(testServerPluginService);
- testServerPluginService.startMasterPluginContainer();
- }
- @AfterClass
- public void tearDown() throws Exception {
- unprepareServerPluginService();
- testServerPluginService.stopMasterPluginContainer();
- }
-
@BeforeMethod
public void beforeMethod() throws Throwable {
try {
+ //we need this because the drift plugins are referenced from the system settings that we use in our tests
+ testServerPluginService = new TestServerPluginService();
+ prepareCustomServerPluginService(testServerPluginService);
+ testServerPluginService.startMasterPluginContainer();
+
prepareScheduler();
TestServerCommunicationsService agentContainer = prepareForTestAgents();
newResource = createNewResource();
@@ -125,12 +115,13 @@ public class DataPurgeJobTest extends AbstractEJB3Test {
}
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void afterMethod() throws Throwable {
try {
deleteNewResource(newResource);
unprepareForTestAgents();
unprepareScheduler();
+ unprepareServerPluginService();
} catch (Throwable t) {
System.err.println("Cannot unprepare test: " + t);
t.printStackTrace();
@@ -369,8 +360,8 @@ public class DataPurgeJobTest extends AbstractEJB3Test {
}
mgr.addTraitData(dataset);
- List<MeasurementDataTrait> persistedTraits = mgr.findTraits(LookupUtil.getSubjectManager().getOverlord(), res
- .getId(), traitSchedule.getDefinition().getId());
+ List<MeasurementDataTrait> persistedTraits = mgr.findTraits(LookupUtil.getSubjectManager().getOverlord(),
+ res.getId(), traitSchedule.getDefinition().getId());
assert persistedTraits.size() == count : "did not persist trait data:" + persistedTraits.size() + ":"
+ persistedTraits;
}
@@ -424,9 +415,9 @@ public class DataPurgeJobTest extends AbstractEJB3Test {
mgr.addEventData(eventMap);
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
- PageList<EventComposite> persistedEvents = mgr.findEventComposites(overlord, EntityContext.forResource(res
- .getId()), timestamp - 1L, timestamp + count + 1L, new EventSeverity[] { EventSeverity.DEBUG }, null, null,
- new PageControl());
+ PageList<EventComposite> persistedEvents = mgr.findEventComposites(overlord,
+ EntityContext.forResource(res.getId()), timestamp - 1L, timestamp + count + 1L,
+ new EventSeverity[] { EventSeverity.DEBUG }, null, null, new PageControl());
assert persistedEvents.getTotalSize() == count : "did not persist all events, only persisted: "
+ persistedEvents.getTotalSize();
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java
index 41f9a56..1f5d0b9 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java
@@ -132,12 +132,12 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public static boolean importerConfigured;
public static boolean importValidatorsObtainedAfterConfiguration;
-
+
public static void reset() {
importerConfigured = false;
importValidatorsObtainedAfterConfiguration = false;
}
-
+
@Override
public void initialize(Subject subject, EntityManager entityManager) {
}
@@ -150,13 +150,13 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public ExportingIterator<String> getExportingIterator() {
return new ExportingIterator<String>() {
boolean ran = false;
-
+
@Override
public boolean hasNext() {
if (ran) {
return false;
}
-
+
ran = true;
return true;
}
@@ -181,7 +181,7 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public String getNotes() {
return null;
}
-
+
};
}
@@ -189,7 +189,7 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public String getNotes() {
return null;
}
-
+
};
}
@@ -215,20 +215,20 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
@Override
public Set<EntityValidator<String>> getEntityValidators() {
EntityValidator<String> v = new EntityValidator<String>() {
-
+
@Override
public void validateExportedEntity(String entity) throws ValidationException {
}
-
+
@Override
public void initialize(Subject subject, EntityManager entityManager) {
}
};
-
+
if (importerConfigured) {
importValidatorsObtainedAfterConfiguration = true;
}
-
+
return Collections.singleton(v);
}
@@ -245,7 +245,7 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public String finishImport() throws Exception {
return null;
}
-
+
};
}
@@ -253,9 +253,9 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public Set<ConsistencyValidator> getRequiredValidators() {
return Collections.emptySet();
}
-
+
}
-
+
private TestData testData;
//I just don't get why this can't be a @BeforeTest
@@ -270,9 +270,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
//add our new metric template that we are going to perform the tests with
testData.fakeType = new ResourceType(RESOURCE_TYPE_NAME, PLUGIN_NAME, ResourceCategory.PLATFORM, null);
- MeasurementDefinition mdef =
- new MeasurementDefinition(METRIC_NAME, MeasurementCategory.PERFORMANCE, MeasurementUnits.NONE,
- DataType.MEASUREMENT, true, 600000, DisplayType.SUMMARY);
+ MeasurementDefinition mdef = new MeasurementDefinition(METRIC_NAME, MeasurementCategory.PERFORMANCE,
+ MeasurementUnits.NONE, DataType.MEASUREMENT, true, 600000, DisplayType.SUMMARY);
testData.fakeType.addMetricDefinition(mdef);
em.persist(testData.fakeType);
@@ -310,43 +309,46 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
systemManager.loadSystemConfigurationCache();
testData.systemSettings = systemManager.getSystemConfiguration(freshUser());
-
+
if (createExport) {
export = synchronizationManager.exportAllSubsystems(freshUser());
}
}
private void tearDown() throws Exception {
- getTransactionManager().begin();
try {
- LookupUtil.getSystemManager().setSystemConfiguration(freshUser(), testData.systemSettings, true);
-
- EntityManager em = getEntityManager();
+ getTransactionManager().begin();
+ try {
+ LookupUtil.getSystemManager().setSystemConfiguration(freshUser(), testData.systemSettings, true);
- MeasurementSchedule sched =
- em.find(MeasurementSchedule.class, testData.fakePlatform.getSchedules().iterator().next().getId());
- em.remove(sched);
+ EntityManager em = getEntityManager();
- Resource attachedPlatform = em.find(Resource.class, testData.fakePlatform.getId());
- em.remove(attachedPlatform);
+ MeasurementSchedule sched = em.find(MeasurementSchedule.class, testData.fakePlatform.getSchedules()
+ .iterator().next().getId());
+ em.remove(sched);
- ResourceType attachedType = em.find(ResourceType.class, testData.fakeType.getId());
- em.remove(attachedType);
+ Resource attachedPlatform = em.find(Resource.class, testData.fakePlatform.getId());
+ em.remove(attachedPlatform);
- em.flush();
+ ResourceType attachedType = em.find(ResourceType.class, testData.fakeType.getId());
+ em.remove(attachedType);
- getTransactionManager().commit();
- } catch (Exception e) {
- getTransactionManager().rollback();
- throw e;
- }
+ em.flush();
- unprepareServerPluginService();
- testData.testServerPluginService.stopMasterPluginContainer();
+ getTransactionManager().commit();
+ } catch (Exception e) {
+ getTransactionManager().rollback();
+ throw e;
+ }
+ } finally {
+ unprepareServerPluginService();
+ //unnecessary, done by above method
+ //testData.testServerPluginService.stopMasterPluginContainer();
- export = null;
- testData = null;
- synchronizationManager = null;
+ export = null;
+ testData = null;
+ synchronizationManager = null;
+ }
}
public void testExport() throws Exception {
@@ -364,16 +366,16 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
try {
SystemManagerLocal systemManager = LookupUtil.getSystemManager();
- MeasurementDefinitionManagerLocal measurementDefinitionManager =
- LookupUtil.getMeasurementDefinitionManager();
+ MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
+ .getMeasurementDefinitionManager();
Properties beforeSystemSettings = systemManager.getSystemConfiguration(freshUser());
MeasurementDefinitionCriteria criteria = new MeasurementDefinitionCriteria();
criteria.setPageControl(PageControl.getUnlimitedInstance());
criteria.fetchResourceType(true);
- List<MeasurementDefinition> beforeMeasurementDefinitions =
- measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), criteria);
+ List<MeasurementDefinition> beforeMeasurementDefinitions = measurementDefinitionManager
+ .findMeasurementDefinitionsByCriteria(freshUser(), criteria);
synchronizationManager.importAllSubsystems(freshUser(), export.getExportFile(), null);
@@ -381,16 +383,16 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
systemManager.loadSystemConfigurationCache();
Properties afterSystemSettings = systemManager.getSystemConfiguration(freshUser());
- List<MeasurementDefinition> afterMeasurementDefinitions =
- measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), criteria);
+ List<MeasurementDefinition> afterMeasurementDefinitions = measurementDefinitionManager
+ .findMeasurementDefinitionsByCriteria(freshUser(), criteria);
assertEquals("System settings unexpectedly differ", beforeSystemSettings, afterSystemSettings);
//make sure we don't fail on simple order differences, which are not important here..
- Set<MeasurementDefinition> beforeDefsToCheck =
- new HashSet<MeasurementDefinition>(beforeMeasurementDefinitions);
- Set<MeasurementDefinition> afterDefsToCheck =
- new HashSet<MeasurementDefinition>(afterMeasurementDefinitions);
+ Set<MeasurementDefinition> beforeDefsToCheck = new HashSet<MeasurementDefinition>(
+ beforeMeasurementDefinitions);
+ Set<MeasurementDefinition> afterDefsToCheck = new HashSet<MeasurementDefinition>(
+ afterMeasurementDefinitions);
assertEquals("Measurement definitions unexpectedly differ", beforeDefsToCheck, afterDefsToCheck);
} finally {
tearDown();
@@ -420,13 +422,13 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
assertEquals(settings.getProperty("CAM_BASE_URL"), "http://testing.domain:7080");
- MeasurementDefinitionManagerLocal measurementDefinitionManager =
- LookupUtil.getMeasurementDefinitionManager();
+ MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
+ .getMeasurementDefinitionManager();
MeasurementDefinitionCriteria crit = new MeasurementDefinitionCriteria();
crit.addFilterResourceTypeName(RESOURCE_TYPE_NAME);
crit.addFilterName(METRIC_NAME);
- MeasurementDefinition mdef =
- measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), crit).get(0);
+ MeasurementDefinition mdef = measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(),
+ crit).get(0);
assertEquals("The " + METRIC_NAME + " metric should have been updated with default interval of 30s",
Long.valueOf(30000), new Long(mdef.getDefaultInterval()));
@@ -445,9 +447,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
//now find the schedule for the measurement
MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager();
- List<MeasurementSchedule> schedules =
- measurementScheduleManager.findSchedulesByResourceIdAndDefinitionIds(freshUser(), platformResourceId,
- new int[] { mdef.getId() });
+ List<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByResourceIdAndDefinitionIds(
+ freshUser(), platformResourceId, new int[] { mdef.getId() });
assertEquals("Unexpected number of '" + METRIC_NAME + "' schedules found.", 1, schedules.size());
@@ -469,13 +470,13 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
String originalBaseUrl = settings.getProperty("CAM_BASE_URL");
- MeasurementDefinitionManagerLocal measurementDefinitionManager =
- LookupUtil.getMeasurementDefinitionManager();
+ MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
+ .getMeasurementDefinitionManager();
MeasurementDefinitionCriteria crit = new MeasurementDefinitionCriteria();
crit.addFilterResourceTypeName(RESOURCE_TYPE_NAME);
crit.addFilterName(METRIC_NAME);
- MeasurementDefinition distroNameDef =
- measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), crit).get(0);
+ MeasurementDefinition distroNameDef = measurementDefinitionManager.findMeasurementDefinitionsByCriteria(
+ freshUser(), crit).get(0);
long originalInterval = distroNameDef.getDefaultInterval();
@@ -489,12 +490,12 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
//let's just use the default configs so that we don't apply the changes suggested in
//the changed default configs created above
- ImportConfiguration systemSettingsConfiguration =
- new ImportConfiguration(SystemSettingsSynchronizer.class.getName(), new SystemSettingsSynchronizer()
- .getImporter().getImportConfigurationDefinition().getDefaultTemplate().createConfiguration());
- ImportConfiguration metricTemplatesConfiguration =
- new ImportConfiguration(MetricTemplateSynchronizer.class.getName(), new MetricTemplateSynchronizer()
- .getImporter().getImportConfigurationDefinition().getDefaultTemplate().createConfiguration());
+ ImportConfiguration systemSettingsConfiguration = new ImportConfiguration(
+ SystemSettingsSynchronizer.class.getName(), new SystemSettingsSynchronizer().getImporter()
+ .getImportConfigurationDefinition().getDefaultTemplate().createConfiguration());
+ ImportConfiguration metricTemplatesConfiguration = new ImportConfiguration(
+ MetricTemplateSynchronizer.class.getName(), new MetricTemplateSynchronizer().getImporter()
+ .getImportConfigurationDefinition().getDefaultTemplate().createConfiguration());
try {
synchronizationManager.importAllSubsystems(freshUser(), exportData,
@@ -529,9 +530,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
//now find the schedule for the measurement
MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager();
- List<MeasurementSchedule> schedules =
- measurementScheduleManager.findSchedulesByResourceIdAndDefinitionIds(freshUser(), platformResourceId,
- new int[] { distroNameDef.getId() });
+ List<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByResourceIdAndDefinitionIds(
+ freshUser(), platformResourceId, new int[] { distroNameDef.getId() });
assertEquals("Unexpected number of '" + METRIC_NAME + "' schedules found.", 1, schedules.size());
@@ -549,43 +549,42 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
try {
String export = getExportData();
- Document xml =
- DocumentBuilderFactory.newInstance().newDocumentBuilder()
- .parse(new InputSource(new StringReader(export)));
-
+ Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+ .parse(new InputSource(new StringReader(export)));
+
Element unknownValidator = xml.createElement("validator");
unknownValidator.setAttribute(SynchronizationConstants.CLASS_ATTRIBUTE, "org.nothing.UnknownValidator");
-
+
xml.getDocumentElement().insertBefore(unknownValidator, xml.getDocumentElement().getFirstChild());
-
+
export = documentToString(xml);
-
+
InputStream exportStream = createCompressedStream(export);
-
+
synchronizationManager.importAllSubsystems(freshUser(), exportStream, null);
} finally {
tearDown();
}
}
- public void testImporterConfiguredBeforeValidatorsObtained() throws Exception {
+ public void testImporterConfiguredBeforeValidatorsObtained() throws Exception {
setup(false);
-
+
try {
ImportConfigurationCheckingSynchronizer.reset();
-
+
synchronizationManager.setSynchronizerFactory(new SynchronizerFactory() {
@Override
public Set<Synchronizer<?, ?>> getAllSynchronizers() {
- return Collections.<Synchronizer<?, ?>>singleton(new ImportConfigurationCheckingSynchronizer());
+ return Collections.<Synchronizer<?, ?>> singleton(new ImportConfigurationCheckingSynchronizer());
}
});
-
+
export = synchronizationManager.exportAllSubsystems(freshUser());
-
+
//and import it back again, so that we actually invoke the import validation
synchronizationManager.importAllSubsystems(freshUser(), export.getExportFile(), null);
-
+
assertTrue(ImportConfigurationCheckingSynchronizer.importerConfigured);
assertTrue(ImportConfigurationCheckingSynchronizer.importValidatorsObtainedAfterConfiguration);
} finally {
@@ -596,8 +595,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
}
private String getExportData() throws IOException {
- InputStreamReader str =
- new InputStreamReader(new GZIPInputStream(new ByteArrayInputStream(export.getExportFile())), "UTF-8");
+ InputStreamReader str = new InputStreamReader(new GZIPInputStream(new ByteArrayInputStream(
+ export.getExportFile())), "UTF-8");
try {
char[] buf = new char[32768];
StringBuilder bld = new StringBuilder();
@@ -634,17 +633,14 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
XPath xpath = XPathFactory.newInstance().newXPath();
xpath.setNamespaceContext(SynchronizationConstants.createConfigurationExportNamespaceContext());
- XPathExpression systemSettingsConfigurationPath =
- xpath
- .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.SystemSettingsSynchronizer']/:default-configuration/ci:simple-property[@name='propertiesToImport']");
+ XPathExpression systemSettingsConfigurationPath = xpath
+ .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.SystemSettingsSynchronizer']/:default-configuration/ci:simple-property[@name='propertiesToImport']");
- XPathExpression baseUrlSettingPath =
- xpath
- .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.SystemSettingsSynchronizer']/:entity/:data/systemSettings/entry[@key='CAM_BASE_URL']");
+ XPathExpression baseUrlSettingPath = xpath
+ .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.SystemSettingsSynchronizer']/:entity/:data/systemSettings/entry[@key='CAM_BASE_URL']");
- Element systemSettingsConfiguration =
- (Element) systemSettingsConfigurationPath.evaluate(new InputSource(new StringReader(exportXML)),
- XPathConstants.NODE);
+ Element systemSettingsConfiguration = (Element) systemSettingsConfigurationPath.evaluate(new InputSource(
+ new StringReader(exportXML)), XPathConstants.NODE);
String propsToImport = systemSettingsConfiguration.getAttribute("value");
propsToImport += ", CAM_BASE_URL";
@@ -653,8 +649,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
exportXML = documentToString(systemSettingsConfiguration.getOwnerDocument());
- Element baseUrlSetting =
- (Element) baseUrlSettingPath.evaluate(new InputSource(new StringReader(exportXML)), XPathConstants.NODE);
+ Element baseUrlSetting = (Element) baseUrlSettingPath.evaluate(new InputSource(new StringReader(exportXML)),
+ XPathConstants.NODE);
baseUrlSetting.setTextContent("http://testing.domain:7080");
@@ -665,12 +661,11 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
XPath xpath = XPathFactory.newInstance().newXPath();
xpath.setNamespaceContext(SynchronizationConstants.createConfigurationExportNamespaceContext());
- XPathExpression overridesPath =
- xpath
- .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.MetricTemplateSynchronizer']/:default-configuration/ci:list-property[@name='metricUpdateOverrides']");
+ XPathExpression overridesPath = xpath
+ .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.MetricTemplateSynchronizer']/:default-configuration/ci:list-property[@name='metricUpdateOverrides']");
- Element overrides =
- (Element) overridesPath.evaluate(new InputSource(new StringReader(exportXML)), XPathConstants.NODE);
+ Element overrides = (Element) overridesPath.evaluate(new InputSource(new StringReader(exportXML)),
+ XPathConstants.NODE);
Document doc = overrides.getOwnerDocument();
@@ -691,13 +686,12 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
exportXML = documentToString(doc);
//now redefine the collection interval of the above metric so that we can see the change after the import
- XPathExpression distroNameMetricPath =
- xpath
- .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.MetricTemplateSynchronizer']/:entity/:data/metricTemplate[@metricName='"
- + METRIC_NAME + "']");
+ XPathExpression distroNameMetricPath = xpath
+ .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.MetricTemplateSynchronizer']/:entity/:data/metricTemplate[@metricName='"
+ + METRIC_NAME + "']");
- Element metric =
- (Element) distroNameMetricPath.evaluate(new InputSource(new StringReader(exportXML)), XPathConstants.NODE);
+ Element metric = (Element) distroNameMetricPath.evaluate(new InputSource(new StringReader(exportXML)),
+ XPathConstants.NODE);
doc = metric.getOwnerDocument();
@@ -730,7 +724,7 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
user = subjectManager.getOverlord();
return user;
}
-
+
private InputStream createCompressedStream(String exportData) throws UnsupportedEncodingException, IOException {
ByteArrayOutputStream compressed = new ByteArrayOutputStream();
OutputStreamWriter wrt = new OutputStreamWriter(new GZIPOutputStream(compressed), "UTF-8");
@@ -740,6 +734,6 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
wrt.close();
}
- return new ByteArrayInputStream(compressed.toByteArray());
+ return new ByteArrayInputStream(compressed.toByteArray());
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
index 8d27267..ede29a4 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.server.system;
import java.util.Properties;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -43,24 +43,25 @@ public class SystemManagerBeanTest extends AbstractEJB3Test {
@BeforeClass
public void setupServer() {
systemManager = LookupUtil.getSystemManager();
-
+ }
+
+ @BeforeMethod
+ public void beforeMethod() {
+ // do this each method so it doesn't expire
+ overlord = LookupUtil.getSubjectManager().getOverlord();
+
//we need this because the drift plugins are referenced from the system settings that we use in our tests
testServerPluginService = new TestServerPluginService();
prepareCustomServerPluginService(testServerPluginService);
testServerPluginService.startMasterPluginContainer();
}
- @AfterClass
+ @AfterMethod(alwaysRun = true)
public void tearDownServer() throws Exception {
unprepareServerPluginService();
- testServerPluginService.stopMasterPluginContainer();
- }
-
- @BeforeMethod
- public void beforeMethod() {
- overlord = LookupUtil.getSubjectManager().getOverlord();
}
+ @SuppressWarnings("deprecation")
public void testGetSystemConfiguration() {
assert null != systemManager.getSystemConfiguration(overlord);
}
@@ -88,7 +89,7 @@ public class SystemManagerBeanTest extends AbstractEJB3Test {
public void testVacuumAppdef() {
systemManager.vacuumAppdef(overlord);
}
-
+
@SuppressWarnings("deprecation")
public void testLegacySystemSettingsInCorrectFormat() throws Exception {
//some of the properties are represented differently
@@ -96,45 +97,45 @@ public class SystemManagerBeanTest extends AbstractEJB3Test {
//settings (and consequently database).
//These two still co-exist together in the codebase
//so let's make sure the values correspond to each other.
-
+
SystemSettings settings = systemManager.getSystemSettings(overlord);
Properties config = systemManager.getSystemConfiguration(overlord);
-
+
SystemSettings origSettings = new SystemSettings(settings);
-
+
try {
//let's make sure the values are the same
checkFormats(settings, config);
-
+
boolean currentJaasProvider = Boolean.valueOf(settings.get(SystemSetting.LDAP_BASED_JAAS_PROVIDER));
settings.put(SystemSetting.LDAP_BASED_JAAS_PROVIDER, Boolean.toString(!currentJaasProvider));
-
+
boolean currentUseSslForLdap = Boolean.valueOf(settings.get(SystemSetting.USE_SSL_FOR_LDAP));
settings.put(SystemSetting.USE_SSL_FOR_LDAP, Boolean.toString(!currentUseSslForLdap));
-
+
systemManager.setSystemSettings(overlord, settings);
-
+
settings = systemManager.getSystemSettings(overlord);
config = systemManager.getSystemConfiguration(overlord);
-
+
checkFormats(settings, config);
} finally {
systemManager.setSystemSettings(overlord, origSettings);
}
}
-
- private void checkFormats(SystemSettings settings, Properties config) {
+
+ private void checkFormats(SystemSettings settings, Properties config) {
assert settings.size() == config.size() : "The old and new style system settings differ in size";
-
- for(String name : config.stringPropertyNames()) {
+
+ for (String name : config.stringPropertyNames()) {
SystemSetting setting = SystemSetting.getByInternalName(name);
-
- String oldStyleValue = config.getProperty(name);
+
+ String oldStyleValue = config.getProperty(name);
String newStyleValue = settings.get(setting);
-
+
assert setting != null : "Could not find a system setting called '" + name + "'.";
-
- switch(setting) {
+
+ switch (setting) {
case USE_SSL_FOR_LDAP:
if (RHQConstants.LDAP_PROTOCOL_SECURED.equals(oldStyleValue)) {
assert Boolean.valueOf(newStyleValue) : "Secured LDAP protocol should be represented by a 'true' in new style settings.";
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 45bda40..566bc21 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -72,6 +72,7 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
private static EJB3StandaloneDeployer deployer;
private static Statistics stats;
+ @SuppressWarnings("unused")
private static long start; // see endTest() if you want to output this
private SchedulerService schedulerService;
private ServerPluginService serverPluginService;
@@ -257,6 +258,13 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
return dummyJBossMBeanServer;
}
+ public void releaseJBossMBeanServer() {
+ if (dummyJBossMBeanServer != null) {
+ MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
+ dummyJBossMBeanServer = null;
+ }
+ }
+
/**
* If you need to test round trips from server to agent and back, you first must install the server communications
* service that houses all the agent clients. Call this method and add your test agent services to the public fields
@@ -285,10 +293,18 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
* {@link #prepareForTestAgents()}.
*/
public void unprepareForTestAgents() {
+ unprepareForTestAgents(false);
+ }
+
+ public void unprepareForTestAgents(boolean beanOnly) {
try {
- MBeanServer mbs = getJBossMBeanServer();
- if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
- mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
+ if (beanOnly) {
+ MBeanServer mbs = getJBossMBeanServer();
+ if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
+ mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
+ }
+ } else {
+ releaseJBossMBeanServer();
}
} catch (Exception e) {
throw new RuntimeException(e);
@@ -317,10 +333,25 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
}
public void unprepareServerPluginService() throws Exception {
+ unprepareServerPluginService(false);
+ }
+
+ public void unprepareServerPluginService(boolean beanOnly) throws Exception {
if (serverPluginService != null) {
serverPluginService.stopMasterPluginContainer();
serverPluginService.stop();
- getJBossMBeanServer().unregisterMBean(ServerPluginService.OBJECT_NAME);
+ if (beanOnly) {
+ MBeanServer mbs = getJBossMBeanServer();
+ if (mbs.isRegistered(ServerPluginService.OBJECT_NAME)) {
+ getJBossMBeanServer().unregisterMBean(ServerPluginService.OBJECT_NAME);
+ }
+ if (mbs.isRegistered(ServerPluginServiceManagement.OBJECT_NAME)) {
+ getJBossMBeanServer().unregisterMBean(ServerPluginServiceManagement.OBJECT_NAME);
+ }
+
+ } else {
+ releaseJBossMBeanServer();
+ }
serverPluginService = null;
}
}
@@ -351,9 +382,21 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
}
public void unprepareScheduler() throws Exception {
+ unprepareScheduler(false);
+ }
+
+ public void unprepareScheduler(boolean beanOnly) throws Exception {
if (schedulerService != null) {
schedulerService.stop();
- getJBossMBeanServer().unregisterMBean(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
+ if (beanOnly) {
+ MBeanServer mbs = getJBossMBeanServer();
+ if (mbs.isRegistered(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME)) {
+ getJBossMBeanServer().unregisterMBean(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
+ }
+ } else {
+ releaseJBossMBeanServer();
+ }
+
schedulerService = null;
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java
index 1fd16a9..cbafd46 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java
@@ -25,8 +25,9 @@ import javax.persistence.NoResultException;
import javax.persistence.Query;
import javax.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
@@ -86,20 +87,23 @@ public abstract class LargeGroupTestBase extends AbstractEJB3Test {
* Prepares things for the entire test class.
*/
@BeforeClass
- public void beforeClass() {
+ public void beforeClassBase() {
configurationManager = LookupUtil.getConfigurationManager();
resourceManager = LookupUtil.getResourceManager();
resourceGroupManager = LookupUtil.getResourceGroupManager();
subjectManager = LookupUtil.getSubjectManager();
+ }
+ @BeforeMethod
+ public void beforeMethodBase() throws Exception {
TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
setupMockAgentServices(agentServiceContainer);
prepareScheduler();
}
- @AfterClass(alwaysRun = true)
- public void afterClass() throws Exception {
+ @AfterMethod(alwaysRun = true)
+ public void afterMethodBase() throws Exception {
try {
unprepareForTestAgents();
} finally {
commit 875a2b7d7000ae8ccdb56d55ae89613e0ba010db
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Jan 18 11:56:16 2012 -0500
[Bug 756184 - RFE: Drift UI needs better Template-Definition handling]
Add ability to expand rows in the drift template table. This gives users
the ability to see which drift definitions will be affected by changes to
a template. Or, to navigate to a derived template.
- Also:
- add explicit nav link to carousel
- fix nav issue DriftCarouselView.renderView which was too agressively
trying to nav to a detailed view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index ef99372..15f8331 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -514,6 +514,11 @@ public class LinkManager {
return "#Resource/" + resourceId + "/Drift/Definitions";
}
+ public static String getDriftDefinitionCarouselLink(int resourceId, int driftDefId) {
+ return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/"
+ + DriftDefinitionsView.DetailView.Carousel.name();
+ }
+
public static String getDriftDefinitionEditLink(int resourceId, int driftDefId) {
return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/"
+ DriftDefinitionsView.DetailView.Edit.name();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
index d7477af..e29a63e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
@@ -312,10 +312,10 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
categories.put(DriftCategory.FILE_REMOVED.name(), MSG.view_drift_category_fileRemoved());
LinkedHashMap<String, String> categoryIcons = new LinkedHashMap<String, String>(3);
categoryIcons.put(DriftCategory.FILE_ADDED.name(), ImageManager.getDriftCategoryIcon(DriftCategory.FILE_ADDED));
- categoryIcons.put(DriftCategory.FILE_CHANGED.name(), ImageManager
- .getDriftCategoryIcon(DriftCategory.FILE_CHANGED));
- categoryIcons.put(DriftCategory.FILE_REMOVED.name(), ImageManager
- .getDriftCategoryIcon(DriftCategory.FILE_REMOVED));
+ categoryIcons.put(DriftCategory.FILE_CHANGED.name(),
+ ImageManager.getDriftCategoryIcon(DriftCategory.FILE_CHANGED));
+ categoryIcons.put(DriftCategory.FILE_REMOVED.name(),
+ ImageManager.getDriftCategoryIcon(DriftCategory.FILE_REMOVED));
SelectItem categoryFilter = new EnumSelectItem(DriftDataSource.FILTER_CATEGORIES, MSG.common_title_category(),
DriftCategory.class, categories, categoryIcons);
@@ -354,10 +354,12 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
@Override
public void renderView(ViewPath viewPath) {
if (!viewPath.isEnd() && !viewPath.isNextEnd()) {
- this.useDriftDetailsView = !viewPath.isNextEnd() && "Drift".equals(viewPath.getNext().getPath());
+ String detail = viewPath.getNext().getPath();
+ if ("Drift".equals(detail) || "Snapshot".equals(detail)) {
+ this.useDriftDetailsView = !viewPath.isNextEnd() && "Drift".equals(viewPath.getNext().getPath());
+ super.renderView(viewPath);
+ }
}
-
- super.renderView(viewPath);
}
@Override
@@ -366,7 +368,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
return new DriftDetailsView(extendLocatorId("Drift"), id);
}
- return new DriftSnapshotView(extendLocatorId("Snapshot"), null, context.getResourceId(), driftDefId, Integer
- .valueOf(id), hasWriteAccess);
+ return new DriftSnapshotView(extendLocatorId("Snapshot"), null, context.getResourceId(), driftDefId,
+ Integer.valueOf(id), hasWriteAccess);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
index bece740..99a4316 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
@@ -43,10 +43,10 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
import org.rhq.core.domain.drift.DriftChangeSet;
import org.rhq.core.domain.drift.DriftComplianceStatus;
-import org.rhq.core.domain.drift.DriftDefinition;
-import org.rhq.core.domain.drift.DriftDefinitionComposite;
import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode;
+import org.rhq.core.domain.drift.DriftDefinition;
import org.rhq.core.domain.drift.DriftDefinition.BaseDirectory;
+import org.rhq.core.domain.drift.DriftDefinitionComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
@@ -70,6 +70,7 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
public static final String ATTR_ENTITY = "object";
public static final String ATTR_ID = "id";
public static final String ATTR_NAME = "name";
+ public static final String ATTR_DESCRIPTION = "description";
public static final String ATTR_INTERVAL = "interval";
public static final String ATTR_DRIFT_HANDLING_MODE = "driftHandlingMode";
public static final String ATTR_BASE_DIR_STRING = "baseDirString";
@@ -418,12 +419,12 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
record.setAttribute(ATTR_IS_ENABLED, String.valueOf(def.isEnabled()));
record.setAttribute(ATTR_IS_ENABLED_ICON, ImageManager.getAvailabilityIcon(def.isEnabled()));
record.setAttribute(ATTR_COMPLIANCE, def.getComplianceStatus().ordinal());
- record.setAttribute(ATTR_COMPLIANCE_ICON, ImageManager
- .getAvailabilityIcon(def.getComplianceStatus() == DriftComplianceStatus.IN_COMPLIANCE));
+ record.setAttribute(ATTR_COMPLIANCE_ICON,
+ ImageManager.getAvailabilityIcon(def.getComplianceStatus() == DriftComplianceStatus.IN_COMPLIANCE));
// fixed value, just the edit icon
record.setAttribute(ATTR_EDIT, ImageManager.getEditIcon());
- record.setAttribute(ATTR_IS_PINNED, def.isPinned() ? ImageManager.getPinnedIcon() : ImageManager
- .getUnpinnedIcon());
+ record.setAttribute(ATTR_IS_PINNED,
+ def.isPinned() ? ImageManager.getPinnedIcon() : ImageManager.getUnpinnedIcon());
record.setAttribute(ATTR_ATTACHED, def.isAttached() ? MSG.common_val_yes() : MSG.common_val_no());
if (def.getTemplate() != null) {
record.setAttribute(ATTR_TEMPLATE, def.getTemplate().getName());
@@ -431,8 +432,8 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
record.setAttribute(ATTR_TEMPLATE, MSG.common_val_none());
}
- record.setAttribute(ATTR_CHANGE_SET_VERSION, (null != changeSet) ? String.valueOf(changeSet.getVersion()) : MSG
- .common_label_none());
+ record.setAttribute(ATTR_CHANGE_SET_VERSION,
+ (null != changeSet) ? String.valueOf(changeSet.getVersion()) : MSG.common_label_none());
record.setAttribute(ATTR_CHANGE_SET_CTIME, (null != changeSet) ? new Date(changeSet.getCtime()) : null);
return record;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
index 3948f58..4ee1f42 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
@@ -22,30 +22,54 @@ package org.rhq.enterprise.gui.coregui.client.drift;
import java.util.ArrayList;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.SortSpecifier;
+import com.smartgwt.client.rpc.RPCResponse;
+import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.Autofit;
+import com.smartgwt.client.types.ExpansionMode;
+import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.SortDirection;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.common.EntityContext;
+import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
import org.rhq.core.domain.drift.DriftCategory;
+import org.rhq.core.domain.drift.DriftComplianceStatus;
+import org.rhq.core.domain.drift.DriftDefinition;
+import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.admin.templates.DriftDefinitionTemplateTypeView;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
+import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.drift.wizard.DriftAddDefinitionWizard;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A list view that displays a paginated table of {@link org.rhq.core.domain.drift.DriftDefinitionTemplate}s. It
* offers various options on the list like filtering (maybe) and sorting, add new/delete. Double-click drills
- * down to the detail view of the underlying Config. This view fully respects the user's authorization, and will not
- * allow actions on the templates unless the user is either the inventory manager or has MANAGE_DRIFT permission.
+ * down to the detail view of the underlying Config. Rows expand to reveal the drift definitions derived from
+ * the template. This view fully respects the user's authorization, and will not allow actions on the templates
+ * unless the user is either the inventory manager or has MANAGE_DRIFT permission.
*
* @author Jay Shaughnessy
*/
@@ -94,6 +118,11 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
return this.dataSource;
}
+ @Override
+ protected LocatableListGrid createListGrid(String locatorId) {
+ return new DriftDefinitionTemplatesListGrid(locatorId);
+ }
+
public static String getTitle(ResourceType type) {
return DriftDefinitionTemplateTypeView.VIEW_ID.getTitle() + " [" + type.getName() + "]";
}
@@ -189,8 +218,8 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
this.useSnapshotDetailsView = !viewPath.isNextEnd() && "Snapshot".equals(viewPath.getNext().getPath());
snapshotDriftDetailsId = null;
if (viewPath.viewsLeft() > 1) {
- snapshotDriftDetailsId = viewPath.getViewForIndex(viewPath.getCurrentIndex() + 2).getPath().substring(
- "0id_".length());
+ snapshotDriftDetailsId = viewPath.getViewForIndex(viewPath.getCurrentIndex() + 2).getPath()
+ .substring("0id_".length());
}
}
@@ -208,4 +237,244 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
return new DriftDefinitionTemplateEditView(extendLocatorId("TemplateEdit"), driftTemplateId, hasWriteAccess);
}
+
+ /**
+ * The expandable list grid
+ */
+ private class DriftDefinitionTemplatesListGrid extends LocatableListGrid {
+
+ public DriftDefinitionTemplatesListGrid(String locatorId) {
+ super(locatorId);
+
+ setCanExpandRecords(true);
+ setCanExpandMultipleRecords(true);
+ setExpansionMode(ExpansionMode.RELATED);
+ }
+
+ @Override
+ protected Canvas getExpansionComponent(ListGridRecord record) {
+
+ int templateId = record.getAttributeAsInt(DriftDefinitionTemplateDataSource.ATTR_ID);
+ String templateName = record.getAttribute(DriftDefinitionTemplateDataSource.ATTR_NAME);
+
+ return new TemplateDefinitionsView(extendLocatorId(templateName), templateId);
+ }
+ }
+
+ /**
+ * The expanded row table view of definitions derived from the template
+ */
+ public class TemplateDefinitionsView extends Table<TemplateDefinitionsView.TemplateDefinitionsDataSource> {
+
+ private int templateId;
+ private TemplateDefinitionsDataSource dataSource;
+
+ public TemplateDefinitionsView(String locatorId, int templateId) {
+ super(locatorId, null, true);
+
+ this.templateId = templateId;
+
+ setShowFilterForm(false);
+ setShowHeader(false);
+ setShowFooter(false);
+
+ setWidth100();
+ setAutoHeight();
+ setOverflow(Overflow.VISIBLE);
+
+ setDataSource(getDataSource());
+ }
+
+ @Override
+ public TemplateDefinitionsDataSource getDataSource() {
+
+ if (null == dataSource) {
+ dataSource = new TemplateDefinitionsDataSource();
+ }
+
+ return dataSource;
+ }
+
+ @Override
+ protected LocatableListGrid createListGrid(String locatorId) {
+ return new TemplateDefinitionsListGrid(locatorId);
+ }
+
+ @Override
+ protected void configureTable() {
+ ArrayList<ListGridField> dataSourceFields = getDataSource().getListGridFields();
+ getListGrid().setFields(dataSourceFields.toArray(new ListGridField[dataSourceFields.size()]));
+
+ super.configureTable();
+ }
+
+ /**
+ * The definitions list grid
+ */
+ private class TemplateDefinitionsListGrid extends LocatableListGrid {
+
+ public TemplateDefinitionsListGrid(String locatorId) {
+ super(locatorId);
+
+ setDefaultHeight(10);
+ setAutoFitData(Autofit.VERTICAL);
+ }
+ }
+
+ public class TemplateDefinitionsDataSource extends RPCDataSource<DriftDefinition, DriftDefinitionCriteria> {
+
+ public TemplateDefinitionsDataSource() {
+ addDataSourceFields();
+ }
+
+ public ArrayList<ListGridField> getListGridFields() {
+ ArrayList<ListGridField> fields = new ArrayList<ListGridField>(6);
+
+ ListGridField nameField = new ListGridField(DriftDefinitionDataSource.ATTR_NAME,
+ MSG.common_title_name());
+ nameField.setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ Integer resourceId = listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
+ Integer driftDefId = listGridRecord.getAttributeAsInt("id");
+ String url = LinkManager.getDriftDefinitionCarouselLink(resourceId, driftDefId);
+ return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ }
+ });
+ fields.add(nameField);
+
+ ListGridField descriptionField = new ListGridField(DriftDefinitionDataSource.ATTR_DESCRIPTION,
+ MSG.common_title_description());
+ fields.add(descriptionField);
+
+ ListGridField attachedField = new ListGridField(DriftDefinitionDataSource.ATTR_ATTACHED,
+ MSG.view_drift_table_attached());
+ fields.add(attachedField);
+
+ ListGridField enabledField = new ListGridField(DriftDefinitionDataSource.ATTR_IS_ENABLED_ICON,
+ MSG.common_title_enabled());
+ enabledField.setType(ListGridFieldType.IMAGE);
+ enabledField.setAlign(Alignment.CENTER);
+ fields.add(enabledField);
+
+ ListGridField inComplianceField = new ListGridField(DriftDefinitionDataSource.ATTR_COMPLIANCE_ICON,
+ MSG.common_title_in_compliance());
+ inComplianceField.setType(ListGridFieldType.IMAGE);
+ inComplianceField.setAlign(Alignment.CENTER);
+ inComplianceField.setShowHover(true);
+ inComplianceField.setHoverCustomizer(new HoverCustomizer() {
+ @Override
+ public String hoverHTML(Object o, ListGridRecord record, int row, int column) {
+ int complianceCode = record.getAttributeAsInt(DriftDefinitionDataSource.ATTR_COMPLIANCE);
+ DriftComplianceStatus complianceStatus = DriftComplianceStatus.fromCode(complianceCode);
+ switch (complianceStatus) {
+ case OUT_OF_COMPLIANCE_NO_BASEDIR:
+ return MSG.view_drift_table_hover_outOfCompliance_noBaseDir();
+ case OUT_OF_COMPLIANCE_DRIFT:
+ return MSG.view_drift_table_hover_outOfCompliance_drift();
+ default:
+ return "";
+ }
+ }
+ });
+ fields.add(inComplianceField);
+
+ ListGridField resourceNameField = new ListGridField(AncestryUtil.RESOURCE_NAME,
+ MSG.common_title_resource());
+ resourceNameField.setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ Integer resourceId = listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
+ String url = LinkManager.getResourceLink(resourceId);
+ return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ }
+ });
+ resourceNameField.setShowHover(true);
+ resourceNameField.setHoverCustomizer(new HoverCustomizer() {
+ public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) {
+ return AncestryUtil.getResourceHoverHTML(listGridRecord, 0);
+ }
+ });
+ fields.add(resourceNameField);
+
+ ListGridField ancestryField = AncestryUtil.setupAncestryListGridField();
+ fields.add(ancestryField);
+
+ nameField.setWidth("15%");
+ descriptionField.setWidth("25%");
+ attachedField.setWidth(70);
+ enabledField.setWidth(60);
+ inComplianceField.setWidth(100);
+ resourceNameField.setWidth("20%");
+ ancestryField.setWidth("*");
+
+ return fields;
+ }
+
+ @Override
+ protected void executeFetch(final DSRequest request, final DSResponse response,
+ DriftDefinitionCriteria criteria) {
+
+ GWTServiceLookup.getDriftService().findDriftDefinitionsByCriteria(criteria,
+ new AsyncCallback<PageList<DriftDefinition>>() {
+
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_drift_failure_load(), caught);
+ response.setStatus(RPCResponse.STATUS_FAILURE);
+ processResponse(request.getRequestId(), response);
+ }
+
+ public void onSuccess(final PageList<DriftDefinition> result) {
+ response.setData(buildRecords(result));
+ response.setTotalRows(result.getTotalSize());
+ processResponse(request.getRequestId(), response);
+ }
+ });
+ }
+
+ @Override
+ protected DriftDefinitionCriteria getFetchCriteria(DSRequest request) {
+
+ DriftDefinitionCriteria criteria = new DriftDefinitionCriteria();
+ criteria.addFilterTemplateId(templateId);
+ criteria.fetchResource(true);
+
+ return criteria;
+ }
+
+ @Override
+ public DriftDefinition copyValues(Record from) {
+ return null;
+ }
+
+ @Override
+ public ListGridRecord copyValues(DriftDefinition from) {
+ ListGridRecord record = new ListGridRecord();
+
+ record.setAttribute(DriftDefinitionDataSource.ATTR_ID, from.getId());
+
+ record.setAttribute(DriftDefinitionDataSource.ATTR_NAME, from.getName());
+ record.setAttribute(DriftDefinitionDataSource.ATTR_DESCRIPTION, from.getDescription());
+
+ record.setAttribute(DriftDefinitionDataSource.ATTR_IS_ENABLED, String.valueOf(from.isEnabled()));
+ record.setAttribute(DriftDefinitionDataSource.ATTR_IS_ENABLED_ICON,
+ ImageManager.getAvailabilityIcon(from.isEnabled()));
+ record.setAttribute(DriftDefinitionDataSource.ATTR_COMPLIANCE, from.getComplianceStatus().ordinal());
+ record
+ .setAttribute(DriftDefinitionDataSource.ATTR_COMPLIANCE_ICON, ImageManager.getAvailabilityIcon(from
+ .getComplianceStatus() == DriftComplianceStatus.IN_COMPLIANCE));
+
+ record.setAttribute(DriftDefinitionDataSource.ATTR_ATTACHED, from.isAttached() ? MSG.common_val_yes()
+ : MSG.common_val_no());
+
+ // for ancestry handling
+ Resource resource = from.getResource();
+ record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId());
+ record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName());
+ record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry());
+ record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId());
+
+ return record;
+ }
+ }
+ }
+
}
commit 70d4bb0592c57d36ed61112cd03aaeea2377b739
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jan 19 13:11:31 2012 +0100
BZ 772726 - Disable tests by default for now
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 5b08a19..9a1f93e 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -28,6 +28,24 @@
<profiles>
<profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
<id>ojdbc-driver</id>
<activation>
<property>
commit 2b63ea39a293e4b60552ce2fbc9ccc9cfb3eaefd
Author: Elias Ross <genman(a)noderunner.net>
Date: Thu Jan 19 11:06:27 2012 +0100
BZ 772726 - Oracle Plugin. Bugfixes feature counting active and total connections per user.
diff --git a/modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableComponent.java b/modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableComponent.java
index d8906f7..34df7bd 100644
--- a/modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableComponent.java
+++ b/modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableComponent.java
@@ -27,6 +27,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementReport;
@@ -73,7 +74,9 @@ public class CustomTableComponent implements DatabaseComponent<DatabaseComponent
}
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- String query = this.context.getPluginConfiguration().getSimpleValue("metricQuery", null);
+
+ Configuration conf = this.context.getPluginConfiguration();
+ String query = conf.getSimpleValue("metricQuery", null);
if (query == null) {
ResourceType type = this.context.getResourceType();
@@ -88,10 +91,10 @@ public class CustomTableComponent implements DatabaseComponent<DatabaseComponent
return;
}
- query = CustomTableRowDiscoveryComponent.formatMessage(query, this.context.getPluginConfiguration()
- .getSimpleValue("key", null));
+ query = CustomTableRowDiscoveryComponent.formatMessage(query, conf.getSimpleValue("key", null));
+
+ Map<String, Double> values = DatabaseQueryUtility.getNumericQueryValueMap(this, query);
- Map<String, Double> values = DatabaseQueryUtility.getNumericQueryValues(this, query);
for (MeasurementScheduleRequest request : metrics) {
Double value = values.get(request.getName());
if (value != null) {
diff --git a/modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableRowDiscoveryComponent.java b/modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableRowDiscoveryComponent.java
index 630b575..56d9ddd 100644
--- a/modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableRowDiscoveryComponent.java
+++ b/modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableRowDiscoveryComponent.java
@@ -27,6 +27,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.regex.Matcher;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
@@ -43,17 +45,21 @@ import org.rhq.core.util.jdbc.JDBCUtil;
* @author Greg Hinkle
*/
public class CustomTableRowDiscoveryComponent implements ResourceDiscoveryComponent<DatabaseComponent<?>> {
+
+ private final Log log = LogFactory.getLog(getClass());
+
public Set<DiscoveredResourceDetails> discoverResources(
ResourceDiscoveryContext<DatabaseComponent<?>> resourceDiscoveryContext)
throws InvalidPluginConfigurationException, Exception {
Statement statement = null;
ResultSet resultSet = null;
+
+ Configuration config = resourceDiscoveryContext.getDefaultPluginConfiguration();
+ String table = config.getSimpleValue("table", null);
+ String keyColumn = config.getSimpleValue("keyColumn", null);
try {
Connection conn = resourceDiscoveryContext.getParentResourceComponent().getConnection();
- Configuration config = resourceDiscoveryContext.getDefaultPluginConfiguration();
- String table = config.getSimpleValue("table", null);
- String keyColumn = config.getSimpleValue("keyColumn", null);
String resourceName = config.getSimpleValue("name", null);
String resourceDescription = config.getSimpleValue("description", "");
@@ -82,7 +88,7 @@ public class CustomTableRowDiscoveryComponent implements ResourceDiscoveryCompon
return found;
} catch (SQLException e) {
- // table not found, don't inventory
+ log.debug("table " + table + " column " + keyColumn, e);
} finally {
JDBCUtil.safeClose(resultSet);
JDBCUtil.safeClose(statement);
@@ -95,10 +101,13 @@ public class CustomTableRowDiscoveryComponent implements ResourceDiscoveryCompon
* Format a message with {<key>} formatted replacement keys.
*
* @param message the message to format
+ * @param key to replace; if null returns the message as-is
*
* @return the formatted text with variables replaced
*/
public static String formatMessage(String message, String key) {
+ if (key == null)
+ return message;
key = Matcher.quoteReplacement(key);
message = message.replaceAll("\\{key\\}", key);
return message;
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 4b52d63..5b08a19 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -68,102 +68,6 @@
</profile>
<profile>
- <id>integration-tests</id>
- <activation>
- <property>
- <name>maven.test.skip</name>
- <value>!true</value>
- </property>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo>
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
- <mkdir dir="target/itest" />
- <mkdir dir="target/itest/plugins" />
- <mkdir dir="target/itest/lib" />
- <copy toDir="target/itest/plugins" flatten="true">
- <fileset dir="${settings.localRepository}/">
- <include name="org/rhq/rhq-platform-plugin/${project.version}/rhq-platform-plugin-${project.version}.jar" />
- <include name="org/rhq/rhq-database-plugin/${project.version}/rhq-database-plugin-${project.version}.jar" />
- </fileset>
- <fileset dir="${project.build.directory}">
- <include name="${project.artifactId}-${project.version}.jar" />
- </fileset>
- </copy>
- <unzip dest="target/itest/lib">
- <fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" />
- <patternset>
- <include name="**/lib/sigar.jar" />
- <include name="**/lib/bcel*.jar" />
- <include name="**/lib/*.so" />
- <include name="**/lib/*.sl" />
- <include name="**/lib/*.dll" />
- <include name="**/lib/*.dylib" />
- </patternset>
- </unzip>
- <move todir="target/itest/lib" flatten="true">
- <fileset dir="target/itest/lib">
- <include name="**/lib/*" />
- </fileset>
- </move>
- <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- Integration testing voodoo to load and test this plugin with its plugin dependencies -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <useSystemClassLoader>false</useSystemClassLoader>
- <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
- <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
- <systemProperties>
- <property>
- <name>project.artifactId</name>
- <value>${project.artifactId}</value>
- </property>
- <property>
- <name>project.version</name>
- <value>${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>dev</id>
<properties>
@@ -176,22 +80,22 @@
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
<execution>
<id>deploy</id>
<phase>compile</phase>
<configuration>
- <tasks>
- <mkdir dir="${rhq.deploymentDir}" />
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating ${deployment.file}...</echo>
- <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" />
- </tasks>
+ <tasks>
+ <mkdir dir="${rhq.deploymentDir}" />
+ <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
+ <echo>*** Updating ${deployment.file}...</echo>
+ <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" />
+ </tasks>
</configuration>
<goals>
- <goal>run</goal>
+ <goal>run</goal>
</goals>
</execution>
@@ -199,18 +103,20 @@
<id>deploy-jar-meta-inf</id>
<phase>package</phase>
<configuration>
- <tasks>
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating META-INF dir in ${deployment.file}...</echo>
- <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}">
- <patternset><include name="META-INF/**" /></patternset>
- </unjar>
- <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
- </jar>
- </tasks>
+ <tasks>
+ <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
+ <echo>*** Updating META-INF dir in ${deployment.file}...</echo>
+ <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}">
+ <patternset>
+ <include name="META-INF/**" />
+ </patternset>
+ </unjar>
+ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
+ </jar>
+ </tasks>
</configuration>
<goals>
- <goal>run</goal>
+ <goal>run</goal>
</goals>
</execution>
@@ -218,107 +124,151 @@
<id>undeploy</id>
<phase>clean</phase>
<configuration>
- <tasks>
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Deleting ${deployment.file}...</echo>
- <delete file="${deployment.file}" />
- </tasks>
+ <tasks>
+ <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
+ <echo>*** Deleting ${deployment.file}...</echo>
+ <delete file="${deployment.file}" />
+ </tasks>
</configuration>
<goals>
- <goal>run</goal>
+ <goal>run</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
</plugins>
</build>
</profile>
- <profile>
- <id>cobertura-plugins</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>${cobertura.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>cobertura-instrument</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
+
+ <profile>
+ <id>oracle-test</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc5</artifactId>
+ <version>${ojdbc5.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>oracle.url</name>
+ <value>${oracle.url}</value>
+ </property>
+ <property>
+ <name>oracle.userid</name>
+ <value>${oracle.userid}</value>
+ </property>
+ <property>
+ <name>oracle.password</name>
+ <value>${oracle.password}</value>
+ </property>
+ </systemProperties>
+ <!-- The below is required for tests to run against Oracle.
+ <additionalClasspathElements>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
+ <id>cobertura-plugins</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>${cobertura.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/cobertura/backup" />
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup" />
<!-- backup all classes so that we can instrument the original classes-->
- <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
- <fileset dir="target/classes">
- <include name="**/*.class" />
- </fileset>
- </copy>
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
<!-- create a properties file and save there location of cobertura data file-->
- <touch file="target/classes/cobertura.properties" />
- <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <touch file="target/classes/cobertura.properties" />
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
- <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/classes">
- <include name="**/*.class" />
- </fileset>
- </cobertura-instrument>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>cobertura-report</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/site/cobertura" />
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
<!-- restore classes from backup folder to classes folder -->
- <copy toDir="target/classes" verbose="true" overwrite="true">
- <fileset dir="target/cobertura/backup">
- <include name="**/*.class" />
- </fileset>
- </copy>
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
<!-- delete backup folder-->
- <delete dir="target/cobertura/backup" />
+ <delete dir="target/cobertura/backup" />
<!-- create a code coverage report -->
- <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
- <fileset dir="${basedir}/src/main/java">
- <include name="**/*.java" />
- </fileset>
- </cobertura-report>
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
<!-- delete cobertura.properties file -->
- <delete file="target/classes/cobertura.properties" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <delete file="target/classes/cobertura.properties" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java
index 2686440..3d70eef 100644
--- a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java
+++ b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java
@@ -34,6 +34,7 @@ import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+import org.rhq.core.util.jdbc.JDBCUtil;
import org.rhq.plugins.database.DatabaseComponent;
import org.rhq.plugins.database.DatabaseQueryUtility;
@@ -47,23 +48,21 @@ public class OracleServerComponent implements DatabaseComponent, MeasurementFace
private ResourceContext resourceContext;
+ private boolean started;
+
public void start(ResourceContext resourceContext) throws InvalidPluginConfigurationException, Exception {
this.resourceContext = resourceContext;
this.connection = buildConnection(resourceContext.getPluginConfiguration());
+ this.started = true;
}
public void stop() {
- if (this.connection != null) {
- try {
- this.connection.close();
- } catch (SQLException e) {
- LOG.debug("Unable to close oracle connection", e);
- }
- }
+ removeConnection();
+ this.started = false;
}
public AvailabilityType getAvailability() {
- if (getConnection() != null) {
+ if (started && getConnection() != null) {
return AvailabilityType.UP;
} else {
return AvailabilityType.DOWN;
@@ -88,18 +87,18 @@ public class OracleServerComponent implements DatabaseComponent, MeasurementFace
}
public Connection getConnection() {
- if (this.connection == null) {
- try {
+ try {
+ if (this.connection == null || connection.isClosed()) {
this.connection = buildConnection(this.resourceContext.getPluginConfiguration());
- } catch (SQLException e) {
- LOG.info("Unable to create oracle connection", e);
}
+ } catch (SQLException e) {
+ LOG.info("Unable to create oracle connection", e);
}
-
return this.connection;
}
public void removeConnection() {
+ JDBCUtil.safeClose(connection);
this.connection = null;
}
diff --git a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleUserComponent.java b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleUserComponent.java
index da386d1..49999fd 100644
--- a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleUserComponent.java
+++ b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleUserComponent.java
@@ -21,8 +21,12 @@ package org.rhq.plugins.oracle;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementReport;
@@ -36,18 +40,27 @@ import org.rhq.plugins.database.DatabaseQueryUtility;
* @author Greg Hinkle
*/
public class OracleUserComponent extends AbstractDatabaseComponent implements MeasurementFacet {
+
+ private static final String SQL_USER = "SELECT COUNT(*) FROM DBA_USERS WHERE username = ?";
+ private static final String SESSIONS =
+ "SELECT SUM(DECODE(Status, 'ACTIVE', 1, 0)) active, COUNT(1) connections " +
+ "FROM V$SESSION where username = ?";
+
+
+ private static Log log = LogFactory.getLog(OracleUserComponent.class);
+
public AvailabilityType getAvailability() {
PreparedStatement statement = null;
ResultSet resultSet = null;
try {
- statement = getConnection().prepareStatement("SELECT COUNT(*) FROM DBA_USERS WHERE username = ?");
+ statement = getConnection().prepareStatement(SQL_USER);
statement.setString(1, this.resourceContext.getResourceKey());
resultSet = statement.executeQuery();
if (resultSet.next() && (resultSet.getInt(1) == 1)) {
return AvailabilityType.UP;
}
} catch (SQLException e) {
- // Problems ? Mark the resource as down
+ log.debug("unable to query", e);
} finally {
JDBCUtil.safeClose(statement, resultSet);
}
@@ -56,15 +69,12 @@ public class OracleUserComponent extends AbstractDatabaseComponent implements Me
}
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
+ Map<String, Double> values = DatabaseQueryUtility.getNumericQueryValues(this, SESSIONS,
+ this.resourceContext.getResourceKey());
for (MeasurementScheduleRequest request : metrics) {
- if (request.getName().equals("sessions")) {
- Map<String, Double> values = DatabaseQueryUtility
- .getNumericQueryValues(this, "SELECT COUNT(*) as activeConnections FROM V$SESSION WHERE username = ?",
- this.resourceContext.getResourceKey());
- Double sessions = values.get("count");
- if (sessions != null) {
- report.addData(new MeasurementDataNumeric(request, sessions));
- }
+ Double d = values.get(request.getName().toUpperCase(Locale.US));
+ if (d != null) {
+ report.addData(new MeasurementDataNumeric(request, d));
}
}
}
diff --git a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
index fea33f1..27c9033 100644
--- a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
@@ -46,7 +46,7 @@
<metric property="session stored procedure space"/>
<metric property="CPU used when call started" displayType="summary"/>
<metric property="CPU used by this session"/>
- <metric property="DB time"/>
+ <metric property="DB time" measurementType="trendsup"/>
<metric property="cluster wait time"/>
<metric property="concurrency wait time"/>
<metric property="application wait time" />
@@ -385,12 +385,12 @@
<service name="Oracle Detailed Statistics"
discovery="org.rhq.plugins.database.CustomTableDiscoveryComponent"
class="org.rhq.plugins.database.CustomTableComponent">
-
+
<plugin-configuration>
<c:simple-property name="table" default="V$SYSMETRIC"/>
<c:simple-property name="metricQuery" default="SELECT metric_name, value from V$SYSMETRIC"/>
- <c:simple-property name="name" default="Oracle 10g Advanced Statistics"/>
- <c:simple-property name="description" default="Detailed Oracle 10g Statistics"/>
+ <c:simple-property name="name" default="Oracle Advanced Statistics"/>
+ <c:simple-property name="description" default="Detailed Oracle Statistics"/>
</plugin-configuration>
<metric property="Buffer Cache Hit Ratio" units="percentage"/>
@@ -578,16 +578,17 @@
<plugin-configuration>
<c:simple-property name="table" default="DBA_USERS"/>
- <c:simple-property name="metricQuery" default="SELECT * FROM DBA_USERS"/>
+ <c:simple-property name="metricQuery" default="SELECT {key} FROM DBA_USERS"/>
<c:simple-property name="keyColumn" default="username"/>
<c:simple-property name="name" default="{key}"/>
<c:simple-property name="description" default="Oracle User"/>
</plugin-configuration>
- <metric property="activeConnections" displayName="Active Connections" displayType="summary"/>
+ <metric property="connections" displayName="Total Connections" displayType="summary"/>
+ <metric property="active" displayName="Active Connections" displayType="summary"/>
</service>
</server>
-</plugin>
\ No newline at end of file
+</plugin>
diff --git a/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java b/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java
new file mode 100644
index 0000000..8eeed0c
--- /dev/null
+++ b/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java
@@ -0,0 +1,281 @@
+package org.rhq.plugins.oracle;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.fail;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager;
+import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil;
+import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementDefinition;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementSchedule;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pc.PluginContainer;
+import org.rhq.core.pc.PluginContainerConfiguration;
+import org.rhq.core.pc.content.ContentContextImpl;
+import org.rhq.core.pc.event.EventContextImpl;
+import org.rhq.core.pc.event.EventManager;
+import org.rhq.core.pc.inventory.InventoryManager;
+import org.rhq.core.pc.inventory.ResourceContainer;
+import org.rhq.core.pc.operation.OperationContextImpl;
+import org.rhq.core.pc.upgrade.plugins.multi.base.NothingDiscoveringDiscoveryComponent;
+import org.rhq.core.pluginapi.content.ContentContext;
+import org.rhq.core.pluginapi.event.EventContext;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.PluginContainerDeployment;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+import org.rhq.core.pluginapi.operation.OperationContext;
+import org.rhq.core.system.SystemInfo;
+import org.rhq.core.system.SystemInfoFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+
+/**
+ * Base class for RHQ Component Testing.
+ * Initializes a plugin configuration.
+ */
+public abstract class ComponentTest {
+
+ static {
+ ResourceComponent.class.toString();
+ }
+
+ protected final Log log = LogFactory.getLog(getClass());
+ private static File temp = new File(System.getProperty("java.io.tmpdir"));
+
+ /**
+ * Associates a resource component with a resource.
+ */
+ protected Map<ResourceComponent, Resource> components = new LinkedHashMap<ResourceComponent, Resource>();
+
+ protected EventManager eventManager;
+ protected ResourceDiscoveryContext resourceDiscoveryContext;
+ protected PluginContainer pluginContainer = PluginContainer.getInstance();
+ protected SystemInfo systemInfo = SystemInfoFactory.createSystemInfo();
+
+ // TODO
+
+ PluginMetadataManager pmm = new PluginMetadataManager();
+ ResourceDiscoveryComponent resourceDiscoveryComponent = new NothingDiscoveringDiscoveryComponent();
+ File temporaryDirectory = temp;
+ File dataDirectory = temp;
+ String pluginContainerName = "rhq";
+ OperationContext operationContext = new OperationContextImpl(0);
+ ContentContext contentContext = new ContentContextImpl(0);
+ Executor availCollectorThreadPool = Executors.newCachedThreadPool();
+ PluginContainerDeployment pluginContainerDeployment = null;
+
+ /**
+ * Constructs a new component test.
+ */
+ protected ComponentTest() {
+ // Speed up propagation of events by adjusting delay/period to 1 second
+ PluginContainerConfiguration pcc = new PluginContainerConfiguration();
+ pcc.setEventSenderInitialDelay(1);
+ pcc.setEventSenderPeriod(1);
+
+ pluginContainer.setConfiguration(pcc);
+ pluginContainer.initialize();
+ eventManager = pluginContainer.getEventManager();
+ }
+
+ /**
+ * Initializes all components in the system; using auto-discovery where possible.
+ */
+ @BeforeTest
+ protected void before() throws Exception {
+
+ InputStream is = getClass().getResourceAsStream("/META-INF/rhq-plugin.xml");
+ PluginDescriptor pd = AgentPluginDescriptorUtil.parsePluginDescriptor(is);
+ ResourceType platformType = pmm.addTestPlatformType();
+ Set<ResourceType> rts = pmm.loadPlugin(pd);
+ for (ResourceType resourceType : pmm.loadPlugin(pd)) {
+ String componentType = pmm.getComponentClass(resourceType);
+ ResourceComponent component = (ResourceComponent) Class.forName(componentType).newInstance();
+ Configuration configuration = resourceType.getPluginConfigurationDefinition().getDefaultTemplate().createConfiguration();
+
+ setConfiguration(configuration, resourceType);
+
+ Resource resource = new Resource();
+ resource.setResourceKey(this.toString());
+ resource.setResourceType(resourceType);
+ resource.setPluginConfiguration(configuration);
+ resource.setName(resourceType.getName());
+ ResourceComponent parentResourceComponent = null;
+
+ components.put(component, resource);
+ resource.setParentResource(pluginContainer.getInventoryManager().getPlatform());
+
+ ResourceDiscoveryComponent resourceDiscoveryComponent = new NothingDiscoveringDiscoveryComponent();
+ EventContext eventContext = new EventContextImpl(resource);
+ ResourceContext context = new ResourceContext(resource, parentResourceComponent,
+ resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory,
+ pluginContainerName, eventContext, operationContext, contentContext,
+ availCollectorThreadPool, pluginContainerDeployment);
+ component.start(context);
+
+ resourceDiscoveryContext = new ResourceDiscoveryContext(resourceType, parentResourceComponent, context, systemInfo,
+ Collections.emptyList(), Collections.emptyList(), pluginContainerName, pluginContainerDeployment);
+
+ for (ResourceType rt : resourceType.getChildResourceTypes()) {
+ processChild(rt, component, resource);
+ }
+ }
+
+ log.info("ResourceComponent map: " + components);
+ }
+
+ /**
+ * Process a child
+ * @param component parent component
+ * @param resource parent resource
+ * @param resourceType child resource type
+ */
+ private void processChild(ResourceType resourceType, ResourceComponent component, Resource resource) throws Exception {
+ Configuration configuration = resourceType.getPluginConfigurationDefinition().getDefaultTemplate().createConfiguration();
+ setConfiguration(configuration, resourceType);
+ log.info("childResource " + resourceType + " properties " + configuration.getProperties());
+
+ String s = pmm.getDiscoveryClass(resourceType);
+ ResourceDiscoveryComponent rdc = (ResourceDiscoveryComponent) Class.forName(s).newInstance();
+ log.debug("rdc=" + rdc);
+
+ EventContext eventContext = new EventContextImpl(resource);
+ ResourceContext context = new ResourceContext(resource, component,
+ resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory,
+ pluginContainerName, eventContext, operationContext, contentContext,
+ availCollectorThreadPool, pluginContainerDeployment);
+ ResourceDiscoveryContext resourceDiscoveryContext = new ResourceDiscoveryContext(resourceType, component, context, systemInfo,
+ Collections.emptyList(), Collections.emptyList(), pluginContainerName, pluginContainerDeployment);
+ Assert.assertNotNull(context.getEventContext());
+ Set<DiscoveredResourceDetails> d = rdc.discoverResources(resourceDiscoveryContext);
+ for (DiscoveredResourceDetails drd : d) {
+ log.debug("discovered " + drd);
+ createChild(drd, resource, configuration, component);
+ }
+
+ }
+
+ private void createChild(DiscoveredResourceDetails drd,
+ Resource resource,
+ Configuration configuration,
+ ResourceComponent parentComponent) throws Exception
+ {
+ ResourceType type = pmm.getType(drd.getResourceType());
+
+ Resource cresource = new Resource();
+ cresource.setResourceType(type);
+ cresource.setPluginConfiguration(configuration);
+ cresource.setResourceKey(drd.getResourceKey());
+ cresource.setParentResource(resource);
+ cresource.setName(drd.getResourceName());
+
+ String rclassname = pmm.getComponentClass(type);
+ ResourceComponent component = (ResourceComponent) Class.forName(rclassname).newInstance();
+
+ EventContext eventContext = new EventContextImpl(resource);
+ ResourceContext context = new ResourceContext(cresource, parentComponent,
+ resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory,
+ pluginContainerName, eventContext, operationContext, contentContext,
+ availCollectorThreadPool, pluginContainerDeployment);
+
+ component.start(context);
+ components.put(component, cresource);
+ }
+
+ /**
+ * Called before the configuration is processed; override to set specific plugin parameters.
+ * @see #configuration
+ */
+ protected void setConfiguration(Configuration configuration, ResourceType resourceType) {
+ }
+
+ /**
+ * Stops all components, stops the plugin container.
+ */
+ @AfterTest
+ protected void after() throws Exception {
+ for (ResourceComponent c : components.keySet())
+ c.stop();
+ PluginContainer.getInstance().shutdown();
+ }
+
+ /**
+ * Returns a measurement report.
+ */
+ protected MeasurementReport getMeasurementReport(ResourceComponent component) throws Exception {
+ Resource resource = this.components.get(component);
+ ResourceType type = resource.getResourceType();
+ MeasurementReport report = new MeasurementReport();
+ Set<MeasurementScheduleRequest> s = new HashSet<MeasurementScheduleRequest>();
+ for (MeasurementDefinition md : type.getMetricDefinitions())
+ s.add(new MeasurementScheduleRequest(new MeasurementSchedule(md, resource)));
+ ((MeasurementFacet)component).getValues(report, s);
+ return report;
+ }
+
+ /**
+ * Finds the first resource component by resource name, or asserts failure if not found.
+ * By default this is the resource type, or for a discovered resource the discovered
+ * resource name.
+ */
+ protected ResourceComponent byName(String name) {
+ for (Map.Entry<ResourceComponent, Resource> c : components.entrySet())
+ if (c.getValue().getName().equals(name))
+ return c.getKey();
+ fail("component not found " + name + " in " + components.entrySet());
+ return null;
+ }
+
+ /**
+ * From a measurement report, returns a measurement value, or asserts failure if no such value exists.
+ */
+ protected Double getValue(MeasurementReport report, String name) {
+ for (MeasurementDataNumeric m: report.getNumericData()) {
+ if (m.getName().equals(name)) {
+ log.debug("measurement name " + name + " " + m.getValue());
+ return m.getValue();
+ }
+ }
+ fail("report does not incude " + name + " report " + report.getNumericData());
+ return null;
+ }
+
+ /**
+ * Asserts the resource component is available.
+ */
+ protected void assertUp(ResourceComponent component) {
+ assertEquals("up " + component, AvailabilityType.UP, component.getAvailability());
+ }
+
+ /**
+ * Asserts the resource component is unavailable.
+ */
+ protected void assertDown(ResourceComponent component) {
+ assertEquals("down " + component, AvailabilityType.DOWN, component.getAvailability());
+ }
+
+}
diff --git a/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java b/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java
new file mode 100644
index 0000000..949aaae
--- /dev/null
+++ b/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java
@@ -0,0 +1,95 @@
+package org.rhq.plugins.oracle;
+
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+public class OracleServerComponentTest extends ComponentTest {
+
+ private static final String ORACLE_SERVER = "Oracle Server";
+ private ResourceComponent<?> server;
+ private ResourceComponent<?> details;
+
+ // Login username; test USERS resource
+ private String username;
+
+ @BeforeMethod
+ public void reset() {
+ }
+
+ @BeforeTest
+ @Override
+ protected void before() throws Exception {
+ log.info("before");
+ super.before();
+ server = byName(ORACLE_SERVER);
+ assertNotNull(server);
+ details = byName("Oracle Advanced Statistics");
+ assertNotNull(details);
+ }
+
+ @AfterTest
+ protected void after() throws Exception {
+ super.after();
+ assertDown(server);
+ }
+
+ @Override
+ protected void setConfiguration(Configuration configuration, ResourceType resourceType) {
+ if (resourceType.getName().equals(ORACLE_SERVER)) {
+ log.info(configuration.getProperties());
+ Pattern p = Pattern.compile("jdbc:.*:@(.*):(\\d+)/(\\w++)");
+ String url = System.getProperty("oracle.url");
+ if (url == null)
+ throw new IllegalStateException("oracle.url system property not set");
+ Matcher matcher = p.matcher(url);
+ if (!matcher.matches())
+ throw new IllegalStateException("Cannot match " + p.pattern() + " against " + url);
+ configuration.getSimple("host").setStringValue(matcher.group(1));
+ configuration.getSimple("port").setIntegerValue(Integer.parseInt(matcher.group(2)));
+ configuration.getSimple("sid").setStringValue(matcher.group(3));
+ username = System.getProperty("oracle.username");
+ String password = System.getProperty("oracle.password");
+ configuration.getSimple("principal").setStringValue(username);
+ configuration.getSimple("credentials").setStringValue(password);
+ }
+ }
+
+ @Test
+ public void up() throws Exception {
+ log.info("testUp");
+ assertUp(server);
+ MeasurementReport report = getMeasurementReport(server);
+ Double rt;
+ rt = getValue(report, "totalSize");
+ assertTrue(rt > 100);
+ rt = getValue(report, "user calls");
+ assertTrue(rt > 0);
+
+ assertUp(details);
+ report = getMeasurementReport(details);
+ rt = getValue(report, "Buffer Cache Hit Ratio");
+ log.debug("hit " + rt);
+
+ ResourceComponent<?> user = byName(username.toUpperCase());
+ assertUp(user);
+ report = getMeasurementReport(user);
+ rt = getValue(report, "active");
+ assertTrue("have at least one active connection", rt >= 1);
+ rt = getValue(report, "connections");
+ assertTrue("have at least one connection", rt >= 1);
+ }
+
+
+}
diff --git a/modules/plugins/oracle/src/test/resources/log4j.xml b/modules/plugins/oracle/src/test/resources/log4j.xml
new file mode 100644
index 0000000..69a897c
--- /dev/null
+++ b/modules/plugins/oracle/src/test/resources/log4j.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- tests configuration that only dumps WARN or higher messages due to appender threadhold -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="ERROR"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t] (%c{5}) - %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <param name="File" value="target/test.log"/>
+ <param name="Threshold" value="DEBUG"/>
+ <param name="Append" value="false"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) -%m%n"/>
+ </layout>
+ </appender>
+
+ <category name="org.jboss.on">
+ <priority value="DEBUG"/>
+ </category>
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
commit 7a155eadc7989be7de1a26fd135ad461660b0959
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Jan 18 17:19:58 2012 -0500
[BZ 782612][BZ 772318] the agent registration now requires a token. null tokens are rejected unless its a new agent.
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
index 5359c3c..c7e0cfc 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
@@ -751,8 +751,8 @@ public class AgentMain {
try {
shutdownPluginContainer();
} catch (Throwable ignore) {
- LOG.warn(AgentI18NResourceKeys.FAILED_TO_SHUTDOWN_COMPONENT, "Plugin Container", ThrowableUtil
- .getAllMessages(ignore));
+ LOG.warn(AgentI18NResourceKeys.FAILED_TO_SHUTDOWN_COMPONENT, "Plugin Container",
+ ThrowableUtil.getAllMessages(ignore));
}
///////
@@ -984,8 +984,8 @@ public class AgentMain {
LOG.debug(AgentI18NResourceKeys.FAILOVER_LIST_LOADED, failoverListFile, list.size());
} catch (Exception e) {
list = new FailoverListComposite(new ArrayList<ServerEntry>());
- LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_LOADED, failoverListFile, ThrowableUtil
- .getAllMessages(e));
+ LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_LOADED, failoverListFile,
+ ThrowableUtil.getAllMessages(e));
}
}
@@ -1191,8 +1191,10 @@ public class AgentMain {
// store is the default value.
// But first we need to backup these original preferences in case the config file fails to load -
// we'll restore the original values in that case.
-
+ // Note that we squirrel away any security token we already have - we need to preserve this when we can
+ // because otherwise the agent will not be able to re-register with any previous name is was registered with.
Preferences preferencesNode = getPreferencesNode();
+ String securityToken = preferencesNode.get(AgentConfigurationConstants.AGENT_SECURITY_TOKEN, null);
ByteArrayOutputStream backup = new ByteArrayOutputStream();
preferencesNode.exportSubtree(backup);
preferencesNode.clear();
@@ -1213,10 +1215,26 @@ public class AgentMain {
ByteArrayInputStream new_config_input_stream = new ByteArrayInputStream(new_config.getBytes());
Preferences.importPreferences(new_config_input_stream);
- if (new AgentConfiguration(preferencesNode).getAgentConfigurationVersion() == 0) {
+ AgentConfiguration newAgentConfig = new AgentConfiguration(preferencesNode);
+ if (newAgentConfig.getAgentConfigurationVersion() == 0) {
throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_NODE_NAME_IN_CONFIG_FILE,
file_name, m_agentPreferencesNodeName));
}
+
+ // If we had a security token, restore it so we can maintain our known registration with the server.
+ // Note that if the configuration file already had a security token defined, it will be used and the old
+ // token we had will be thrown away.
+ if (securityToken != null) {
+ if (newAgentConfig.getAgentSecurityToken() == null) {
+ LOG.debug(AgentI18NResourceKeys.RESTORING_SECURITY_TOKEN);
+ newAgentConfig.setAgentSecurityToken(securityToken);
+ } else {
+ LOG.info(AgentI18NResourceKeys.NOT_RESTORING_SECURITY_TOKEN);
+ }
+ }
+
+ preferencesNode.flush();
+
} catch (Exception e) {
// a problem occurred importing the config file; let's restore our original values
try {
@@ -2297,8 +2315,8 @@ public class AgentMain {
*/
private void prepareAutoDiscoveryListener() throws Exception {
if (m_configuration.isServerAutoDetectionEnabled()) {
- ServiceContainerConfiguration comm_config = new ServiceContainerConfiguration(m_configuration
- .getPreferences());
+ ServiceContainerConfiguration comm_config = new ServiceContainerConfiguration(
+ m_configuration.getPreferences());
if (comm_config.isMulticastDetectorEnabled()) {
m_autoDiscoveryListener = new AgentAutoDiscoveryListener(this, createServerRemoteCommunicator(null,
false, false));
@@ -2469,8 +2487,8 @@ public class AgentMain {
if (wait > 0) {
long now = System.currentTimeMillis();
if ((started + wait) < now) {
- throw new RuntimeException(MSG
- .getMsg(AgentI18NResourceKeys.CANNOT_WAIT_TO_BE_REGISTERED_ANY_LONGER));
+ throw new RuntimeException(
+ MSG.getMsg(AgentI18NResourceKeys.CANNOT_WAIT_TO_BE_REGISTERED_ANY_LONGER));
}
}
@@ -2570,27 +2588,27 @@ public class AgentMain {
Map<String, String> config = new HashMap<String, String>();
if (SecurityUtil.isTransportSecure(uri)) {
- config.put(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH, m_configuration
- .getClientSenderSecurityKeystoreFile());
- config.put(SSLSocketBuilder.REMOTING_KEY_STORE_ALGORITHM, m_configuration
- .getClientSenderSecurityKeystoreAlgorithm());
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH,
+ m_configuration.getClientSenderSecurityKeystoreFile());
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_ALGORITHM,
+ m_configuration.getClientSenderSecurityKeystoreAlgorithm());
config.put(SSLSocketBuilder.REMOTING_KEY_STORE_TYPE, m_configuration.getClientSenderSecurityKeystoreType());
- config.put(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD, m_configuration
- .getClientSenderSecurityKeystorePassword());
- config.put(SSLSocketBuilder.REMOTING_KEY_PASSWORD, m_configuration
- .getClientSenderSecurityKeystoreKeyPassword());
- config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH, m_configuration
- .getClientSenderSecurityTruststoreFile());
- config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_ALGORITHM, m_configuration
- .getClientSenderSecurityTruststoreAlgorithm());
- config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE, m_configuration
- .getClientSenderSecurityTruststoreType());
- config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD, m_configuration
- .getClientSenderSecurityTruststorePassword());
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD,
+ m_configuration.getClientSenderSecurityKeystorePassword());
+ config.put(SSLSocketBuilder.REMOTING_KEY_PASSWORD,
+ m_configuration.getClientSenderSecurityKeystoreKeyPassword());
+ config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH,
+ m_configuration.getClientSenderSecurityTruststoreFile());
+ config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_ALGORITHM,
+ m_configuration.getClientSenderSecurityTruststoreAlgorithm());
+ config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE,
+ m_configuration.getClientSenderSecurityTruststoreType());
+ config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD,
+ m_configuration.getClientSenderSecurityTruststorePassword());
config.put(SSLSocketBuilder.REMOTING_SSL_PROTOCOL, m_configuration.getClientSenderSecuritySocketProtocol());
config.put(SSLSocketBuilder.REMOTING_KEY_ALIAS, m_configuration.getClientSenderSecurityKeystoreAlias());
- config.put(SSLSocketBuilder.REMOTING_SERVER_AUTH_MODE, Boolean.toString(m_configuration
- .isClientSenderSecurityServerAuthMode()));
+ config.put(SSLSocketBuilder.REMOTING_SERVER_AUTH_MODE,
+ Boolean.toString(m_configuration.isClientSenderSecurityServerAuthMode()));
config.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
// since we do not know the server's client-auth mode, assume we need a keystore and let's make sure we have one
@@ -2600,10 +2618,10 @@ public class AgentMain {
dummy_sslbuilder.setKeyStoreURL(m_configuration.getClientSenderSecurityKeystoreFile());
} catch (Exception e) {
// this probably is due to the fact that the keystore doesn't exist yet - let's prepare one now
- SecurityUtil.createKeyStore(m_configuration.getClientSenderSecurityKeystoreFile(), m_configuration
- .getClientSenderSecurityKeystoreAlias(), "CN=RHQ, OU=RedHat, O=redhat.com, C=US", m_configuration
- .getClientSenderSecurityKeystorePassword(), m_configuration
- .getClientSenderSecurityKeystoreKeyPassword(), "DSA", 36500);
+ SecurityUtil.createKeyStore(m_configuration.getClientSenderSecurityKeystoreFile(),
+ m_configuration.getClientSenderSecurityKeystoreAlias(), "CN=RHQ, OU=RedHat, O=redhat.com, C=US",
+ m_configuration.getClientSenderSecurityKeystorePassword(),
+ m_configuration.getClientSenderSecurityKeystoreKeyPassword(), "DSA", 36500);
// now try to set it again, if an exception is still thrown, it's an unrecoverable error
dummy_sslbuilder.setKeyStoreURL(m_configuration.getClientSenderSecurityKeystoreFile());
@@ -2702,8 +2720,8 @@ public class AgentMain {
StreamUtil.copy(byteStream, fileStream, true);
LOG.debug(AgentI18NResourceKeys.FAILOVER_LIST_PERSISTED, failoverListFile);
} catch (Exception e) {
- LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_PERSISTED, failoverListFile, ThrowableUtil
- .getAllMessages(e));
+ LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_PERSISTED, failoverListFile,
+ ThrowableUtil.getAllMessages(e));
}
// let's be kind to the user - if any server address is "localhost" or "127.0.0.#"
@@ -2773,8 +2791,8 @@ public class AgentMain {
break;
}
} catch (Throwable t) {
- m_output.println(MSG.getMsg(AgentI18NResourceKeys.COMMAND_FAILURE, cmd, ThrowableUtil
- .getAllMessages(t)));
+ m_output.println(MSG.getMsg(AgentI18NResourceKeys.COMMAND_FAILURE, cmd,
+ ThrowableUtil.getAllMessages(t)));
LOG.debug(t, AgentI18NResourceKeys.COMMAND_FAILURE_STACK_TRACE);
}
}
@@ -2890,7 +2908,7 @@ public class AgentMain {
* @throws HelpException if help was requested and the agent should not be created
*/
private void processArguments(String[] args) throws Exception {
- String sopts = "-:hdlasntguD:i:o:c:p:e:";
+ String sopts = "-:hdlLasntguD:i:o:c:p:e:";
LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("input", LongOpt.REQUIRED_ARGUMENT, null, 'i'),
new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'),
@@ -2899,6 +2917,7 @@ public class AgentMain {
new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'),
new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'),
new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'),
+ new LongOpt("cleanallconfig", LongOpt.NO_ARGUMENT, null, 'L'),
new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'),
new LongOpt("setup", LongOpt.NO_ARGUMENT, null, 's'),
new LongOpt("nostart", LongOpt.NO_ARGUMENT, null, 'n'),
@@ -2908,6 +2927,7 @@ public class AgentMain {
String config_file_name = null;
boolean clean_config = false;
+ boolean clean_token = false; // only used if clean_config = true
boolean purge_data = false;
boolean purge_plugins = false;
AgentInputReaderFactory.ConsoleType console_type = null;
@@ -2967,6 +2987,13 @@ public class AgentMain {
break;
}
+ case 'L': {
+ clean_config = true;
+ purge_data = true;
+ clean_token = true;
+ break;
+ }
+
case 'u': {
purge_data = true;
break;
@@ -3051,7 +3078,21 @@ public class AgentMain {
// now that all the arguments were processed, let's load in our config (this allows the -p to come after -c)
if (clean_config) {
- getPreferencesNode().removeNode();
+ Preferences prefsNode = getPreferencesNode();
+ if (clean_token) {
+ prefsNode.removeNode();
+ } else {
+ // remove everything EXCEPT the security token
+ String[] prefKeys = prefsNode.keys();
+ if (prefKeys != null && prefKeys.length > 0) {
+ for (String prefKey : prefKeys) {
+ if (!prefKey.equals(AgentConfigurationConstants.AGENT_SECURITY_TOKEN)) {
+ prefsNode.remove(prefKey);
+ }
+ }
+ }
+ }
+ prefsNode.flush();
}
if (config_file_name != null) {
@@ -3260,6 +3301,8 @@ public class AgentMain {
preferencesNode.put(ServiceContainerConfigurationConstants.DATA_DIRECTORY, data_dir);
}
+ prefs.flush();
+
LOG.debug(AgentI18NResourceKeys.CONFIGURATION, agent_configuration);
return;
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
index 59702fc..0b41bb7 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
@@ -613,7 +613,8 @@ public interface AgentI18NResourceKeys {
+ "\\ -g, --purgeplugins Deletes all plugins, forcing the agent to re-download all of them\\n\\\n"
+ "\\ -h, --help Shows this help message (default)\\n\\\n"
+ "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n"
- + "\\ -l, --cleanconfig Clears out any existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
+ + "\\ -l, --cleanconfig Clears out existing configuration and data files, except for the security token.\\n\\\n"
+ + "\\ -L, --cleanallconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
+ "\\ -n, --nostart If specified, the agent will not be automatically started\\n\\\n"
+ "\\ -o, --output=<filename> Specifies a file to write all output (excluding log messages)\\n\\\n"
+ "\\ -p, --pref=<preferences name> Specifies the agent preferences name used to identify what configuration to use\\n\\\n"
@@ -2104,4 +2105,10 @@ public interface AgentI18NResourceKeys {
@I18NMessage("Restarting the plugin container due to previous failure to merge the upgrade results with the server.")
String RESTARTING_PLUGIN_CONTAINER_AFTER_UPGRADE_MERGE_FAILURE = "AgentMain.pc-conditional-restart";
+
+ @I18NMessage("Restoring the original security token.")
+ String RESTORING_SECURITY_TOKEN = "AgentMain.restoring-security-token";
+
+ @I18NMessage("The config file already has a security token defined. The original security token will be thrown away.")
+ String NOT_RESTORING_SECURITY_TOKEN = "AgentMain.not-restoring-security-token";
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
index fd2286c..90d7042 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
@@ -56,6 +56,9 @@ public class ViewAgentUIBean extends PagedDataTableUIBean {
hasPermission();
int agentId = FacesContextUtility.getRequiredRequestParameter("agentId", Integer.class);
agent = agentManager.getAgentByID(agentId);
+ if (!hasPermissionToViewSecurityToken()) {
+ agent.setAgentToken("******");
+ }
}
return agent;
}
@@ -94,4 +97,9 @@ public class ViewAgentUIBean extends PagedDataTableUIBean {
+ "] does not have the proper permissions to view or manage agents");
}
}
+
+ private boolean hasPermissionToViewSecurityToken() {
+ Subject subject = EnterpriseFacesContextUtility.getSubject();
+ return LookupUtil.getAuthorizationManager().hasGlobalPermission(subject, Permission.MANAGE_SECURITY);
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
index e380b6e..75c4d65 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
@@ -104,14 +104,10 @@ public class CoreServerServiceImpl implements CoreServerService {
* something else".
*
* If there is no original token with the request, this is either a brand new agent never before registered, or it
- * is an agent that has been registered before but for some reason lost its token. In this case, we will look at
- * this registration's host/port of this new agent. If it matches the host/port of another agent but the
- * existing name and the new agent's name don't match, the server will abort and tell the agent, "You don't know
- * who you are, but I know there is already an agent with the host and port you are trying to register with
- * under a different name - so I'm going to trust this original agent and not allow you to register that name
- * under a different host/port. If you are that original agent, then you need to register with that original
- * name". When the agent registers again, this time with the correct name, the agent will be given its token.
- * This usually will occur if you reinstall the agent and try to register it under a different name.
+ * is an agent that has been registered before but for some reason lost its token.
+ * In this case, if there is no agent with the name being requested, we register this as a new agent.
+ * If, however, the agent name is already in use, we abort the request. An agent cannot register with an
+ * existing agent without sending that agent's security token.
*/
if (request.getOriginalToken() != null) {
@@ -140,19 +136,24 @@ public class CoreServerServiceImpl implements CoreServerService {
// the agent request provided a name that already is in use by an agent. However, the request
// provided a security token that was not assigned to any agent! How can this be? Something is fishy.
String msg = "The agent asking for registration under the name [" + request.getName()
- + "] provided an invalid security token. This request will fail.";
+ + "] provided an invalid security token. This request will fail. "
+ + "Please consult an administrator to reconfigure this agent with its proper security token.";
throw new AgentRegistrationException(msg);
}
Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
request.getPort());
if (agentByAddressPort != null) {
- // the agent request provided a security token but it is an unknown/unused/bogus token.
+ // The agent is requesting to register an unused agent name - so this is considered a new agent.
+ // It provided a security token but it is an unknown/obsolete/bogus token (usually due to the
+ // fact that someone purged the platform/agent from the server database but the old agent is
+ // still around with its old token).
// However, the IP/port it wants to use is already in-use. This sounds fishy. If we let this
// go through, this agent with an unknown/bogus token will essentially hijack this IP/port
// belonging to an existing agent. If the agent wants to reuse an IP/port already in existence, it should
// already know its security token associated with that IP/port. Thus, we will abort this request.
String msg = "The agent asking for registration under the name [" + request.getName()
- + "] is attempting to authenticate using an unknown security token. This request will fail.";
+ + "] is attempting to take another agent's address/port [" + request.getAddress() + ":"
+ + request.getPort() + "] with an unknown security token. This request will fail.";
throw new AgentRegistrationException(msg);
}
}
@@ -167,23 +168,25 @@ public class CoreServerServiceImpl implements CoreServerService {
+ request.getPort()
+ "] that is already registered under a different name ["
+ agentByAddressPort.getName()
- + "]; if this new agent is actually the same as the original, then re-register with the same name";
+ + "]; if this new agent is actually the same as the original, then re-register with the same name"
+ + " and same security token.";
throw new AgentRegistrationException(msg);
+ } else {
+ String msg = "The agent [" + request.getName()
+ + "] is attempting to re-register without a security token. "
+ + "Please consult an administrator to reconfigure this agent with its proper security token.";
+ throw new AgentRegistrationException(msg);
+
}
} else {
if (agentByName != null) {
- // the name being registered already exists, however, the agent request is trying to set it
- // to some unknown IP/port combination and there is no security token to authenticate this request!
+ // the name being registered already exists - but there is no security token to authenticate this request!
// Therefore, because this agent name is already registered and because this current request
// cannot authenticate itself with the proper security token, we fail.
String msg = "An agent is trying to register with an existing agent name ["
+ request.getName()
- + "]. The registration request is attempting to assign the agent an unknown address/port ["
- + request.getAddress()
- + ":"
- + request.getPort()
+ "] without providing a valid security token. If you are attempting to re-register this agent, "
- + "make sure you register with its prior address/port.";
+ + "please consult an administrator to reconfigure this agent with its proper security token.";
throw new AgentRegistrationException(msg);
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index a3dda5e..5a702ff 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -41,12 +41,57 @@ import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.core.domain.resource.Agent;
+import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
/**
+ * This tests the core server service. This includes agent registration.
+ *
* @author John Mazzitelli
*/
+
+// These are the agent registration unit test cases.
+// (allowed) means the registration should succeed.
+// (REJECT) means the server should reject that agent registration request.
+// ---
+// A. testNewAgentRegistrationWithOldToken
+// 1) register a new agent with a non-null, unknown security token (allowed)
+// B. testChangeAddressPort
+// 1) register a new agent Z with null security token (allowed)
+// 2) re-register agent Z with its token but change its host (allowed)
+// 3) re-register agent Z with its token but change its port (allowed)
+// 4) re-register agent Z with its token but change its host and port (allowed)
+// 5) re-register agent Z with its token but change nothing (allowed)
+// 6) re-register agent Z with NO token but change its host (REJECT)
+// 7) re-register agent Z with NO token but change its port (REJECT)
+// 8) re-register agent Z with NO token but change its host and port (REJECT)
+// 9) re-register agent Z with NO token but change nothing (REJECT)
+// C. testNormalAgentRegistration
+// 1) register a new agent A with a null security token (allowed, same as B.1)
+// D. testHijackExistingAgentAddressPort
+// 1) register a new agent B with null security token but using A's host/port (REJECT)
+// E. testHijackExistingAgentName
+// 1) register an agent using an already-existing agent name A, and using A's host but a different port with a null token (REJECT - missing the token)
+// 2) register an agent using an already-existing agent name A, and using A's port but a different host with a null token (REJECT - missing the token)
+// 3) register an agent using an already-existing agent name A, and using a different port and host with a null token (REJECT - missing the token)
+// F. testHijackExistingAgentAddressPortWithBogusToken
+// 1) register a new agent B with A's host and port but with a bogus token (REJECT)
+// G. testHijackExistingAgentNameWithBogusToken
+// 1) re-register agent A with its original host and port but with a bogus token (REJECT)
+// 2) re-register agent A with its original host, different port but with bogus token (REJECT)
+// 3) re-register agent A with different host, original port but with bogus token (REJECT)
+// 4) re-register agent A with different host and port but with bogus token (REJECT)
+// H. testHijackExistingAgentNameWithAnotherAgentToken
+// 1) re-register agent A with its original host and port but with Z's security token (REJECT - you cannot authenticate using another agent's token)
+// 2) re-register agent A with different host and original port but with Z's security token (REJECT - you cannot authenticate using another agent's token)
+// 3) re-register agent A with original host and different port but with Z's security token (REJECT - you cannot authenticate using another agent's token)
+// 4) re-register agent A with different host and port but with Z's security token (REJECT - you cannot authenticate using another agent's token)
+// I. testAgentHijackingAnotherAgentAddressPort
+// 1) re-register agent A using A's correct security token but with Z's host and Z's port (REJECT - one agent cannot steal another agent's host/port endpoint) NOTE: this is not D.1 because in D.1, the request doesn't have a token. This I.1 test has a token and it really authenticates the agent A making the request. This also isn't F.1 because F.1, while it has a token, it is not a valid token, thus its agent is not authentic.
+// J. testAttemptToChangeAgentName
+// 1) register agent "newName" but with Z's host/port/token. In effect, this is trying to change the agent's name. (REJECT - you are not allowed to rename agents)
+
@Test
public class CoreServerServiceImplTest extends AbstractEJB3Test {
private static final String TEST_AGENT_NAME_PREFIX = "CoreServerServiceImplTest.Agent";
@@ -67,7 +112,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
public void testNewAgentRegistrationWithOldToken() throws Exception {
// this tests the case where someone purged an agent from the DB, but then
// changed their mind and want to re-run that agent and re-register it again.
- // In this case, the agent (if not using --cleanconfig) would still have the old token.
+ // In this case, the agent (if not using --cleanallconfig) would still have the old token.
// The agent should still be allowed to register again.
CoreServerServiceImpl service = new CoreServerServiceImpl();
AgentRegistrationRequest request = createRequest(prefixName("old"), "hostOld", 12345, "oldtoken");
@@ -128,18 +173,40 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
assert agent.getAddress().equals("hostZdoubleprime");
assert agent.getPort() == 55552;
- // now don't change Z's host/port but re-register everything the same, but with no token
- request = createRequest(zName, "hostZdoubleprime", 55552, null);
- results = service.registerAgent(request);
- assert results != null;
- agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
- assert agent.getName().equals(zName);
- assert agent.getAddress().equals("hostZdoubleprime");
- assert agent.getPort() == 55552;
-
// remember this agent so our later tests can use it
zReq = request;
zResults = results;
+
+ // Try to re-register changes to host and/or port but do not send any token.
+ // Because there is no token, these should fail.
+ request = createRequest(zName, B_HOST, zReq.getPort(), null);
+ try {
+ service.registerAgent(request);
+ assert false : "(1) Should not have been able to register without a token";
+ } catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
+ }
+ request = createRequest(zName, zReq.getAddress(), B_PORT, null);
+ try {
+ service.registerAgent(request);
+ assert false : "(2) Should not have been able to register without a token";
+ } catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
+ }
+ request = createRequest(zName, B_HOST, B_PORT, null);
+ try {
+ service.registerAgent(request);
+ assert false : "(3) Should not have been able to register without a token";
+ } catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
+ }
+ request = createRequest(zName, zReq.getAddress(), zReq.getPort(), null);
+ try {
+ service.registerAgent(request);
+ assert false : "(4) Should not have been able to register without a token";
+ } catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
+ }
}
@Test(dependsOnMethods = "testChangeAddressPort")
@@ -159,6 +226,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used host/port with new agent name";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -171,18 +239,21 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name without a token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), null);
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name without a token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, B_PORT, null);
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name without a token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -195,6 +266,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used host/port with new agent name and invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -207,24 +279,28 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name with an invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, "badtoken");
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name with an invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), "badtoken");
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name with an invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, B_PORT, "badtoken");
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name with an invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -237,24 +313,28 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack agent A using Z's token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), zResults.getAgentToken());
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack agent A using Z's token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, zResults.getAgentToken());
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack agent A using Z's token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, B_PORT, zResults.getAgentToken());
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack agent A using Z's token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -267,6 +347,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "An agent should not have been able to hijack another agent's host/port";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -279,6 +360,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "An agent should not be able to change its name";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -291,6 +373,12 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
return TEST_AGENT_NAME_PREFIX + name;
}
+ private void debugPrintThrowable(Throwable t) {
+ if (true) {
+ System.out.println(ThrowableUtil.getAllMessages(t));
+ }
+ }
+
@BeforeClass
public void prepare() throws Exception {
// mock the name of our server via the sysprop (in production, this is normally set in rhq-server.properties)
commit bb1f35f5994233e9f002952c7084ce4d8769c1e1
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 17 20:46:09 2012 +0100
BZ 708332 - Add support for reading/writing of system-properties and paths (partially cherry picked from commit 3e12e49)
Also enable system-properties and path for host controller and hosts.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index cf0b5b9..6fa678b 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -241,7 +241,9 @@ public class ASConnection {
if (node==null) {
log.warn("Operation [" + op + "] returned null");
- return null;
+ Result failure = new Result();
+ failure.setFailureDescription("Operation [" + op + "] returned null");
+ return failure;
}
try {
Result res;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
index cbed07e..4f72013 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
@@ -165,21 +165,25 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
* We may have a mismatch for groups where the <c:group name="children:*"> child is a list of maps
* but the result is actually the contained map
*/
- if (propDef instanceof PropertyDefinitionList && (propDef.getName().equals("*"))) {
+ String propertyName = propDef.getName();
+ if (propDef instanceof PropertyDefinitionList && (propertyName.startsWith("*"))) {
propDef = ((PropertyDefinitionList) propDef).getMemberDefinition();
+ String innerPropdefName = propDef.getName();
+
if (!(propDef instanceof PropertyDefinitionMap)) {
log.error("Embedded child is not a map");
return;
}
// Now we are at map level which matches the operations results
- PropertyList list = new PropertyList("*");
+ PropertyList list = new PropertyList(propertyName);
for (Map.Entry<String,Object> entry : results.entrySet()) {
Object val = entry.getValue();
+ String key = entry.getKey();
- PropertyMap propertyMap = loadHandlePropertyMap((PropertyDefinitionMap) propDef, val);
+ PropertyMap propertyMap = loadHandlePropertyMap((PropertyDefinitionMap) propDef, val, key);
if (propertyMap!=null)
list.add(propertyMap);
@@ -188,7 +192,6 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
config.put(list);
} else { // standard case
- String propertyName = propDef.getName();
Object valueObject = results.get(propertyName);
@@ -207,7 +210,7 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
config.put(propertyList);
}
else if (propDef instanceof PropertyDefinitionMap) {
- PropertyMap propertyMap = loadHandlePropertyMap((PropertyDefinitionMap) propDef, valueObject);
+ PropertyMap propertyMap = loadHandlePropertyMap((PropertyDefinitionMap) propDef, valueObject, null);
if (propertyMap!=null)
config.put(propertyMap);
@@ -239,20 +242,35 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
/**
* Handle a Map of ...
+ *
* @param propDef Definition of the map
* @param valueObject the objects to put into the map
+ * @param optionalEntryName
* @return the populated map
*/
- PropertyMap loadHandlePropertyMap(PropertyDefinitionMap propDef, Object valueObject) {
+ PropertyMap loadHandlePropertyMap(PropertyDefinitionMap propDef, Object valueObject, String optionalEntryName) {
if (valueObject==null)
return null;
- PropertyMap propertyMap = new PropertyMap(propDef.getName());
+ String propDefName = propDef.getName();
+ PropertyMap propertyMap = new PropertyMap(propDefName);
+ String specialNameProp = null;
+ if (propDefName.startsWith("*:")) {
+ specialNameProp = propDefName.substring(2);
+ PropertySimple additionalNameProperty = new PropertySimple(specialNameProp,optionalEntryName);
+ propertyMap.put(additionalNameProperty);
+ }
Map<String, PropertyDefinition> memberDefMap = propDef.getPropertyDefinitions();
+
+
+
Map<String,Object> objects = (Map<String, Object>) valueObject;
for (Map.Entry<String, PropertyDefinition> maEntry : memberDefMap.entrySet()) {
String key = maEntry.getKey();
+ if (key.equals(specialNameProp)) // Skip over specialName prop, as we have processed that already.
+ continue;
+
// special case: if the key is "*", we just pick the first element
Object o ;
if (key.equals("*"))
@@ -266,9 +284,9 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
else if (value instanceof PropertyDefinitionList)
property = loadHandlePropertyList((PropertyDefinitionList) value, o);
else if (value instanceof PropertyDefinitionMap)
- property = loadHandlePropertyMap((PropertyDefinitionMap) value, o);
+ property = loadHandlePropertyMap((PropertyDefinitionMap) value, o,null);
else
- throw new IllegalArgumentException("Unknown property type in map property [" + propDef.getName() +"]");
+ throw new IllegalArgumentException("Unknown property type in map property [" + propDefName +"]");
if (property!=null)
propertyMap.put(property);
@@ -320,7 +338,7 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
Map<String,Object> map = (Map<String, Object>) obj;
PropertyMap propertyMap = loadHandlePropertyMap(
- (PropertyDefinitionMap) propDef.getMemberDefinition(), map);
+ (PropertyDefinitionMap) propDef.getMemberDefinition(), map, null);
if (propertyMap!=null)
propertyList.add(propertyMap);
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
index 4f07bfc..fbf0509 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
@@ -43,6 +43,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadChildrenResources;
import org.rhq.modules.plugins.jbossas7.json.Result;
import org.rhq.modules.plugins.jbossas7.json.WriteAttribute;
@@ -55,6 +56,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
private ConfigurationDefinition configurationDefinition;
private String namePropLocator;
private String type;
+ private boolean addNewChildren;
/**
* Create a new configuration delegate, that reads the attributes for the resource at address.
@@ -114,10 +116,17 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
for (PropertyGroupDefinition pgd: configurationDefinition.getGroupDefinitions()) {
String groupName = pgd.getName();
namePropLocator = null;
- if (groupName.startsWith("children:")) {
+ if (groupName.startsWith("children:")) { // children, where the key in key=value from the path is known
type = groupName.substring("children:".length());
if (type.contains(":")) {
namePropLocator = type.substring(type.indexOf(":") + 1);
+ if (namePropLocator.endsWith("+")) { // ending in + -> we need to :add new entries
+ namePropLocator=namePropLocator.substring(0,namePropLocator.length()-1);
+ addNewChildren = true;
+ }
+ else {
+ addNewChildren = false;
+ }
type = type.substring(0, type.indexOf(":"));
}
else {
@@ -128,7 +137,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
for (PropertyDefinition def : definitions) {
updateProperty(conf,cop,def, address);
}
- } if (groupName.startsWith("child:")) {
+ } if (groupName.startsWith("child:")) { // one named child resource
String subPath = groupName.substring("child:".length());
if (!subPath.contains("="))
throw new IllegalArgumentException("subPath of 'child:' expression has no =");
@@ -156,17 +165,54 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
return;
// Handle the special case
- if (propDef instanceof PropertyDefinitionList && propDef.getName().equals("*")) {
+ String propDefName = propDef.getName();
+ if (propDef instanceof PropertyDefinitionList && propDefName.startsWith("*")) {
propDef = ((PropertyDefinitionList) propDef).getMemberDefinition();
- PropertyList pl = (PropertyList) conf.get("*"); // TODO loop over the list content
+ PropertyList pl = (PropertyList) conf.get(propDefName);
+
+ // check if we need to see if that property exists - get the current state of affairs from the AS
+ List<String> existingPropnames = new ArrayList<String>();
+ if (addNewChildren) {
+ Operation op = new ReadChildrenResources(baseAddress,type);
+ Result tmp = connection.execute(op);
+ if (tmp.isSuccess()) {
+ Map<String,Object> tmpResMap = (Map<String, Object>) tmp.getResult();
+ existingPropnames.addAll(tmpResMap.keySet());
+ }
+ }
+ // Loop over the list - i.e. the individual rows that come from the server
for (Property prop2 : pl.getList()) {
- updateHandlePropertyMapSpecial(cop, (PropertyMap) prop2, (PropertyDefinitionMap) propDef, baseAddress);
+ updateHandlePropertyMapSpecial(cop, (PropertyMap) prop2, (PropertyDefinitionMap) propDef, baseAddress,
+ existingPropnames);
}
+ // now check about removed properties
+ for (String existingName : existingPropnames ) {
+ boolean found=false;
+ for (Property prop2 : pl.getList()) {
+ PropertyMap propMap2 = (PropertyMap) prop2;
+ String itemName = propMap2.getSimple(namePropLocator).getStringValue();
+ if (itemName==null) {
+ throw new IllegalArgumentException("Map contains no entry with name '" + namePropLocator + "'");
+ }
+ if (itemName.equals(existingName)) {
+ found=true;
+ break;
+ }
+ }
+
+ if (!found) {
+ Address tmpAddr = new Address(baseAddress);
+ tmpAddr.add(type, existingName);
+ Operation operation = new Operation("remove",tmpAddr);
+ cop.addStep(operation);
+ }
+ }
+
}
else {
// Normal cases
- Property prop = conf.get(propDef.getName());
+ Property prop = conf.get(propDefName);
if (prop instanceof PropertySimple) {
updateHandlePropertySimple(cop, (PropertySimple)prop, (PropertyDefinitionSimple) propDef, baseAddress);
@@ -188,18 +234,36 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
private void updateHandlePropertyMapSpecial(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef,
- Address address) {
+ Address address, List<String> existingPropNames) {
Map<String,Object> results = updateHandleMap(prop,propDef, address);
if (prop.get(namePropLocator)==null) {
throw new IllegalArgumentException("There is no element in the map with the name " + namePropLocator);
}
String addrVal= ((PropertySimple)prop.get(namePropLocator)).getStringValue();
+
+
+ // determine key from map as propDefName
+ String key = prop.getSimpleValue(namePropLocator, null);
+ if (key==null) {
+ throw new IllegalArgumentException("Map contains no entry with name '" + namePropLocator + "'");
+ }
+
Address addr = new Address(address);
addr.add(type,addrVal);
for (Map.Entry<String,Object> entry : results.entrySet()) {
- Operation writeAttribute = new WriteAttribute(addr,entry.getKey(),entry.getValue());
- cop.addStep(writeAttribute);
+ Operation operation;
+ if (!addNewChildren || existingPropNames.contains(key))
+ operation = new WriteAttribute(addr,entry.getKey(),entry.getValue());
+ else {
+ Address tmpAddr = new Address(address);
+ tmpAddr.add(type, key);
+ operation = new Operation("add",tmpAddr);
+ operation.addAdditionalProperty("name",key);
+ operation.addAdditionalProperty("value",entry.getValue());
+ }
+ cop.addStep(operation);
}
+
}
private void updateHandlePropertyList(CompositeOperation cop, PropertyList prop, PropertyDefinitionList propDef,
@@ -265,4 +329,4 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
return results;
}
-}
\ No newline at end of file
+}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index bdcf227..7198463 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -203,8 +203,30 @@
</c:list-property>
</c:group>
-->
+ <c:group name="children:system-property:name+" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+
+ <c:group name="children:path:name+" displayName="Path">
+ <c:list-property name="*3" displayName="Path" required="false"
+ description="The standard paths provided by the system include: jboss.home - the root directory of the JBoss AS distribution; user.home - user's home directory; user.dir - user's current working directory; java.home - java installation directory; jboss.server.base.dir - root directory for an individual server instance; jboss.server.data.dir - directory the server will use for persistent data file storage; jboss.server.log.dir - directory the server will use for log file storage; jboss.server.tmp.dir - directory the server will use for temporary file storage; jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances">
+ <c:map-property name="*" displayName="Entry">
+ <c:simple-property name="name" required="true" type="string" readOnly="false"
+ description="The name of the path. Cannot be one of the standard fixed paths provided by the system"/>
+ <c:simple-property name="path" required="true" type="string" readOnly="false"
+ description="The actual filesystem path. Treated as an absolute path, unless the 'relative-to' attribute is specified, in which case the value is treated as relative to that path."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false"
+ description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute."/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
- <c:group name="children:extension" displayName="Installed extensions" hiddenByDefault="true">
+ <c:group name="children:extension:module" displayName="Installed extensions" hiddenByDefault="true">
<c:list-property name="*" displayName="Installed extensions" readOnly="true" required="false">
<c:map-property name="*" displayName="Name" readOnly="true">
<c:simple-property name="module" displayName="Module name" readOnly="true"/>
@@ -277,6 +299,31 @@
<c:simple-property name="operationResult" description="Outcome of the delete server operation"/>
</results>
</operation>
+
+ <resource-configuration>
+ <c:group name="children:system-property:name+" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ <c:group name="children:path:name+" displayName="Path">
+ <c:list-property name="*3" displayName="Path" required="false"
+ description="The standard paths provided by the system include: jboss.home - the root directory of the JBoss AS distribution; user.home - user's home directory; user.dir - user's current working directory; java.home - java installation directory; jboss.server.base.dir - root directory for an individual server instance; jboss.server.data.dir - directory the server will use for persistent data file storage; jboss.server.log.dir - directory the server will use for log file storage; jboss.server.tmp.dir - directory the server will use for temporary file storage; jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances">
+ <c:map-property name="*" displayName="Entry">
+ <c:simple-property name="name" required="true" type="string" readOnly="false"
+ description="The name of the path. Cannot be one of the standard fixed paths provided by the system"/>
+ <c:simple-property name="path" required="true" type="string" readOnly="false"
+ description="The actual filesystem path. Treated as an absolute path, unless the 'relative-to' attribute is specified, in which case the value is treated as relative to that path."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false"
+ description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute."/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+
+ </resource-configuration>
</server>
<service name="DomainDeployment"
@@ -338,12 +385,6 @@
description="The absolute path to a JRE or JDK installation directory containing
the JVM that should be used to start and shutdown the JBossAS instance;
defaults to the home directory of the RHQ agent JRE."/>
- <c:list-property name="system-properties">
- <c:map-property name="system-property">
- <c:simple-property name="key" readOnly="true"/>
- <c:simple-property name="value" readOnly="true"/>
- </c:map-property>
- </c:list-property>
&logSources;
<c:group name="event" displayName="Events">
@@ -435,19 +476,32 @@
<resource-configuration>
-<!--
- <c:group name="attribute:schema-locations" displayName="Schema locations">
+ <c:group name="children:system-property:name+" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
- <c:list-property name="schema-locations" displayName="Schema locations" readOnly="true" required="false">
- <c:map-property name="*">
- <c:simple-property name="*" readOnly="true" displayName="Schema name"/>
+ <c:group name="children:path:name+" displayName="Path">
+ <c:list-property name="*3" displayName="Path" required="false"
+ description="The standard paths provided by the system include: jboss.home - the root directory of the JBoss AS distribution; user.home - user's home directory; user.dir - user's current working directory; java.home - java installation directory; jboss.server.base.dir - root directory for an individual server instance; jboss.server.data.dir - directory the server will use for persistent data file storage; jboss.server.log.dir - directory the server will use for log file storage; jboss.server.tmp.dir - directory the server will use for temporary file storage; jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances">
+ <c:map-property name="*" displayName="Entry">
+ <c:simple-property name="name" required="true" type="string" readOnly="false"
+ description="The name of the path. Cannot be one of the standard fixed paths provided by the system"/>
+ <c:simple-property name="path" required="true" type="string" readOnly="false"
+ description="The actual filesystem path. Treated as an absolute path, unless the 'relative-to' attribute is specified, in which case the value is treated as relative to that path."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false"
+ description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute."/>
</c:map-property>
</c:list-property>
</c:group>
--->
- <c:group name="children:extension" displayName="Installed extensions" hiddenByDefault="true">
- <c:list-property name="*" displayName="Installed extensions" readOnly="true" required="false">
+ <c:group name="children:extension:module" displayName="Installed extensions" hiddenByDefault="true">
+
+ <c:list-property name="*1" displayName="Installed extensions" readOnly="true" required="false">
<c:map-property name="*" displayName="Name" readOnly="true">
<c:simple-property name="module" displayName="Module name" readOnly="true"/>
</c:map-property>
@@ -529,10 +583,8 @@
</results>
</operation>
- <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
+ <metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
displayType="summary"/>
- <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
- <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
<event name="logEntry" description="an entry in a log file"/>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
index e1627e3..1af2f2f 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
@@ -18,6 +18,9 @@
*/
package org.rhq.modules.plugins.jbossas7;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.net.URL;
import java.util.List;
@@ -89,6 +92,22 @@ public class AbstractConfigurationHandlingTest {
return null;
}
+ protected String loadJsonFromFile(String fileName) throws Exception {
+ InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileName);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ try {
+ StringBuilder builder = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ builder.append(line);
+ }
+ return builder.toString();
+ }
+ finally {
+ reader.close();
+ }
+ }
+
/**
* Provide a fake connection, that will return the
* content we provide via #setContent
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
index e895dd4..8e3704b 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
@@ -463,20 +463,4 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest
}
- private String loadJsonFromFile(String fileName) throws Exception {
- InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileName);
- BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
- try {
- StringBuilder builder = new StringBuilder();
- String line;
- while ((line = reader.readLine()) != null) {
- builder.append(line);
- }
- return builder.toString();
- }
- finally {
- reader.close();
- }
- }
-
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index 09439f3..703722a 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -21,6 +21,7 @@ package org.rhq.modules.plugins.jbossas7;
import java.util.List;
import java.util.Map;
+import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
import org.testng.annotations.BeforeSuite;
@@ -32,6 +33,7 @@ import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.ComplexResult;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
@@ -362,4 +364,63 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
assert step2.getAdditionalProperties().get("value").equals("23");
}
+
+ public void test10() throws Exception {
+
+ ConfigurationDefinition definition = loadDescriptor("test10");
+
+ FakeConnection connection = new FakeConnection();
+ String resultString = loadJsonFromFile("system-props.json");
+
+ ObjectMapper mapper = new ObjectMapper();
+ ComplexResult result = mapper.readValue(resultString,ComplexResult.class);
+ JsonNode json = mapper.valueToTree(result);
+
+ connection.setContent(json);
+
+
+ ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition,connection,null);
+
+ Configuration conf = new Configuration();
+
+ // We have properties 'bar' and 'hello' on the server
+ // update 'bar', add 'hulla' and remove 'hello'
+
+ PropertyList propertyList = new PropertyList("*2");
+ PropertyMap propertyMap = new PropertyMap("*");
+ propertyMap.put(new PropertySimple("name","hulla"));
+ propertyMap.put(new PropertySimple("value","hopp"));
+ propertyList.add(propertyMap);
+ propertyMap = new PropertyMap("*");
+ propertyMap.put(new PropertySimple("name","bar"));
+ propertyMap.put(new PropertySimple("value","42!"));
+ propertyList.add(propertyMap);
+ conf.put(propertyList);
+
+
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
+
+ assert cop.numberOfSteps() == 3 : "#Steps should be 3 but were " + cop.numberOfSteps();
+
+ Operation step1 = cop.step(0);
+ Operation step2 = cop.step(1);
+ Operation step3 = cop.step(2);
+
+ assert step1.getAddress().size()==1;
+ assert step2.getAddress().size()==1;
+ assert step3.getAddress().size()==1;
+ assert step1.getAddress().get(0).equals("system-property=hulla");
+ assert step2.getAddress().get(0).equals("system-property=bar");
+ assert step3.getAddress().get(0).equals("system-property=hello");
+ assert step1.getOperation().equals("add");
+ assert step2.getOperation().equals("write-attribute");
+ assert step3.getOperation().equals("remove");
+
+ assert step1.getAdditionalProperties().get("name").equals("hulla");
+ assert step1.getAdditionalProperties().get("value").equals("hopp");
+ assert step2.getAdditionalProperties().get("name").equals("value"); // This is the name of the property
+ assert step2.getAdditionalProperties().get("value").equals("42!");
+ assert step3.getAdditionalProperties().isEmpty();
+
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/system-props.json b/modules/plugins/jboss-as-7/src/test/resources/system-props.json
new file mode 100644
index 0000000..da211cc
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/system-props.json
@@ -0,0 +1,10 @@
+{
+ "outcome" : "success",
+ "result" :
+ {
+ "bar" :
+ {"value" : "44"},
+ "hello" :
+ {"value" : "world"}
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
index 53f351a..173d2be 100644
--- a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
@@ -104,6 +104,19 @@
</resource-configuration>
</server>
+ <server class="foo" discovery="foo" name="test10">
+ <resource-configuration>
+ <c:group name="children:system-property:name+" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ </resource-configuration>
+ </server>
+
<server class="foo" discovery="foo" name="simple1">
<resource-configuration>
commit 81533f2742439923e77ae6d51166f9ed4f6caaa1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 17 14:48:11 2012 -0500
[BZ 772318] forgot to test the most obvious and most common scenario - re-starting the agent. My original fix broke that. This fixes it back again and adds a unit test for it.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
index 85aa364..e380b6e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
@@ -125,7 +125,7 @@ public class CoreServerServiceImpl implements CoreServerService {
} else {
Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
request.getPort());
- if (agentByAddressPort != null) {
+ if (agentByAddressPort != null && !agentByAddressPort.getName().equals(request.getName())) {
// the agent request provided information about an authentic agent but it is trying to
// steal another agent's host/port. Thus, we will abort this request.
String msg = "The agent asking for registration [" + request.getName()
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 0abbbeb..a3dda5e 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -119,6 +119,15 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
assert agent.getAddress().equals("hostZdoubleprime");
assert agent.getPort() == 55552;
+ // now don't change Z's host/port but re-register everything the same with its token
+ request = createRequest(zName, "hostZdoubleprime", 55552, results.getAgentToken());
+ results = service.registerAgent(request);
+ assert results != null;
+ agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZdoubleprime");
+ assert agent.getPort() == 55552;
+
// now don't change Z's host/port but re-register everything the same, but with no token
request = createRequest(zName, "hostZdoubleprime", 55552, null);
results = service.registerAgent(request);
@@ -343,6 +352,8 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
MBeanServer mbs = getJBossMBeanServer();
mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
+ unprepareForTestAgents();
+
// in case this was set before our tests, put it back the way it was
if (oldServerNamePropertyValue != null) {
System.setProperty(RHQ_SERVER_NAME_PROPERTY, oldServerNamePropertyValue);
commit 6f1033574f6e2541677382373f9960f29f8a2956
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 17 12:04:00 2012 -0500
[BZ 772318] the agent registration process was lax and allowed somethings that it shouldn't have. This closes the known holes and adds unit tests to check that all known use-cases are handled properly.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
index 3b5ecc7..85aa364 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
@@ -94,9 +94,6 @@ public class CoreServerServiceImpl implements CoreServerService {
// If not, no point in continuing - the server won't be able to talk to the agent anyway.
pingEndpoint(request.getRemoteEndpoint());
- // TODO (ghinkle): Check platform limit - do we still care about this?
- //getPlatformManager().enforceLicenseLimit(args.getCpuCount());
-
Agent agentByName = getAgentManager().getAgentByName(request.getName());
/*
@@ -125,6 +122,38 @@ public class CoreServerServiceImpl implements CoreServerService {
String msg = "The agent asking for registration is already registered with the name ["
+ agentByToken.getName() + "], it cannot change its name to [" + request.getName() + "]";
throw new AgentRegistrationException(msg);
+ } else {
+ Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
+ request.getPort());
+ if (agentByAddressPort != null) {
+ // the agent request provided information about an authentic agent but it is trying to
+ // steal another agent's host/port. Thus, we will abort this request.
+ String msg = "The agent asking for registration [" + request.getName()
+ + "] is trying to register the same address/port [" + request.getAddress() + ":"
+ + request.getPort() + "] that is already registered under a different name ["
+ + agentByAddressPort.getName() + "]";
+ throw new AgentRegistrationException(msg);
+ }
+ }
+ } else {
+ if (agentByName != null) {
+ // the agent request provided a name that already is in use by an agent. However, the request
+ // provided a security token that was not assigned to any agent! How can this be? Something is fishy.
+ String msg = "The agent asking for registration under the name [" + request.getName()
+ + "] provided an invalid security token. This request will fail.";
+ throw new AgentRegistrationException(msg);
+ }
+ Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
+ request.getPort());
+ if (agentByAddressPort != null) {
+ // the agent request provided a security token but it is an unknown/unused/bogus token.
+ // However, the IP/port it wants to use is already in-use. This sounds fishy. If we let this
+ // go through, this agent with an unknown/bogus token will essentially hijack this IP/port
+ // belonging to an existing agent. If the agent wants to reuse an IP/port already in existence, it should
+ // already know its security token associated with that IP/port. Thus, we will abort this request.
+ String msg = "The agent asking for registration under the name [" + request.getName()
+ + "] is attempting to authenticate using an unknown security token. This request will fail.";
+ throw new AgentRegistrationException(msg);
}
}
} else {
@@ -141,6 +170,22 @@ public class CoreServerServiceImpl implements CoreServerService {
+ "]; if this new agent is actually the same as the original, then re-register with the same name";
throw new AgentRegistrationException(msg);
}
+ } else {
+ if (agentByName != null) {
+ // the name being registered already exists, however, the agent request is trying to set it
+ // to some unknown IP/port combination and there is no security token to authenticate this request!
+ // Therefore, because this agent name is already registered and because this current request
+ // cannot authenticate itself with the proper security token, we fail.
+ String msg = "An agent is trying to register with an existing agent name ["
+ + request.getName()
+ + "]. The registration request is attempting to assign the agent an unknown address/port ["
+ + request.getAddress()
+ + ":"
+ + request.getPort()
+ + "] without providing a valid security token. If you are attempting to re-register this agent, "
+ + "make sure you register with its prior address/port.";
+ throw new AgentRegistrationException(msg);
+ }
}
}
@@ -196,8 +241,8 @@ public class CoreServerServiceImpl implements CoreServerService {
// the agent does not yet exist, we need to create it
try {
- agentByName = new Agent(request.getName(), request.getAddress(), request.getPort(), request
- .getRemoteEndpoint(), generateAgentToken());
+ agentByName = new Agent(request.getName(), request.getAddress(), request.getPort(),
+ request.getRemoteEndpoint(), generateAgentToken());
agentByName.setServer(registeringServer);
agentManager.createAgent(agentByName);
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
new file mode 100644
index 0000000..0abbbeb
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -0,0 +1,432 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.core;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+
+import javax.management.MBeanServer;
+import javax.persistence.Query;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.core.clientapi.server.core.AgentRegistrationException;
+import org.rhq.core.clientapi.server.core.AgentRegistrationRequest;
+import org.rhq.core.clientapi.server.core.AgentRegistrationResults;
+import org.rhq.core.clientapi.server.core.AgentVersion;
+import org.rhq.core.domain.cloud.Server;
+import org.rhq.core.domain.cloud.Server.OperationMode;
+import org.rhq.core.domain.common.ProductInfo;
+import org.rhq.core.domain.resource.Agent;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+/**
+ * @author John Mazzitelli
+ */
+@Test
+public class CoreServerServiceImplTest extends AbstractEJB3Test {
+ private static final String TEST_AGENT_NAME_PREFIX = "CoreServerServiceImplTest.Agent";
+ private static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name";
+ private AgentVersion agentVersion;
+ private Server server;
+ private String oldServerNamePropertyValue = null;
+ private AgentRegistrationRequest aReq = null;
+ private AgentRegistrationResults aResults = null;
+ private AgentRegistrationRequest zReq = null;
+ private AgentRegistrationResults zResults = null;
+
+ private static final int A_PORT = 11111;
+ private static final String A_HOST = "hostA";
+ private static final int B_PORT = 22222;
+ private static final String B_HOST = "hostB";
+
+ public void testNewAgentRegistrationWithOldToken() throws Exception {
+ // this tests the case where someone purged an agent from the DB, but then
+ // changed their mind and want to re-run that agent and re-register it again.
+ // In this case, the agent (if not using --cleanconfig) would still have the old token.
+ // The agent should still be allowed to register again.
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request = createRequest(prefixName("old"), "hostOld", 12345, "oldtoken");
+ AgentRegistrationResults results = service.registerAgent(request);
+ assert results != null : "cannot re-register an old agent";
+ Agent agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(request.getName());
+ assert agent.getAddress().equals(request.getAddress());
+ assert agent.getPort() == request.getPort();
+ LookupUtil.getAgentManager().deleteAgent(agent);
+ }
+
+ public void testChangeAddressPort() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ AgentRegistrationResults results;
+
+ String zName = prefixName("Z");
+
+ // create a new agent Z with host/port of hostZ/55550
+ request = createRequest(zName, "hostZ", 55550, null);
+ results = service.registerAgent(request);
+ assert results != null : "got null results";
+
+ // now change Z's host to hostZprime
+ request = createRequest(zName, "hostZprime", 55550, results.getAgentToken());
+ results = service.registerAgent(request);
+ assert results != null;
+ Agent agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZprime");
+ assert agent.getPort() == 55550;
+
+ // now change Z's port to 55551
+ request = createRequest(zName, "hostZprime", 55551, results.getAgentToken());
+ results = service.registerAgent(request);
+ assert results != null;
+ agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZprime");
+ assert agent.getPort() == 55551;
+
+ // now change Z's host/port to hostZdoubleprime/55552
+ request = createRequest(zName, "hostZdoubleprime", 55552, results.getAgentToken());
+ results = service.registerAgent(request);
+ assert results != null;
+ agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZdoubleprime");
+ assert agent.getPort() == 55552;
+
+ // now don't change Z's host/port but re-register everything the same, but with no token
+ request = createRequest(zName, "hostZdoubleprime", 55552, null);
+ results = service.registerAgent(request);
+ assert results != null;
+ agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZdoubleprime");
+ assert agent.getPort() == 55552;
+
+ // remember this agent so our later tests can use it
+ zReq = request;
+ zResults = results;
+ }
+
+ @Test(dependsOnMethods = "testChangeAddressPort")
+ public void testNormalAgentRegistration() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ aReq = createRequest(prefixName("A"), A_HOST, A_PORT, null);
+ aResults = service.registerAgent(aReq);
+ assert aResults != null : "got null results";
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentAddressPort() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(prefixName("B"), aReq.getAddress(), aReq.getPort(), null);
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used host/port with new agent name";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentName() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, null);
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name without a token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), null);
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name without a token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, B_PORT, null);
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name without a token";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentAddressPortWithBogusToken() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(prefixName("B"), aReq.getAddress(), aReq.getPort(), "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used host/port with new agent name and invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentNameWithBogusToken() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(aReq.getName(), aReq.getAddress(), aReq.getPort(), "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name with an invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name with an invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name with an invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, B_PORT, "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name with an invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentNameWithAnotherAgentToken() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(aReq.getName(), aReq.getAddress(), aReq.getPort(), zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack agent A using Z's token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack agent A using Z's token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack agent A using Z's token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, B_PORT, zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack agent A using Z's token";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testAgentHijackingAnotherAgentAddressPort() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(aReq.getName(), zReq.getAddress(), zReq.getPort(), aResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "An agent should not have been able to hijack another agent's host/port";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testAttemptToChangeAgentName() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(prefixName("newName"), zReq.getAddress(), zReq.getPort(), zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "An agent should not be able to change its name";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ private AgentRegistrationRequest createRequest(String name, String address, int port, String token) {
+ return new AgentRegistrationRequest(name, address, port, "socket://" + address + ":" + port
+ + "/?rhq.communications.connector.rhqtype=agent", true, token, agentVersion);
+ }
+
+ private String prefixName(String name) {
+ return TEST_AGENT_NAME_PREFIX + name;
+ }
+
+ @BeforeClass
+ public void prepare() throws Exception {
+ // mock the name of our server via the sysprop (in production, this is normally set in rhq-server.properties)
+ oldServerNamePropertyValue = System.getProperty(RHQ_SERVER_NAME_PROPERTY);
+ String newServerNamePropertyValue = "CoreServerServiceImplTest.Server";
+ System.setProperty(RHQ_SERVER_NAME_PROPERTY, newServerNamePropertyValue);
+
+ // mock up our core server MBean that provides information about where the jboss home dir is
+ MBeanServer mbs = getJBossMBeanServer();
+ DummyCoreServer mbean = new DummyCoreServer();
+ mbs.registerMBean(mbean, CoreServerMBean.OBJECT_NAME);
+
+ // in order to register, we need to mock out the agent version file used by the server
+ // to determine the agent version it supports.
+ agentVersion = new AgentVersion("1.2.3", "12345");
+ File agentVersionFile = new File(mbean.getJBossServerHomeDir(),
+ "deploy/rhq.ear/rhq-downloads/rhq-agent/rhq-server-agent-versions.properties");
+ agentVersionFile.getParentFile().mkdirs();
+ agentVersionFile.delete();
+ Properties agentVersionProps = new Properties();
+ agentVersionProps.put("rhq-agent.latest.version", agentVersion.getVersion());
+ agentVersionProps.put("rhq-agent.latest.build-number", agentVersion.getBuild());
+ FileOutputStream fos = new FileOutputStream(agentVersionFile);
+ try {
+ agentVersionProps.store(fos, "This file was created by " + CoreServerServiceImplTest.class.getName());
+ } finally {
+ fos.close();
+ }
+
+ // this mocks out the endpoint ping - the server will think the agent that is registering is up and pingable
+ prepareForTestAgents();
+
+ // mock our server
+ server = new Server();
+ server.setName(newServerNamePropertyValue);
+ server.setAddress("CoreServerServiceImplTest.localhost");
+ server.setPort(12345);
+ server.setSecurePort(12346);
+ server.setOperationMode(OperationMode.NORMAL);
+ int serverId = LookupUtil.getServerManager().create(server);
+ server.setId(serverId);
+ }
+
+ @AfterClass
+ public void unprepare() throws Exception {
+ // clean up any agents we might have created
+ Query q = getEntityManager().createQuery(
+ "select a from Agent a where name like '" + TEST_AGENT_NAME_PREFIX + "%'");
+ List<Agent> doomed = (List<Agent>) q.getResultList();
+ for (Agent deleteMe : doomed) {
+ LookupUtil.getAgentManager().deleteAgent(deleteMe);
+ }
+
+ // cleanup our test server
+ LookupUtil.getCloudManager().updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN);
+ LookupUtil.getCloudManager().deleteServer(server.getId());
+
+ // shutdown our mock mbean server
+ MBeanServer mbs = getJBossMBeanServer();
+ mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
+
+ // in case this was set before our tests, put it back the way it was
+ if (oldServerNamePropertyValue != null) {
+ System.setProperty(RHQ_SERVER_NAME_PROPERTY, oldServerNamePropertyValue);
+ }
+ }
+
+ interface DummyCoreServerMBean extends CoreServerMBean {
+ };
+
+ class DummyCoreServer implements DummyCoreServerMBean {
+
+ @Override
+ public String getName() {
+ return "CoreServer";
+ }
+
+ @Override
+ public int getState() {
+ return 0;
+ }
+
+ @Override
+ public String getStateString() {
+ return "";
+ }
+
+ @Override
+ public void jbossInternalLifecycle(String arg0) throws Exception {
+ }
+
+ @Override
+ public void create() throws Exception {
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ @Override
+ public void start() throws Exception {
+ }
+
+ @Override
+ public void stop() {
+ }
+
+ @Override
+ public String getVersion() {
+ return null;
+ }
+
+ @Override
+ public String getBuildNumber() {
+ return null;
+ }
+
+ @Override
+ public Date getBootTime() {
+ return null;
+ }
+
+ @Override
+ public File getInstallDir() {
+ return null;
+ }
+
+ @Override
+ public File getJBossServerHomeDir() {
+ return new File(System.getProperty("java.io.tmpdir"), "CoreServerServiceImplTest");
+ }
+
+ @Override
+ public File getJBossServerDataDir() {
+ return null;
+ }
+
+ @Override
+ public File getJBossServerTempDir() {
+ return null;
+ }
+
+ @Override
+ public ProductInfo getProductInfo() {
+ return null;
+ }
+ }
+}
commit e5d30c973fd0c8e7410c331ebdd991d330f4049c
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 17 14:10:50 2012 +0100
Use the secured script engine in the JNDI integration tests.
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
index f20d4f1..c6140a0 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
@@ -177,11 +177,7 @@ public class JndiAccessTest extends AbstractEJB3Test {
private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
- ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
-
- PermissionCollection perms = new StandardScriptPermissions();
-
- return new SandboxedScriptEngine(engine, perms);
+ return ScriptEngineFactory.getSecuredScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings, new StandardScriptPermissions());
}
private static void checkIsDesiredSecurityException(ScriptException e) {
commit 2c9a0b72daaefbab9697d0a14494106a957b2dac
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 16 15:47:14 2012 -0500
[Bug 769719 - resource key not HTML-escaped in search results and resource detail]
Treat the key value as needing to be html escaped in the resource
overview and search views. Although, it is not typically displayed in
search results anyway.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java
index c60236c..27db60f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java
@@ -2,7 +2,7 @@ package org.rhq.enterprise.gui.coregui.client.components.table;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.enterprise.gui.coregui.client.ImageManager;
+
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index c9210e9..a164620 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -139,38 +139,40 @@ public class ResourceSearchView extends Table {
List<ListGridField> fields = createFields();
setListGridFields(fields.toArray(new ListGridField[fields.size()]));
- addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(), MSG
- .view_inventory_resources_uninventoryConfirm(), new ResourceAuthorizedTableAction(ResourceSearchView.this,
- TableActionEnablement.ANY, Permission.DELETE_RESOURCE, new RecordExtractor<Integer>() {
-
- public Collection<Integer> extract(Record[] records) {
- List<Integer> result = new ArrayList<Integer>(records.length);
- for (Record record : records) {
- result.add(record.getAttributeAsInt("id"));
+ addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(),
+ MSG.view_inventory_resources_uninventoryConfirm(), new ResourceAuthorizedTableAction(
+ ResourceSearchView.this, TableActionEnablement.ANY, Permission.DELETE_RESOURCE,
+ new RecordExtractor<Integer>() {
+
+ public Collection<Integer> extract(Record[] records) {
+ List<Integer> result = new ArrayList<Integer>(records.length);
+ for (Record record : records) {
+ result.add(record.getAttributeAsInt("id"));
+ }
+
+ return result;
}
+ }) {
- return result;
- }
- }) {
-
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- int[] resourceIds = TableUtility.getIds(selection);
- ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ int[] resourceIds = TableUtility.getIds(selection);
+ ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
- resourceManager.uninventoryResources(resourceIds, new AsyncCallback<List<Integer>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_uninventoryFailed(), caught);
- }
+ resourceManager.uninventoryResources(resourceIds, new AsyncCallback<List<Integer>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_uninventoryFailed(),
+ caught);
+ }
- public void onSuccess(List<Integer> result) {
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_inventory_resources_uninventorySuccessful(), Severity.Info));
+ public void onSuccess(List<Integer> result) {
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_inventory_resources_uninventorySuccessful(), Severity.Info));
- onUninventorySuccess();
- }
- });
- }
- });
+ onUninventorySuccess();
+ }
+ });
+ }
+ });
setListGridDoubleClickHandler(new DoubleClickHandler() {
public void onDoubleClick(DoubleClickEvent event) {
@@ -226,6 +228,7 @@ public class ResourceSearchView extends Table {
fields.add(nameField);
ListGridField keyField = new ListGridField(KEY.propertyName(), KEY.title(), 170);
+ keyField.setCellFormatter(new EscapedHtmlCellFormatter());
fields.add(keyField);
ListGridField ancestryField = AncestryUtil.setupAncestryListGridField();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java
index 3db8f68..50bf723 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java
@@ -40,8 +40,8 @@ import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.form.EditableFormItem;
import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm;
-import org.rhq.enterprise.gui.coregui.client.components.form.StringLengthValidator;
import org.rhq.enterprise.gui.coregui.client.components.form.SimpleEditableFormItem.ValueEditedHandler;
+import org.rhq.enterprise.gui.coregui.client.components.form.StringLengthValidator;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
@@ -153,6 +153,7 @@ public class OverviewForm extends EnhancedDynamicForm {
// Key
StaticTextItem keyItem = new StaticTextItem(ResourceDataSourceField.KEY.propertyName(),
ResourceDataSourceField.KEY.title());
+ keyItem.setAttribute(OUTPUT_AS_HTML_ATTRIBUTE, true);
keyItem.setValue(resource.getResourceKey());
formItems.add(keyItem);
@@ -189,8 +190,8 @@ public class OverviewForm extends EnhancedDynamicForm {
public void onSuccess(Void result) {
titleBar.displayResourceName(newName);
CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(String
- .valueOf(resource.getId()), oldName, newName), Message.Severity.Info));
+ new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(
+ String.valueOf(resource.getId()), oldName, newName), Message.Severity.Info));
}
});
}
@@ -218,8 +219,8 @@ public class OverviewForm extends EnhancedDynamicForm {
OverviewForm.this.resourceService.updateResource(resource, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(
- MSG.view_summaryOverviewForm_error_descriptionChangeFailure(String.valueOf(resource
- .getId()), oldDescription, newDescription), caught);
+ MSG.view_summaryOverviewForm_error_descriptionChangeFailure(
+ String.valueOf(resource.getId()), oldDescription, newDescription), caught);
// We failed to update it on the Server, so change back the Resource and the form item to
// the original value.
resource.setDescription(oldDescription);
@@ -227,11 +228,10 @@ public class OverviewForm extends EnhancedDynamicForm {
}
public void onSuccess(Void result) {
- CoreGUI.getMessageCenter()
- .notify(
- new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(String
- .valueOf(resource.getId()), oldDescription, newDescription),
- Message.Severity.Info));
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(
+ String.valueOf(resource.getId()), oldDescription, newDescription),
+ Message.Severity.Info));
}
});
}
@@ -259,8 +259,8 @@ public class OverviewForm extends EnhancedDynamicForm {
OverviewForm.this.resourceService.updateResource(resource, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(
- MSG.view_summaryOverviewForm_error_locationChangeFailure(String.valueOf(resource
- .getId()), oldLocation, newLocation), caught);
+ MSG.view_summaryOverviewForm_error_locationChangeFailure(
+ String.valueOf(resource.getId()), oldLocation, newLocation), caught);
// We failed to update it on the Server, so change back the Resource and the form item to
// the original value.
resource.setLocation(oldLocation);
@@ -268,9 +268,11 @@ public class OverviewForm extends EnhancedDynamicForm {
}
public void onSuccess(Void result) {
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(String
- .valueOf(resource.getId()), oldLocation, newLocation), Message.Severity.Info));
+ CoreGUI.getMessageCenter()
+ .notify(
+ new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(
+ String.valueOf(resource.getId()), oldLocation, newLocation),
+ Message.Severity.Info));
}
});
}
commit 13546f899490b333b4527ce963d1b39b3a097153
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 16 13:45:09 2012 -0500
[Bug 758503 - Various AS-5 plugin types have unset read-only plugin config props]
required/read-only contextPath and filename props were not being set
[reliably] at discovery time. Removed filename props, which did not seem
to be used by the plugin. Set contextPath props to required="false".
The value does not seem to be used by the plugin but the property is
at least defined in the code.
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 2729d31..bac3e20 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -2278,7 +2278,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="The name of this EAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="ear" readOnly="true"/>
@@ -2335,8 +2334,8 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" readOnly="true"/>
+ <!-- setting to required=false since this is not usually set properly at discovery time -->
+ <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" required="false" readOnly="false"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="war" readOnly="true"/>
@@ -2418,7 +2417,8 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/>
- <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" readOnly="true"/>
+ <!-- setting to required=false since this is not usually set properly at discovery time -->
+ <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" required="false" readOnly="false"/>
</c:group>
<c:group name="ResponseTime">
<c:simple-property name="responseTimeLogFile" required="false"
@@ -2485,7 +2485,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="jar" readOnly="true"/>
@@ -2581,7 +2580,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="jar" readOnly="true"/>
@@ -2654,7 +2652,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="jar" readOnly="true"/>
@@ -2731,7 +2728,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="jar" readOnly="true"/>
@@ -2793,7 +2789,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="rar" readOnly="true"/>
@@ -2839,7 +2834,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="rar" readOnly="true"/>
commit 5b4ab4a5a34811b157ab8bcb889aa2f4a0274302
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 16 13:41:23 2012 +0100
Fixing the JNDI integration test's pom.
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 1991e0e..fad4127 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -80,6 +80,12 @@
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -94,6 +100,12 @@
<artifactId>rhq-server-client-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -300,7 +312,7 @@
<jnp.port>${jnp.port}</jnp.port>
<jnp.rmiPort>${jnp.rmiPort}</jnp.rmiPort>
</systemPropertyVariables>
- <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
+ <argLine>-Djava.security.manager -Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
<additionalClasspathElements>
<!-- The below is required for tests to run against
Oracle. -->
commit eeeb3156b6b66fb4ead5cadec1f4eb3aa0af18c5
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 16 12:24:39 2012 +0100
Adding missing module references to the integration tests profile.
diff --git a/modules/pom.xml b/modules/pom.xml
index f0eaeef..ba4d1b5 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -156,9 +156,19 @@
<module>core</module>
<module>common</module>
<module>plugins</module>
+
<!-- these two are needed by the rhq-agent plugin -->
<module>enterprise/agent</module>
<module>enterprise/comm</module>
+
+ <!-- These 6 are needed for the JNDI intergration tests -->
+ <module>enterprise/server/container-lib</module>
+ <module>enterprise/server/xml-schemas</module>
+ <module>enterprise/server/safe-invoker</module>
+ <module>enterprise/server/jar</module>
+ <module>enterprise/binding</module>
+ <module>enterprise/server/client-api</module>
+
<module>integration-tests</module>
</modules>
</profile>
commit a5d162e2e77b65945eb56e0800b380de93ca1bba
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sun Jan 15 14:32:14 2012 +0100
Fix a small issue with opacity, that prevented the dots to show.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
index 0f38577..4ff8174 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
@@ -160,12 +160,14 @@ $.getJSON('/rest/1/resource/platforms.json', function (json) {
var line = d3.svg.line()
.x(function(d,i) { return x(d.timeStamp-dayMinTs); })
- .y(function(d) { return y(d.value); })
- lines.append("svg:path").attr("d", line(daydat)).style("stroke",colors[day]);
+ .y(function(d) { return y(d.value); });
+ lines.append("svg:path")
+ .attr("d", line(daydat))
+ .style("stroke",colors[day]);
var dot = svg.append("svg:g").attr("class","dotschart")
- .selectAll("dot").data(jsondata)
+ .selectAll("dot").data(jsondata);
dot.enter().append("svg:circle")
.attr("cx", function (d) {
@@ -175,8 +177,7 @@ $.getJSON('/rest/1/resource/platforms.json', function (json) {
return y(d.value);
})
.style("stroke", colors[day])
- .attr("r", 1)
- .attr("opacity","0")
+ .attr("r", 1);
}
});
commit a6015157d51f146e824898b60108d5ea03ec030a
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sun Jan 15 14:31:32 2012 +0100
Allow to get and set baselines.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index 71a6a45..53255a6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -36,6 +36,8 @@ import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
import javax.sql.DataSource;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
@@ -62,6 +64,7 @@ import org.jboss.cache.Fqn;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.DataType;
+import org.rhq.core.domain.measurement.MeasurementBaseline;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
@@ -70,6 +73,7 @@ import org.rhq.core.util.jdbc.JDBCUtil;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
+import org.rhq.enterprise.server.rest.domain.Baseline;
import org.rhq.enterprise.server.rest.domain.Link;
import org.rhq.enterprise.server.rest.domain.MetricAggregate;
import org.rhq.enterprise.server.measurement.MeasurementAggregate;
@@ -93,6 +97,8 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
MeasurementScheduleManagerLocal scheduleManager;
@EJB
ResourceManagerLocal resMgr;
+ @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
+ EntityManager em;
@javax.annotation.Resource(name = "RHQ_DS")
private DataSource rhqDs;
@@ -114,7 +120,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
startTime = endTime - EIGHT_HOURS;
}
- MeasurementSchedule schedule = obtainSchedule(scheduleId);
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, false);
MeasurementAggregate aggr = dataManager.getAggregate(caller, scheduleId, startTime, endTime);
MetricAggregate res = new MetricAggregate(scheduleId, aggr.getMin(),aggr.getAvg(),aggr.getMax());
@@ -149,13 +155,16 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
/**
* Get the schedule for the passed schedule id
+ *
* @param scheduleId id to look up
+ * @param force
* @return schedule
* @throws StuffNotFoundException if there is no schedule with the passed id
*/
- private MeasurementSchedule obtainSchedule(int scheduleId) {
- MeasurementSchedule schedule;
- schedule = getFromCache(scheduleId,MeasurementSchedule.class);
+ private MeasurementSchedule obtainSchedule(int scheduleId, boolean force) {
+ MeasurementSchedule schedule=null;
+ if(!force)
+ schedule = getFromCache(scheduleId,MeasurementSchedule.class);
if (schedule==null) {
schedule = scheduleManager.getScheduleById(caller,scheduleId);
if (schedule==null) {
@@ -419,7 +428,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
throw new IllegalArgumentException("Start time is older than 7 days");
// Check if the schedule exists
- obtainSchedule(scheduleId);
+ obtainSchedule(scheduleId, false);
RawNumericStreamingOutput so = new RawNumericStreamingOutput();
so.scheduleId = scheduleId;
@@ -441,7 +450,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
NumericDataPoint point, @Context HttpHeaders headers, UriInfo uriInfo) {
MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
- MeasurementSchedule schedule = obtainSchedule(scheduleId);
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, false);
Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(1);
data.add(new MeasurementDataNumeric(point.getTimeStamp(),scheduleId,point.getValue()));
@@ -476,6 +485,50 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
}
+ @Override
+ @GET
+ @Path("data/{scheduleId}/baseline")
+ public Baseline getBaseline(@PathParam("scheduleId") int scheduleId, @Context HttpHeaders headers,
+ @Context UriInfo uriInfo) {
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, true);
+ MeasurementBaseline mBase = schedule.getBaseline();
+
+ Baseline b;
+ if (mBase==null)
+ throw new StuffNotFoundException("Baseline for schedule [" + scheduleId +"]");
+ else
+ b = new Baseline(mBase.getMin(),mBase.getMax(),mBase.getMean(),mBase.getComputeTime().getTime());
+ return b;
+
+ }
+
+ @Override
+ @PUT
+ @Path("data/{scheduleId}/baseline")
+ public void setBaseline(@PathParam("scheduleId") int scheduleId,
+ Baseline baseline, HttpHeaders headers, @Context UriInfo uriInfo) {
+ MeasurementSchedule schedule = obtainSchedule(scheduleId, false);
+
+ // little bit of sanity checking
+ if (baseline.getMin()>baseline.getMean() || baseline.getMean()>baseline.getMax() || baseline.getMin()>baseline.getMax())
+ throw new IllegalArgumentException("Baseline not correct. it should be min<=mean<=max");
+
+ MeasurementBaseline mBase = schedule.getBaseline();
+ if (mBase == null) {
+ mBase = new MeasurementBaseline();
+ mBase.setSchedule(schedule);
+ schedule.setBaseline(mBase);
+ em.persist(mBase);
+ }
+ mBase.setMax(baseline.getMax());
+ mBase.setMin(baseline.getMin());
+ mBase.setMean(baseline.getMean());
+ mBase.setUserEntered(true);
+
+ scheduleManager.updateSchedule(caller,schedule);
+
+ }
+
/**
* Write the numeric data points to the output stream in JSON encoding
* without creating tons of objects in the middle to have them marshalled
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
index 6f76bce..6d9c174 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
@@ -39,6 +39,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import javax.ws.rs.core.UriInfo;
+import org.rhq.enterprise.server.rest.domain.Baseline;
import org.rhq.enterprise.server.rest.domain.MetricAggregate;
import org.rhq.enterprise.server.rest.domain.MetricSchedule;
import org.rhq.enterprise.server.rest.domain.NumericDataPoint;
@@ -155,4 +156,19 @@ public interface MetricHandlerLocal {
@Path("data/raw")
@Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
Response postMetricValues(Collection<NumericDataPoint> points, @Context HttpHeaders headers);
+
+ @GET
+ @Path("data/{scheduleId}/baseline")
+ @Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ Baseline getBaseline(@PathParam("scheduleId") int scheduleId,
+ @Context HttpHeaders headers,
+ @Context UriInfo uriInfo);
+
+ @PUT
+ @Path("data/{scheduleId}/baseline")
+ @Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ void setBaseline(@PathParam("scheduleId") int scheduleId,
+ Baseline baseline,
+ @Context HttpHeaders headers,
+ @Context UriInfo uriInfo);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java
new file mode 100644
index 0000000..d6a4073
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java
@@ -0,0 +1,58 @@
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * A baseline
+ * @author Heiko W. Rupp
+ */
+@XmlRootElement
+public class Baseline {
+
+ double min;
+ double max;
+ double mean;
+ long computeTime;
+
+ public Baseline() {
+ }
+
+ public Baseline(double min, double max, double mean, long computeTime) {
+ this.min = min;
+ this.max = max;
+ this.mean = mean;
+ this.computeTime = computeTime;
+ }
+
+ public double getMin() {
+ return min;
+ }
+
+ public void setMin(double min) {
+ this.min = min;
+ }
+
+ public double getMax() {
+ return max;
+ }
+
+ public void setMax(double max) {
+ this.max = max;
+ }
+
+ public double getMean() {
+ return mean;
+ }
+
+ public void setMean(double mean) {
+ this.mean = mean;
+ }
+
+ public long getComputeTime() {
+ return computeTime;
+ }
+
+ public void setComputeTime(long computeTime) {
+ this.computeTime = computeTime;
+ }
+}
commit 10051994173b5b1467155bb957b7c4dbd579011c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sun Jan 15 13:55:51 2012 +0100
BZ 781801 - if frequency is 0 print a note and return.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
index 286a75e..1d64102 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
@@ -115,7 +115,12 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage
// Determine how much data we need to calculate baselines for by determining the oldest and youngest
// measurement data to include in the calculations.
long amountOfData = Long.parseLong(baselineDataSetString);
- long baselinesOlderThanTime = System.currentTimeMillis() - Long.parseLong(baselineFrequencyString);
+ long baselineFrequency = Long.parseLong(baselineFrequencyString);
+ if (baselineFrequency==0) {
+ log.info("Baseline frequency is set to 0 - not recomputing baselines. Go to Admin->System settings to change this.");
+ return;
+ }
+ long baselinesOlderThanTime = System.currentTimeMillis() - baselineFrequency;
measurementBaselineManager.calculateAutoBaselines(amountOfData, baselinesOlderThanTime);
@@ -147,20 +152,20 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage
now = System.currentTimeMillis();
int totalInserted = 0;
while (true) {
- /*
+ /*
* each call is done in a separate xtn of at most 100K inserted rows; this helps to keep the xtn
* shorter to avoid timeouts in scenarios where baseline calculations bunch together. the idea was that
- * by basing a batch of baseline calculations off of the import time of the resource into inventory,
+ * by basing a batch of baseline calculations off of the import time of the resource into inventory,
* that the total work would naturally be staggered throughout the day. in practice, this didn't always
* work as intended for one of several reasons:
- *
- * 1) all servers in the cloud were down for a few days (maybe a slow product upgrade, maybe a cold
+ *
+ * 1) all servers in the cloud were down for a few days (maybe a slow product upgrade, maybe a cold
* data center relocation)
* 2) issues with running the job itself, if quartz had locking issues under severe load and somehow
* this job wasn't get executed for a few hours / days
* 3) the user tended to import all new resources / platforms at the same time of day, thus bypassing
* the implicit optimization of trying to stagger the calculations by resource commit time
- *
+ *
* 2/18/2010 NOTE: Limits weren't / aren't actually achieving the affect we want. The baseline query
* follows the general form of "insert into...select from <big query> having <subquery> limit X".
* In this case, the limit was reducing the number of rows inserted, but it was still taking the full
@@ -169,20 +174,20 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage
* part - the "big query". What we actually want to do is come of with a strategy that lessens the
* amount of data we need to select, thereby reducing the amount of time it takes to calculate the
* insertion list.
- *
+ *
* One proposed strategy for this would be to chunk on the scheduleId. So if there were, say,
* 5M scheduleIds in the systems, we might take 500K of them at a time and then execute the
* baseline insertion job 10 times against a much smaller set of data each time. But the
* complication here is how to calculate precise groups of 500K schedules at a time, and then
* walk that chunked list.
- *
+ *
* Another strategy would be to divy things up by resource type. Since a measurementSchedule is
* linked to a measurementDefinition which is linked to a resourceType, we could very easily chunk
* the insertion based off the schedules that belong to each resourceType. This would create
* one insert statement for each type of resource in system. The complication here, however,
* is that you may have millions of resources of one type, but hardly any resources of another.
* So there's still a chance that some insertions proceed slowly (in the worst case).
- *
+ *
* In any event, an appropriate chunking solution needs to be found, and that partitioning strategy
* needs to replace the limits in the query today.
*/
commit b68ebef3089a2358a64d1594c0357cd076ef4cf8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 13 17:35:16 2012 -0500
[BZ 692948] config comparator GWT view now compares list-o-maps and maps
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
index 15e0fb1..cbf4059 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
@@ -37,10 +37,14 @@ import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.configuration.AbstractPropertyMap;
import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
+import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinition;
+import org.rhq.core.domain.configuration.definition.PropertyDefinitionList;
+import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
import org.rhq.core.domain.configuration.definition.PropertyGroupDefinition;
import org.rhq.core.domain.resource.ResourceType;
@@ -53,6 +57,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
* @author Greg Hinkle
*/
public class ConfigurationComparisonView extends VLayout {
+ private static final String ATTRIB_ALL_SAME = "consistent";
+
private static final Messages MSG = CoreGUI.getMessages();
private ConfigurationDefinition definition;
@@ -83,7 +89,7 @@ public class ConfigurationComparisonView extends VLayout {
nameField.setFrozen(true);
nameField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
- if (listGridRecord == null || listGridRecord.getAttributeAsBoolean("consistent")) {
+ if (listGridRecord == null || listGridRecord.getAttributeAsBoolean(ATTRIB_ALL_SAME)) {
return String.valueOf(o);
} else {
return "<span style=\"color: red;\">" + String.valueOf(o) + "</span>";
@@ -103,7 +109,7 @@ public class ConfigurationComparisonView extends VLayout {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
if (!(listGridRecord instanceof ComparisonTreeNode)) {
return "";
- } else if (listGridRecord.getAttributeAsBoolean("consistent")) {
+ } else if (listGridRecord.getAttributeAsBoolean(ATTRIB_ALL_SAME)) {
return String.valueOf(o);
} else {
return "<span style=\"color: red;\">" + String.valueOf(o) + "</span>";
@@ -135,9 +141,7 @@ public class ConfigurationComparisonView extends VLayout {
}
for (PropertyGroupDefinition group : definition.getGroupDefinitions()) {
-
TreeNode groupNode = new TreeNode(group.getDisplayName());
-
buildNode(groupNode, definition.getPropertiesInGroup(group.getName()), configs);
children.add(groupNode);
}
@@ -152,23 +156,79 @@ public class ConfigurationComparisonView extends VLayout {
List<? extends AbstractPropertyMap> maps) {
ArrayList<TreeNode> children = new ArrayList<TreeNode>();
- parent.setAttribute("consistent", true);
+ parent.setAttribute(ATTRIB_ALL_SAME, true);
for (PropertyDefinition definition : definitions) {
if (definition instanceof PropertyDefinitionSimple) {
-
ArrayList<PropertySimple> properties = new ArrayList<PropertySimple>();
for (AbstractPropertyMap map : maps) {
properties.add(map.getSimple(definition.getName()));
}
ComparisonTreeNode node = new ComparisonTreeNode((PropertyDefinitionSimple) definition, properties,
titles);
- if (!node.getAttributeAsBoolean("consistent")) {
- parent.setAttribute("consistent", false);
+ if (!node.getAttributeAsBoolean(ATTRIB_ALL_SAME)) {
+ parent.setAttribute(ATTRIB_ALL_SAME, false);
}
children.add(node);
+ } else if (definition instanceof PropertyDefinitionMap) {
+ PropertyDefinitionMap defMap = (PropertyDefinitionMap) definition;
+ TreeNode mapNode = new TreeNode(defMap.getDisplayName());
+ ArrayList<PropertyMap> properties = new ArrayList<PropertyMap>();
+ for (AbstractPropertyMap map : maps) {
+ properties.add((PropertyMap) map);
+ }
+ buildNode(mapNode, defMap.getPropertyDefinitions().values(), properties);
+ if (!mapNode.getAttributeAsBoolean(ATTRIB_ALL_SAME)) {
+ parent.setAttribute(ATTRIB_ALL_SAME, false);
+ }
+ children.add(mapNode);
+ } else if (definition instanceof PropertyDefinitionList) {
+ PropertyDefinitionList defList = (PropertyDefinitionList) definition;
+ TreeNode listNode = new TreeNode(defList.getDisplayName());
+ listNode.setAttribute(ATTRIB_ALL_SAME, true);
+ if (defList.getMemberDefinition() instanceof PropertyDefinitionMap) { // support list-o-maps only
+ PropertyDefinition memberDef = defList.getMemberDefinition();
+ Collection<PropertyDefinition> memberDefColl = new ArrayList<PropertyDefinition>(1);
+ memberDefColl.add(memberDef);
+
+ int max = 0; // will be the largest size of any of our lists that are being compared
+ for (AbstractPropertyMap map : maps) {
+ try {
+ int size = map.getList(defList.getName()).getList().size();
+ if (size > max) {
+ max = size;
+ }
+ } catch (Throwable t) {
+ // paranoia - just skip so we don't kill entire compare window if our config doesn't have proper list-o-map
+ }
+ }
+ ArrayList<TreeNode> innerChildren = new ArrayList<TreeNode>();
+ for (int i = 0; i < max; i++) {
+ TreeNode listItemNode = new TreeNode(String.valueOf(i));
+ ArrayList<PropertyMap> properties = new ArrayList<PropertyMap>();
+ for (AbstractPropertyMap map : maps) {
+ try {
+ List<Property> list = map.getList(defList.getName()).getList();
+ if (list.size() < (i + 1)) {
+ properties.add(new PropertyMap()); // this list didn't have an i-th item, just use an empty map
+ } else {
+ properties.add((PropertyMap) list.get(i));
+ }
+ } catch (Throwable t) {
+ // paranoia - just skip so we don't kill entire compare window if our config doesn't have proper list-o-map
+ properties.add(new PropertyMap());
+ }
+ }
+ buildNode(listItemNode, memberDefColl, properties);
+ if (!listItemNode.getAttributeAsBoolean(ATTRIB_ALL_SAME)) {
+ parent.setAttribute(ATTRIB_ALL_SAME, false);
+ listNode.setAttribute(ATTRIB_ALL_SAME, false); // any diffs always causes this to indicate the diff
+ }
+ innerChildren.add(listItemNode);
+ }
+ listNode.setChildren(innerChildren.toArray(new TreeNode[innerChildren.size()]));
+ }
+ children.add(listNode);
}
-
- // TODO Add support for maps and lists of maps
}
parent.setChildren(children.toArray(new TreeNode[children.size()]));
}
@@ -232,25 +292,15 @@ public class ConfigurationComparisonView extends VLayout {
private static class ComparisonTreeNode extends TreeNode {
- PropertyDefinitionSimple definition;
- List<PropertySimple> properties;
-
private ComparisonTreeNode(PropertyDefinitionSimple definition, List<PropertySimple> properties,
List<String> titles) {
super(definition.getDisplayName());
-
- this.definition = definition;
- this.properties = properties;
-
setAttribute("type", definition.getType().name());
-
int i = 0;
boolean allTheSame = true;
String commonValue = null;
for (PropertySimple prop : properties) {
-
String value = prop != null ? prop.getStringValue() : null;
-
if (i == 0) {
commonValue = value;
} else if (allTheSame && commonValue == null && value != null
@@ -258,8 +308,7 @@ public class ConfigurationComparisonView extends VLayout {
allTheSame = false;
}
setAttribute(titles.get(i++), value);
-
- setAttribute("consistent", allTheSame);
+ setAttribute(ATTRIB_ALL_SAME, allTheSame);
}
}
}
commit ed0187d752ee3c47db6a7ac3b5b6566887ddc119
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Fri Jan 13 16:40:32 2012 -0500
[BZ 781621] fixing ldap ssl issue. Users unable to configure SSL support.
This was introduced with the other SystemSettings refactor changes. We thought we'd found all the places affected.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java
index d1f2294..fc09b0f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java
@@ -165,7 +165,7 @@ public class CustomJaasDeploymentService implements CustomJaasDeploymentServiceM
configOptions.put(Context.INITIAL_CONTEXT_FACTORY, conf.getProperty(RHQConstants.LDAPFactory));
configOptions.put(Context.PROVIDER_URL, conf.getProperty(RHQConstants.LDAPUrl));
String value = conf.getProperty(SystemSetting.USE_SSL_FOR_LDAP.getInternalName());
- boolean ldapSsl = Boolean.TRUE.toString().equals(value);
+ boolean ldapSsl = "ssl".equalsIgnoreCase(value);
configOptions.put(Context.SECURITY_PROTOCOL, (ldapSsl) ? "ssl" : null);
configOptions.put("LoginProperty", conf.getProperty(RHQConstants.LDAPLoginProperty));
configOptions.put("Filter", conf.getProperty(RHQConstants.LDAPFilter));
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
index 396b2c8..9dd2eb5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
@@ -443,7 +443,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
// Setup SSL if requested
String value = env.getProperty(SystemSetting.USE_SSL_FOR_LDAP.getInternalName());
- boolean ldapSsl = Boolean.TRUE.toString().equals(value);
+ boolean ldapSsl = "ssl".equalsIgnoreCase(value);
if (ldapSsl) {
String ldapSocketFactory = env.getProperty("java.naming.ldap.factory.socket");
if (ldapSocketFactory == null) {
commit a509359864fcdd3f19c37db99d62414181cc3bef
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Jan 13 17:18:53 2012 +0100
BZ 734495 - allow to provide JAVA_HOME
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 99c8cee..60f819f 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -113,6 +113,10 @@ public class BaseServerComponent extends BaseComponent {
processExecution.setWaitForCompletion(15000L); // 15 seconds // TODO: Should we wait longer than 15 seconds?
processExecution.setKillOnTimeout(false);
+ String javaHomeDir = pluginConfiguration.getSimpleValue("javaHomePath",null);
+ if (javaHomeDir!=null) {
+ processExecution.getEnvironmentVariables().put("JAVA_HOME", javaHomeDir);
+ }
if (log.isDebugEnabled()) {
log.debug("About to execute the following process: [" + processExecution + "]");
@@ -121,6 +125,8 @@ public class BaseServerComponent extends BaseComponent {
logExecutionResults(results);
if (results.getError()!=null) {
operationResult.setErrorMessage(results.getError().getMessage());
+ } else if (results.getExitCode()!=null) {
+ operationResult.setErrorMessage("Start failed with error code " + results.getExitCode() + ":\n" + results.getCapturedOutput());
} else {
operationResult.setSimpleResult("Success");
}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 7e88906..bdcf227 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -70,6 +70,10 @@
<c:simple-property name="hostConfig" type="string" default="host.xml" description="Running configuration (host part)" displayName="Host Configuration"/>
<c:simple-property name="baseDir" type="file" description="Base directory of the server installation" displayName="Base directory" readOnly="true" required="false"/>
<c:simple-property name="startScript" type="file" default="bin/domain.sh" description="Script used to start the server. If the path is not absolute, it is relative to the base directory"/>
+ <c:simple-property name="javaHomePath" type="file" displayName="JAVA_HOME Path" required="false"
+ description="The absolute path to a JRE or JDK installation directory containing
+ the JVM that should be used to start and shutdown the HostController instance;
+ defaults to the home directory of the RHQ agent JRE."/>
<c:simple-property name="domainHost" type="string" readOnly="true" required="false" description="Host name within the AS7 domain"/>
&logSources;
@@ -330,6 +334,10 @@
<c:simple-property name="config" type="string" default="standalone.xml" description="Running configuration" displayName="Configuration"/>
<c:simple-property name="baseDir" type="file" description="Base directory of the server installation" displayName="Base directory" readOnly="true" required="false"/>
<c:simple-property name="startScript" type="file" default="bin/standalone.sh" description="Script used to start the server. If the path is not absolute, it is relative to the base directory"/>
+ <c:simple-property name="javaHomePath" type="file" displayName="JAVA_HOME Path" required="false"
+ description="The absolute path to a JRE or JDK installation directory containing
+ the JVM that should be used to start and shutdown the JBossAS instance;
+ defaults to the home directory of the RHQ agent JRE."/>
<c:list-property name="system-properties">
<c:map-property name="system-property">
<c:simple-property name="key" readOnly="true"/>
commit 94b7a562f4efb9e4d9922e090ceca49deef5c1fd
Merge: 3bf2fbf 7d14f74
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Jan 13 11:38:26 2012 +0100
Merge branch 'lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs'
commit 3bf2fbfd118d30e2c0c9b616ff12ba7bc9e9492c
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Jan 13 11:38:18 2012 +0100
Putting back the original version of secured JNDI access so that the latest
batch of fixes can be merged into it.
This reverts commit 0e36c3ee8f1954486b1c12ee22ddd4b90cf7e685.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
index 894c953..5822d44 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
@@ -20,6 +20,7 @@
package org.rhq.bindings;
import java.io.FilePermission;
+import java.io.SerializablePermission;
import java.lang.reflect.ReflectPermission;
import java.net.SocketPermission;
import java.security.Permission;
@@ -83,6 +84,11 @@ public class StandardScriptPermissions extends PermissionCollection {
add(new PropertyPermission("*", "read"));
add(new ReflectPermission("suppressAccessChecks"));
+
+ //these 2 are required for server-side scripts to be able to
+ //invoke remote EJBs.
+ add(new SerializablePermission("enableSubclassImplementation"));
+ add(new RuntimePermission("reflectionFactoryAccess"));
}
public void add(Permission permission) {
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index e777e21..4dfd109 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -17,15 +17,35 @@
<properties>
<persistence-api.version>1.0</persistence-api.version>
+ <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
+ <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
+
+ <!-- dependency versions -->
+ <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
+
+ <clean.db>true</clean.db>
</properties>
<dependencies>
+
+ <!-- Note, the test deps are intentionally placed above the other scoped deps because of classpath
+ reasons. Maven orders the [test] classpath in the order listed in the pom. We specifically
+ need the embeddable-ejb3 jar above the standard ejb3 jars because we need the embeddble packages
+ loaded when testing. -->
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>${jboss-embeddable-ejb3.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-script-bindings</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -40,20 +60,333 @@
section. -->
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <!-- Test deps - this insane list of deps is needed to get the embedded JBoss server with RHQ server deployed running -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate-entitymanager</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <!-- The Sun javamail jar isn't available from a public repo due to licensing issues,
+ so use the Geronimo one instead. -->
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz-oracle</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed by the PoolClass annotation used on some
+ of our SLSB's -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbosssx</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbpm</artifactId>
+ <version>3.1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- for the transaction interrupt EJB3 interceptor -->
+ <dependency>
+ <groupId>org.jboss.transaction</groupId>
+ <artifactId>jboss-jta</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>5.5.20</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-jk</artifactId>
+ <version>4.1.31</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Needed by com.jboss.jbossnetwork.apl.actions.xml.XPathProcessor; TODO: Remove once APL has been excised. -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.29</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jettison-provider</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-links</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <version>2.0.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.18</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <!-- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
- -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Everything but the web service tests, this is the standard test execution -->
+ <configuration>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
+ <systemPropertyVariables>
+ <embeddedDeployment>true</embeddedDeployment>
+ <deploymentDirectory>target/test-classes</deploymentDirectory>
+ <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
+ <clean.db>${clean.db}</clean.db>
+ </systemPropertyVariables>
+ <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
+ <additionalClasspathElements>
+ <!-- The below is required for tests to run against Oracle. -->
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
- </plugin>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+
+ <!-- in order to get JMS to work properly in embedded test container, extract jms-rs.rar classes -->
+ <execution>
+ <id>Extract JMS classes from RAR needed for JMS tests</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <unzip src="src/test/resources/jms-ra.rar" dest="target">
+ <patternset>
+ <include name="jms-ra.jar"/>
+ </patternset>
+ </unzip>
+ <unzip src="target/jms-ra.jar" dest="target/test-classes">
+ <patternset>
+ <include name="org/**"/>
+ </patternset>
+ </unzip>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
index 5f3ff90..e9f1e4d 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
@@ -20,6 +20,8 @@
package org.rhq.enterprise.client;
import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
import org.apache.commons.logging.Log;
@@ -54,11 +56,21 @@ public class LocalClientProxy extends AbstractRhqFacadeProxy<LocalClient> {
}
}
- protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, Object[] args) throws Throwable {
+ protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, final Object[] args) throws Throwable {
try {
- Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes);
-
- return realMethod.invoke(localSLSB, args);
+ final Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes);
+
+ //run this through the privileged block to elevate the privs of the script
+ //the scripts don't have the AllowEjbAccessPermission but this code has
+ //all perms (or at least all perms assigned to it by the current context,
+ //which at the time of writing is defined by the rhq-server.policy file
+ //which gives all code all permissions).
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+ @Override
+ public Object run() throws Exception {
+ return realMethod.invoke(localSLSB, args);
+ }
+ });
} catch (NoSuchMethodException e) {
throw new IllegalArgumentException("Method [" + originalMethod + "] does not have a desimplified counterpart with arguments " + Arrays.asList(argTypes) + ".", e);
}
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
new file mode 100644
index 0000000..dc1fc83
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
@@ -0,0 +1,198 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.client.security.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.SerializablePermission;
+import java.security.PermissionCollection;
+import java.util.Collections;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.rhq.bindings.SandboxedScriptEngine;
+import org.rhq.bindings.ScriptEngineFactory;
+import org.rhq.bindings.StandardBindings;
+import org.rhq.bindings.StandardScriptPermissions;
+import org.rhq.bindings.util.PackageFinder;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.client.LocalClient;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
+import org.rhq.enterprise.server.util.LookupUtil;
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class EjbAccessTest extends AbstractEJB3Test {
+
+ public void testEjbsAccessibleThroughPrivilegedCode() {
+ LookupUtil.getSubjectManager().getOverlord();
+ }
+
+ public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ engine.eval("SubjectManager.getSubjectByName('rhqadmin');");
+ }
+
+ public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "subjectManager = context.lookup('SubjectManagerBean/local');\n"
+ + "subjectManager.getOverlord();");
+
+ Assert.fail("The script shouldn't have been able to call local SLSB method.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "subjectManager = context.lookup('SubjectManagerBean/remote');\n"
+ + "subjectManager.getSubjectByName('rhqadmin');");
+
+ Assert.fail("The script shouldn't have been able to call remote SLSB method directly.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ public void testScriptCantUseSessionManagerMethods() throws Exception {
+
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ final ScriptEngine engine = getEngine(overlord);
+
+ class G {
+ private String sessionManager = ""
+ + "org.rhq.enterprise.server.auth.SessionManager.getInstance().";
+
+ public void testInvoke(String methodCall) throws ScriptException {
+ String code = sessionManager + methodCall;
+
+ try {
+ engine.eval(code);
+ Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall);
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+ };
+ G manager = new G();
+
+ manager.testInvoke("getlastAccess(0);");
+ manager.testInvoke("getOverlord()");
+ manager.testInvoke("getSubject(2);");
+ manager.testInvoke("invalidate(0);");
+ manager.testInvoke("invalidate(\"\");");
+ manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());");
+ manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);");
+ }
+
+ public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "datasource = context.lookup('java:/RHQDS');\n"
+ + "con = datasource.getConnection();");
+
+ Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ public void testScriptCantUseEntityManager() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
+ + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
+
+ Assert.fail("The script shouldn't have been able to use the EntityManager.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+
+ //try harder with manually specifying the initial context factory
+ try {
+ engine.eval(""
+ + "env = new java.util.Hashtable();"
+ + "env.put('java.naming.factory.initial', 'org.jnp.interfaces.LocalOnlyContextFactory');"
+ + "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');"
+ + "context = new javax.naming.InitialContext(env);\n"
+ + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
+ + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
+
+ Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
+ StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
+ ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
+
+ PermissionCollection perms = new StandardScriptPermissions();
+ perms.add(new SerializablePermission("enableSubclassImplementation"));
+
+ return new SandboxedScriptEngine(engine, perms);
+ }
+
+ private static void checkIsDesiredSecurityException(ScriptException e) {
+ String message = e.getMessage();
+ String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
+
+ Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
+ }
+}
diff --git a/modules/enterprise/server/client-api/src/test/resources/hibernate.properties b/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
new file mode 100644
index 0000000..1951b84
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
@@ -0,0 +1,26 @@
+# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
+# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
+# WORK IN THIS MODULE.
+
+hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+#hibernate.connection.release_mode=after_statement
+#hibernate.transaction.flush_before_completion=false
+#hibernate.transaction.auto_close_session=false
+#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
+#hibernate.hbm2ddl.auto=create-drop
+#hibernate.hbm2ddl.auto=create
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+# Clustered cache with TreeCache
+#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
+#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
+#hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+hibernate.bytecode.use_reflection_optimizer=false
+# I don't think this is honored, but EJB3Deployer uses it
+hibernate.bytecode.provider=javassist
+hibernate.jdbc.use_streams_for_binary=true
+hibernate.show_sql=false
+hibernate.format_sql=true
+hibernate.default_batch_fetch_size=16
+hibernate.jdbc.batch_size=20
diff --git a/modules/enterprise/server/client-api/src/test/resources/security.policy b/modules/enterprise/server/client-api/src/test/resources/security.policy
new file mode 100644
index 0000000..8860b47
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/resources/security.policy
@@ -0,0 +1,10 @@
+// We need the SecurityManager installed to enable sandboxing of CLI scripts
+// but we don't define any other security measures on the RHQ server itself.
+//
+// Granting all permissions allows us to run the RHQ server as if no security
+// manager was in place (which is assumed by default by JBoss AS) but be able
+// to use it when we need it for our own purposes.
+
+grant {
+ permission java.security.AllPermission;
+};
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index b832b06..0974431 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -39,6 +39,12 @@
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>4.2.2.GA</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
new file mode 100644
index 0000000..3046af7
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -0,0 +1,230 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.event.EventDirContext;
+import javax.naming.ldap.LdapContext;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.InitialContextFactoryBuilder;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jnp.interfaces.NamingContextFactory;
+
+import org.rhq.jndi.context.AccessCheckingContextDecorator;
+import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
+import org.rhq.jndi.context.ContextDecorator;
+import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
+import org.rhq.jndi.util.DecoratorPicker;
+
+/**
+ * This initial context factory builder is installed early on during the RHQ server startup
+ * and is later on used for obtaining the {@link Context}s for all JNDI lookups in the
+ * RHQ server.
+ * <p>
+ * We use a custom initial context factory builder to prevent the potential malicious 3rd party
+ * code (like CLI alert scripts) from supplying custom environment variables to {@link InitialContext}
+ * that would modify the JNDI lookup to skip our security access checks.
+ * <p>
+ * By using a builder we effectively take control of the initial context creation process
+ * and are free to ignore whatever the script is trying to supply.
+ * <p>
+ * This builder makes sure to install the RHQ server's security access checks to whatever
+ * initial context that is configured by the standard environment variables
+ * ({@link Context#INITIAL_CONTEXT_FACTORY}, etc.)
+ * <p>
+ * This class is heavily inspired by the implementation of a similar builder in JBoss AS 7.
+ *
+ * @see AllowRhqServerInternalsAccessPermission
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingInitialContextFactoryBuilder implements InitialContextFactoryBuilder {
+ private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
+
+ /**
+ * The list of JNDI name schemes that should be checked for security permissions
+ * (in addition to the names with no scheme).
+ *
+ * @see AccessCheckingContextDecorator
+ */
+ private static final String[] CHECKED_SCHEMES = { "java" };
+
+ private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
+
+ static {
+ SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
+ SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
+ }
+
+ private static final Set<InetAddress> SERVER_BIND_IPS;
+ static {
+ SERVER_BIND_IPS = new HashSet<InetAddress>();
+
+ try {
+ String bindingAddressString = System.getProperty("jboss.bind.address");
+ InetAddress bindingAddress = InetAddress.getByName(bindingAddressString);
+
+ if (bindingAddress.isAnyLocalAddress()) {
+ Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
+ while (ifaces.hasMoreElements()) {
+ NetworkInterface iface = ifaces.nextElement();
+ SERVER_BIND_IPS.addAll(Collections.list(iface.getInetAddresses()));
+ }
+ } else {
+ SERVER_BIND_IPS.add(bindingAddress);
+ }
+ } catch (SocketException e) {
+ LOG.error("Could not obtain the list of local IPs", e);
+ } catch (UnknownHostException e) {
+ LOG.error("Failed to get the binding address of the RHQ server.", e);
+ }
+ }
+
+ private static final int JNP_PORT = Integer.parseInt(System.getProperty("rhq.server.startup.namingservice.port",
+ "2099"));
+
+ /**
+ * This is the default initial context factory that is returned when no other is
+ * configured using the environment variables.
+ * <p>
+ * It uses {@link NamingContextFactory} as the underlying mechanism - the same
+ * as the default configuration in JBoss 4.
+ */
+ private static final InitialContextFactory DEFAULT_FACTORY = new InitialContextFactory() {
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ return createSecureWrapper(new NamingContextFactory(), environment).getInitialContext(environment);
+ }
+ };
+
+ /**
+ * Create a InitialContext factory. If the environment does not override the factory class it will use the
+ * default context factory.
+ *
+ * @param environment The environment
+ * @return An initial context factory
+ * @throws NamingException If an error occurs loading the factory class.
+ */
+ public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> environment) throws NamingException {
+ final String factoryClassName = (String) environment.get(Context.INITIAL_CONTEXT_FACTORY);
+ if (factoryClassName == null) {
+ return DEFAULT_FACTORY;
+ }
+ final ClassLoader classLoader = getContextClassLoader();
+ try {
+ final Class<?> factoryClass = Class.forName(factoryClassName, true, classLoader);
+ InitialContextFactory configuredFactory = (InitialContextFactory) factoryClass.newInstance();
+ return createSecureWrapper(configuredFactory, environment);
+ } catch (Exception e) {
+ throw new NamingException("Failed instantiate InitialContextFactory " + factoryClassName
+ + " from classloader " + classLoader);
+ }
+ }
+
+ private ClassLoader getContextClassLoader() {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ private static InitialContextFactory
+ createSecureWrapper(InitialContextFactory factory, Hashtable<?, ?> environment) {
+ String providerUrl = (String) environment.get(Context.PROVIDER_URL);
+
+ if (providerUrl == null) {
+ return getAccessCheckingFactory(factory);
+ } else {
+ try {
+ URI uri = new URI(providerUrl);
+ InetAddress providerHost = InetAddress.getByName(uri.getHost());
+
+ //check if we are accessing the RHQ server through some remoting
+ //interface.
+ if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
+ return getAccessCheckingFactory(factory);
+ } else {
+ return getURLPreferringFactory(factory);
+ }
+ } catch (URISyntaxException e) {
+ return getAccessCheckingFactory(factory);
+ } catch (UnknownHostException e) {
+ //let the factory deal with the unknown host...
+ //this most probably shouldn't be secured because localhost addresses
+ //should be resolvable.
+ return getURLPreferringFactory(factory);
+ }
+ }
+ }
+
+ private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+ pickers.add(getURLPreferringDecoratorPicker());
+ pickers.add(getAccessCheckingDecoratorPicker());
+
+ return new DecoratingInitialContextFactory(original, pickers);
+ }
+
+ private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+ pickers.add(getURLPreferringDecoratorPicker());
+
+ return new DecoratingInitialContextFactory(original, pickers);
+ }
+
+ private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
+ DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+ ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
+
+ return ret;
+ }
+
+ private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
+ DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+ ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
+
+ return ret;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej
deleted file mode 100644
index 445fa3a..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej
+++ /dev/null
@@ -1,122 +0,0 @@
---- modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
-+++ modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
-@@ -27,7 +27,7 @@
- import java.net.UnknownHostException;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
--import java.util.ArrayList;
-+import java.util.Arrays;
- import java.util.Collections;
- import java.util.Enumeration;
- import java.util.HashSet;
-@@ -37,10 +37,6 @@
- import javax.naming.Context;
- import javax.naming.InitialContext;
- import javax.naming.NamingException;
--import javax.naming.directory.DirContext;
--import javax.naming.event.EventContext;
--import javax.naming.event.EventDirContext;
--import javax.naming.ldap.LdapContext;
- import javax.naming.spi.InitialContextFactory;
- import javax.naming.spi.InitialContextFactoryBuilder;
-
-@@ -49,10 +45,16 @@
- import org.jnp.interfaces.NamingContextFactory;
-
- import org.rhq.jndi.context.AccessCheckingContextDecorator;
--import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
--import org.rhq.jndi.context.ContextDecorator;
--import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
--import org.rhq.jndi.util.DecoratorPicker;
-+import org.rhq.jndi.context.AccessCheckingDirContextDecorator;
-+import org.rhq.jndi.context.AccessCheckingEventContextDecorator;
-+import org.rhq.jndi.context.AccessCheckingEventDirContextDecorator;
-+import org.rhq.jndi.context.AccessCheckingLdapContextDecorator;
-+import org.rhq.jndi.context.ContextDecoratorPicker;
-+import org.rhq.jndi.context.URLPreferringContextDecorator;
-+import org.rhq.jndi.context.URLPreferringDirContextDecorator;
-+import org.rhq.jndi.context.URLPreferringEventContextDecorator;
-+import org.rhq.jndi.context.URLPreferringEventDirContextDecorator;
-+import org.rhq.jndi.context.URLPreferringLdapContextDecorator;
-
- /**
- * This initial context factory builder is installed early on during the RHQ server startup
-@@ -87,17 +89,6 @@
- */
- private static final String[] CHECKED_SCHEMES = { "java" };
-
-- private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
--
-- static {
-- SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
-- SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
-- SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
-- SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
-- SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
-- SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
-- }
--
- private static final Set<InetAddress> SERVER_BIND_IPS;
- static {
- SERVER_BIND_IPS = new HashSet<InetAddress>();
-@@ -200,31 +191,42 @@
- }
-
- private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
-- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
-- pickers.add(getURLPreferringDecoratorPicker());
-- pickers.add(getAccessCheckingDecoratorPicker());
--
-- return new DecoratingInitialContextFactory(original, pickers);
-+ return new DecoratingInitialContextFactory(original, Arrays.asList(
-+ getURLPreferringDecoratorPicker(), getAccessCheckingDecoratorPicker()));
- }
--
-+
- private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
-- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
-- pickers.add(getURLPreferringDecoratorPicker());
--
-- return new DecoratingInitialContextFactory(original, pickers);
-+ return new DecoratingInitialContextFactory(original, Arrays.asList(
-+ getURLPreferringDecoratorPicker()));
- }
-
-- private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
-- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
-- ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
--
-+ private static ContextDecoratorPicker getAccessCheckingDecoratorPicker() {
-+ ContextDecoratorPicker ret = new ContextDecoratorPicker();
-+
-+ ret.setConstructorParameters(new Object[] { CHECKED_SCHEMES });
-+ ret.setConstructorParameterTypes(new Class<?>[] { String[].class });
-+
-+ ret.getPossibleDecorators().add(AccessCheckingContextDecorator.class);
-+ ret.getPossibleDecorators().add(AccessCheckingDirContextDecorator.class);
-+ ret.getPossibleDecorators().add(AccessCheckingEventContextDecorator.class);
-+ ret.getPossibleDecorators().add(AccessCheckingEventDirContextDecorator.class);
-+ ret.getPossibleDecorators().add(AccessCheckingLdapContextDecorator.class);
-+
- return ret;
- }
-
-- private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
-- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
-- ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
--
-+ private static ContextDecoratorPicker getURLPreferringDecoratorPicker() {
-+ ContextDecoratorPicker ret = new ContextDecoratorPicker();
-+
-+ ret.setConstructorParameters(null);
-+ ret.setConstructorParameterTypes(null);
-+
-+ ret.getPossibleDecorators().add(URLPreferringContextDecorator.class);
-+ ret.getPossibleDecorators().add(URLPreferringDirContextDecorator.class);
-+ ret.getPossibleDecorators().add(URLPreferringEventContextDecorator.class);
-+ ret.getPossibleDecorators().add(URLPreferringEventDirContextDecorator.class);
-+ ret.getPossibleDecorators().add(URLPreferringLdapContextDecorator.class);
-+
- return ret;
- }
- }
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java
new file mode 100644
index 0000000..aa807d6
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java
@@ -0,0 +1,36 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.security.BasicPermission;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AllowRhqServerInternalsAccessPermission extends BasicPermission {
+
+ private static final long serialVersionUID = 1L;
+
+ public AllowRhqServerInternalsAccessPermission() {
+ super("org.rhq.allow.server.internals.access");
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
new file mode 100644
index 0000000..19b30ea
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
@@ -0,0 +1,100 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+import org.rhq.jndi.context.ContextDecorator;
+import org.rhq.jndi.util.DecoratorPicker;
+import org.rhq.jndi.util.DecoratingInvocationHandler;
+
+/**
+ * This class implements an initial context factory that decorates the contexts
+ * returned from a "wrapped" initial factory passed to this class in the constructor.
+ * <p>
+ * The contexts returned from the wrapped initial factory are hidden behind a proxy
+ * that implements the intersection of interfaces from the <code>supportedContextInterfaces</code>
+ * constructor parameter and the actual interfaces the wrapped context implements.
+ * <p>
+ * The proxy method calls are handled using the {@link DecoratingInvocationHandler} which is initialized
+ * with the list of {@link DecoratorPicker pickers} that are used to intercept the method
+ * calls on the wrapped context.
+ *
+ * @see DecoratorPicker
+ * @see DecoratingInvocationHandler
+ *
+ * @author Lukas Krejci
+ */
+public class DecoratingInitialContextFactory implements InitialContextFactory {
+
+ List<DecoratorPicker<Context, ContextDecorator>> pickers;
+ private InitialContextFactory factory;
+ private Set<Class<? extends Context>> supportedContextInterfaces;
+
+ public DecoratingInitialContextFactory(InitialContextFactory factory, List<DecoratorPicker<Context, ContextDecorator>> decoratorPickers) {
+ this.factory = factory;
+ this.pickers = decoratorPickers;
+ this.supportedContextInterfaces = new HashSet<Class<? extends Context>>();
+ for(DecoratorPicker<Context, ContextDecorator> picker : pickers) {
+ supportedContextInterfaces.addAll(picker.getContext().getSupportedInterfaces());
+ }
+ }
+
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ Context ctx = factory.getInitialContext(environment);
+
+ Set<Class<?>> implementedIfaces = getAllImplementedInterfaces(ctx.getClass());
+ Class<?>[] ii = new Class<?>[implementedIfaces.size()];
+ implementedIfaces.toArray(ii);
+
+ return (Context) Proxy.newProxyInstance(ctx.getClass().getClassLoader(), ii, new DecoratingInvocationHandler<Context, ContextDecorator>(pickers, ctx));
+ }
+
+ private Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
+ HashSet<Class<?>> ret = new HashSet<Class<?>>();
+ getAllImplementedInterfaces(cls, ret);
+
+ ret.retainAll(supportedContextInterfaces);
+
+ return ret;
+ }
+
+ private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
+ Class<?>[] ifaces = cls.getInterfaces();
+
+ for (Class<?> iface : Arrays.asList(ifaces)) {
+ output.add(iface);
+ getAllImplementedInterfaces(iface, output);
+ }
+
+ if (cls.getSuperclass() != null) {
+ getAllImplementedInterfaces(cls.getSuperclass(), output);
+ }
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
new file mode 100644
index 0000000..6bfec7e
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
@@ -0,0 +1,254 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
+
+/**
+ * This is the "meat" of the RHQ's secured JNDI access. This {@link Context} decorator
+ * applied security checks in each method (lookups, (un)bindings, etc).
+ * <p>
+ * The security check consists of checking if the current callstack has the {@link AllowRhqServerInternalsAccessPermission}.
+ * <p>
+ * This decorator applies the security check on any JNDI name without a scheme and
+ * on any name that has a scheme listed in the {@link #checkedSchemes} list supplied
+ * in the constructor.
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingContextDecorator implements Context, ContextDecorator, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final AllowRhqServerInternalsAccessPermission PERM = new AllowRhqServerInternalsAccessPermission();
+ private Context original;
+ private List<String> checkedSchemes;
+
+ public AccessCheckingContextDecorator(String... checkedSchemes) {
+ this.checkedSchemes = Arrays.asList(checkedSchemes);
+ }
+
+ public AccessCheckingContextDecorator(Context original, String... checkedSchemes) {
+ this.original = original;
+ this.checkedSchemes = Arrays.asList(checkedSchemes);
+ }
+
+ public void init(Context ctx) {
+ this.original = ctx;
+ }
+
+ protected Context getOriginal() {
+ return original;
+ }
+
+ protected static void check() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) sm.checkPermission(PERM);
+ }
+
+ private void checkScheme(String scheme) {
+ if (scheme == null || checkedSchemes.contains(scheme)) {
+ check();
+ }
+ }
+
+ protected void check(String name) {
+ checkScheme(getURLScheme(name));
+ }
+
+ protected void check(Name name) {
+ if (name.size() == 0) {
+ check();
+ } else {
+ String first = name.get(0);
+ checkScheme(getURLScheme(first));
+ }
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ check(name);
+ return original.lookup(name);
+ }
+
+ public Object lookup(String name) throws NamingException {
+ check(name);
+ return original.lookup(name);
+ }
+
+ public void bind(Name name, Object obj) throws NamingException {
+ check(name);
+ original.bind(name, obj);
+ }
+
+ public void bind(String name, Object obj) throws NamingException {
+ check(name);
+ original.bind(name, obj);
+ }
+
+ public void rebind(Name name, Object obj) throws NamingException {
+ check(name);
+ original.rebind(name, obj);
+ }
+
+ public void rebind(String name, Object obj) throws NamingException {
+ check(name);
+ original.rebind(name, obj);
+ }
+
+ public void unbind(Name name) throws NamingException {
+ check(name);
+ original.unbind(name);
+ }
+
+ public void unbind(String name) throws NamingException {
+ check(name);
+ original.unbind(name);
+ }
+
+ public void rename(Name oldName, Name newName) throws NamingException {
+ check(oldName);
+ check(newName);
+ original.rename(oldName, newName);
+ }
+
+ public void rename(String oldName, String newName) throws NamingException {
+ check(oldName);
+ check(newName);
+ original.rename(oldName, newName);
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+ check(name);
+ return original.list(name);
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
+ check(name);
+ return original.list(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+ check(name);
+ return original.listBindings(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
+ check(name);
+ return original.listBindings(name);
+ }
+
+ public void destroySubcontext(Name name) throws NamingException {
+ check(name);
+ original.destroySubcontext(name);
+ }
+
+ public void destroySubcontext(String name) throws NamingException {
+ check(name);
+ original.destroySubcontext(name);
+ }
+
+ public Context createSubcontext(Name name) throws NamingException {
+ check(name);
+ return original.createSubcontext(name);
+ }
+
+ public Context createSubcontext(String name) throws NamingException {
+ check(name);
+ return original.createSubcontext(name);
+ }
+
+ public Object lookupLink(Name name) throws NamingException {
+ check(name);
+ return original.lookupLink(name);
+ }
+
+ public Object lookupLink(String name) throws NamingException {
+ check(name);
+ return original.lookupLink(name);
+ }
+
+ public NameParser getNameParser(Name name) throws NamingException {
+ check(name);
+ return original.getNameParser(name);
+ }
+
+ public NameParser getNameParser(String name) throws NamingException {
+ check(name);
+ return original.getNameParser(name);
+ }
+
+ public Name composeName(Name name, Name prefix) throws NamingException {
+ check(name);
+ return original.composeName(name, prefix);
+ }
+
+ public String composeName(String name, String prefix) throws NamingException {
+ check(name);
+ return original.composeName(name, prefix);
+ }
+
+ public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+ check();
+ return original.addToEnvironment(propName, propVal);
+ }
+
+ public Object removeFromEnvironment(String propName) throws NamingException {
+ check();
+ return original.removeFromEnvironment(propName);
+ }
+
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
+ check();
+ return original.getEnvironment();
+ }
+
+ public void close() throws NamingException {
+ check();
+ original.close();
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ check();
+ return original.getNameInNamespace();
+ }
+
+ //copied from InitialContext
+ private static String getURLScheme(String str) {
+ int colon_posn = str.indexOf(':');
+ int slash_posn = str.indexOf('/');
+
+ if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
+ return str.substring(0, colon_posn);
+ return null;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
new file mode 100644
index 0000000..284fd0c
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
@@ -0,0 +1,75 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.Constructor;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
+
+ private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
+ static {
+ HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
+ tmp.add(AccessCheckingContextDecorator.class);
+ tmp.add(AccessCheckingDirContextDecorator.class);
+ tmp.add(AccessCheckingEventContextDecorator.class);
+ tmp.add(AccessCheckingEventDirContextDecorator.class);
+ tmp.add(AccessCheckingLdapContextDecorator.class);
+
+ DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
+ }
+
+ private Set<Class<? extends Context>> supportedInterfaces;
+ private String[] checkedSchemes;
+
+ public AccessCheckingContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces, String... checkedSchemes) {
+ this.supportedInterfaces = supportedInterfaces;
+ this.checkedSchemes = checkedSchemes;
+ }
+
+ public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
+ Constructor<? extends ContextDecorator> ctor = decoratorClass.getConstructor(String[].class);
+
+ return ctor.newInstance((Object)checkedSchemes);
+ }
+
+ public Set<Class<? extends Context>> getSupportedInterfaces() {
+ return supportedInterfaces;
+ }
+
+ public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
+ return DECORATOR_CLASSES;
+ }
+
+ public void init(ContextDecorator decorator, Context object) throws Exception {
+ decorator.init(object);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
new file mode 100644
index 0000000..1614180
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
@@ -0,0 +1,187 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+/**
+ * A decorator of {@link DirContext}.
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingDirContextDecorator extends AccessCheckingContextDecorator implements DirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingDirContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingDirContextDecorator(DirContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected DirContext getOriginal() {
+ return (DirContext) super.getOriginal();
+ }
+
+ public Attributes getAttributes(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name);
+ }
+
+ public Attributes getAttributes(String name) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name);
+ }
+
+ public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name, attrIds);
+ }
+
+ public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name, attrIds);
+ }
+
+ public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mods);
+ }
+
+ public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mods);
+ }
+
+ public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().bind(name, obj, attrs);
+ }
+
+ public void bind(String name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().bind(name, obj, attrs);
+ }
+
+ public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().rebind(name, obj, attrs);
+ }
+
+ public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().rebind(name, obj, attrs);
+ }
+
+ public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
+ check(name);
+ return getOriginal().createSubcontext(name, attrs);
+ }
+
+ public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
+ check(name);
+ return getOriginal().createSubcontext(name, attrs);
+ }
+
+ public DirContext getSchema(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public DirContext getSchema(String name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public DirContext getSchemaClassDefinition(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getSchemaClassDefinition(name);
+ }
+
+ public DirContext getSchemaClassDefinition(String name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
+ String[] attributesToReturn) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
+ throws NamingException {
+ check(name);
+ return getOriginal().search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filterExpr, filterArgs, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
+ SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filterExpr, filterArgs, cons);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
new file mode 100644
index 0000000..67a9527
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
@@ -0,0 +1,69 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingEventContextDecorator extends AccessCheckingContextDecorator implements EventContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingEventContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingEventContextDecorator(EventContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected EventContext getOriginal() {
+ return (EventContext) super.getOriginal();
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ check();
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ check();
+ return getOriginal().targetMustExist();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
new file mode 100644
index 0000000..ed7a848
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
@@ -0,0 +1,96 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.SearchControls;
+import javax.naming.event.EventDirContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingEventDirContextDecorator extends AccessCheckingDirContextDecorator implements
+ EventDirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingEventDirContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingEventDirContextDecorator(EventDirContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected EventDirContext getOriginal() {
+ return (EventDirContext) super.getOriginal();
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ check();
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ check();
+ return getOriginal().targetMustExist();
+ }
+
+ public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void
+ addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
+ NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
new file mode 100644
index 0000000..e361db8
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
@@ -0,0 +1,85 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.ExtendedRequest;
+import javax.naming.ldap.ExtendedResponse;
+import javax.naming.ldap.LdapContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingLdapContextDecorator extends AccessCheckingDirContextDecorator implements LdapContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingLdapContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingLdapContextDecorator(LdapContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected LdapContext getOriginal() {
+ return (LdapContext) super.getOriginal();
+ }
+
+ public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
+ check();
+ return getOriginal().extendedOperation(request);
+ }
+
+ public LdapContext newInstance(Control[] requestControls) throws NamingException {
+ check();
+ return getOriginal().newInstance(requestControls);
+ }
+
+ public void reconnect(Control[] connCtls) throws NamingException {
+ check();
+ getOriginal().reconnect(connCtls);
+ }
+
+ public Control[] getConnectControls() throws NamingException {
+ check();
+ return getOriginal().getConnectControls();
+ }
+
+ public void setRequestControls(Control[] requestControls) throws NamingException {
+ check();
+ getOriginal().setRequestControls(requestControls);
+ }
+
+ public Control[] getRequestControls() throws NamingException {
+ check();
+ return getOriginal().getRequestControls();
+ }
+
+ public Control[] getResponseControls() throws NamingException {
+ check();
+ return getOriginal().getResponseControls();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
new file mode 100644
index 0000000..5755ebd
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
@@ -0,0 +1,33 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public interface ContextDecorator extends Context {
+
+ void init(Context context) throws NamingException;
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
new file mode 100644
index 0000000..20077de
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
@@ -0,0 +1,212 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.io.Serializable;
+import java.util.Hashtable;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ * This is a wrapper class around another {@link Context} implementation that
+ * prefers to use an URL context for some operation if the JNDI name contains
+ * a scheme rather than the original. This is the behavior of {@link InitialContext}
+ * which we need to restore in the contexts created by the {@link AccessCheckingInitialContextFactoryBuilder}
+ * (which an {@link InitialContext} uses exclusively if the builder is set).
+ * <p>
+ * This is important because RHQ server has its own initial context factory
+ * builder that creates factories that in turn create contexts. If the default
+ * {@link InitialContext} implementation was used, we'd never be able to lookup
+ * scheme-based names because the default implementation of the {@link InitialContext}
+ * always uses the default context of the builder if one is installed no matter
+ * the scheme in the name.
+ * <p>
+ * The {@link AccessCheckingInitialContextFactoryBuilder} wraps the context returned
+ * by the factory in an instance of this class and thus is restoring the original
+ * intended behavior of the {@link InitialContext}. It looks at the name being looked
+ * up (bound or whatever) and prefers to use the URL context factories if the name
+ * contains the scheme (as does the {@link InitialContext} if no builder is installed).
+ * If the name doesn't contain a scheme, the provided default context factory is used to
+ * look up the name.
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecorator implements Context, ContextDecorator, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Context original;
+
+ public URLPreferringContextDecorator() {
+
+ }
+
+ public URLPreferringContextDecorator(Context ctx) {
+ original = ctx;
+ }
+
+ public void init(Context context) {
+ original = context;
+ }
+
+ protected Context getOriginal() throws NamingException {
+ return original;
+ }
+
+ protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
+ @SuppressWarnings("unchecked")
+ Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
+ return urlContext == null ? getOriginal() : urlContext;
+ }
+
+ protected Context getURLOrDefaultInitCtx(String name) throws NamingException {
+ @SuppressWarnings("unchecked")
+ Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
+ return urlContext == null ? getOriginal() : urlContext;
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookup(name);
+ }
+
+ public Object lookup(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookup(name);
+ }
+
+ public void bind(Name name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj);
+ }
+
+ public void bind(String name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj);
+ }
+
+ public void rebind(Name name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj);
+ }
+
+ public void rebind(String name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj);
+ }
+
+ public void unbind(Name name) throws NamingException {
+ getURLOrDefaultInitCtx(name).unbind(name);
+ }
+
+ public void unbind(String name) throws NamingException {
+ getURLOrDefaultInitCtx(name).unbind(name);
+ }
+
+ public void rename(Name oldName, Name newName) throws NamingException {
+ getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
+ }
+
+ public void rename(String oldName, String newName) throws NamingException {
+ getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).list(name);
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).list(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).listBindings(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).listBindings(name);
+ }
+
+ public void destroySubcontext(Name name) throws NamingException {
+ getURLOrDefaultInitCtx(name).destroySubcontext(name);
+ }
+
+ public void destroySubcontext(String name) throws NamingException {
+ getURLOrDefaultInitCtx(name).destroySubcontext(name);
+ }
+
+ public Context createSubcontext(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name);
+ }
+
+ public Context createSubcontext(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name);
+ }
+
+ public Object lookupLink(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookupLink(name);
+ }
+
+ public Object lookupLink(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookupLink(name);
+ }
+
+ public NameParser getNameParser(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getNameParser(name);
+ }
+
+ public NameParser getNameParser(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getNameParser(name);
+ }
+
+ public Name composeName(Name name, Name prefix) throws NamingException {
+ return getOriginal().composeName(name, prefix);
+ }
+
+ public String composeName(String name, String prefix) throws NamingException {
+ return getOriginal().composeName(name, prefix);
+ }
+
+ public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+ return getOriginal().addToEnvironment(propName, propVal);
+ }
+
+ public Object removeFromEnvironment(String propName) throws NamingException {
+ return getOriginal().removeFromEnvironment(propName);
+ }
+
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
+ return getOriginal().getEnvironment();
+ }
+
+ public void close() throws NamingException {
+ if (getOriginal() != null) {
+ getOriginal().close();
+ original = null;
+ }
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ return getOriginal().getNameInNamespace();
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
new file mode 100644
index 0000000..6e7debc
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
@@ -0,0 +1,76 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.spi.NamingManager;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecoratorHelper {
+
+ private URLPreferringContextDecoratorHelper() {
+
+ }
+
+ public static Context getURLContext(String name, Hashtable<Object, Object> env) throws NamingException {
+ String scheme = getURLScheme(name);
+ if (scheme != null) {
+ Context ctx = NamingManager.getURLContext(scheme, env);
+ if (ctx != null) {
+ return ctx;
+ }
+ }
+
+ return null;
+ }
+
+ public static Context getURLContext(Name name, Hashtable<Object, Object> env) throws NamingException {
+ if (name.size() > 0) {
+ String first = name.get(0);
+ String scheme = getURLScheme(first);
+ if (scheme != null) {
+ Context ctx = NamingManager.getURLContext(scheme, env);
+ if (ctx != null) {
+ return ctx;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ //copied from InitialContext
+ private static String getURLScheme(String str) {
+ int colon_posn = str.indexOf(':');
+ int slash_posn = str.indexOf('/');
+
+ if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
+ return str.substring(0, colon_posn);
+ return null;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
new file mode 100644
index 0000000..828cd74
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
@@ -0,0 +1,71 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
+
+ private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
+ static {
+ HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
+ tmp.add(URLPreferringContextDecorator.class);
+ tmp.add(URLPreferringDirContextDecorator.class);
+ tmp.add(URLPreferringEventContextDecorator.class);
+ tmp.add(URLPreferringEventDirContextDecorator.class);
+ tmp.add(URLPreferringLdapContextDecorator.class);
+
+ DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
+ }
+
+ private Set<Class<? extends Context>> supportedInterfaces;
+
+ public URLPreferringContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces) {
+ this.supportedInterfaces = supportedInterfaces;
+ }
+
+ public Set<Class<? extends Context>> getSupportedInterfaces() {
+ return supportedInterfaces;
+ }
+
+ public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
+ return DECORATOR_CLASSES;
+ }
+
+ public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
+ return decoratorClass.newInstance();
+ }
+
+ public void init(ContextDecorator decorator, Context object) throws Exception {
+ decorator.init(object);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
new file mode 100644
index 0000000..6a49942
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
@@ -0,0 +1,185 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+/**
+ * Akin to {@link URLPreferringContextDecorator} this class implements the similar logic
+ * for {@link DirContext}s.
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringDirContextDecorator extends URLPreferringContextDecorator implements DirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringDirContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringDirContextDecorator(DirContext ctx) {
+ super(ctx);
+ }
+
+ protected DirContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof DirContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of DirContext");
+ }
+ }
+
+ return (DirContext) ctx;
+ }
+
+ @Override
+ protected DirContext getURLOrDefaultInitCtx(Name name) throws NamingException {
+ Context ctx = super.getURLOrDefaultInitCtx(name);
+ return checkAndCast(ctx);
+ }
+
+ @Override
+ protected DirContext getURLOrDefaultInitCtx(String name) throws NamingException {
+ Context ctx = super.getURLOrDefaultInitCtx(name);
+ return checkAndCast(ctx);
+ }
+
+ public Attributes getAttributes(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name);
+ }
+
+ public Attributes getAttributes(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name);
+ }
+
+ public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
+ }
+
+ public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
+ }
+
+ public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
+ }
+
+ public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
+ }
+
+ public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
+ }
+
+ public void bind(String name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
+ }
+
+ public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
+ }
+
+ public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
+ }
+
+ public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
+ }
+
+ public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
+ }
+
+ public DirContext getSchema(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchema(name);
+ }
+
+ public DirContext getSchema(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchema(name);
+ }
+
+ public DirContext getSchemaClassDefinition(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
+ }
+
+ public DirContext getSchemaClassDefinition(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
+ String[] attributesToReturn) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
+ throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
+ SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
new file mode 100644
index 0000000..e3298a0
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
@@ -0,0 +1,81 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringEventContextDecorator extends URLPreferringContextDecorator implements EventContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringEventContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringEventContextDecorator(EventContext ctx) {
+ super(ctx);
+ }
+
+ protected EventContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof EventContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of EventContext");
+ }
+ }
+
+ return (EventContext) ctx;
+ }
+
+ @Override
+ protected EventContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return getOriginal().targetMustExist();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
new file mode 100644
index 0000000..4925297
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
@@ -0,0 +1,104 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.directory.SearchControls;
+import javax.naming.event.EventDirContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringEventDirContextDecorator extends URLPreferringDirContextDecorator implements EventDirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringEventDirContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringEventDirContextDecorator(EventDirContext ctx) {
+ super(ctx);
+ }
+
+ @Override
+ protected EventDirContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof EventDirContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of EventDirContext");
+ }
+ }
+
+ return (EventDirContext) ctx;
+ }
+
+ @Override
+ protected EventDirContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return getOriginal().targetMustExist();
+ }
+
+ public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void
+ addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
+ NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
new file mode 100644
index 0000000..c74df39
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
@@ -0,0 +1,94 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.ExtendedRequest;
+import javax.naming.ldap.ExtendedResponse;
+import javax.naming.ldap.LdapContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringLdapContextDecorator extends URLPreferringDirContextDecorator implements LdapContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringLdapContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringLdapContextDecorator(LdapContext original) {
+ super(original);
+ }
+
+ @Override
+ protected LdapContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof LdapContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException("Not an instance of LdapContext");
+ }
+ }
+
+ return (LdapContext) ctx;
+ }
+
+ @Override
+ protected LdapContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
+ return getOriginal().extendedOperation(request);
+ }
+
+ public LdapContext newInstance(Control[] requestControls) throws NamingException {
+ return new URLPreferringLdapContextDecorator(getOriginal().newInstance(requestControls));
+ }
+
+ public void reconnect(Control[] connCtls) throws NamingException {
+ getOriginal().reconnect(connCtls);
+ }
+
+ public Control[] getConnectControls() throws NamingException {
+ return getOriginal().getConnectControls();
+ }
+
+ public void setRequestControls(Control[] requestControls) throws NamingException {
+ getOriginal().setRequestControls(requestControls);
+ }
+
+ public Control[] getRequestControls() throws NamingException {
+ return getOriginal().getRequestControls();
+ }
+
+ public Control[] getResponseControls() throws NamingException {
+ return getOriginal().getResponseControls();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
new file mode 100644
index 0000000..d938c50
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
@@ -0,0 +1,45 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.mbean;
+
+import javax.naming.spi.NamingManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingInitialContextFactoryBuilderInstaller implements AccessCheckingInitialContextFactoryBuilderInstallerMBean {
+ private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
+
+ public void start() throws Exception {
+ LOG.info("Installing RHQ's access permission checking initial context factory builder");
+
+ NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
+ }
+
+ public void stop() throws Exception {
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java
new file mode 100644
index 0000000..87d19ab
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java
@@ -0,0 +1,32 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.mbean;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public interface AccessCheckingInitialContextFactoryBuilderInstallerMBean {
+
+ void start() throws Exception;
+
+ void stop() throws Exception;
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
new file mode 100644
index 0000000..356a6e9
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
@@ -0,0 +1,46 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.List;
+
+public class DecoratingInvocationHandler<Type, Decorator extends Type> implements InvocationHandler {
+
+ private final List<DecoratorPicker<Type, Decorator>> pickers;
+ private Type object;
+
+ public DecoratingInvocationHandler(List<DecoratorPicker<Type, Decorator>> pickers, Type object) {
+ this.pickers = pickers;
+ this.object = object;
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ Type target = object;
+ Class<?> methodClass = method.getDeclaringClass();
+
+ for(DecoratorPicker<Type, Decorator> picker : pickers) {
+ target = picker.decorate(target, methodClass);
+ }
+
+ return method.invoke(target, args);
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
new file mode 100644
index 0000000..017d29f
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
@@ -0,0 +1,195 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Given as set of decorators extending given type, this class can pick
+ * the most appropriate set of decorators for a class or a method call.
+ * <p>
+ * To configure the decorator, one has to provide a {@link DecoratorSetContext} that
+ * is then used to obtain the list of
+ * {@link DecoratorSetContext#getSupportedInterfaces() supported interfaces}, which are
+ * all the interfaces that should be used for decorator resolution (i.e. all other interfaces
+ * that a class might implement are ignored during decorator resolution), the list of
+ * {@link DecoratorSetContext#getDecoratorClasses() decorator classes}, which is a list
+ * of decorators the picker can choose from and is also used to instantiate and initialize
+ * the decorators.
+ *
+ * @author Lukas Krejci
+ */
+public class DecoratorPicker<Type, Decorator extends Type> {
+
+ private DecoratorSetContext<Type, Decorator> context;
+
+ public DecoratorSetContext<Type, Decorator> getContext() {
+ return context;
+ }
+
+ public void setContext(DecoratorSetContext<Type, Decorator> decoratorSetContext) {
+ this.context = decoratorSetContext;
+ }
+
+ /**
+ * Returns a set of decorators applicable for given method. The set is established based
+ * on the declaring class of the method.
+ *
+ * @param method the method to inspect
+ * @return the set of decorators that can be used to wrap a method call
+ * @throws Exception
+ */
+ public Set<Decorator> getDecoratorsForMethod(Method method) throws Exception {
+ return getDecoratorsForClass_Private(method.getDeclaringClass());
+ }
+
+ /**
+ * Returns a set of decorators that can be used on instances of given class.
+ * @param cls the class to inspect
+ * @return
+ * @throws Exception
+ */
+ public Set<Decorator> getDecoratorsForClass(Class<? extends Type> cls) throws Exception {
+ return getDecoratorsForClass_Private(cls);
+ }
+
+ /**
+ * This method first establishes the set of decorators to use based on the class of the supplied
+ * object and then chains the decorators (in arbitrary order) with the supplied object at the
+ * "root" of the chain.
+ * <p>
+ * If a method is then called on the returned object, the methods of all the decorators are called
+ * in chain (each supposedly calling the next) and finally, at the end of the chain, the method on
+ * the original object (the one supplied to this method) is called.
+ * <p>
+ * Note that the above is only an intended behavior and actually depends on the implementation of
+ * the decorators that are resposinble for the chaining. Each decorator is initialized
+ * (@{link {@link DecoratorSetContext#init(Object, Object)} which should set it up for such chaining.
+ *
+ * @param object
+ * @return
+ * @throws Exception
+ */
+ public Type decorate(Type object) throws Exception {
+ Set<Decorator> decs = getDecoratorsForClass_Private(object.getClass());
+ Type ret = object;
+ for(Decorator d : decs) {
+ context.init(d, ret);
+ ret = d;
+ }
+
+ return ret;
+ }
+
+ /**
+ * Similar to {@link #decorate(Object)} but instead of the class of the object itself,
+ * uses the significantSuperClass as the basis for the decorator resolution.
+ * <p>
+ * This is important, because if the object implements two mutually incompatible sub-interfaces of <code>Type</code>,
+ * the chained decorators might fail to execute a method later on if the decorator depends on the upper part
+ * of the chain to implement certain sub-interface of <code>Type</code>.
+ *
+ * @param object the object to wrap in decorators
+ * @param significantSuperClass the class to base the decorator resolution on
+ * @return
+ * @throws Exception
+ */
+ public Type decorate(Type object, Class<?> significantSuperClass) throws Exception {
+ Set<Decorator> decs = getDecoratorsForClass_Private(significantSuperClass);
+ Type ret = object;
+ for(Decorator d : decs) {
+ context.init(d, ret);
+ ret = d;
+ }
+
+ return ret;
+ }
+
+ private Set<Decorator> getDecoratorsForClass_Private(Class<?> cls) throws Exception {
+ Set<Class<? extends Type>> ifaces = getNearestApplicableInterfaces(cls);
+
+ HashSet<Decorator> ret = new HashSet<Decorator>();
+
+ for (Class<? extends Type> iface : ifaces) {
+ for (Class<? extends Decorator> decClass : getMatch(iface)) {
+ ret.add(context.instantiate(decClass));
+ }
+ }
+
+ return ret;
+ }
+
+ private Set<Class<? extends Type>> getNearestApplicableInterfaces(Class<?> cls) {
+ List<Class<? extends Type>> ifaces = new ArrayList<Class<? extends Type>>(getAllApplicableInterfaces(cls));
+
+ //now compact the set to only contain the most concrete interfaces
+
+ Iterator<Class<? extends Type>> it = ifaces.iterator();
+ while (it.hasNext()) {
+ Class<? extends Type> c = it.next();
+
+ for (int i = 0; i < ifaces.size(); ++i) {
+ Class<? extends Type> nextC = ifaces.get(i);
+ if (!c.equals(nextC) && c.isAssignableFrom(nextC)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+
+ return new HashSet<Class<? extends Type>>(ifaces);
+ }
+
+ private Set<Class<? extends Type>> getAllApplicableInterfaces(Class<?> cls) {
+ Set<Class<? extends Type>> ifaces = new HashSet<Class<? extends Type>>();
+
+ for (Class<? extends Type> iface : context.getSupportedInterfaces()) {
+ if (iface.isAssignableFrom(cls)) {
+ ifaces.add(iface);
+ }
+ }
+
+ if (ifaces.isEmpty()) {
+ throw new IllegalArgumentException("Class " + cls
+ + " doesn't implement any of the applicable interfaces. Cannot find decorators for it.");
+ }
+
+ return ifaces;
+ }
+
+ private Set<Class<? extends Decorator>> getMatch(Class<?> targetIface) {
+
+ Set<Class<? extends Decorator>> ret = new HashSet<Class<? extends Decorator>>();
+
+ for (Class<? extends Decorator> cls : context.getDecoratorClasses()) {
+ if (Arrays.asList(cls.getInterfaces()).contains(targetIface)) {
+ ret.add(cls);
+ }
+ }
+
+ return ret;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
new file mode 100644
index 0000000..d7b1676
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
@@ -0,0 +1,59 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.util.Set;
+
+/**
+ * Implementations of this interface provide a context to the {@link DecoratorPicker}.
+ *
+ * @author Lukas Krejci
+ */
+public interface DecoratorSetContext<Type, Decorator> {
+
+ /**
+ * @return the set of interfaces that the decorators are able support.
+ * Usually this should be just a union of all interfaces the decorators implement
+ * but can be trimmed down.
+ */
+ Set<Class<? extends Type>> getSupportedInterfaces();
+
+ /**
+ * @return the set of all decorator classes in this set
+ */
+ Set<Class<? extends Decorator>> getDecoratorClasses();
+
+ /**
+ * Instantiates a new decorator of given class.
+ * @param decoratorClass
+ * @return
+ * @throws Exception
+ */
+ Decorator instantiate(Class<? extends Decorator> decoratorClass) throws Exception;
+
+ /**
+ * Initializes the decorator to decorate given object.
+ *
+ * @param decorator
+ * @param object
+ * @throws Exception on error
+ */
+ void init(Decorator decorator, Type object) throws Exception;
+}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
new file mode 100644
index 0000000..45ba114
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
@@ -0,0 +1,145 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.NamingManager;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class DecoratingInvocationHandlerTest {
+ private static final Set<String> INVOKED_METHODS = new HashSet<String>();
+
+ private static final InvocationHandler NOTE_TAKING_HANDLER = new InvocationHandler() {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ INVOKED_METHODS.add(method.getName());
+
+ if ("hashCode".equals(method.getName())) {
+ return 0;
+ } else if ("equals".equals(method.getName())) {
+ return false;
+ }
+
+ return null;
+ }
+ };
+
+ private static Class<?>[] CONTEXT_INTERFACES;
+
+ public static class Factory implements InitialContextFactory {
+ public Context getInitialContext(Hashtable<?, ?> environment)
+ throws NamingException {
+
+ return (Context) Proxy.newProxyInstance(DecoratingInvocationHandlerTest.class.getClassLoader(), CONTEXT_INTERFACES, NOTE_TAKING_HANDLER);
+ }
+ }
+
+ private static class DummyInitialEventContext extends InitialContext implements EventContext {
+
+ /**
+ * @param environment
+ * @throws NamingException
+ */
+ public DummyInitialEventContext(Hashtable<?, ?> environment) throws NamingException {
+ super(environment);
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ ((EventContext)getDefaultInitCtx()).removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return ((EventContext)getDefaultInitCtx()).targetMustExist();
+ }
+
+
+ }
+
+ @BeforeClass
+ public void setBuilder() throws Exception {
+ NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
+ }
+
+ public void testSimpleDispatch() throws Exception {
+ INVOKED_METHODS.clear();
+ Properties env = new Properties();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
+
+ CONTEXT_INTERFACES = new Class<?>[] { Context.class };
+
+ InitialContext ctx = new InitialContext(env);
+
+ ctx.lookup("asdf");
+
+ assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
+ }
+
+ public void testMultiInterfaceDispatch() throws Exception {
+ INVOKED_METHODS.clear();
+ Properties env = new Properties();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
+
+ CONTEXT_INTERFACES = new Class<?>[] { EventContext.class, DirContext.class };
+
+ InitialContext ctx = new InitialContext(env);
+
+ ctx.lookup("asdf");
+
+ DummyInitialEventContext ectx = new DummyInitialEventContext(env);
+
+ ectx.addNamingListener("hodiny", 0, null);
+
+ assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
+ assert INVOKED_METHODS.contains("addNamingListener") : "The addNamingListener doesn't seem to have propagated to the actual context to be used.";
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
new file mode 100644
index 0000000..e2d7429
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
@@ -0,0 +1,180 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.ldap.LdapContext;
+
+import org.testng.annotations.Test;
+
+import org.rhq.jndi.util.DecoratorPicker;
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ * @author Lukas Krejci
+ */
+@Test
+public class DecoratorPickerTest {
+
+ private static final InvocationHandler DUMMY_HANDLER = new InvocationHandler() {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ if ("hashCode".equals(method.getName())) {
+ return 0;
+ } else if ("equals".equals(method.getName())) {
+ return false;
+ }
+
+ return null;
+ }
+ };
+
+ private static final Class<?> TEST_OBJECT_CLASS1 = createProxyClass(Context.class);
+ private static final Class<?> TEST_OBJECT_CLASS2 = createProxyClass(DirContext.class);
+ private static final Class<?> TEST_OBJECT_CLASS3 = createProxyClass(LdapContext.class);
+ private static final Class<?> TEST_OBJECT_CLASS4 = createProxyClass(LdapContext.class, EventContext.class);
+ private static final Class<?> DECORATOR_CLASS1 = createProxyClass(Context.class);
+ private static final Class<?> DECORATOR_CLASS2 = createProxyClass(EventContext.class);
+ private static final Class<?> DECORATOR_CLASS3 = createProxyClass(LdapContext.class);
+ private static final Class<?> DECORATOR_CLASS4 = createProxyClass(DirContext.class);
+
+ public void testSimpleDecoratorIdentifiedByClass() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS1);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for Context class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], Context.class);
+ }
+
+ public void testSuperClassDecoratorHasPrecedenceOverSubClassDecorator() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ //this tests that the LdapContext isn't returned even though it subclasses the DirContext
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS2);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for DirContext class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], DirContext.class);
+ }
+
+ public void testSubClassDecoratorCorrectlyIdentified() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS3);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for LdapContext class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ public void testMultipleDecoratorsDetectable() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> decorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS4);
+ assertEquals(decorators.size(), 2,
+ "Exactly 2 decorators should have been found for a class implementing 2 interfaces.");
+
+ boolean ldapContextDecoratorFound = false;
+ boolean eventContextDecoratorFound = false;
+
+ for (Object d : decorators) {
+ if (LdapContext.class.isAssignableFrom(d.getClass())) {
+ ldapContextDecoratorFound = true;
+ continue; //just to make sure that somehow the decorator doesn't implement both
+ }
+ if (EventContext.class.isAssignableFrom(d.getClass())) {
+ eventContextDecoratorFound = true;
+ }
+ }
+
+ assertTrue(ldapContextDecoratorFound && eventContextDecoratorFound,
+ "The found decorators don't implement the desired interfaces.");
+ }
+
+ public void testDecoratorsIdentifiedByMethod() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> decorators =
+ picker.getDecoratorsForMethod(LdapContext.class.getMethod("getConnectControls", (Class<?>[]) null));
+ assertEquals(decorators.size(), 1,
+ "Expected exactly one decorator for method 'getConnectControls()' from LdapContext class");
+ assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ public void testMethodFromSubclassMatchesSubclassDecorator() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ //this is a method from the DirContext but we're asking for it from a class
+ //that implements also an LdapContext
+ //The LdapContext decorator also inherits from the DirContext decorator
+ //(by the virtue of LdapContext interface inheriting from the DirContext)
+ //The picker should therefore match the LdapContext decorator because its
+ //the "closest" one to the actual class.
+ Set<Object> decorators =
+ picker.getDecoratorsForMethod(TEST_OBJECT_CLASS3.getMethod("getSchemaClassDefinition",
+ new Class<?>[] { String.class }));
+ assertEquals(decorators.size(), 1,
+ "Expected exactly one decorator for method 'getSchemaClassDefinition(String)' from LdapContext class");
+ assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ private static Class<?> createProxyClass(Class<?>... ifaces) {
+ return Proxy.getProxyClass(DecoratorPickerTest.class.getClassLoader(), ifaces);
+ }
+
+ private static DecoratorPicker<Object, Object> createTestPicker() {
+ DecoratorPicker<Object, Object> picker = new DecoratorPicker<Object, Object>();
+
+ DecoratorSetContext<Object, Object> decSet = new DecoratorSetContext<Object, Object>() {
+
+ public Object instantiate(Class<? extends Object> decoratorClass) throws Exception {
+ Constructor<? extends Object> ctor = decoratorClass.getConstructor(InvocationHandler.class);
+ return ctor.newInstance(DUMMY_HANDLER);
+ }
+
+ public void init(Object decorator, Object object) throws Exception {
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<Class<? extends Object>> getSupportedInterfaces() {
+ return new HashSet<Class<? extends Object>>(Arrays.asList(Context.class, EventContext.class,
+ LdapContext.class, DirContext.class));
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<Class<? extends Object>> getDecoratorClasses() {
+ return new HashSet<Class<? extends Object>>(Arrays.asList(DECORATOR_CLASS1, DECORATOR_CLASS2, DECORATOR_CLASS3, DECORATOR_CLASS4));
+ }
+ };
+
+ picker.setContext(decSet);
+
+ return picker;
+ }
+}
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
index 859b552..f231f15 100644
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
+++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
@@ -225,6 +225,13 @@
<!-- JNDI -->
<!-- ==================================================================== -->
+ <!-- This installs a custom initial context factory builder into the JVM
+ that will ensure that all the default InitialContexts are going to check
+ for the permission to access the RHQ internals. -->
+ <mbean code="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
+ name="org.rhq:service=AccessCheckingInitialContextFactoryBuilderInstaller">
+ </mbean>
+
<!-- A simple mbean wrapper around the jndi Naming object. This
only handles an in memory instance. The NamingService uses this
as the JNDI store and exposes it remotely.
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 8753e6f..6898621 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -56,6 +56,12 @@
<dependency>
<groupId>org.rhq</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 6eaf304..92f4cf1 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -78,6 +78,13 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>com.googlecode.java-diff-utils</groupId>
<artifactId>diffutils</artifactId>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
index 39b6076..ecf2f6f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
@@ -26,29 +26,41 @@ import java.util.Random;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.server.util.LookupUtil;
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
/**
* This is the JON Server's own session ID generator. It is outside any container-provided session mechanism. Its sole
* purpose is to provide session IDs to logged in {@link Subject}s. It will timeout those sessions regardless of any
* container-provided session-timeout mechanism.
- *
+ * <p>
+ * Because this is a very security-sensitive class, any public method requires the caller to
+ * have the {@link AllowEjbAccessPermission} as any other calls to the EJB layer. This is so that the
+ * malicious users can't trick the EJB layer into thinking that some users are logged in or log out other
+ * users.
+ * <p>
+ * Also, for security reasons, this class is final so that malicious code can't subclass it and modify its
+ * behavior.
+ *
* <p>This object is a {@link #getInstance() singleton}.</p>
*/
-public class SessionManager {
+public final class SessionManager {
+
+ private static final AllowRhqServerInternalsAccessPermission ACCESS_PERMISSION = new AllowRhqServerInternalsAccessPermission();
+
/**
* Our source for random session IDs.
*/
- private static Random _random = new Random();
+ private static final Random _random = new Random();
/**
* Our session cache that is keyed on the session ID.
*/
- private static Map<Integer, AuthSession> _cache = new HashMap<Integer, AuthSession>();
+ private static final Map<Integer, AuthSession> _cache = new HashMap<Integer, AuthSession>();
/**
* The singleton instance
*/
- private static SessionManager _manager = new SessionManager();
+ private static final SessionManager _manager = new SessionManager();
/**
* The timeout for all user sessions.
@@ -78,7 +90,7 @@ public class SessionManager {
/**
* Return the singleton object.
- *
+ *
* @return the {@link SessionManager}
*/
public static SessionManager getInstance() {
@@ -95,6 +107,7 @@ public class SessionManager {
* sessionId will be assigned.
*/
public Subject put(Subject subject) {
+ checkPermission();
return put(subject, DEFAULT_TIMEOUT);
}
@@ -108,6 +121,7 @@ public class SessionManager {
* that Subject is overlord). The sessionId will be assigned.
*/
public synchronized Subject put(Subject subject, long timeout) {
+ checkPermission();
Integer key;
do {
@@ -141,6 +155,7 @@ public class SessionManager {
* @throws SessionTimeoutException
*/
public synchronized Subject getSubject(int sessionId) throws SessionNotFoundException, SessionTimeoutException {
+ checkPermission();
Integer id = new Integer(sessionId);
AuthSession session = _cache.get(id);
@@ -162,6 +177,7 @@ public class SessionManager {
* @param sessionId session id to invalidate
*/
public synchronized void invalidate(int sessionId) {
+ checkPermission();
_cache.remove(new Integer(sessionId));
// while we are here, let's go through the entire session cache and remove expired sessions
@@ -187,6 +203,7 @@ public class SessionManager {
* @param username username for the sessions to be invalidated
*/
public synchronized void invalidate(String username) {
+ checkPermission();
List<Integer> doomedSessionIds = new ArrayList<Integer>(_cache.size());
for (AuthSession s : _cache.values()) {
if (username.equals(s.getSubject(false).getName())) {
@@ -201,6 +218,7 @@ public class SessionManager {
}
public long getlastAccess(int sessionId) {
+ checkPermission();
AuthSession session = _cache.get(sessionId);
if (session == null) {
return -1;
@@ -209,6 +227,7 @@ public class SessionManager {
}
public Subject getOverlord() {
+ checkPermission();
if (overlordSubject == null) {
overlordSubject = LookupUtil.getSubjectManager().getSubjectById(OVERLORD_SUBJECT_ID);
@@ -256,4 +275,9 @@ public class SessionManager {
return copy;
}
+
+ private static void checkPermission() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) sm.checkPermission(ACCESS_PERMISSION);
+ }
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml b/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
index 05edefa..85e2fb3 100644
--- a/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
+++ b/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
@@ -4,6 +4,14 @@
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- This installs a custom initial context factory builder into the JVM
+ that will ensure that all the default InitialContexts are going to check
+ for the permission to access the RHQ internals. -->
+ <bean class="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
+ name="AccessCheckingInitialContextFactoryBuilderInstaller">
+ </bean>
+
+
<bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
<bean name="InitialContextProperties" class="java.util.Hashtable">
@@ -20,7 +28,7 @@
</entry>
</map>
</parameter>
- </constructor>
+ </constructor>
</bean>
<bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
new file mode 100644
index 0000000..1991e0e
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -0,0 +1,315 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>jndi-access-test-parent</artifactId>
+ <groupId>org.rhq</groupId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>jndi-access-test</artifactId>
+ <packaging>jar</packaging>
+
+ <name>JNDI access integration test</name>
+ <description>Tests for local and remote JNDI access from within serverside scripts.</description>
+
+ <properties>
+ <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
+ <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
+ <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
+ <jnp.port>54987</jnp.port>
+ <jnp.rmiPort>54988</jnp.rmiPort>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!--================ Test Deps ================ -->
+
+ <!-- Note, the test deps are intentionally placed above the other
+ scoped deps because of classpath reasons. Maven orders the [test] classpath
+ in the order listed in the pom. We specifically need the embeddable-ejb3
+ jar above the standard ejb3 jars because we need the embeddble packages loaded
+ when testing. -->
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-core-client-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-server-client-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>jndi-access-remote-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>${jboss-embeddable-ejb3.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- NOTE: The remaining test deps correspond to the classes contained
+ in hibernate-all.jar and thirdparty-all.jar. -->
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- needed by embedded ejb container -->
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- needed by embedded ejb container -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- 3rd Party Deps -->
+
+ <!-- required by RHQ server classes, as well as EJB3 Embedded -->
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1-jboss</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate-annotations</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate-entitymanager</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed
+ by the PoolClass annotation used on some of our SLSB's -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <!-- for the transaction interrupt EJB3 interceptor -->
+ <dependency>
+ <groupId>org.jboss.transaction</groupId>
+ <artifactId>jboss-jta</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz-oracle</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
+ </dependency>
+
+ <!-- This is needed cglib which is in turn needed by hibernate -->
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.18</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- in order to get JMS to work properly in embedded
+ test container, extract jms-rs.rar classes -->
+ <execution>
+ <id>Extract JMS classes from RAR needed for JMS tests</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <unzip src="src/test/resources/jms-ra.rar"
+ dest="target">
+ <patternset>
+ <include name="jms-ra.jar" />
+ </patternset>
+ </unzip>
+ <unzip src="target/jms-ra.jar"
+ dest="target/test-classes">
+ <patternset>
+ <include name="org/**" />
+ </patternset>
+ </unzip>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Everything but the web service tests, this is the standard
+ test execution -->
+ <configuration>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
+ <systemPropertyVariables>
+ <embeddedDeployment>true</embeddedDeployment>
+ <deploymentDirectory>target/test-classes</deploymentDirectory>
+ <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
+ <clean.db>${clean.db}</clean.db>
+ <test.server.jar.path>${settings.localRepository}/org/rhq/jndi-access-remote-server/${project.version}/jndi-access-remote-server-${project.version}.jar</test.server.jar.path>
+ <jnp.port>${jnp.port}</jnp.port>
+ <jnp.rmiPort>${jnp.rmiPort}</jnp.rmiPort>
+ </systemPropertyVariables>
+ <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
+ <additionalClasspathElements>
+ <!-- The below is required for tests to run against
+ Oracle. -->
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
new file mode 100644
index 0000000..f20d4f1
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
@@ -0,0 +1,193 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.test;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.SerializablePermission;
+import java.security.PermissionCollection;
+import java.util.Collections;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import org.rhq.bindings.SandboxedScriptEngine;
+import org.rhq.bindings.ScriptEngineFactory;
+import org.rhq.bindings.StandardBindings;
+import org.rhq.bindings.StandardScriptPermissions;
+import org.rhq.bindings.util.PackageFinder;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.client.LocalClient;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
+import org.rhq.enterprise.server.util.LookupUtil;
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class JndiAccessTest extends AbstractEJB3Test {
+ private static final Log JNP_SERVER_LOG = LogFactory.getLog("Test JNP Server");
+
+ private Process testServerProcess;
+ private Thread testServerStdErrReader;
+ private Thread testServerStdOutReader;
+
+ @BeforeClass
+ @Parameters({"test.server.jar.path", "jnp.port", "jnp.rmiPort"})
+ public void startTestJnpServer(String testServerJar, int jnpPort, int rmiPort) throws Exception {
+ ProcessBuilder bld = new ProcessBuilder("java", "-Djnp.port=" + jnpPort, "-Djnp.rmiPort=" + rmiPort, "-jar", testServerJar);
+
+ testServerProcess = bld.start();
+
+ testServerStdErrReader = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getErrorStream()));
+ try {
+ String line;
+ while((line = rdr.readLine()) != null) {
+ JNP_SERVER_LOG.warn(line);
+ }
+ } catch (IOException e) {
+ JNP_SERVER_LOG.error("Reading test JNP server error output failed.", e);
+ } finally {
+ try {
+ rdr.close();
+ } catch (IOException e) {
+ JNP_SERVER_LOG.error("Failed to close the test server error stream.", e);
+ }
+ }
+ }
+ });
+ testServerStdErrReader.start();
+
+ testServerStdOutReader = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getInputStream()));
+ try {
+ String line;
+ while((line = rdr.readLine()) != null) {
+ JNP_SERVER_LOG.debug(line);
+ }
+ } catch (IOException e) {
+ JNP_SERVER_LOG.error("Reading test JNP server standard output failed.", e);
+ } finally {
+ try {
+ rdr.close();
+ } catch (IOException e) {
+ JNP_SERVER_LOG.error("Failed to close the test server standard output stream.", e);
+ }
+ }
+ }
+ });
+ testServerStdOutReader.start();
+
+ //give the JNP server some time to start up
+ Thread.sleep(5000);
+ }
+
+ @AfterClass
+ public void stopTestJnpServer() throws Exception {
+ testServerProcess.destroy();
+ testServerStdErrReader.join();
+ testServerStdOutReader.join();
+ }
+
+ @Parameters("jnp.port")
+ public void testRemoteConnectionWorkingFromJava(int jnpPort) throws Exception {
+ Properties env = new Properties();
+ env.put("java.naming.factory.initial", "org.jboss.naming.NamingContextFactory");
+ env.put("java.naming.provider.url", "jnp://localhost:" + jnpPort);
+ InitialContext ctx = new InitialContext(env);
+ Object kachny = ctx.lookup("kachny");
+
+ assert kachny != null;
+ }
+
+ public void testLocalJNDILookupFailsFromScripts() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
+ + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
+
+ Assert.fail("The script shouldn't have been able to use the EntityManager.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ @Parameters("jnp.port")
+ public void testRemoteJNDILookupWorksFromScripts(int jnpPort) throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "env = new java.util.Hashtable();"
+ + "env.put('java.naming.factory.initial', 'org.jboss.naming.NamingContextFactory');"
+ + "env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort + "');"
+ + "context = new javax.naming.InitialContext(env);\n"
+ + "kachny = context.lookup('kachny');\n"
+ + "assertNotNull(kachny);\n");
+ } catch (ScriptException e) {
+ Assert.fail("The script should have been able to access a remote JNDI server.", e);
+ }
+ }
+
+ private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
+ StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
+ ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
+
+ PermissionCollection perms = new StandardScriptPermissions();
+
+ return new SandboxedScriptEngine(engine, perms);
+ }
+
+ private static void checkIsDesiredSecurityException(ScriptException e) {
+ String message = e.getMessage();
+ String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
+
+ Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
+ }
+}
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties
new file mode 100644
index 0000000..1951b84
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties
@@ -0,0 +1,26 @@
+# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
+# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
+# WORK IN THIS MODULE.
+
+hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+#hibernate.connection.release_mode=after_statement
+#hibernate.transaction.flush_before_completion=false
+#hibernate.transaction.auto_close_session=false
+#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
+#hibernate.hbm2ddl.auto=create-drop
+#hibernate.hbm2ddl.auto=create
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+# Clustered cache with TreeCache
+#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
+#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
+#hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+hibernate.bytecode.use_reflection_optimizer=false
+# I don't think this is honored, but EJB3Deployer uses it
+hibernate.bytecode.provider=javassist
+hibernate.jdbc.use_streams_for_binary=true
+hibernate.show_sql=false
+hibernate.format_sql=true
+hibernate.default_batch_fetch_size=16
+hibernate.jdbc.batch_size=20
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml
new file mode 100644
index 0000000..ec09ed7
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 39945 2006-01-12 02:44:07Z bill $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="WARN"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Messagen -->
+ <!--
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ -->
+ <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="target/server-jar-test.log"/>
+ <param name="Threshold" value="WARN"/>
+ <param name="Append" value="false"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Messagen -->
+ <!--
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ -->
+ <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
+ </layout>
+ </appender>
+
+ <category name="Test JNP Server">
+ <priority value="DEBUG"/>
+ </category>
+
+ <!-- Hibernate logs WARNINGS frequent from this class, in test envs. -->
+ <category name="org.hibernate.hql.ast.QueryTranslatorImpl">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- hides the TIMER SERVICE IS NOT INSTALLED warning - we know embedded EJB3 container doesn't support timers -->
+ <category name="org.jboss.ejb3.timerservice.jboss.JBossTimerServiceFactory">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- hides the shutdown warnings - for some reason, the container spits out some warnings when shutting down -->
+ <category name="org.jboss.kernel.plugins.dependency.StartStopLifecycleAction">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Hibernate SQL logs -->
+ <!--
+ <category name="org.hibernate.SQL">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy
new file mode 100644
index 0000000..8860b47
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy
@@ -0,0 +1,10 @@
+// We need the SecurityManager installed to enable sandboxing of CLI scripts
+// but we don't define any other security measures on the RHQ server itself.
+//
+// Granting all permissions allows us to run the RHQ server as if no security
+// manager was in place (which is assumed by default by JBoss AS) but be able
+// to use it when we need it for our own purposes.
+
+grant {
+ permission java.security.AllPermission;
+};
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
new file mode 100644
index 0000000..6e9c673
--- /dev/null
+++ b/modules/integration-tests/jndi-access/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>rhq-integration-tests</artifactId>
+ <groupId>org.rhq</groupId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>jndi-access-test-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <name>JNDI access tests</name>
+ <description>Tests for the secured JNDI access tests</description>
+
+ <modules>
+ <module>remote-server</module>
+ <module>jndi-access-test</module>
+ </modules>
+</project>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
new file mode 100644
index 0000000..9046e6f
--- /dev/null
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -0,0 +1,72 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>jndi-access-test-parent</artifactId>
+ <groupId>org.rhq</groupId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>jndi-access-remote-server</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Test JNDI-enabled remote server</name>
+ <description>
+ A testing JNDI-enabled server to test the ability to connect to remote servers without security
+ checks from within the scripts running inside the RHQ server.
+ </description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>4.2.2.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.2.2.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals><goal>single</goal></goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.rhq.jndi.test.Server</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java b/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java
new file mode 100644
index 0000000..7bfb8e8
--- /dev/null
+++ b/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java
@@ -0,0 +1,79 @@
+package org.rhq.jndi.test;
+import java.util.Properties;
+
+import javax.naming.CompoundName;
+
+import org.jnp.server.Main;
+import org.jnp.server.NamingBeanImpl;
+
+import org.jboss.logging.Logger;
+
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class Server {
+ private static final Logger LOG = Logger.getLogger(Server.class);
+
+ private static Server INSTANCE;
+
+ private Main jnpServer;
+
+ public static void main(String[] args) throws Exception {
+ LOG.debug("System properties: " + System.getProperties());
+ Server.start();
+ }
+
+ private Server() {
+ jnpServer = new Main("org.rhq.jndi.access.test.server");
+ }
+
+ public static synchronized Server getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE = new Server();
+ }
+
+ return INSTANCE;
+ }
+
+ public static void start() throws Exception {
+ LOG.debug("Initializing the JNP server");
+
+ NamingBeanImpl nbi = new NamingBeanImpl();
+ getInstance().jnpServer.setNamingInfo(nbi);
+ nbi.start();
+
+ LOG.debug("Binding kachny");
+
+ nbi.getNamingInstance().bind(new CompoundName("kachny", new Properties()), "KACHNY!", String.class.getName());
+
+ LOG.debug("Starting the JNP server");
+
+ getInstance().jnpServer.start();
+ }
+
+ public static void stop() {
+ LOG.debug("Stopping the JNP server");
+ getInstance().jnpServer.stop();
+ }
+}
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties b/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties
new file mode 100644
index 0000000..a45f2ce
--- /dev/null
+++ b/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jboss.naming.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties b/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties
new file mode 100644
index 0000000..2d41f83
--- /dev/null
+++ b/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootCategory=TRACE, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 0290729..969b94a 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -62,6 +62,7 @@
<id>integration-tests</id>
<modules>
<module>apache-plugin-test</module>
+ <module>jndi-access</module>
<!--<module>mod_cluster-plugin-test</module>-->
</modules>
</profile>
commit 1174064a0372d31199d75939b64d36eaa2232d02
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jan 12 16:51:18 2012 -0500
[BZ 672947] add favorite groups portlet
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
index b2aa035..67937b0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
@@ -30,6 +30,7 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.FavoriteGroupsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupBundleDeploymentsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigurationUpdatesPortlet;
@@ -105,6 +106,7 @@ public class PortletFactory {
globalPortletFactoryMap.put(TagCloudPortlet.KEY, TagCloudPortlet.Factory.INSTANCE);
}
globalPortletFactoryMap.put(FavoriteResourcesPortlet.KEY, FavoriteResourcesPortlet.Factory.INSTANCE);
+ globalPortletFactoryMap.put(FavoriteGroupsPortlet.KEY, FavoriteGroupsPortlet.Factory.INSTANCE);
globalPortletFactoryMap.put(MashupPortlet.KEY, MashupPortlet.Factory.INSTANCE);
globalPortletFactoryMap.put(MessagePortlet.KEY, MessagePortlet.Factory.INSTANCE);
globalPortletFactoryMap.put(ProblemResourcesPortlet.KEY, ProblemResourcesPortlet.Factory.INSTANCE);
@@ -125,6 +127,7 @@ public class PortletFactory {
globalPortletNameMap.put(TagCloudPortlet.NAME, TagCloudPortlet.KEY);
}
globalPortletNameMap.put(FavoriteResourcesPortlet.NAME, FavoriteResourcesPortlet.KEY);
+ globalPortletNameMap.put(FavoriteGroupsPortlet.NAME, FavoriteGroupsPortlet.KEY);
globalPortletNameMap.put(MashupPortlet.NAME, MashupPortlet.KEY);
globalPortletNameMap.put(MessagePortlet.NAME, MessagePortlet.KEY);
globalPortletNameMap.put(ProblemResourcesPortlet.NAME, ProblemResourcesPortlet.KEY);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java
new file mode 100644
index 0000000..b438071
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java
@@ -0,0 +1,151 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
+
+import java.util.Set;
+
+import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.types.Overflow;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.events.FieldStateChangedEvent;
+import com.smartgwt.client.widgets.grid.events.FieldStateChangedHandler;
+
+import org.rhq.core.domain.common.EntityContext;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil;
+import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
+import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupCompositeDataSource;
+import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListView;
+
+public class FavoriteGroupsPortlet extends ResourceGroupListView implements AutoRefreshPortlet {
+
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "FavoriteGroups";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.favorites_groups();
+
+ public static final String CFG_TABLE_PREFS = "tablePreferences";
+
+ // set on initial configuration, the window for this portlet view.
+ private PortletWindow portletWindow;
+
+ private Timer refreshTimer;
+
+ public FavoriteGroupsPortlet(String locatorId) {
+ super(locatorId, createInitialCriteria(), NAME);
+ setOverflow(Overflow.VISIBLE);
+
+ setShowHeader(false);
+ setShowFooter(false);
+ }
+
+ private static Criteria createInitialCriteria() {
+ Set<Integer> favoriteIds = UserSessionManager.getUserPreferences().getFavoriteResourceGroups();
+
+ Integer[] favArray = favoriteIds.toArray(new Integer[favoriteIds.size()]);
+
+ Criteria criteria = new Criteria();
+ if (favoriteIds.isEmpty()) {
+ criteria.addCriteria("id", -1);
+ } else {
+ criteria.addCriteria(ResourceGroupCompositeDataSource.FILTER_GROUP_IDS, favArray);
+ }
+
+ return criteria;
+ }
+
+ @Override
+ protected void configureTable() {
+ super.configureTable();
+
+ getListGrid().addFieldStateChangedHandler(new FieldStateChangedHandler() {
+ public void onFieldStateChanged(FieldStateChangedEvent fieldStateChangedEvent) {
+ String state = getListGrid().getViewState();
+
+ portletWindow.getStoredPortlet().getConfiguration().put(new PropertySimple(CFG_TABLE_PREFS, state));
+ portletWindow.save();
+ }
+ });
+
+ DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
+ if ((null != storedPortlet && null != storedPortlet.getConfiguration())) {
+
+ PropertySimple tablePrefs = storedPortlet.getConfiguration().getSimple(CFG_TABLE_PREFS);
+ ListGrid listGrid = getListGrid();
+ if (null != tablePrefs && null != listGrid) {
+ String state = tablePrefs.getStringValue();
+ listGrid.setViewState(state);
+ }
+ }
+ }
+
+ public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
+ if (null == this.portletWindow && null != portletWindow) {
+ this.portletWindow = portletWindow;
+ }
+ }
+
+ public Canvas getHelpCanvas() {
+ return new HTMLFlow(MSG.view_portlet_help_favoriteResources());
+ }
+
+ public static final class Factory implements PortletViewFactory {
+ public static PortletViewFactory INSTANCE = new Factory();
+
+ public final Portlet getInstance(String locatorId, EntityContext context) {
+
+ return new FavoriteGroupsPortlet(locatorId);
+ }
+ }
+
+ public void startRefreshCycle() {
+ refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer);
+ }
+
+ @Override
+ protected void onDestroy() {
+ AutoRefreshPortletUtil.onDestroy(this, refreshTimer);
+
+ super.onDestroy();
+ }
+
+ public boolean isRefreshing() {
+ return false;
+ }
+
+ @Override
+ public void refresh() {
+ if (!isRefreshing()) {
+ super.refresh();
+ }
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
index b9f7e31..7d94624 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
@@ -42,6 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
/**
@@ -78,7 +79,7 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto
if (favoriteIds.isEmpty()) {
criteria.addCriteria("id", -1);
} else {
- criteria.addCriteria("resourceIds", favArray);
+ criteria.addCriteria(ResourceDatasource.FILTER_RESOURCE_IDS, favArray);
}
return criteria;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 17b2b56..4a87378 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -18,6 +18,14 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.groups;
+import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.AVAIL_CHILDREN;
+import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.AVAIL_DESCENDANTS;
+import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.CATEGORY;
+import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.DESCRIPTION;
+import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.NAME;
+import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN;
+import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE;
+
import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -43,13 +51,13 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.*;
-
/**
* @author Joseph Marques
*/
public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGroupComposite, ResourceGroupCriteria> {
+ public static final String FILTER_GROUP_IDS = "resourceGroupIds";
+
ResourceGroupGWTServiceAsync groupService = GWTServiceLookup.getResourceGroupService();
private static ResourceGroupCompositeDataSource INSTANCE;
@@ -80,8 +88,8 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
nameDataField.setCanEdit(false);
fields.add(nameDataField);
- DataSourceTextField descriptionDataField = new DataSourceTextField(DESCRIPTION.propertyName(), DESCRIPTION
- .title());
+ DataSourceTextField descriptionDataField = new DataSourceTextField(DESCRIPTION.propertyName(),
+ DESCRIPTION.title());
descriptionDataField.setCanEdit(false);
fields.add(descriptionDataField);
@@ -125,12 +133,14 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
criteria.setPageControl(getPageControl(request));
+ criteria.addFilterId(getFilter(request, "id", Integer.class));
criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class));
criteria.addFilterGroupCategory(getFilter(request, CATEGORY.propertyName(), GroupCategory.class));
criteria.addFilterDownMemberCount(getFilter(request, "downMemberCount", Long.class));
criteria.addFilterExplicitResourceIds(getFilter(request, "explicitResourceId", Integer.class));
criteria.addFilterGroupDefinitionId(getFilter(request, "groupDefinitionId", Integer.class));
criteria.setSearchExpression(getFilter(request, "search", String.class));
+ criteria.addFilterIds(getArrayFilter(request, FILTER_GROUP_IDS, Integer.class));
return criteria;
}
@@ -202,14 +212,15 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
StringBuilder results = new StringBuilder();
results.append("<table width=\"120px\"><tr>");
if (up == 0 && down == 0) {
- results.append(getColumn(false, "<img src=\""
- + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(null)) + "\" /> 0"));
+ results.append(getColumn(false,
+ "<img src=\"" + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(null)) + "\" /> 0"));
results.append(getColumn(true));
results.append(getColumn(false));
} else {
if (up > 0) {
- results.append(getColumn(false, " <img src=\""
- + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(Boolean.TRUE)) + "\" />", up));
+ results.append(getColumn(false,
+ " <img src=\"" + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(Boolean.TRUE))
+ + "\" />", up));
}
if (up > 0 && down > 0) {
@@ -217,8 +228,9 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
}
if (down > 0) {
- results.append(getColumn(false, " <img src=\""
- + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(Boolean.FALSE)) + "\" />", down));
+ results.append(getColumn(false,
+ " <img src=\"" + ImageManager.getFullImagePath(ImageManager.getAvailabilityIcon(Boolean.FALSE))
+ + "\" />", down));
} else {
results.append(getColumn(false,
" <img src=\"/images/blank.png\" width=\"16px\" height=\"16px\" />"));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
index 83c356f..9f2cd03 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
@@ -51,6 +51,8 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
*/
public class ResourceGroupsDataSource extends RPCDataSource<ResourceGroup, ResourceGroupCriteria> {
+ public static final String FILTER_GROUP_IDS = "resourceGroupIds";
+
private ResourceGroupGWTServiceAsync groupService = GWTServiceLookup.getResourceGroupService();
private static ResourceGroupsDataSource INSTANCE;
@@ -79,8 +81,8 @@ public class ResourceGroupsDataSource extends RPCDataSource<ResourceGroup, Resou
DataSourceTextField nameDataField = new DataSourceTextField(NAME.propertyName(), NAME.title(), 200);
fields.add(nameDataField);
- DataSourceTextField descriptionDataField = new DataSourceTextField(DESCRIPTION.propertyName(), DESCRIPTION
- .title());
+ DataSourceTextField descriptionDataField = new DataSourceTextField(DESCRIPTION.propertyName(),
+ DESCRIPTION.title());
fields.add(descriptionDataField);
DataSourceTextField typeNameDataField = new DataSourceTextField(TYPE.propertyName(), TYPE.title());
@@ -117,12 +119,14 @@ public class ResourceGroupsDataSource extends RPCDataSource<ResourceGroup, Resou
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
criteria.setPageControl(getPageControl(request));
+ criteria.addFilterId(getFilter(request, "id", Integer.class));
criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class));
criteria.addFilterGroupCategory(getFilter(request, CATEGORY.propertyName(), GroupCategory.class));
criteria.addFilterDownMemberCount(getFilter(request, "downMemberCount", Long.class));
criteria.addFilterExplicitResourceIds(getFilter(request, "explicitResourceId", Integer.class));
criteria.addFilterGroupDefinitionId(getFilter(request, "groupDefinitionId", Integer.class));
criteria.setSearchExpression(getFilter(request, "search", String.class));
+ criteria.addFilterIds(getArrayFilter(request, FILTER_GROUP_IDS, Integer.class));
return criteria;
}
commit f9a99a4e1f83f3bc74b4fae5a8515914f69b15a5
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jan 12 13:46:23 2012 -0500
[Bug 535725 - (RHQ-2391) Logfile parser ignores lines where severity is not surrounded by spaces]
I've updated our logEntry pattern handling to allow for bracket or paren
delimiters, with optional spacing, around the severity. So, the
following should all now match, for example:
2012-01-05 11:42:13,607 INFO [org.foo.Baz] my message
2012-01-05 11:42:13,607 [INFO] [org.foo.Baz] my message
2012-01-05 11:42:13,607 ( INFO ) [org.foo.Baz] my message
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessor.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessor.java
index 8b5caa0..9eb4f09 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessor.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessor.java
@@ -35,15 +35,23 @@ import org.rhq.core.domain.event.EventSeverity;
/**
* A {@link org.rhq.core.pluginapi.event.log.LogEntryProcessor} for Log4J log files.
- *
+ * <pre>
+ * By default we support log entries of the format: date [delimiter]severity[delimiter] message
+ * Where:
+ * - the optional delimiters are either square brackets ort parens, with or without spaces
+ * - the date format is one of the built-ins below, or a user-specified date format for the logfile source
+ * - the message portion may contain multiple lines.
+ * For example:
+ * 2007-12-21 15:32:49,514 DEBUG [com.example.FooBar] run: IdleRemover notifying pools, interval: 450000
+ * 2007/12/21 15:32:49,514 (DEBUG) [com.example.FooBar] run: IdleRemover notifying pools, interval: 450000
+ * 2007-Dec-21 15:32:49 [ DEBUG ] [com.example.FooBar] run: IdleRemover notifying pools, interval: 450000
+ * </pre>
* @author Ian Springer
*/
public class Log4JLogEntryProcessor extends MultiLineLogEntryProcessor {
- // For now, we only support the default pattern: date priority '['category']' message
- // e.g.: 2007-12-09 15:32:49,514 DEBUG [com.example.FooBar] run: IdleRemover notifying pools, interval: 450000
- // NOTE: The message portion may contain multiple lines.
- private static final String REGEX = "(.*?) (TRACE|DEBUG|INFO|WARN|ERROR|FATAL) (.*)";
- private static final Pattern PATTERN = Pattern.compile(REGEX);
+
+ private static final String REGEX;
+ private static final Pattern PATTERN;
private static final String ISO8601_DATE_PATTERN = "yyyy-MM-dd kk:mm:ss,SSS";
private static final DateFormat ISO8601_DATE_FORMAT = new SimpleDateFormat(ISO8601_DATE_PATTERN);
@@ -55,6 +63,12 @@ public class Log4JLogEntryProcessor extends MultiLineLogEntryProcessor {
private static final Map<Priority, EventSeverity> PRIORITY_TO_SEVERITY_MAP = new LinkedHashMap<Priority, EventSeverity>();
static {
+ // just in case there is something unanticipated that our default pattern doesn't like, allow
+ // a backdoor prop to set the REGEX pattern.
+ String regex = System.getProperty("rhq.agent.event.log4j.regex");
+ REGEX = (null != regex) ? regex : "(.*?) [\\[\\(]??\\s*(TRACE|DEBUG|INFO|WARN|ERROR|FATAL)\\s*[\\]\\)]?? (.*)";
+ PATTERN = Pattern.compile(REGEX);
+
PRIORITY_TO_SEVERITY_MAP.put(Priority.TRACE, EventSeverity.DEBUG);
PRIORITY_TO_SEVERITY_MAP.put(Priority.DEBUG, EventSeverity.DEBUG);
PRIORITY_TO_SEVERITY_MAP.put(Priority.INFO, EventSeverity.INFO);
diff --git a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java
index e38e1be..78d98ce 100644
--- a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java
+++ b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java
@@ -1,92 +1,159 @@
- /*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.pluginapi.event.log;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.StringReader;
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.testng.annotations.Test;
-
-import org.rhq.core.domain.event.Event;
-import org.rhq.core.domain.event.EventSeverity;
-
-/**
- * @author Ian Springer
- */
-@Test
-public class Log4JLogEntryProcessorTest {
- private static final String LINE_SEPARATOR = System.getProperty("line.separator");
- private static final StringBuilder TEST_LOG = new StringBuilder();
- static {
- TEST_LOG.append(
- "2007-12-09 15:32:49,909 DEBUG [com.example.FooBar] run: IdleRemover notifying pools, interval: 450000")
- .append(LINE_SEPARATOR);
- TEST_LOG.append("2008-02-09 02:10:11,909 INFO [com.example.FooBar] a multi-line entry").append(LINE_SEPARATOR);
- TEST_LOG.append("\tyada yada yada").append(LINE_SEPARATOR);
- TEST_LOG.append("\twocka wocka").append(LINE_SEPARATOR);
- }
-
- public void testProcessLine() throws Exception {
- String eventType = "logEntry";
- File logFile = new File("C:/test.log");
- System.out.println("Testing with no includes pattern...");
- Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
- BufferedReader bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
- Set<Event> events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 2;
- Iterator<Event> eventIterator = events.iterator();
- Event event1 = eventIterator.next();
- assert eventType.equals(event1.getType());
- assert new File(event1.getSourceLocation()).equals(logFile);
- Calendar calendar = Calendar.getInstance();
- calendar.set(2007, 11, 9, 15, 32, 49);
- calendar.set(Calendar.MILLISECOND, 909);
- long expectedTimestamp = calendar.getTimeInMillis();
- assert event1.getTimestamp() == expectedTimestamp;
- assert event1.getSeverity().equals(EventSeverity.DEBUG);
- assert event1.getDetail().equals("[com.example.FooBar] run: IdleRemover notifying pools, interval: 450000");
- Event event2 = eventIterator.next();
- assert event2.getDetail().startsWith("[com.example.FooBar] a multi-line entry\n");
- assert event2.getDetail().endsWith("\twocka wocka");
- System.out.println("SUCCESS!");
- System.out.println("Testing with matching includes pattern...");
- processor.setIncludesPattern(Pattern.compile("wocka wocka"));
- bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
- events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 1;
- event1 = events.iterator().next();
- assert event1.getDetail().endsWith("\twocka wocka");
- System.out.println("SUCCESS!");
- System.out.println("Testing with non-matching includes pattern...");
- processor.setIncludesPattern(Pattern.compile("hubba bubba"));
- bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
- events = processor.processLines(bufferedReader);
- assert events != null && events.size() == 0;
- System.out.println("SUCCESS!");
- }
-}
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.pluginapi.event.log;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.StringReader;
+import java.util.Calendar;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.event.Event;
+import org.rhq.core.domain.event.EventSeverity;
+
+/**
+ * @author Ian Springer
+ */
+@Test
+public class Log4JLogEntryProcessorTest {
+ private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+ private static final StringBuilder TEST_LOG = new StringBuilder();
+ static {
+ TEST_LOG.append(
+ "2007-12-09 15:32:49,909 DEBUG [com.example.FooBar] run: IdleRemover notifying pools, interval: 450000")
+ .append(LINE_SEPARATOR);
+ TEST_LOG.append("2008-02-09 02:10:11,909 INFO [com.example.FooBar] a multi-line entry").append(LINE_SEPARATOR);
+ TEST_LOG.append("\tyada yada yada").append(LINE_SEPARATOR);
+ TEST_LOG.append("\twocka wocka").append(LINE_SEPARATOR);
+ }
+
+ public void testProcessLine() throws Exception {
+ String eventType = "logEntry";
+ File logFile = new File("C:/test.log");
+ System.out.println("Testing with no includes pattern...");
+ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
+ BufferedReader bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
+ Set<Event> events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 2;
+ Iterator<Event> eventIterator = events.iterator();
+ Event event1 = eventIterator.next();
+ assert eventType.equals(event1.getType());
+ assert new File(event1.getSourceLocation()).equals(logFile);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(2007, 11, 9, 15, 32, 49);
+ calendar.set(Calendar.MILLISECOND, 909);
+ long expectedTimestamp = calendar.getTimeInMillis();
+ assert event1.getTimestamp() == expectedTimestamp;
+ assert event1.getSeverity().equals(EventSeverity.DEBUG);
+ assert event1.getDetail().equals("[com.example.FooBar] run: IdleRemover notifying pools, interval: 450000");
+ Event event2 = eventIterator.next();
+ assert event2.getDetail().startsWith("[com.example.FooBar] a multi-line entry\n");
+ assert event2.getDetail().endsWith("\twocka wocka");
+ System.out.println("SUCCESS!");
+ System.out.println("Testing with matching includes pattern...");
+ processor.setIncludesPattern(Pattern.compile("wocka wocka"));
+ bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
+ events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 1;
+ event1 = events.iterator().next();
+ assert event1.getDetail().endsWith("\twocka wocka");
+ System.out.println("SUCCESS!");
+ System.out.println("Testing with non-matching includes pattern...");
+ processor.setIncludesPattern(Pattern.compile("hubba bubba"));
+ bufferedReader = new BufferedReader(new StringReader(TEST_LOG.toString()));
+ events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 0;
+ System.out.println("SUCCESS!");
+ }
+
+ public void testProcessLineBracketDelimitedSeverity() throws Exception {
+ String eventType = "logEntry";
+ File logFile = new File("C:/test.log");
+ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
+
+ String logEntry = "2007-12-09 15:32:49,909 [DEBUG] [com.example.FooBar] test message";
+ BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
+ Set<Event> events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 1;
+ Iterator<Event> eventIterator = events.iterator();
+ Event event1 = eventIterator.next();
+ assert eventType.equals(event1.getType());
+ assert new File(event1.getSourceLocation()).equals(logFile);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(2007, 11, 9, 15, 32, 49);
+ calendar.set(Calendar.MILLISECOND, 909);
+ long expectedTimestamp = calendar.getTimeInMillis();
+ assert event1.getTimestamp() == expectedTimestamp;
+ assert event1.getSeverity().equals(EventSeverity.DEBUG);
+ assert event1.getDetail().equals("[com.example.FooBar] test message");
+ }
+
+ public void testProcessLineParenDelimitedSeverity() throws Exception {
+ String eventType = "logEntry";
+ File logFile = new File("C:/test.log");
+ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
+
+ String logEntry = "2007-12-09 15:32:49,909 (DEBUG) [com.example.FooBar] test message";
+ BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
+ Set<Event> events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 1;
+ Iterator<Event> eventIterator = events.iterator();
+ Event event1 = eventIterator.next();
+ assert eventType.equals(event1.getType());
+ assert new File(event1.getSourceLocation()).equals(logFile);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(2007, 11, 9, 15, 32, 49);
+ calendar.set(Calendar.MILLISECOND, 909);
+ long expectedTimestamp = calendar.getTimeInMillis();
+ assert event1.getTimestamp() == expectedTimestamp;
+ assert event1.getSeverity().equals(EventSeverity.DEBUG);
+ assert event1.getDetail().equals("[com.example.FooBar] test message");
+ }
+
+ public void testProcessLineSpacedDelimitedSeverity() throws Exception {
+ String eventType = "logEntry";
+ File logFile = new File("C:/test.log");
+ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(eventType, logFile);
+
+ String logEntry = "2007-12-09 15:32:49,909 [ DEBUG ) [com.example.FooBar] test message";
+ BufferedReader bufferedReader = new BufferedReader(new StringReader(logEntry));
+ Set<Event> events = processor.processLines(bufferedReader);
+ assert events != null && events.size() == 1;
+ Iterator<Event> eventIterator = events.iterator();
+ Event event1 = eventIterator.next();
+ assert eventType.equals(event1.getType());
+ assert new File(event1.getSourceLocation()).equals(logFile);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(2007, 11, 9, 15, 32, 49);
+ calendar.set(Calendar.MILLISECOND, 909);
+ long expectedTimestamp = calendar.getTimeInMillis();
+ assert event1.getTimestamp() == expectedTimestamp;
+ assert event1.getSeverity().equals(EventSeverity.DEBUG);
+ assert event1.getDetail().equals("[com.example.FooBar] test message");
+ }
+
+}
commit 7d14f7484ad758be037694e3599654e4fcb11a88
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Jan 12 16:45:50 2012 +0100
Increasing the log level back to WARN now that the tests are working again.
diff --git a/modules/enterprise/server/itests/src/test/resources/log4j.xml b/modules/enterprise/server/itests/src/test/resources/log4j.xml
index 1e37497..bc65329 100644
--- a/modules/enterprise/server/itests/src/test/resources/log4j.xml
+++ b/modules/enterprise/server/itests/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
+ <param name="Threshold" value="WARN"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Messagen -->
@@ -32,7 +32,7 @@
<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="target/server-jar-test.log"/>
- <param name="Threshold" value="INFO"/>
+ <param name="Threshold" value="WARN"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
commit 759b64ee6b76525650ebece39459bf9abe5c7dd4
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Jan 12 16:45:20 2012 +0100
Making the script security work with Java 6u27 and up.
Due to CVE-2011-3544 the Rhino script engine changed the way it applies
security permissions which broke our original sandboxing approach.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/SandboxedScriptEngine.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/SandboxedScriptEngine.java
index 7b34c6d..f994f09 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/SandboxedScriptEngine.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/SandboxedScriptEngine.java
@@ -40,6 +40,9 @@ import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
/**
+ * <b>DO NOT USE THIS CLASS DIRECTLY!!!!</b> Use {@link org.rhq.bindings.ScriptEngineFactory#getSecuredScriptEngine(String, org.rhq.bindings.util.PackageFinder, StandardBindings, PermissionCollection)}
+ * method instead for a reliably secured script engine.
+ * <p>
* This is a decorator class for any other {@link ScriptEngine} implementation
* that runs any of the eval methods with the defined set of {@link Permission}s.
* <p>
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
index 168d2fb..5834922 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
@@ -25,6 +25,15 @@ import java.beans.Introspector;
import java.beans.MethodDescriptor;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.net.URL;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.PermissionCollection;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
+import java.security.cert.Certificate;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -79,7 +88,7 @@ public class ScriptEngineFactory {
public static ScriptEngine getScriptEngine(String language, PackageFinder packageFinder, StandardBindings bindings)
throws ScriptException, IOException {
ScriptEngineInitializer initializer = getInitializer(language);
-
+
if (initializer == null) {
return null;
}
@@ -92,6 +101,55 @@ public class ScriptEngineFactory {
return engine;
}
+
+ /**
+ * This method is similar to the {@link #getScriptEngine(String, PackageFinder, StandardBindings)} method
+ * but additionally applies a security wrapper on the returned script engine so that the scripts execute
+ * with the provided java permissions.
+ *
+ * @see #getScriptEngine(String, PackageFinder, StandardBindings)
+ */
+ public static ScriptEngine getSecuredScriptEngine(final String language, final PackageFinder packageFinder, final StandardBindings bindings, final PermissionCollection permissions) throws ScriptException, IOException {
+ CodeSource src = new CodeSource(new URL("http://rhq-project.org/scripting"), (Certificate[]) null);
+ ProtectionDomain scriptDomain = new ProtectionDomain(src, permissions);
+ AccessControlContext ctx = new AccessControlContext(new ProtectionDomain[] { scriptDomain });
+ try {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<ScriptEngine>() {
+ @Override
+ public ScriptEngine run() throws Exception {
+ //This might seem a bit excessive but is necessary due to the
+ //change in security handling in the rhino script engine
+ //that occured in Java6u27 (due to a CVE desribed here:
+ //https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2011-3544)
+
+ //In Java 6u26 and earlier, it was enough to wrap a script engine
+ //in the sandbox and everything would work.
+
+ //Java 6u27 introduced new behavior where the rhino script engine
+ //remembers the access control context with which it has been
+ //constructed and combines that with the callers protection domain
+ //when a script is executed. Because this class has all perms and
+ //all the code in RHQ that called ScriptEngine.eval* also
+ //had all perms, the scripts would never be sandboxed even if the call
+ //was pushed through the SandboxedScriptEngine.
+
+ //This means that the below wrapping is necessary for the security
+ //to work in java6 pre u27 while the surrounding privileged block
+ //is necessary for the security to be applied in java6 u27 and later.
+ return new SandboxedScriptEngine(getScriptEngine(language, packageFinder, bindings), permissions);
+ }
+ }, ctx);
+ } catch (PrivilegedActionException e) {
+ Throwable cause = e.getCause();
+ if (cause instanceof IOException) {
+ throw (IOException) cause;
+ } else if (cause instanceof ScriptException) {
+ throw (ScriptException) cause;
+ } else {
+ throw new ScriptException(e);
+ }
+ }
+ }
/**
* Injects the values provided in the bindings into the {@link ScriptContext#ENGINE_SCOPE engine scope}
diff --git a/modules/enterprise/binding/src/test/java/org/rhq/bindings/ScriptEngineTest.java b/modules/enterprise/binding/src/test/java/org/rhq/bindings/ScriptEngineTest.java
index 69874e4..15184c1 100644
--- a/modules/enterprise/binding/src/test/java/org/rhq/bindings/ScriptEngineTest.java
+++ b/modules/enterprise/binding/src/test/java/org/rhq/bindings/ScriptEngineTest.java
@@ -40,6 +40,7 @@ import org.rhq.bindings.util.PackageFinder;
*
* @author Lukas Krejci
*/
+@Test
public class ScriptEngineTest {
private static StandardBindings EMPTY_BINDINGS = new StandardBindings(new PrintWriter(System.out), new FakeRhqFacade());
@@ -52,9 +53,7 @@ public class ScriptEngineTest {
@Test
public void testSandbox() throws ScriptException, IOException {
- ScriptEngine engine = getScriptEngine();
-
- SandboxedScriptEngine sandbox = new SandboxedScriptEngine(engine, new StandardScriptPermissions());
+ ScriptEngine sandbox = getSecuredScriptEngine();
try {
sandbox.eval("java.lang.System.exit(1);");
@@ -90,6 +89,10 @@ public class ScriptEngineTest {
return ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), EMPTY_BINDINGS);
}
+ private ScriptEngine getSecuredScriptEngine() throws ScriptException, IOException {
+ return ScriptEngineFactory.getSecuredScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), EMPTY_BINDINGS, new StandardScriptPermissions());
+ }
+
private void assertSecurityExceptionPresent(Throwable t) {
boolean ok = false;
while (t != null) {
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
index ae848a8..de0d912 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
@@ -181,12 +181,10 @@ public class JndiAccessTest extends AbstractEJB3Test {
private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
- ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
PermissionCollection perms = new StandardScriptPermissions();
- perms.add(new SerializablePermission("enableSubclassImplementation"));
- return new SandboxedScriptEngine(engine, perms);
+ return ScriptEngineFactory.getSecuredScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings, perms);
}
private static void checkIsDesiredSecurityException(ScriptException e) {
diff --git a/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java b/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
index 3aab6a2..43090c7 100644
--- a/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
+++ b/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
@@ -127,8 +127,6 @@ public class CliSender extends AlertSender<CliComponent> {
engine = getScriptEngine(alert, scriptOut, config);
- final SandboxedScriptEngine sandbox = new SandboxedScriptEngine(engine, new StandardScriptPermissions());
-
InputStream packageBits = getPackageBits(config.packageId, config.repoId);
reader = new BufferedReader(new InputStreamReader(packageBits));
@@ -137,10 +135,11 @@ public class CliSender extends AlertSender<CliComponent> {
final ExceptionHolder exceptionHolder = new ExceptionHolder();
+ final ScriptEngine e = engine;
Thread scriptRunner = new Thread(new Runnable() {
public void run() {
try {
- sandbox.eval(rdr);
+ e.eval(rdr);
} catch (ScriptException e) {
exceptionHolder.scriptException = e;
}
@@ -414,8 +413,8 @@ public class CliSender extends AlertSender<CliComponent> {
ScriptEngine engine = SCRIPT_ENGINES.poll();
if (engine == null) {
- engine = ScriptEngineFactory.getScriptEngine(ENGINE_NAME, new PackageFinder(Collections
- .<File> emptyList()), bindings);
+ engine = ScriptEngineFactory.getSecuredScriptEngine(ENGINE_NAME, new PackageFinder(Collections
+ .<File> emptyList()), bindings, new StandardScriptPermissions());
} else {
ScriptEngineFactory.injectStandardBindings(engine, bindings, true);
}
commit 40247b6c476b0a68476480fe5bca118c4db93489
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Jan 12 16:28:10 2012 +0100
making sure that the tests that try to exit the jvm won't make the test
suite appear to have succeeded.
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 0a9dd46..52def8e 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -209,6 +209,8 @@
<!-- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> -->
<argLine>-Djava.security.manager -Djava.security.policy==${project.build.testOutputDirectory}/allow-all.policy</argLine>
+ <!-- This is important, because some of the tests try to exit the JVM. -->
+ <failIfNoTests>true</failIfNoTests>
</configuration>
</plugin>
commit 3af946684338eecfced03356dfbebdf1f308eec3
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Jan 11 17:05:52 2012 -0500
[BZ 773090] fix the attachment form item so it doesn't cause the info to go off the screen
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
index 63a10d7..db5d363 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
@@ -38,8 +38,10 @@ import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.AutoFitTextAreaItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import com.smartgwt.client.widgets.form.fields.TextAreaItem;
+import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
+import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
@@ -172,9 +174,17 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout {
StaticTextItem message = new StaticTextItem("message", MSG.common_title_message());
message.setTitleVAlign(VerticalAlignment.TOP);
- AutoFitTextAreaItem detail = new AutoFitTextAreaItem("attachment", MSG.common_title_details());
+ TextAreaItem detail = new TextAreaItem("attachment", MSG.common_title_details());
detail.setTitleVAlign(VerticalAlignment.TOP);
+ detail.setMinHeight(100);
+ detail.setHeight("100%");
detail.setWidth("100%");
+ detail.addChangeHandler(new ChangeHandler() {
+ @Override
+ public void onChange(ChangeEvent event) {
+ event.cancel(); // we want the user to interact with the text to copy it, but not to edit it
+ }
+ });
form.setItems(timestamp, action, category, user, status, info, message, detail);
form.editRecord(record);
commit 3a40aefab45f851facda766e766bb312675d1e63
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Jan 11 16:05:01 2012 -0500
[Bug 773031 - Component start() called more than once without an intervening stop()]
A variety of auto-formatting changes took place, actual changes are in:
InventoryManager.prepareResourceForActivation
InventoryManager.activateResource
The resource component state could be STOPPED or STARTED. There was a
large window while a component was actually starting that a call
to prepareResourceForActivation would happily allow the component to
again be activated. So, added an actual STARTING state that can block
redundant activation.
Additionally, if forcing reactivation ensure a STARTED component is
stopped before being restarted.
Also:
- remove unnecessary and bad lazy state check
- comment out some unused/debug code
- remove warnings
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 2a5bd2f..2afe7f0 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -130,6 +130,7 @@ import org.rhq.core.util.exception.WrappedRemotingException;
* @author Ian Springer
* @author Jay Shaughnessy
*/
+@SuppressWarnings({ "rawtypes", "unchecked" })
public class InventoryManager extends AgentService implements ContainerService, DiscoveryAgentService {
private static final String INVENTORY_THREAD_POOL_NAME = "InventoryManager.discovery";
private static final String AVAIL_THREAD_POOL_NAME = "InventoryManager.availability";
@@ -245,16 +246,19 @@ public class InventoryManager extends AgentService implements ContainerService,
// inside EmbJopr).
if (configuration.isInsideAgent()) {
// After an initial delay (5s by default), periodically run an availability check (every 1m by default).
- availabilityThreadPoolExecutor.scheduleWithFixedDelay(availabilityExecutor, configuration
- .getAvailabilityScanInitialDelay(), configuration.getAvailabilityScanPeriod(), TimeUnit.SECONDS);
+ availabilityThreadPoolExecutor.scheduleWithFixedDelay(availabilityExecutor,
+ configuration.getAvailabilityScanInitialDelay(), configuration.getAvailabilityScanPeriod(),
+ TimeUnit.SECONDS);
// After an initial delay (10s by default), periodically run a server discovery scan (every 15m by default).
- inventoryThreadPoolExecutor.scheduleWithFixedDelay(serverScanExecutor, configuration
- .getServerDiscoveryInitialDelay(), configuration.getServerDiscoveryPeriod(), TimeUnit.SECONDS);
+ inventoryThreadPoolExecutor.scheduleWithFixedDelay(serverScanExecutor,
+ configuration.getServerDiscoveryInitialDelay(), configuration.getServerDiscoveryPeriod(),
+ TimeUnit.SECONDS);
// After an initial delay (20s by default), periodically run a service discovery scan (every 1d by default).
- inventoryThreadPoolExecutor.scheduleWithFixedDelay(serviceScanExecutor, configuration
- .getServiceDiscoveryInitialDelay(), configuration.getServiceDiscoveryPeriod(), TimeUnit.SECONDS);
+ inventoryThreadPoolExecutor.scheduleWithFixedDelay(serviceScanExecutor,
+ configuration.getServiceDiscoveryInitialDelay(), configuration.getServiceDiscoveryPeriod(),
+ TimeUnit.SECONDS);
}
} finally {
inventoryLock.writeLock().unlock();
@@ -311,8 +315,8 @@ public class InventoryManager extends AgentService implements ContainerService,
long timeout = getDiscoveryComponentTimeout(context.getResourceType());
try {
- ResourceDiscoveryComponent proxy = this.discoveryComponentProxyFactory.getDiscoveryComponentProxy(context
- .getResourceType(), component, timeout, parentResourceContainer);
+ ResourceDiscoveryComponent proxy = this.discoveryComponentProxyFactory.getDiscoveryComponentProxy(
+ context.getResourceType(), component, timeout, parentResourceContainer);
Set<DiscoveredResourceDetails> results = proxy.discoverResources(context);
return results;
} catch (TimeoutException te) {
@@ -347,8 +351,8 @@ public class InventoryManager extends AgentService implements ContainerService,
long timeout = getDiscoveryComponentTimeout(context.getResourceType());
try {
- ManualAddFacet proxy = this.discoveryComponentProxyFactory.getDiscoveryComponentProxy(context
- .getResourceType(), component, timeout, ManualAddFacet.class, parentResourceContainer);
+ ManualAddFacet proxy = this.discoveryComponentProxyFactory.getDiscoveryComponentProxy(
+ context.getResourceType(), component, timeout, ManualAddFacet.class, parentResourceContainer);
DiscoveredResourceDetails result = proxy.discoverResource(pluginConfig, context);
return result;
} catch (TimeoutException te) {
@@ -387,8 +391,8 @@ public class InventoryManager extends AgentService implements ContainerService,
component, timeout, ClassLoaderFacet.class, parentContainer);
ResourceDiscoveryContext discoveryContext = new ResourceDiscoveryContext(resourceType, parentComponent,
- parentResourceContext, SystemInfoFactory.createSystemInfo(), null, null, this.configuration
- .getContainerName(), this.configuration.getPluginContainerDeployment());
+ parentResourceContext, SystemInfoFactory.createSystemInfo(), null, null,
+ this.configuration.getContainerName(), this.configuration.getPluginContainerDeployment());
// Configurations are not immutable, so clone the plugin config, so the plugin will not be able to change the
// actual PC-managed plugin config.
@@ -409,7 +413,6 @@ public class InventoryManager extends AgentService implements ContainerService,
long timeout = getDiscoveryComponentTimeout(resourceType);
try {
- @SuppressWarnings("unchecked")
ResourceUpgradeFacet<T> proxy = this.discoveryComponentProxyFactory.getDiscoveryComponentProxy(
resourceType, component, timeout, ResourceUpgradeFacet.class, parentResourceContainer);
@@ -641,7 +644,6 @@ public class InventoryManager extends AgentService implements ContainerService,
return new Availability(resource, new Date(), availType);
}
- @SuppressWarnings("unchecked")
public MergeResourceResponse manuallyAddResource(ResourceType resourceType, int parentResourceId,
Configuration pluginConfiguration, int ownerSubjectId) throws InvalidPluginConfigurationClientException,
PluginContainerException {
@@ -676,8 +678,8 @@ public class InventoryManager extends AgentService implements ContainerService,
ResourceDiscoveryContext<ResourceComponent<?>> discoveryContext = new ResourceDiscoveryContext<ResourceComponent<?>>(
resourceType, parentResourceComponent, parentResourceContainer.getResourceContext(),
SystemInfoFactory.createSystemInfo(), new ArrayList<ProcessScanResult>(0),
- new ArrayList<Configuration>(0), this.configuration.getContainerName(), this.configuration
- .getPluginContainerDeployment());
+ new ArrayList<Configuration>(0), this.configuration.getContainerName(),
+ this.configuration.getPluginContainerDeployment());
// Ask the plugin's discovery component to find the new resource, throwing exceptions if it cannot be
// found at all.
@@ -879,8 +881,7 @@ public class InventoryManager extends AgentService implements ContainerService,
if ((this.platform != null) && (this.platform.getInventoryStatus() == InventoryStatus.NEW)
&& newPlatformWasDeletedRecently) {
// let's make sure we are registered; its probable that our platform was deleted and we need to re-register
- log
- .info("No committed resources to send in our availability report - the platform/agent was deleted, let's re-register again");
+ log.info("No committed resources to send in our availability report - the platform/agent was deleted, let's re-register again");
registerWithServer();
newPlatformWasDeletedRecently = false; // we've tried to recover from our platform being deleted, let's not do it again
}
@@ -923,8 +924,8 @@ public class InventoryManager extends AgentService implements ContainerService,
log.debug("Availability report content: " + report.toString(log.isTraceEnabled()));
}
- boolean ok = configuration.getServerServices().getDiscoveryServerService().mergeAvailabilityReport(
- report);
+ boolean ok = configuration.getServerServices().getDiscoveryServerService()
+ .mergeAvailabilityReport(report);
if (!ok) {
// I guess I could immediately call executeAvailabilityScanImmediately and pass its results to
// mergeAvailabilityReport again right now, but what happens if we've queued up a bunch of
@@ -970,10 +971,9 @@ public class InventoryManager extends AgentService implements ContainerService,
(System.currentTimeMillis() - startTime)));
}
} catch (StaleTypeException e) {
- log
- .error("Failed to merge inventory report with server. The report contains one or more resource types "
- + "that have been marked for deletion. Notifying the plugin container that a reboot is needed to purge "
- + "stale types.");
+ log.error("Failed to merge inventory report with server. The report contains one or more resource types "
+ + "that have been marked for deletion. Notifying the plugin container that a reboot is needed to purge "
+ + "stale types.");
PluginContainer.getInstance().notifyRebootRequestListener();
return false;
} catch (InvalidInventoryReportException e) {
@@ -981,8 +981,7 @@ public class InventoryManager extends AgentService implements ContainerService,
if ((this.platform != null) && (this.platform.getInventoryStatus() == InventoryStatus.NEW)
&& newPlatformWasDeletedRecently) {
// let's make sure we are registered; its probable that our platform was deleted and we need to re-register
- log
- .info("The inventory report was invalid probably because the platform/Agent was deleted; let's re-register...");
+ log.info("The inventory report was invalid probably because the platform/Agent was deleted; let's re-register...");
registerWithServer();
newPlatformWasDeletedRecently = false; // we've tried to recover from our platform being deleted, let's not do it again
}
@@ -1178,8 +1177,8 @@ public class InventoryManager extends AgentService implements ContainerService,
parent.removeChildResource(resource);
}
- PluginContainer.getInstance().getMeasurementManager().unscheduleCollection(
- Collections.singleton(resource.getId()));
+ PluginContainer.getInstance().getMeasurementManager()
+ .unscheduleCollection(Collections.singleton(resource.getId()));
if (this.resourceContainers.remove(resource.getUuid()) == null) {
if (log.isDebugEnabled()) {
@@ -1285,8 +1284,8 @@ public class InventoryManager extends AgentService implements ContainerService,
logMessage.append("description, ");
}
- logMessage.replace(logMessage.length() - 1, logMessage.length(), "to become [").append(
- existingResource.toString()).append("]");
+ logMessage.replace(logMessage.length() - 1, logMessage.length(), "to become [")
+ .append(existingResource.toString()).append("]");
log.info(logMessage.toString());
} else {
@@ -1449,25 +1448,48 @@ public class InventoryManager extends AgentService implements ContainerService,
*/
private boolean prepareResourceForActivation(Resource resource, @NotNull ResourceContainer container,
boolean forceReinitialization) throws InvalidPluginConfigurationException, PluginContainerException {
+
if (resourceUpgradeDelegate.hasUpgradeFailed(resource)) {
if (log.isTraceEnabled()) {
log.trace("Skipping activation of " + resource + " - it has failed to upgrade.");
}
+
return false;
}
ResourceComponent component = container.getResourceComponent();
+ ResourceComponentState state = container.getResourceComponentState();
- // if the component already exists and is started, and the resource's plugin config has not changed, there is
- // nothing to do, so return immediately
- if ((component != null)
- && (container.getResourceComponentState() == ResourceComponentState.STARTED && !forceReinitialization)) {
- if (log.isTraceEnabled()) {
- log.trace("No need to prepare the activation of resource " + resource
- + " - its component is already started and its plugin "
- + "config has not been updated since it was last started.");
+ // state is a transient field, so reinitialize it just in case this is invoked just after loadFromDisk()
+ if (state == null) {
+ container.setResourceComponentState(ResourceComponentState.STOPPED);
+ }
+
+ // if the component exists and is not stopped then we may not have to do anything
+ if ((component != null) && (state != ResourceComponentState.STOPPED)) {
+
+ // if STARTED and we are forced to restart (e.g. plugin config change), then stop the component
+ // and continue. If STARTING just let it continue to start as interruption could put us in a bad state.
+ if (forceReinitialization) {
+ switch (state) {
+ case STARTED:
+ component.stop();
+ break;
+ case STARTING:
+ log.warn("Could not force initialization of component for resource [" + resource.getId()
+ + "] as it is already in the process of starting.");
+
+ return false;
+ }
+ } else {
+ if (log.isTraceEnabled()) {
+ log.trace("No need to prepare the activation of resource " + resource
+ + " - its component is already started and its plugin "
+ + "config has not been updated since it was last started.");
+ }
+
+ return false;
}
- return false;
}
if (log.isDebugEnabled()) {
@@ -1483,16 +1505,13 @@ public class InventoryManager extends AgentService implements ContainerService,
}
try {
component = PluginContainer.getInstance().getPluginComponentFactory().buildResourceComponent(resource);
+
} catch (Throwable e) {
throw new PluginContainerException("Could not build component for Resource [" + resource + "]", e);
}
container.setResourceComponent(component);
}
- //this is a transient field, so reinitialize it just in case this is invoked just after
- //loadFromDisk()
- container.setResourceComponentState(ResourceComponentState.STOPPED);
-
// start the resource, but only if its parent component is running. If the parent is null, that means
// the resource is, itself, the root platform and we always activate that.
ResourceContainer parentResourceContainer;
@@ -1522,8 +1541,8 @@ public class InventoryManager extends AgentService implements ContainerService,
log.warn("Cannot give activated resource its discovery component. Cause: " + e);
}
- ConfigurationUtility.normalizeConfiguration(resource.getPluginConfiguration(), type
- .getPluginConfigurationDefinition());
+ ConfigurationUtility.normalizeConfiguration(resource.getPluginConfiguration(),
+ type.getPluginConfigurationDefinition());
ResourceComponent<?> parentComponent = null;
if (resource.getParentResource() != null) {
@@ -1531,10 +1550,9 @@ public class InventoryManager extends AgentService implements ContainerService,
}
ResourceContext context = createResourceContext(resource, parentComponent, discoveryComponent);
-
container.setResourceContext(context);
-
return true;
+
} else {
if (log.isDebugEnabled()) {
log.debug("Resource [" + resource + "] not being prepared for activation; parent isn't started: "
@@ -1558,9 +1576,9 @@ public class InventoryManager extends AgentService implements ContainerService,
* plugin configuration
* @throws PluginContainerException for all other errors
*/
- @SuppressWarnings("unchecked")
public void activateResource(Resource resource, @NotNull ResourceContainer container, boolean updatedPluginConfig)
throws InvalidPluginConfigurationException, PluginContainerException {
+
if (resourceUpgradeDelegate.hasUpgradeFailed(resource)) {
if (log.isTraceEnabled()) {
log.trace("Skipping activation of " + resource + " - it has failed to upgrade.");
@@ -1569,6 +1587,7 @@ public class InventoryManager extends AgentService implements ContainerService,
}
if (prepareResourceForActivation(resource, container, updatedPluginConfig)) {
+ container.setResourceComponentState(ResourceComponentState.STARTING);
ResourceContext context = container.getResourceContext();
@@ -1577,27 +1596,26 @@ public class InventoryManager extends AgentService implements ContainerService,
FacetLockType.READ, COMPONENT_START_TIMEOUT, true, false);
try {
- // One last check to make sure another thread didn't beat us to the punch.
- // TODO: Add some real synchronization to this method. (ips, 07/09/07)
- if (container.getResourceComponentState() == ResourceComponentState.STARTED) {
- if (log.isTraceEnabled()) {
- log.trace("Skipping activation of " + resource + " - its component is already started.");
- }
- return;
- }
component.start(context);
container.setResourceComponentState(ResourceComponentState.STARTED);
resource.setConnected(true); // This tells the server-side that the resource has connected successfully.
+
} catch (Throwable t) {
+ // Don't leave in a STARTING state. Don't actually call component.stop(),
+ // because we're not actually STARTED
+ container.setResourceComponentState(ResourceComponentState.STOPPED);
+
if (updatedPluginConfig || (t instanceof InvalidPluginConfigurationException)) {
if (log.isDebugEnabled()) {
log.debug("Resource has a bad config, waiting for this to go away: " + resource);
}
InventoryEventListener iel = new ResourceGotActivatedListener();
addInventoryEventListener(iel);
+
throw new InvalidPluginConfigurationException("Failed to start component for resource " + resource
+ ".", t);
}
+
throw new PluginContainerException("Failed to start component for resource " + resource + ".", t);
}
@@ -1661,8 +1679,8 @@ public class InventoryManager extends AgentService implements ContainerService,
resource.setConnected(false); // invalid plugin configuration infers the resource component is disconnected
// Give the server-side an error message describing the connection failure that can be
// displayed on the resource's Inventory page.
- ResourceError resourceError = new ResourceError(resource, ResourceErrorType.INVALID_PLUGIN_CONFIGURATION, t
- .getLocalizedMessage(), ThrowableUtil.getStackAsString(t), System.currentTimeMillis());
+ ResourceError resourceError = new ResourceError(resource, ResourceErrorType.INVALID_PLUGIN_CONFIGURATION,
+ t.getLocalizedMessage(), ThrowableUtil.getStackAsString(t), System.currentTimeMillis());
return sendResourceErrorToServer(resourceError);
}
@@ -1750,37 +1768,39 @@ public class InventoryManager extends AgentService implements ContainerService,
return servers;
}
- private void activateFromDisk(Resource resource) throws PluginContainerException {
- if (resource.getId() == 0) {
- return; // This is for the case of a resource that hadn't been synced to the server (there are probably better places to handle this)
- }
-
- resource.setAgent(this.agent);
- ResourceContainer container = getResourceContainer(resource.getId());
- if (container == null) {
- if (log.isDebugEnabled()) {
- log.debug("Could not find a container for resource: " + resource);
- }
- return;
- }
- if (container.getSynchronizationState() != ResourceContainer.SynchronizationState.SYNCHRONIZED) {
- if (log.isDebugEnabled()) {
- log.debug("Stopped activating resources at unsynchronized resource [" + resource + "]");
- }
- return;
- }
-
- try {
- activateResource(resource, container, false);
- } catch (Exception e) {
- log.debug("Failed to activate from disk [" + resource + "]");
- }
-
- for (Resource child : resource.getChildResources()) {
- initResourceContainer(child);
- activateFromDisk(child);
- }
- }
+ // commenting out dead code, leaving for reference -jshaughn
+ //
+ // private void activateFromDisk(Resource resource) throws PluginContainerException {
+ // if (resource.getId() == 0) {
+ // return; // This is for the case of a resource that hadn't been synced to the server (there are probably better places to handle this)
+ // }
+ //
+ // resource.setAgent(this.agent);
+ // ResourceContainer container = getResourceContainer(resource.getId());
+ // if (container == null) {
+ // if (log.isDebugEnabled()) {
+ // log.debug("Could not find a container for resource: " + resource);
+ // }
+ // return;
+ // }
+ // if (container.getSynchronizationState() != ResourceContainer.SynchronizationState.SYNCHRONIZED) {
+ // if (log.isDebugEnabled()) {
+ // log.debug("Stopped activating resources at unsynchronized resource [" + resource + "]");
+ // }
+ // return;
+ // }
+ //
+ // try {
+ // activateResource(resource, container, false);
+ // } catch (Exception e) {
+ // log.debug("Failed to activate from disk [" + resource + "]");
+ // }
+ //
+ // for (Resource child : resource.getChildResources()) {
+ // initResourceContainer(child);
+ // activateFromDisk(child);
+ // }
+ // }
/**
* Tries to load an existing inventory from the file data/inventory.dat
@@ -1875,7 +1895,6 @@ public class InventoryManager extends AgentService implements ContainerService,
* TODO GH: Move this to another class (this one is getting too big)
* @return The discovered platform (which might be a dummy in case of testing)
*/
- @SuppressWarnings("unchecked")
private Resource discoverPlatform() {
PluginManager pluginManager = PluginContainer.getInstance().getPluginManager();
PluginComponentFactory componentFactory = PluginContainer.getInstance().getPluginComponentFactory();
@@ -1921,8 +1940,7 @@ public class InventoryManager extends AgentService implements ContainerService,
}
} else {
// This is very strange - there are no platform types - we should never be missing the built-in platform plugin.
- log
- .error("Missing platform plugin(s) - falling back to dummy platform impl; this should only occur in tests!");
+ log.error("Missing platform plugin(s) - falling back to dummy platform impl; this should only occur in tests!");
// TODO: Set sysprop (e.g. rhq.test.mode=true) in integration tests,
// and throw a runtime exception here if that sysprop is not set.
return getTestPlatform();
@@ -2307,8 +2325,8 @@ public class InventoryManager extends AgentService implements ContainerService,
try {
ResourceDiscoveryContext context = new ResourceDiscoveryContext(resourceType, parentComponent,
parentResourceContext, SystemInfoFactory.createSystemInfo(), processScanResults,
- Collections.EMPTY_LIST, this.configuration.getContainerName(), this.configuration
- .getPluginContainerDeployment());
+ Collections.EMPTY_LIST, this.configuration.getContainerName(),
+ this.configuration.getPluginContainerDeployment());
newResources = new HashSet<Resource>();
try {
Set<DiscoveredResourceDetails> discoveredResources = invokeDiscoveryComponent(parentContainer,
@@ -2419,19 +2437,19 @@ public class InventoryManager extends AgentService implements ContainerService,
return contentContext;
}
- private ResourceComponent<?> createTestPlatformComponent() {
- return new ResourceComponent() {
- public AvailabilityType getAvailability() {
- return AvailabilityType.UP;
- }
-
- public void start(ResourceContext context) {
- }
-
- public void stop() {
- }
- };
- }
+ // private ResourceComponent<?> createTestPlatformComponent() {
+ // return new ResourceComponent() {
+ // public AvailabilityType getAvailability() {
+ // return AvailabilityType.UP;
+ // }
+ //
+ // public void start(ResourceContext context) {
+ // }
+ //
+ // public void stop() {
+ // }
+ // };
+ // }
private void updateResourceVersion(Resource resource, String version) {
String existingVersion = resource.getVersion();
@@ -2547,8 +2565,8 @@ public class InventoryManager extends AgentService implements ContainerService,
if (log.isDebugEnabled()) {
log.debug("Merging [" + modifiedResourceIds.size() + "] modified Resources into local inventory...");
}
- Set<Resource> modifiedResources = configuration.getServerServices().getDiscoveryServerService().getResources(
- modifiedResourceIds, false);
+ Set<Resource> modifiedResources = configuration.getServerServices().getDiscoveryServerService()
+ .getResources(modifiedResourceIds, false);
syncSchedules(modifiedResources); // RHQ-792, mtime is the indicator that schedules should be sync'ed too
syncDriftDefinitions(modifiedResources);
for (Resource modifiedResource : modifiedResources) {
@@ -2590,16 +2608,16 @@ public class InventoryManager extends AgentService implements ContainerService,
return;
}
- private void print(Resource resourceTreeNode, int level) {
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < level; i++) {
- builder.append(" ");
- }
- log.info(builder.toString() + resourceTreeNode.getId() + " " + resourceTreeNode.getUuid());
- for (Resource child : resourceTreeNode.getChildResources()) {
- print(child, level + 1);
- }
- }
+ // private void print(Resource resourceTreeNode, int level) {
+ // StringBuilder builder = new StringBuilder();
+ // for (int i = 0; i < level; i++) {
+ // builder.append(" ");
+ // }
+ // log.info(builder.toString() + resourceTreeNode.getId() + " " + resourceTreeNode.getUuid());
+ // for (Resource child : resourceTreeNode.getChildResources()) {
+ // print(child, level + 1);
+ // }
+ // }
private void mergeResource(Resource resource) {
if (log.isDebugEnabled()) {
@@ -2797,10 +2815,9 @@ public class InventoryManager extends AgentService implements ContainerService,
log.info("Resource activation and upgrade finished.");
} catch (Throwable t) {
- log
- .error(
- "Resource activation or upgrade failed with an exception. An attempt to merely activate the resources will be made now.",
- t);
+ log.error(
+ "Resource activation or upgrade failed with an exception. An attempt to merely activate the resources will be made now.",
+ t);
//make sure to at least activate the resources
activateAndUpgradeResourceRecursively(getPlatform(), false);
@@ -2831,6 +2848,7 @@ public class InventoryManager extends AgentService implements ContainerService,
}
} catch (InvalidPluginConfigurationException e) {
log.debug("Failed to activate resource [" + resource + "] due to invalid plugin configuration.", e);
+
} catch (Throwable t) {
log.error("Exception thrown while activating [" + resource + "].", t);
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java
index 854e624..c348a57 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java
@@ -67,7 +67,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
* @author John Mazzitelli
* @author Ian Springer
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "rawtypes", "unchecked" })
public class ResourceContainer implements Serializable {
private static final long serialVersionUID = 1L;
@@ -76,7 +76,7 @@ public class ResourceContainer implements Serializable {
}
public enum ResourceComponentState {
- STARTED, STOPPED
+ STARTED, STOPPED, STARTING
}
// thread pools used to invoke methods on container's components
commit d1a4410a78bfbed7baa8b65b71abea0315a3fea0
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Jan 11 15:25:51 2012 -0500
[Bug 773435 - Enabled event sources cause initial resource component start to time out]
lazily access sigar on the first polling, which happens after container
initialization.
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
index d936522..6fcb6d1 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
@@ -1,25 +1,25 @@
- /*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
package org.rhq.core.pluginapi.event.log;
import java.io.BufferedReader;
@@ -46,24 +46,21 @@ import org.rhq.core.pluginapi.event.EventPoller;
*
* @author Ian Springer
*/
-public class LogFileEventPoller implements EventPoller {
+public class LogFileEventPoller implements EventPoller {
private final Log log = LogFactory.getLog(this.getClass());
private String eventType;
private File logFile;
private FileInfo logFileInfo;
private LogEntryProcessor entryProcessor;
+ private EventContext eventContext;
- public LogFileEventPoller(EventContext eventContext, String eventType, File logFile, LogEntryProcessor entryProcessor) {
+ public LogFileEventPoller(EventContext eventContext, String eventType, File logFile,
+ LogEntryProcessor entryProcessor) {
this.eventType = eventType;
this.logFile = logFile;
- SigarProxy sigar = eventContext.getSigar();
- try {
- this.logFileInfo = new LogFileInfo(sigar.getFileInfo(logFile.getPath()));
- } catch (SigarException e) {
- throw new RuntimeException(e);
- }
this.entryProcessor = entryProcessor;
+ this.eventContext = eventContext;
}
@NotNull
@@ -76,8 +73,27 @@ public class LogFileEventPoller implements EventPoller {
return this.logFile.getPath();
}
+ // we can't get the FileInfo in the constructor because pollers are constructed during pc initialization, and
+ // at that time the eventManager is not available (and so we can't get sigar).
+ private FileInfo getFileInfo() {
+ if (null == this.logFileInfo) {
+ try {
+ SigarProxy sigar = eventContext.getSigar();
+ this.logFileInfo = new LogFileInfo(sigar.getFileInfo(logFile.getPath()));
+ // once we have the file info we can let go of the event context, just in case that's useful
+ this.eventContext = null;
+
+ } catch (SigarException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ return this.logFileInfo;
+ }
+
@Nullable
public Set<Event> poll() {
+
if (!this.logFile.exists()) {
log.warn("Log file [" + this.logFile + "' being polled does not exist.");
return null;
@@ -86,23 +102,25 @@ public class LogFileEventPoller implements EventPoller {
log.error("Log file [" + this.logFile + "' being polled is a directory, not a regular file.");
return null;
}
+ FileInfo fileInfo;
try {
- if (!this.logFileInfo.changed()) {
+ fileInfo = getFileInfo();
+ if (!fileInfo.changed()) {
return null;
}
} catch (SigarException e) {
throw new RuntimeException(e);
}
- return processNewLines();
+ return processNewLines(fileInfo);
}
- private Set<Event> processNewLines() {
+ private Set<Event> processNewLines(FileInfo fileInfo) {
Set<Event> events = null;
Reader reader = null;
try {
reader = new FileReader(this.logFile);
- long offset = getOffset();
+ long offset = getOffset(fileInfo);
if (offset > 0) {
reader.skip(offset);
@@ -123,24 +141,24 @@ public class LogFileEventPoller implements EventPoller {
return events;
}
- private long getOffset() {
- FileInfo previousFileInfo = this.logFileInfo.getPreviousInfo();
+ private long getOffset(FileInfo fileInfo) {
+ FileInfo previousFileInfo = fileInfo.getPreviousInfo();
if (previousFileInfo == null) {
if (log.isDebugEnabled()) {
log.debug(this.logFile + ": first stat");
}
- return this.logFileInfo.getSize();
+ return fileInfo.getSize();
}
- if (this.logFileInfo.getInode() != previousFileInfo.getInode()) {
+ if (fileInfo.getInode() != previousFileInfo.getInode()) {
if (log.isDebugEnabled()) {
log.debug(this.logFile + ": file inode changed");
}
return -1;
}
- if (this.logFileInfo.getSize() < previousFileInfo.getSize()) {
+ if (fileInfo.getSize() < previousFileInfo.getSize()) {
if (log.isDebugEnabled()) {
log.debug(this.logFile + ": file truncated");
}
@@ -148,7 +166,7 @@ public class LogFileEventPoller implements EventPoller {
}
if (log.isDebugEnabled()) {
- long diff = this.logFileInfo.getSize() - previousFileInfo.getSize();
+ long diff = fileInfo.getSize() - previousFileInfo.getSize();
log.debug(this.logFile + ": " + diff + " new bytes");
}
commit 4a4e0dcbc60faef7e25e1801fd7aeffb5a74521b
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jan 11 15:15:44 2012 +0100
BZ 771940 - Increase timeout when waiting for process start.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 3a3fa03..99c8cee 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -110,7 +110,7 @@ public class BaseServerComponent extends BaseComponent {
}
processExecution.setWorkingDirectory(baseDir);
processExecution.setCaptureOutput(true);
- processExecution.setWaitForCompletion(2000L); // 2 seconds // TODO: Should we wait longer than two seconds?
+ processExecution.setWaitForCompletion(15000L); // 15 seconds // TODO: Should we wait longer than 15 seconds?
processExecution.setKillOnTimeout(false);
commit e314d32549140d221af587c7c794b8856a87b4d0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jan 11 09:55:55 2012 +0100
Fix the computation of the correct start and end times, so that each color represents a full day.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
index 62b2ec5..0f38577 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
@@ -36,7 +36,7 @@ path {
stroke-width: 2;
fill: none;
}
-
+
line {
stroke: black;
}
@@ -70,8 +70,8 @@ $.getJSON('/rest/1/resource/platforms.json', function (json) {
var schId = json2[0].scheduleId;
$("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + "), base unit: " + json2[0].unit);
-
-// '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ var now = new Date().getTime();
+ var startTime = now - (7 * 86400*1000);
d3.json(
'/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
function (jsondata) {
@@ -81,14 +81,14 @@ $.getJSON('/rest/1/resource/platforms.json', function (json) {
var w = 960,
h = 600;
// compute min/max values for x and y a
- var minVal = d3.min(jsondata,function(d) { return d.value;});
- var maxVal = d3.max(jsondata,function(d) { return d.value;});
- var minTsD = 0;
- var maxTsD = 86400*1000;
+ var minVal = d3.min(jsondata,function(d) { return d.value;});
+ var maxVal = d3.max(jsondata,function(d) { return d.value;});
+ var minTsD = 0;
+ var maxTsD = 86400*1000;
- var minTimestamp = d3.min(jsondata,function(d) { return d.timeStamp;});
+ var minTimestamp = d3.min(jsondata,function(d) { return d.timeStamp;});
- var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
+ var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
@@ -119,12 +119,12 @@ $.getJSON('/rest/1/resource/platforms.json', function (json) {
.tickFormat(d3.format("0e"))
.tickSubdivide(true); // display ticks between text labels
-// create the SVG
+ // create the SVG
var svg = d3.select("body").append("svg:svg")
.attr("width", w)
.attr("height", h);
-// Create axes
+ // Create axes
svg.append("svg:g")
.attr("class","x axis")
.call(xAxis);
@@ -134,51 +134,51 @@ $.getJSON('/rest/1/resource/platforms.json', function (json) {
.attr("transform", "translate(" + (MARGINS.left) + ",0)")
.call(yAxis);
- svg.append("svg:line")
- .attr("x1","50")
- .attr("x2","950")
- .attr("y1",y(avg))
- .attr("y2",y(avg))
- .style("stroke","red")
- .attr("style","stroke-dasharray:2 2; stroke:red")
- ;
+ svg.append("svg:line")
+ .attr("x1","50")
+ .attr("x2","950")
+ .attr("y1",y(avg))
+ .attr("y2",y(avg))
+ .style("stroke","red")
+ .attr("style","stroke-dasharray:2 2; stroke:red")
+ ;
-// split the data into 7 data sets (1 per day)
+ var colors = ["black","blue","green","cyan","red","orange","yellow"];
-//var dat = d3.split(jsondata,function(d) { return (d.timeStamp-minTimestamp % 86400*1000) < 3*60*0000; });
-var colors = ["black","blue","green","cyan","red","orange","yellow"];
-var dat = putToBuckets(jsondata,7);
+ // split the data into 7 data sets (1 per day)
+ var dat = putToBuckets(jsondata,7,now);
-for (day = 0 ; day < 7 ; day ++ ) {
- var daydat = dat[day];
- // Now lets "loop" over the data and show the dots
- var lines = svg.append("svg:g").attr("class","linechart")
- .attr("opacity","0");
-;
- var dayMinTs = d3.min(daydat,function(d) { return d.timeStamp;});
+ // loop over the buckets and create the graph
+ for (day = 0 ; day < 7 ; day ++ ) {
+ var daydat = dat[day];
+ // Now lets "loop" over the data of a bucket and show the lines and dots
+ var lines = svg.append("svg:g").attr("class","linechart")
+ .attr("opacity","1");
-var line = d3.svg.line()
- .x(function(d,i) { return x(d.timeStamp-dayMinTs); })
- .y(function(d) { return y(d.value); })
+ var dayMinTs = startTime + day * (86400*1000);
-lines.append("svg:path").attr("d", line(daydat)).style("stroke",colors[day]);
+ var line = d3.svg.line()
+ .x(function(d,i) { return x(d.timeStamp-dayMinTs); })
+ .y(function(d) { return y(d.value); })
+ lines.append("svg:path").attr("d", line(daydat)).style("stroke",colors[day]);
- var dot = svg.append("svg:g").attr("class","dotschart")
- .selectAll("dot").data(jsondata)
+ var dot = svg.append("svg:g").attr("class","dotschart")
+ .selectAll("dot").data(jsondata)
- dot.enter().append("svg:circle")
- .attr("cx", function (d) {
- return x(d.timeStamp-dayMinTs);
- })
- .attr("cy", function (d) {
- return y(d.value);
- })
- .style("stroke", colors[day])
- .attr("r", 1)
+ dot.enter().append("svg:circle")
+ .attr("cx", function (d) {
+ return x(d.timeStamp-dayMinTs);
+ })
+ .attr("cy", function (d) {
+ return y(d.value);
+ })
+ .style("stroke", colors[day])
+ .attr("r", 1)
+ .attr("opacity","0")
-}
+ }
});
})
})
@@ -198,29 +198,25 @@ function transitionBoth() {
}
// put the data in d into n buckets
-function putToBuckets(data,n) {
+function putToBuckets(data,n,now) {
- var band = d3.extent(data,function(d){ return d.timeStamp;});
- var bs = band[1] - band[0];
-// var bs = bs / n;
- var bs = 86400*1000;
+ var band = d3.extent(data,function(d){ return d.timeStamp;});
+ var bs = 86400*1000;
+ var start = now - n * bs;
-console.log("bs : " + bs );
-console.log("min ts : " + band[0]);
-
-var dat = new Array(n);
-for (i = 0; i < n ; i++ ) {
- dat[i]=new Array();
-}
+ var dat = new Array(n);
+ for (i = 0; i < n ; i++ ) {
+ dat[i]=new Array();
+ }
-data.forEach(function (d) {
- var diff = d.timeStamp-band[0];
- var bucket = parseInt(diff / bs);
-console.log(d.timeStamp + ", " + diff + " buck : " + bucket);
- dat[bucket].push(d);
-});
+ data.forEach(function (d) {
+ var diff = d.timeStamp-start;
+ var bucket = parseInt(diff / bs);
+// console.log(d.timeStamp + ", " + diff + " buck : " + bucket);
+ dat[bucket].push(d);
+ });
-return dat;
+ return dat;
}
</script>
commit 6483f4edcf08478af30763af05df004b5840e350
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Jan 11 15:03:38 2012 +0100
Explicitly list the container-lib in the list of submodules of
the enterprise/server module with hope of resolving the mysterious Jenkins
build failures. Also slightly increase the logging verbosity in the itests
to see what might be going wrong.
diff --git a/modules/enterprise/server/itests/src/test/resources/log4j.xml b/modules/enterprise/server/itests/src/test/resources/log4j.xml
index bc65329..1e37497 100644
--- a/modules/enterprise/server/itests/src/test/resources/log4j.xml
+++ b/modules/enterprise/server/itests/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Target" value="System.out"/>
- <param name="Threshold" value="WARN"/>
+ <param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Messagen -->
@@ -32,7 +32,7 @@
<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="target/server-jar-test.log"/>
- <param name="Threshold" value="WARN"/>
+ <param name="Threshold" value="INFO"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 42d5c4b..8cf8acc 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -25,6 +25,7 @@
</activation>
<modules>
<module>xml-schemas</module>
+ <module>container-lib</module>
<module>jar</module>
<module>sars</module>
<module>plugins</module>
@@ -44,6 +45,7 @@
</activation>
<modules>
<module>xml-schemas</module>
+ <module>container-lib</module>
<module>jar</module>
<module>safe-invoker</module>
</modules>
commit 9ffda9543216f1176b3fd5ba87d08df5f1bbec87
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Jan 11 15:02:04 2012 +0100
Adding some logging to AccessCheckingInitialContextFactoryBuilder.
Use the correct logger in
the AccessCheckingInitialContextFactoryBuilderInstaller MBean.
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
index 3046af7..9abe13c 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -147,14 +147,17 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
* @throws NamingException If an error occurs loading the factory class.
*/
public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> environment) throws NamingException {
- final String factoryClassName = (String) environment.get(Context.INITIAL_CONTEXT_FACTORY);
+ final String factoryClassName = (String) environment.get(Context.INITIAL_CONTEXT_FACTORY);
if (factoryClassName == null) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("No " + Context.INITIAL_CONTEXT_FACTORY + " set. Using the default factory.");
+ }
return DEFAULT_FACTORY;
}
final ClassLoader classLoader = getContextClassLoader();
try {
final Class<?> factoryClass = Class.forName(factoryClassName, true, classLoader);
- InitialContextFactory configuredFactory = (InitialContextFactory) factoryClass.newInstance();
+ InitialContextFactory configuredFactory = (InitialContextFactory) factoryClass.newInstance();
return createSecureWrapper(configuredFactory, environment);
} catch (Exception e) {
throw new NamingException("Failed instantiate InitialContextFactory " + factoryClassName
@@ -175,6 +178,9 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
String providerUrl = (String) environment.get(Context.PROVIDER_URL);
if (providerUrl == null) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Wrapping " + factory + " of class " + factory.getClass() + " in an access checking wrapper. No provider URL detected.");
+ }
return getAccessCheckingFactory(factory);
} else {
try {
@@ -184,16 +190,32 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
//check if we are accessing the RHQ server through some remoting
//interface.
if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Wrapping " + factory + " of class " + factory.getClass() + " in an access checking wrapper. The provider URL points to this server.");
+ }
return getAccessCheckingFactory(factory);
} else {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Wrapping " + factory + " of class " + factory.getClass() + " in an URL preferring wrapper to enable remote connections.");
+ }
return getURLPreferringFactory(factory);
}
} catch (URISyntaxException e) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("The " + Context.PROVIDER_URL
+ + " is not a valid URI. Falling back to using the access checking wrapper for the factory "
+ + factory + " of class " + factory.getClass() + ".", e);
+ }
return getAccessCheckingFactory(factory);
} catch (UnknownHostException e) {
//let the factory deal with the unknown host...
//this most probably shouldn't be secured because localhost addresses
//should be resolvable.
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("The " + Context.PROVIDER_URL
+ + " is not resolvable. Falling back to using the URL preferring wrapper for the factory "
+ + factory + " of class " + factory.getClass() + ".", e);
+ }
return getURLPreferringFactory(factory);
}
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
index d938c50..a1ccb4f 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
@@ -32,7 +32,7 @@ import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
* @author Lukas Krejci
*/
public class AccessCheckingInitialContextFactoryBuilderInstaller implements AccessCheckingInitialContextFactoryBuilderInstallerMBean {
- private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
+ private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilderInstaller.class);
public void start() throws Exception {
LOG.info("Installing RHQ's access permission checking initial context factory builder");
commit 8eaf6da4148d2eeea265f5deb633ce7a295731ff
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jan 10 12:35:51 2012 -0500
[Bug 772771 - Agent not syncing updated plugin config at startup]
The resource mtime was not being properly updated when completing the
plugin config sync. If the agent was down at update time it would not
know to sync the resource on startup, or at any point until perhaps
the resource was modified in some other way, or the plugin config was
changed when the agent was up.
Also, in general Resource.setAgentSynchronizationNeeded() should be called
by any code performing an update that requires agent sync. The
Resource.setMtime() method should not be called for this purpose, but
rather only when manual mtime manipulation is required.
- fixed plugin config update
- converted setMtime calls to be setAgentSynchronizationNeeded() where appropriate
- added a missing call to setAgentSynchronizationNeeded() in DiscoveryBossBean
- trivial
-- fixed a method name typo
-- fixed some compiler warnings
-- removed some dead code
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index dd5da1b..c90ed4e 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -83,7 +83,7 @@ import org.rhq.core.domain.util.Summary;
* Represents an RHQ managed resource (i.e. a platform, server, or service).
*/
@Entity
-@NamedQueries( {
+@NamedQueries({
@NamedQuery(name = Resource.QUERY_FIND_PROBLEM_RESOURCES_ALERT_ADMIN, query = "" //
+ " SELECT DISTINCT new org.rhq.core.domain.resource.composite.ProblemResourceComposite"
+ " ( "
@@ -1302,6 +1302,12 @@ public class Resource implements Comparable<Resource>, Serializable {
return this.mtime;
}
+ /**
+ * Call this directly only when needing manual manipulation of the mtime. Otherwise, you probably want to
+ * call {@link #setAgentSynchronizationNeeded()}.
+ *
+ * @param mtime
+ */
public void setMtime(long mtime) {
this.mtime = mtime;
}
@@ -1336,8 +1342,6 @@ public class Resource implements Comparable<Resource>, Serializable {
*
* For a list of changes that the agent cares about, see InventoryManager.mergeResource(Resource, Resource)
*/
-
- // @PreUpdate
public void setAgentSynchronizationNeeded() {
this.mtime = System.currentTimeMillis();
}
@@ -1434,7 +1438,7 @@ public class Resource implements Comparable<Resource>, Serializable {
return schedules;
}
- public void setSchendules(Set<MeasurementSchedule> schedules) {
+ public void setSchedules(Set<MeasurementSchedule> schedules) {
this.schedules = schedules;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 5b88fe5..60550be 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -136,7 +136,6 @@ import org.rhq.enterprise.server.util.QuartzUtil;
* @author John Mazzitelli
* @author Ian Springer
*/
-@SuppressWarnings({ "UnnecessaryLocalVariable", "UnnecessaryReturnStatement" })
@Stateless
@XmlType(namespace = ServerVersion.namespace)
public class ConfigurationManagerBean implements ConfigurationManagerLocal, ConfigurationManagerRemote {
@@ -220,6 +219,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
Resource resource = update.getResource();
// link to the newer, persisted configuration object -- regardless of errors
+ resource.setAgentSynchronizationNeeded();
resource.setPluginConfiguration(update.getConfiguration());
if (response.getStatus() == ConfigurationUpdateStatus.SUCCESS) {
@@ -1242,17 +1242,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return configService.validate(configuration, resourceId, isStructured);
}
- private boolean isRawSupported(int resourceId) {
- Resource resource = entityManager.find(Resource.class, resourceId);
- ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
- if (configDef == null) {
- return false;
- }
-
- return (ConfigurationFormat.STRUCTURED_AND_RAW == configDef.getConfigurationFormat() || (ConfigurationFormat.RAW == configDef
- .getConfigurationFormat()));
- }
-
private boolean isStructuredAndRawSupported(int resourceId) {
Resource resource = entityManager.find(Resource.class, resourceId);
ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
@@ -1691,7 +1680,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public Configuration getConfiguration(Subject subject, int configurationId) {
- @SuppressWarnings({ "UnnecessaryLocalVariable" })
Configuration configuration = getConfigurationById(configurationId);
return configuration;
}
@@ -2337,7 +2325,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return out;
}
- @SuppressWarnings("unchecked")
public PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdatesByCriteria(Subject subject,
ResourceConfigurationUpdateCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2346,8 +2333,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
"resource", subject.getId());
}
- CriteriaQueryRunner<ResourceConfigurationUpdate> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager);
+ CriteriaQueryRunner<ResourceConfigurationUpdate> queryRunner = new CriteriaQueryRunner<ResourceConfigurationUpdate>(
+ criteria, generator, entityManager);
PageList<ResourceConfigurationUpdate> updates = queryRunner.execute();
@@ -2371,7 +2358,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return updates;
}
- @SuppressWarnings("unchecked")
public PageList<PluginConfigurationUpdate> findPluginConfigurationUpdatesByCriteria(Subject subject,
PluginConfigurationUpdateCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2380,8 +2366,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
"resource", subject.getId());
}
- CriteriaQueryRunner<PluginConfigurationUpdate> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager);
+ CriteriaQueryRunner<PluginConfigurationUpdate> queryRunner = new CriteriaQueryRunner<PluginConfigurationUpdate>(
+ criteria, generator, entityManager);
PageList<PluginConfigurationUpdate> updates = queryRunner.execute();
@@ -2405,7 +2391,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return updates;
}
- @SuppressWarnings("unchecked")
public PageList<GroupResourceConfigurationUpdate> findGroupResourceConfigurationUpdatesByCriteria(Subject subject,
GroupResourceConfigurationUpdateCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2414,8 +2399,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
subject.getId());
}
- CriteriaQueryRunner<GroupResourceConfigurationUpdate> queryRunner = new CriteriaQueryRunner(criteria,
- generator, entityManager);
+ CriteriaQueryRunner<GroupResourceConfigurationUpdate> queryRunner = new CriteriaQueryRunner<GroupResourceConfigurationUpdate>(
+ criteria, generator, entityManager);
PageList<GroupResourceConfigurationUpdate> updates = queryRunner.execute();
@@ -2438,7 +2423,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return updates;
}
- @SuppressWarnings("unchecked")
public PageList<GroupPluginConfigurationUpdate> findGroupPluginConfigurationUpdatesByCriteria(Subject subject,
GroupPluginConfigurationUpdateCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2447,8 +2431,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
subject.getId());
}
- CriteriaQueryRunner<GroupPluginConfigurationUpdate> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager);
+ CriteriaQueryRunner<GroupPluginConfigurationUpdate> queryRunner = new CriteriaQueryRunner<GroupPluginConfigurationUpdate>(
+ criteria, generator, entityManager);
PageList<GroupPluginConfigurationUpdate> updates = queryRunner.execute();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index 2ea6234..7609492 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.server.discovery;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import java.util.Date;
import javax.ejb.EJB;
import javax.ejb.Stateless;
@@ -44,12 +44,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
+
import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.clientapi.agent.discovery.InvalidPluginConfigurationClientException;
import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeRequest;
@@ -314,16 +314,15 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
final String randomSuffix = UUID.randomUUID().toString();
final String triggerName = TRIGGER_PREFIX + " - " + randomSuffix;
- SimpleTrigger trigger = new SimpleTrigger(triggerName, DEFAULT_JOB_GROUP,
- new Date());
+ SimpleTrigger trigger = new SimpleTrigger(triggerName, DEFAULT_JOB_GROUP, new Date());
JobDataMap jobDataMap = new JobDataMap();
jobDataMap.put(AgentInventoryStatusUpdateJob.KEY_TRIGGER_NAME, triggerName);
jobDataMap.put(AgentInventoryStatusUpdateJob.KEY_TRIGGER_GROUP_NAME, DEFAULT_JOB_GROUP);
AgentInventoryStatusUpdateJob.externalizeJobValues(jobDataMap,
- AgentInventoryStatusUpdateJob.PLATFORMS_COMMA_LIST, platforms);
+ AgentInventoryStatusUpdateJob.PLATFORMS_COMMA_LIST, platforms);
AgentInventoryStatusUpdateJob.externalizeJobValues(jobDataMap,
- AgentInventoryStatusUpdateJob.SERVERS_COMMA_LIST, servers);
+ AgentInventoryStatusUpdateJob.SERVERS_COMMA_LIST, servers);
trigger.setJobName(DEFAULT_JOB_NAME);
trigger.setJobGroup(DEFAULT_JOB_GROUP);
@@ -333,7 +332,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
scheduler.scheduleJob(trigger);
} else {
JobDetail jobDetail = new JobDetail(DEFAULT_JOB_NAME, DEFAULT_JOB_GROUP,
- AgentInventoryStatusUpdateJob.class);
+ AgentInventoryStatusUpdateJob.class);
scheduler.scheduleJob(jobDetail, trigger);
}
} catch (SchedulerException e) {
@@ -357,10 +356,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
AgentClient agentClient = agentManager.getAgentClient(platform.getAgent());
try {
agentClient.getDiscoveryAgentService().synchronizeInventory(
- entityManager.find(ResourceSyncInfo.class, platform.getId()));
+ entityManager.find(ResourceSyncInfo.class, platform.getId()));
} catch (Exception e) {
log.warn("Could not perform commit synchronization with agent for platform [" + platform.getName()
- + "]", e);
+ + "]", e);
}
}
for (Resource server : servers) {
@@ -369,10 +368,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
AgentClient agentClient = agentManager.getAgentClient(server.getAgent());
try {
agentClient.getDiscoveryAgentService().synchronizeInventory(
- entityManager.find(ResourceSyncInfo.class, server.getId()));
+ entityManager.find(ResourceSyncInfo.class, server.getId()));
} catch (Exception e) {
log.warn("Could not perform commit synchronization with agent for server [" + server.getName()
- + "]", e);
+ + "]", e);
}
}
}
@@ -511,6 +510,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
}
}
+ @SuppressWarnings("deprecation")
public Set<ResourceUpgradeResponse> upgradeResources(Set<ResourceUpgradeRequest> upgradeRequests) {
Set<ResourceUpgradeResponse> result = new HashSet<ResourceUpgradeResponse>();
@@ -588,8 +588,9 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
private ResourceUpgradeResponse upgradeResource(@NotNull Resource resource, ResourceUpgradeRequest upgradeRequest,
boolean allowGenericPropertiesUpgrade) {
if (upgradeRequest.getUpgradeErrorMessage() != null) {
- ResourceError error = new ResourceError(resource, ResourceErrorType.UPGRADE, upgradeRequest
- .getUpgradeErrorMessage(), upgradeRequest.getUpgradeErrorStackTrace(), upgradeRequest.getTimestamp());
+ ResourceError error = new ResourceError(resource, ResourceErrorType.UPGRADE,
+ upgradeRequest.getUpgradeErrorMessage(), upgradeRequest.getUpgradeErrorStackTrace(),
+ upgradeRequest.getTimestamp());
resourceManager.addResourceError(error);
return null;
}
@@ -767,8 +768,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
continue;
}
}
- existingResource = resourceManager.getResourceByParentAndKey(overlord, existingParent, resource
- .getResourceKey(), resourceType.getPlugin(), resourceType.getName());
+ existingResource = resourceManager.getResourceByParentAndKey(overlord, existingParent,
+ resource.getResourceKey(), resourceType.getPlugin(), resourceType.getName());
}
if (existingResource != null) {
@@ -871,6 +872,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
if (existingResource.getInventoryStatus() == InventoryStatus.DELETED) {
existingResource.setInventoryStatus(InventoryStatus.COMMITTED);
existingResource.setPluginConfiguration(updatedResource.getPluginConfiguration());
+ existingResource.setAgentSynchronizationNeeded();
}
for (Resource childResource : updatedResource.getChildResources()) {
@@ -1021,14 +1023,14 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
// Do one query per 1000 Resource id's to prevent Oracle from failing because of an IN clause with more
// than 1000 items.
- List<Resource> resources = new ArrayList(resourceIds.length);
+ List<Resource> resources = new ArrayList<Resource>(resourceIds.length);
fromIndex = 0;
while (fromIndex < resourceIds.length) {
int toIndex = (resourceIds.length < (fromIndex + 1000)) ? resourceIds.length : (fromIndex + 1000);
int[] resourceIdSubArray = Arrays.copyOfRange(resourceIds, fromIndex, toIndex);
PageList<Resource> batchResources = resourceManager.findResourceByIds(subject, resourceIdSubArray, false,
- PageControl.getUnlimitedInstance());
+ PageControl.getUnlimitedInstance());
resources.addAll(batchResources);
fromIndex = toIndex;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java
index c899487..964d84c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java
@@ -160,7 +160,7 @@ class WsResourceListWrapper extends Resource {
destination.setProductVersion(source.getProductVersion());
destination.setResourceConfiguration(source.getResourceConfiguration());
destination.setResourceConfigurationUpdates(source.getResourceConfigurationUpdates());
- destination.setSchendules(source.getSchedules());
+ destination.setSchedules(source.getSchedules());
destination.setUuid(source.getUuid());
//handle the problematic references that would cause cycles if used by storing only ids.
if (source.getParentResource() != null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java
index 20d1c95..3c74f06 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java
@@ -116,7 +116,7 @@ class WsResource extends Resource {
destination.setProductVersion(source.getProductVersion());
destination.setResourceConfiguration(source.getResourceConfiguration());
destination.setResourceConfigurationUpdates(source.getResourceConfigurationUpdates());
- destination.setSchendules(source.getSchedules());
+ destination.setSchedules(source.getSchedules());
destination.setUuid(source.getUuid());
//handle the problematic references that would cause cycles if used by storing only ids.
if (source.getParentResource() != null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java
index 8a21886..fba8a68 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java
@@ -74,8 +74,6 @@ public class MeasurementDefinitionManagerBean implements MeasurementDefinitionMa
* @param def the MeasuremendDefinition to delete
*/
public void removeMeasurementDefinition(MeasurementDefinition def) {
- long now = System.currentTimeMillis();
-
// First remove the schedules and associated OOBs.
List<MeasurementSchedule> schedules = def.getSchedules();
Iterator<MeasurementSchedule> schedIter = schedules.iterator();
@@ -86,8 +84,7 @@ public class MeasurementDefinitionManagerBean implements MeasurementDefinitionMa
sched.setBaseline(null);
}
oobManager.removeOOBsForSchedule(subjectManager.getOverlord(), sched);
- // IMPORTANT: Update the mtime to tell the Agent this Resource needs to be synced.
- sched.getResource().setMtime(now);
+ sched.getResource().setAgentSynchronizationNeeded();
entityManager.remove(sched);
schedIter.remove();
}
@@ -134,14 +131,13 @@ public class MeasurementDefinitionManagerBean implements MeasurementDefinitionMa
return results;
}
- @SuppressWarnings("unchecked")
public PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(Subject subject,
MeasurementDefinitionCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
;
- CriteriaQueryRunner<MeasurementDefinition> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager);
+ CriteriaQueryRunner<MeasurementDefinition> queryRunner = new CriteriaQueryRunner<MeasurementDefinition>(
+ criteria, generator, entityManager);
return queryRunner.execute();
}
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
index 5b6b048..69a22db 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
@@ -24,21 +24,14 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Date;
import java.util.UUID;
-import org.quartz.Trigger;
-import org.quartz.Scheduler;
-import org.quartz.JobDetail;
-import org.quartz.JobDataMap;
-import org.quartz.SimpleTrigger;
-import org.quartz.SchedulerException;
-
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
@@ -52,6 +45,12 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.quartz.JobDataMap;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SimpleTrigger;
+import org.quartz.Trigger;
import org.jboss.annotation.IgnoreDependency;
@@ -318,13 +317,13 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
return;
}
- @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY),
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_INVENTORY),
@RequiredPermission(Permission.MANAGE_SETTINGS) })
public void disableAllDefaultCollections(Subject subject) {
entityManager.createNamedQuery(MeasurementDefinition.DISABLE_ALL).executeUpdate();
}
- @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY),
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_INVENTORY),
@RequiredPermission(Permission.MANAGE_SETTINGS) })
public void disableAllSchedules(Subject subject) {
entityManager.createNamedQuery(MeasurementSchedule.DISABLE_ALL).executeUpdate();
@@ -332,11 +331,10 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
}
public void createSchedulesForExistingResources(ResourceType type, MeasurementDefinition newDefinition) {
- long now = System.currentTimeMillis();
List<Resource> resources = type.getResources();
if (resources != null) {
for (Resource res : resources) {
- res.setMtime(now); // changing MTime tells the agent this resource needs to be synced
+ res.setAgentSynchronizationNeeded();
MeasurementSchedule sched = new MeasurementSchedule(newDefinition, res);
sched.setInterval(newDefinition.getDefaultInterval());
entityManager.persist(sched);
@@ -649,16 +647,10 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
final String randomSuffix = UUID.randomUUID().toString();
final String jobName = DEFAULT_AGENT_JOB + " - " + randomSuffix;
- JobDetail jobDetail = new JobDetail(
- jobName,
- DEFAULT_AGENT_GROUP,
- NotifyAgentsOfScheduleUpdatesJob.class);
+ JobDetail jobDetail = new JobDetail(jobName, DEFAULT_AGENT_GROUP, NotifyAgentsOfScheduleUpdatesJob.class);
final String triggerName = DEFAULT_AGENT_TRIGGER + " - " + randomSuffix;
- SimpleTrigger simpleTrigger = new SimpleTrigger(
- triggerName,
- DEFAULT_AGENT_GROUP,
- new Date());
+ SimpleTrigger simpleTrigger = new SimpleTrigger(triggerName, DEFAULT_AGENT_GROUP, new Date());
JobDataMap jobDataMap = simpleTrigger.getJobDataMap();
jobDataMap.put(TRIGGER_NAME, triggerName);
@@ -1236,8 +1228,8 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
// first get all the resources, which is needed to get the agent mappings
Subject overlord = subjectManager.getOverlord();
- PageList<Resource> resources = resourceManager.findResourceByIds(overlord, resourceIds, false, PageControl
- .getUnlimitedInstance());
+ PageList<Resource> resources = resourceManager.findResourceByIds(overlord, resourceIds, false,
+ PageControl.getUnlimitedInstance());
// then get all the requests
Set<ResourceMeasurementScheduleRequest> requests = findSchedulesForResourceAndItsDescendants(resourceIds, false);
@@ -1483,8 +1475,8 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
;
if (authorizationManager.isInventoryManager(subject) == false) {
- generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.RESOURCE, subject
- .getId());
+ generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.RESOURCE,
+ subject.getId());
}
CriteriaQueryRunner<MeasurementSchedule> queryRunner = new CriteriaQueryRunner(criteria, generator,
@@ -1523,4 +1515,3 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
// }
}
-
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
index f2d05c5..14479ba 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
@@ -238,8 +238,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
persistedResource.setLocation(resource.getLocation());
persistedResource.setDescription(resource.getDescription());
- // NOTE: Updating the mtime will tell the Agent it needs to sync this Resource.
- persistedResource.setMtime(System.currentTimeMillis());
+ persistedResource.setAgentSynchronizationNeeded();
persistedResource.setModifiedBy(user.getName());
return entityManager.merge(persistedResource);
@@ -614,7 +613,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
private void updateInventoryStatus(Resource resource, InventoryStatus newStatus, long now) {
resource.setInventoryStatus(newStatus);
resource.setItime(now);
- resource.setMtime(now);
+ resource.setAgentSynchronizationNeeded();
}
@SuppressWarnings("unchecked")
@@ -757,8 +756,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
// Build up a list of composite Resources for the ancestry that includes which ancestors, if any, should be
// locked from view.
boolean isInventoryManager = authorizationManager.isInventoryManager(subject);
- List<ResourceLineageComposite> resourceLineage = new ArrayList<ResourceLineageComposite>(rawResourceLineage
- .size());
+ List<ResourceLineageComposite> resourceLineage = new ArrayList<ResourceLineageComposite>(
+ rawResourceLineage.size());
for (Resource resource : rawResourceLineage) {
boolean isLocked = !(isInventoryManager || authorizationManager.canViewResource(subject, resource.getId()));
ResourceLineageComposite composite = new ResourceLineageComposite(resource, isLocked);
@@ -776,8 +775,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
// If the ancestor is not locked, include viewable children.
if (!ancestor.isLocked() || ancestor.getResource() == parent) {
// Get all viewable committed children.
- PageList<Resource> children = findChildResourcesByCategoryAndInventoryStatus(subject, ancestor
- .getResource(), null, InventoryStatus.COMMITTED, PageControl.getUnlimitedInstance());
+ PageList<Resource> children = findChildResourcesByCategoryAndInventoryStatus(subject,
+ ancestor.getResource(), null, InventoryStatus.COMMITTED, PageControl.getUnlimitedInstance());
// Remove any that are in the lineage to avoid repeated handling.
children.removeAll(rawResourceLineage);
for (Resource child : children) {
@@ -1384,7 +1383,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
return result;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public List<AutoGroupComposite> findResourcesAutoGroups(Subject subject, int[] resourceIds) {
List<AutoGroupComposite> results = new ArrayList<AutoGroupComposite>();
List<Integer> ids = ArrayUtils.wrapInList(resourceIds);
@@ -1484,6 +1483,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
query.setParameter("inventoryStatus", InventoryStatus.COMMITTED);
List<Object[]> objs = query.getResultList();
+ @SuppressWarnings("rawtypes")
List results = new ArrayList<ResourceWithAvailability>(objs.size());
for (Object[] ob : objs) {
Resource r = (Resource) ob[0];
@@ -1814,7 +1814,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
List<Resource> resources = query.getResultList();
- return new PageList(resources, (int) count, pageControl);
+ return new PageList<Resource>(resources, (int) count, pageControl);
}
@SuppressWarnings("unchecked")
@@ -1847,7 +1847,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
List<Resource> resources = query.getResultList();
- return new PageList(resources, (int) count, pageControl);
+ return new PageList<Resource>(resources, (int) count, pageControl);
}
@SuppressWarnings("unchecked")
@@ -1890,7 +1890,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
List<Resource> resources = query.getResultList();
- return new PageList(resources, (int) count, pageControl);
+ return new PageList<Resource>(resources, (int) count, pageControl);
}
@SuppressWarnings("unchecked")
@@ -2396,7 +2396,6 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
return results;
}
- @SuppressWarnings("unchecked")
public PageList<ResourceComposite> findResourceCompositesByCriteria(Subject subject, ResourceCriteria criteria) {
boolean isInventoryManager = authorizationManager.isInventoryManager(subject);
@@ -2440,8 +2439,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
subject.getId());
}
- CriteriaQueryRunner<ResourceComposite> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager, false); // don't auto-init bags, we're returning composites not entities
+ CriteriaQueryRunner<ResourceComposite> queryRunner = new CriteriaQueryRunner<ResourceComposite>(criteria,
+ generator, entityManager, false); // don't auto-init bags, we're returning composites not entities
PageList<ResourceComposite> results = queryRunner.execute();
for (ResourceComposite nextComposite : results) {
@@ -2456,7 +2455,6 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
return results;
}
- @SuppressWarnings("unchecked")
public PageList<Resource> findResourcesByCriteria(Subject subject, ResourceCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2470,7 +2468,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
subject.getId());
}
- CriteriaQueryRunner<Resource> queryRunner = new CriteriaQueryRunner(criteria, generator, entityManager);
+ CriteriaQueryRunner<Resource> queryRunner = new CriteriaQueryRunner<Resource>(criteria, generator,
+ entityManager);
PageList<Resource> results = queryRunner.execute();
return results;
}
@@ -2521,8 +2520,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
public <T> List<DisambiguationReport<T>> disambiguate(List<T> results, IntExtractor<? super T> extractor,
DisambiguationUpdateStrategy updateStrategy) {
- return Disambiguator.disambiguate(results, updateStrategy, extractor, entityManager, typeManager
- .getDuplicateTypeNames());
+ return Disambiguator.disambiguate(results, updateStrategy, extractor, entityManager,
+ typeManager.getDuplicateTypeNames());
}
public void updateAncestry(Subject subject, int resourceId) {
@@ -2545,13 +2544,13 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
@SuppressWarnings("unchecked")
public List<Integer> findIdsByTypeIds(List<Integer> resourceTypeIds) {
- return entityManager.createNamedQuery(Resource.QUERY_FIND_IDS_BY_TYPE_IDS).setParameter("resourceTypeIds",
- resourceTypeIds).getResultList();
+ return entityManager.createNamedQuery(Resource.QUERY_FIND_IDS_BY_TYPE_IDS)
+ .setParameter("resourceTypeIds", resourceTypeIds).getResultList();
}
@Override
public Integer getResourceCount(List<Integer> resourceTypeIds) {
- return (Integer) entityManager.createNamedQuery(Resource.QUERY_FIND_COUNT_BY_TYPES).setParameter(
- "resourceTypeIds", resourceTypeIds).getSingleResult();
+ return (Integer) entityManager.createNamedQuery(Resource.QUERY_FIND_COUNT_BY_TYPES)
+ .setParameter("resourceTypeIds", resourceTypeIds).getSingleResult();
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java
index 3963f9d..841fe03 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java
@@ -1,6 +1,5 @@
package org.rhq.enterprise.server.resource.metadata;
-import java.util.Date;
import java.util.List;
import javax.ejb.EJB;
@@ -58,8 +57,8 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
// all new
if (existingConfigurationDefinition == null) {
if (log.isDebugEnabled()) {
- log.debug(existingType + " currently does not have a plugin configuration definition. Adding " +
- "new plugin configuration.");
+ log.debug(existingType + " currently does not have a plugin configuration definition. Adding "
+ + "new plugin configuration.");
}
entityMgr.persist(newType.getPluginConfigurationDefinition());
existingType.setPluginConfigurationDefinition(newType.getPluginConfigurationDefinition());
@@ -72,8 +71,8 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
.updateConfigurationDefinition(newType.getPluginConfigurationDefinition(),
existingConfigurationDefinition);
- if (updateReport.getNewPropertyDefinitions().size() > 0 ||
- updateReport.getUpdatedPropertyDefinitions().size() > 0) {
+ if (updateReport.getNewPropertyDefinitions().size() > 0
+ || updateReport.getUpdatedPropertyDefinitions().size() > 0) {
Subject overlord = subjectMgr.getOverlord();
ResourceCriteria criteria = new ResourceCriteria();
criteria.addFilterResourceTypeId(existingType.getId());
@@ -99,6 +98,7 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
private void updateResourcePluginConfiguration(Resource resource, ConfigurationDefinitionUpdateReport updateReport) {
Configuration pluginConfiguration = resource.getPluginConfiguration();
boolean modified = false;
+ @SuppressWarnings("unused")
int numberOfProperties = pluginConfiguration.getProperties().size();
ConfigurationTemplate template = updateReport.getConfigurationDefinition().getDefaultTemplate();
Configuration templateConfiguration = template.getConfiguration();
@@ -106,10 +106,10 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
for (PropertyDefinition propertyDef : updateReport.getNewPropertyDefinitions()) {
if (propertyDef.isRequired()) {
Property templateProperty = templateConfiguration.get(propertyDef.getName());
- if (templateProperty==null) {
+ if (templateProperty == null) {
throw new IllegalArgumentException("The property [" + propertyDef.getName()
- + "] marked as required in the configuration definition of [" + propertyDef.getConfigurationDefinition().getName()
- + "] has no attribute 'default'");
+ + "] marked as required in the configuration definition of ["
+ + propertyDef.getConfigurationDefinition().getName() + "] has no attribute 'default'");
} else {
pluginConfiguration.put(templateProperty.deepCopy(false));
modified = true;
@@ -129,7 +129,7 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
}
if (modified) {
- resource.setMtime(new Date().getTime());
+ resource.setAgentSynchronizationNeeded();
}
}
}
commit ca98fa5acf8c59902ff3dac98215605a4a455237
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 10 14:25:11 2012 +0100
Moving the JNDI access tests from rhq-server-client-api to
rhq-server-itests to reduce the number of tests suites that set up
the whole RHQ container.
Made sure to avoid multiple inclusion of the server jar classes on
the test classpath (by explicitly excluding the module from the deps of
rhq-script-bindings and rhq-server-client-api that the itests module is
now dependent on). This caused some weird problems during the embedded
container startup.
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 4dfd109..29ac29a 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -15,380 +15,32 @@
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
- <properties>
- <persistence-api.version>1.0</persistence-api.version>
- <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
- <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
-
- <!-- dependency versions -->
- <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
-
- <clean.db>true</clean.db>
- </properties>
-
- <dependencies>
-
- <!-- Note, the test deps are intentionally placed above the other scoped deps because of classpath
- reasons. Maven orders the [test] classpath in the order listed in the pom. We specifically
- need the embeddable-ejb3 jar above the standard ejb3 jars because we need the embeddble packages
- loaded when testing. -->
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>${jboss-embeddable-ejb3.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-script-bindings</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>${persistence-api.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- Test deps - this insane list of deps is needed to get the embedded JBoss server with RHQ server deployed running -->
-
+ <dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- <!-- The Sun javamail jar isn't available from a public repo due to licensing issues,
- so use the Geronimo one instead. -->
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed by the PoolClass annotation used on some
- of our SLSB's -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbosssx</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbpm</artifactId>
- <version>3.1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- <!-- for the transaction interrupt EJB3 interceptor -->
- <dependency>
- <groupId>org.jboss.transaction</groupId>
- <artifactId>jboss-jta</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-script-bindings</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>5.5.20</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-jk</artifactId>
- <version>4.1.31</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Needed by com.jboss.jbossnetwork.apl.actions.xml.XPathProcessor; TODO: Remove once APL has been excised. -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.29</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jettison-provider</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-links</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.18</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- Everything but the web service tests, this is the standard test execution -->
- <configuration>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <groups>${rhq.testng.includedGroups}</groups>
- <systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
- <deploymentDirectory>target/test-classes</deploymentDirectory>
- <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- <clean.db>${clean.db}</clean.db>
- </systemPropertyVariables>
- <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
- <additionalClasspathElements>
- <!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <!-- in order to get JMS to work properly in embedded test container, extract jms-rs.rar classes -->
- <execution>
- <id>Extract JMS classes from RAR needed for JMS tests</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <unzip src="src/test/resources/jms-ra.rar" dest="target">
- <patternset>
- <include name="jms-ra.jar"/>
- </patternset>
- </unzip>
- <unzip src="target/jms-ra.jar" dest="target/test-classes">
- <patternset>
- <include name="org/**"/>
- </patternset>
- </unzip>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<profiles>
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
deleted file mode 100644
index dc1fc83..0000000
--- a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.client.security.test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.SerializablePermission;
-import java.security.PermissionCollection;
-import java.util.Collections;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import org.rhq.bindings.SandboxedScriptEngine;
-import org.rhq.bindings.ScriptEngineFactory;
-import org.rhq.bindings.StandardBindings;
-import org.rhq.bindings.StandardScriptPermissions;
-import org.rhq.bindings.util.PackageFinder;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.client.LocalClient;
-import org.rhq.enterprise.server.test.AbstractEJB3Test;
-import org.rhq.enterprise.server.util.LookupUtil;
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-@Test
-public class EjbAccessTest extends AbstractEJB3Test {
-
- public void testEjbsAccessibleThroughPrivilegedCode() {
- LookupUtil.getSubjectManager().getOverlord();
- }
-
- public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- engine.eval("SubjectManager.getSubjectByName('rhqadmin');");
- }
-
- public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager = context.lookup('SubjectManagerBean/local');\n"
- + "subjectManager.getOverlord();");
-
- Assert.fail("The script shouldn't have been able to call local SLSB method.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager = context.lookup('SubjectManagerBean/remote');\n"
- + "subjectManager.getSubjectByName('rhqadmin');");
-
- Assert.fail("The script shouldn't have been able to call remote SLSB method directly.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testScriptCantUseSessionManagerMethods() throws Exception {
-
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- final ScriptEngine engine = getEngine(overlord);
-
- class G {
- private String sessionManager = ""
- + "org.rhq.enterprise.server.auth.SessionManager.getInstance().";
-
- public void testInvoke(String methodCall) throws ScriptException {
- String code = sessionManager + methodCall;
-
- try {
- engine.eval(code);
- Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall);
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
- };
- G manager = new G();
-
- manager.testInvoke("getlastAccess(0);");
- manager.testInvoke("getOverlord()");
- manager.testInvoke("getSubject(2);");
- manager.testInvoke("invalidate(0);");
- manager.testInvoke("invalidate(\"\");");
- manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());");
- manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);");
- }
-
- public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "datasource = context.lookup('java:/RHQDS');\n"
- + "con = datasource.getConnection();");
-
- Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testScriptCantUseEntityManager() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
-
- //try harder with manually specifying the initial context factory
- try {
- engine.eval(""
- + "env = new java.util.Hashtable();"
- + "env.put('java.naming.factory.initial', 'org.jnp.interfaces.LocalOnlyContextFactory');"
- + "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
- StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
- ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
-
- PermissionCollection perms = new StandardScriptPermissions();
- perms.add(new SerializablePermission("enableSubclassImplementation"));
-
- return new SandboxedScriptEngine(engine, perms);
- }
-
- private static void checkIsDesiredSecurityException(ScriptException e) {
- String message = e.getMessage();
- String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
-
- Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
- }
-}
diff --git a/modules/enterprise/server/client-api/src/test/resources/hibernate.properties b/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
deleted file mode 100644
index 1951b84..0000000
--- a/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
-# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
-# WORK IN THIS MODULE.
-
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-#hibernate.connection.release_mode=after_statement
-#hibernate.transaction.flush_before_completion=false
-#hibernate.transaction.auto_close_session=false
-#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-#hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-hibernate.bytecode.use_reflection_optimizer=false
-# I don't think this is honored, but EJB3Deployer uses it
-hibernate.bytecode.provider=javassist
-hibernate.jdbc.use_streams_for_binary=true
-hibernate.show_sql=false
-hibernate.format_sql=true
-hibernate.default_batch_fetch_size=16
-hibernate.jdbc.batch_size=20
diff --git a/modules/enterprise/server/client-api/src/test/resources/jms-ra.rar b/modules/enterprise/server/client-api/src/test/resources/jms-ra.rar
deleted file mode 100644
index c4807c6..0000000
Binary files a/modules/enterprise/server/client-api/src/test/resources/jms-ra.rar and /dev/null differ
diff --git a/modules/enterprise/server/client-api/src/test/resources/security.policy b/modules/enterprise/server/client-api/src/test/resources/security.policy
deleted file mode 100644
index 8860b47..0000000
--- a/modules/enterprise/server/client-api/src/test/resources/security.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-// We need the SecurityManager installed to enable sandboxing of CLI scripts
-// but we don't define any other security measures on the RHQ server itself.
-//
-// Granting all permissions allows us to run the RHQ server as if no security
-// manager was in place (which is assumed by default by JBoss AS) but be able
-// to use it when we need it for our own purposes.
-
-grant {
- permission java.security.AllPermission;
-};
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 6898621..653ef99 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -58,6 +58,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-container-lib</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -84,6 +85,32 @@
</dependency>
<dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-script-bindings</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-server-client-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
<version>${project.version}</version>
@@ -232,6 +259,7 @@
<artifactId>resteasy-jaxrs</artifactId>
<version>${resteasy.version}</version>
</dependency>
+
</dependencies>
<build>
@@ -270,6 +298,23 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Everything but the web service tests, this is the standard test execution -->
+ <configuration>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
+ <systemPropertyVariables>
+ <embeddedDeployment>true</embeddedDeployment>
+ <deploymentDirectory>target/test-classes</deploymentDirectory>
+ </systemPropertyVariables>
+ <argLine>-Djava.security.manager -Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
+ <additionalClasspathElements>
+ <!-- The below is required for tests to run against Oracle. -->
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
new file mode 100644
index 0000000..ae848a8
--- /dev/null
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
@@ -0,0 +1,198 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.client.security.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.SerializablePermission;
+import java.security.PermissionCollection;
+import java.util.Collections;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.rhq.bindings.SandboxedScriptEngine;
+import org.rhq.bindings.ScriptEngineFactory;
+import org.rhq.bindings.StandardBindings;
+import org.rhq.bindings.StandardScriptPermissions;
+import org.rhq.bindings.util.PackageFinder;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.client.LocalClient;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
+import org.rhq.enterprise.server.util.LookupUtil;
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class JndiAccessTest extends AbstractEJB3Test {
+
+ public void testEjbsAccessibleThroughPrivilegedCode() {
+ LookupUtil.getSubjectManager().getOverlord();
+ }
+
+ public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ engine.eval("SubjectManager.getSubjectByName('rhqadmin');");
+ }
+
+ public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "subjectManager = context.lookup('SubjectManagerBean/local');\n"
+ + "subjectManager.getOverlord();");
+
+ Assert.fail("The script shouldn't have been able to call local SLSB method.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "subjectManager = context.lookup('SubjectManagerBean/remote');\n"
+ + "subjectManager.getSubjectByName('rhqadmin');");
+
+ Assert.fail("The script shouldn't have been able to call remote SLSB method directly.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ public void testScriptCantUseSessionManagerMethods() throws Exception {
+
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ final ScriptEngine engine = getEngine(overlord);
+
+ class G {
+ private String sessionManager = ""
+ + "org.rhq.enterprise.server.auth.SessionManager.getInstance().";
+
+ public void testInvoke(String methodCall) throws ScriptException {
+ String code = sessionManager + methodCall;
+
+ try {
+ engine.eval(code);
+ Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall);
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+ };
+ G manager = new G();
+
+ manager.testInvoke("getlastAccess(0);");
+ manager.testInvoke("getOverlord()");
+ manager.testInvoke("getSubject(2);");
+ manager.testInvoke("invalidate(0);");
+ manager.testInvoke("invalidate(\"\");");
+ manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());");
+ manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);");
+ }
+
+ public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "datasource = context.lookup('java:/RHQDS');\n"
+ + "con = datasource.getConnection();");
+
+ Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ public void testScriptCantUseEntityManager() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
+ + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
+
+ Assert.fail("The script shouldn't have been able to use the EntityManager.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+
+ //try harder with manually specifying the initial context factory
+ try {
+ engine.eval(""
+ + "env = new java.util.Hashtable();"
+ + "env.put('java.naming.factory.initial', 'org.jnp.interfaces.LocalOnlyContextFactory');"
+ + "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');"
+ + "context = new javax.naming.InitialContext(env);\n"
+ + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
+ + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
+
+ Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
+ StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
+ ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
+
+ PermissionCollection perms = new StandardScriptPermissions();
+ perms.add(new SerializablePermission("enableSubclassImplementation"));
+
+ return new SandboxedScriptEngine(engine, perms);
+ }
+
+ private static void checkIsDesiredSecurityException(ScriptException e) {
+ String message = e.getMessage();
+ String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
+
+ Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
+ }
+}
diff --git a/modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml b/modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml
index 05edefa..85e2fb3 100644
--- a/modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml
+++ b/modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml
@@ -4,6 +4,14 @@
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- This installs a custom initial context factory builder into the JVM
+ that will ensure that all the default InitialContexts are going to check
+ for the permission to access the RHQ internals. -->
+ <bean class="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
+ name="AccessCheckingInitialContextFactoryBuilderInstaller">
+ </bean>
+
+
<bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
<bean name="InitialContextProperties" class="java.util.Hashtable">
@@ -20,7 +28,7 @@
</entry>
</map>
</parameter>
- </constructor>
+ </constructor>
</bean>
<bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
diff --git a/modules/enterprise/server/itests/src/test/resources/security.policy b/modules/enterprise/server/itests/src/test/resources/security.policy
new file mode 100644
index 0000000..8860b47
--- /dev/null
+++ b/modules/enterprise/server/itests/src/test/resources/security.policy
@@ -0,0 +1,10 @@
+// We need the SecurityManager installed to enable sandboxing of CLI scripts
+// but we don't define any other security measures on the RHQ server itself.
+//
+// Granting all permissions allows us to run the RHQ server as if no security
+// manager was in place (which is assumed by default by JBoss AS) but be able
+// to use it when we need it for our own purposes.
+
+grant {
+ permission java.security.AllPermission;
+};
commit 583cdadd3ac3f2aabec176c57423895292fe6348
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 10 10:40:27 2012 +0100
Make sure the decorated contexts behave the same as the originals.
hashCode and equals of the decorators are now taken from the original,
the exceptions from the method calls are rethrown from
the DispatchingInvocationHandler.
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
index 19b30ea..e0f1d84 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
@@ -96,5 +96,15 @@ public class DecoratingInitialContextFactory implements InitialContextFactory {
if (cls.getSuperclass() != null) {
getAllImplementedInterfaces(cls.getSuperclass(), output);
}
- }
+ }
+
+ @Override
+ public int hashCode() {
+ return factory.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return factory.equals(o);
+ }
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
index 6bfec7e..8970b0a 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
@@ -251,4 +251,14 @@ public class AccessCheckingContextDecorator implements Context, ContextDecorator
return str.substring(0, colon_posn);
return null;
}
+
+ @Override
+ public int hashCode() {
+ return getOriginal() == null ? super.hashCode() : getOriginal().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return getOriginal() == null ? super.equals(o) : getOriginal().equals(o);
+ }
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
index 20077de..3f3a95d 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
@@ -209,4 +209,14 @@ public class URLPreferringContextDecorator implements Context, ContextDecorator,
public String getNameInNamespace() throws NamingException {
return getOriginal().getNameInNamespace();
}
+
+ @Override
+ public int hashCode() {
+ return original == null ? super.hashCode() : original.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return original == null ? super.equals(o) : original.equals(o);
+ }
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
index 356a6e9..1bfa7ac 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
@@ -20,6 +20,7 @@
package org.rhq.jndi.util;
import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
@@ -41,6 +42,14 @@ public class DecoratingInvocationHandler<Type, Decorator extends Type> implement
target = picker.decorate(target, methodClass);
}
- return method.invoke(target, args);
+ try {
+ return method.invoke(target, args);
+ } catch (InvocationTargetException e) {
+ if (e.getCause() != null) {
+ throw e.getCause();
+ } else {
+ throw e;
+ }
+ }
}
}
\ No newline at end of file
commit 2c2d2aeffc8dd7adf3e0f60711f9556b52355baf
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Jan 9 16:25:45 2012 -0500
[BZ 772749] Adding null check for when there are no repos
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java
index fac5b79..ffaf0e3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java
@@ -58,8 +58,11 @@ public class ContentRepositoryTreeView extends LocatableTreeGrid {
addNodeClickHandler(new NodeClickHandler() {
public void onNodeClick(NodeClickEvent event) {
- String path = event.getNode().getAttribute("id").replaceAll(":", "/");
- CoreGUI.goToView("Bundles/Repository/" + path);
+ String id = event.getNode().getAttribute("id");
+ if (id != null) {
+ String path = id.replaceAll(":", "/");
+ CoreGUI.goToView("Bundles/Repository/" + path);
+ }
}
});
}
commit c6706aed03df889e23102ea254b2d342141d8b9b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 9 15:45:21 2012 -0500
[Bug 772742 - DB upgrade gives "All Resources Role" an unintended permission]
Fix the upgrade step that grants the bad permission. And add a new
step to revoke it if it exists.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 3350cdd..c18ffe1 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -15,7 +15,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.117</db.schema.version>
+ <db.schema.version>2.118</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
<rhq.ds.connection-url>${rhq.test.ds.connection-url}</rhq.ds.connection-url>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 24c536d..c9b0bea 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3370,12 +3370,12 @@
</statement>
</schema-directSQL>
- <!-- Now add modify the permissions to give all the roles with MANAGE_INVENTORY
- the new MANAGE_REPOSITORIES privilege so that people's privs remain unchanged. -->
+ <!-- Now modify the permissions to give all the roles with MANAGE_INVENTORY, except for
+ all-resources-role, the new MANAGE_REPOSITORIES privilege so that privs remain unchanged. -->
<schema-directSQL>
<statement>
INSERT INTO RHQ_PERMISSION (role_id, operation)
- SELECT role_id, 15 FROM RHQ_PERMISSION WHERE operation = 1
+ SELECT role_id, 15 FROM RHQ_PERMISSION WHERE operation = 1 AND NOT role_id = 2
</statement>
</schema-directSQL>
</schemaSpec>
@@ -3831,6 +3831,15 @@
<!-- Remove an unwanted null consraint -->
<schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_DEFINITION_ID" nullable="TRUE" />
</schemaSpec>
+
+ <schemaSpec version="2.118">
+ <!-- Correct an earlier upgrade issue where 'All Resources Role' was granted MANAGE_REPOSITORIES. -->
+ <schema-directSQL>
+ <statement>
+ DELETE FROM RHQ_PERMISSION WHERE role_id = 2 AND operation = 15
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
</dbupgrade>
</target>
commit da342ac1a965e70e78eb088328fa3c0bdbbdbca7
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 9 15:34:07 2012 -0500
Fix an NPE issue generated for unavailable TC webapp resources. Also,
tune down logging in general for unavailable TC server resources to
help reduce noise in the agent log file. And get rid of a few compile
warnings.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
index bc843ef..98f861b 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
@@ -23,7 +23,6 @@
package org.jboss.on.plugins.tomcat;
import java.io.File;
-import java.sql.SQLException;
import java.util.Properties;
import java.util.Set;
@@ -124,7 +123,7 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
*/
private TomcatServerOperationsDelegate operationsDelegate;
- private ResourceContext resourceContext;
+ private ResourceContext<T> resourceContext;
// JMXComponent Implementation --------------------------------------------
@@ -134,7 +133,9 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
try {
emsConnection = loadConnection();
} catch (Exception e) {
- log.error("Component attempting to access a connection that could not be loaded");
+ if (log.isTraceEnabled()) {
+ log.debug("Component attempting to access a connection that could not be loaded:" + e.getMessage());
+ }
}
return emsConnection;
@@ -232,6 +233,7 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
if (log.isDebugEnabled())
log.debug("Successfully made connection to the Tomcat Server for resource ["
+ this.resourceContext.getResourceKey() + "]");
+
} catch (Exception e) {
// The connection will be established even in the case that the principal cannot be authenticated,
@@ -239,8 +241,9 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
// the connection is established. If we get to this point that an exception was thrown, close any
// connection that was made and null it out so we can try to establish it again.
if (this.connection != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Connection created but an exception was thrown. Closing the connection.", e);
+ }
try {
this.connection.close();
} catch (Exception e2) {
@@ -250,19 +253,21 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
}
// Since the connection is attempted each time it's used, failure to connect could result in log
- // file spamming. Log it once for every 10 consecutive times it's encountered.
- if (consecutiveConnectionErrors % 10 == 0) {
- log.warn(
- "Could not establish connection to the Tomcat instance [" + (consecutiveConnectionErrors + 1)
- + "] times for resource [" + resourceContext.getResourceKey() + "]", e);
+ // file spamming. Log a warning only one time outside of debug mode, and throttle even in debug
+ // mode (once for every 10 connect errors).
+ if (0 == consecutiveConnectionErrors) {
+ log.warn("Could not connect to the Tomcat instance for resource ["
+ + resourceContext.getResourceKey() + "] (enable debug logging for more info): "
+ + e.getMessage());
}
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled() && (consecutiveConnectionErrors % 10 == 0)) {
log.debug(
- "Could not connect to the Tomcat instance for resource [" + resourceContext.getResourceKey()
- + "]", e);
+ "Could not establish connection to the Tomcat instance [" + (consecutiveConnectionErrors + 1)
+ + "] times for resource [" + resourceContext.getResourceKey() + "]", e);
+ }
- consecutiveConnectionErrors++;
+ ++consecutiveConnectionErrors;
throw e;
}
@@ -293,7 +298,8 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
}
}
- public void start(ResourceContext context) throws SQLException {
+ @Override
+ public void start(ResourceContext<T> context) throws InvalidPluginConfigurationException, Exception {
this.resourceContext = context;
this.operationsDelegate = new TomcatServerOperationsDelegate(this, resourceContext.getSystemInformation());
@@ -360,7 +366,7 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
}
}
- ResourceContext getResourceContext() {
+ ResourceContext<T> getResourceContext() {
return this.resourceContext;
}
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
index 9ecc0d7..d1c0f59 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
@@ -349,13 +349,13 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
throw new IllegalStateException("Could not find MBean for WAR '" + getApplicationName() + "'.");
}
- EmsOperation mbeanOperation = this.webModuleMBean.getOperation(name);
+ // NOTE: None of the supported operations have any parameters or return values, which makes our job easier.
+ EmsOperation mbeanOperation = this.webModuleMBean.getOperation(name, new Class[0]);
if (mbeanOperation == null) {
throw new IllegalStateException("Operation [" + name + "] not found on bean ["
+ this.webModuleMBean.getBeanName() + "]");
}
- // NOTE: None of the supported operations have any parameters or return values, which makes our job easier.
Object[] paramValues = new Object[0];
mbeanOperation.invoke(paramValues);
@@ -417,12 +417,15 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
String webModuleMBeanName = getWebModuleMBeanName();
EmsBean result = null;
- if (webModuleMBeanName != null) {
- ObjectNameQueryUtility queryUtility = new ObjectNameQueryUtility(webModuleMBeanName);
- List<EmsBean> mBeans = getEmsConnection().queryBeans(queryUtility.getTranslatedQuery());
- // There should only be one mBean for this match.
- if (mBeans.size() == 1) {
- result = mBeans.get(0);
+ if (null != webModuleMBeanName) {
+ EmsConnection conn = getEmsConnection();
+ if (null != conn) {
+ ObjectNameQueryUtility queryUtility = new ObjectNameQueryUtility(webModuleMBeanName);
+ List<EmsBean> mBeans = conn.queryBeans(queryUtility.getTranslatedQuery());
+ // There should only be one mBean for this match.
+ if (mBeans.size() == 1) {
+ result = mBeans.get(0);
+ }
}
}
@@ -449,8 +452,8 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
private List<EmsBean> getVHosts() {
EmsConnection emsConnection = getEmsConnection();
String query = QUERY_TEMPLATE_HOST;
- query = query.replace("%PATH%", getResourceContext().getPluginConfiguration().getSimpleValue(
- PROPERTY_CONTEXT_ROOT, ""));
+ query = query.replace("%PATH%",
+ getResourceContext().getPluginConfiguration().getSimpleValue(PROPERTY_CONTEXT_ROOT, ""));
ObjectNameQueryUtility queryUtil = new ObjectNameQueryUtility(query);
List<EmsBean> mBeans = emsConnection.queryBeans(queryUtil.getTranslatedQuery());
return mBeans;
@@ -741,9 +744,8 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon
File file = new File(fileName);
if (!file.exists()) {
- log
- .warn("Could not delete web application files (perhaps removed manually?). Proceeding with resource removal for: "
- + fileName);
+ log.warn("Could not delete web application files (perhaps removed manually?). Proceeding with resource removal for: "
+ + fileName);
} else {
deleteApp(pluginConfiguration, file, false, true);
}
commit 791205857b2e3550e51ea1e101b8a4704ebfad33
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 9 15:32:22 2012 -0500
[Bug 703562 - Tomcat plugin missing support for JNDI configured Datasources]
Added support for Datasources. Tomcat allows DS Resource declaration at the
global/host/app level. A global DS is available to all apps, a host DS is
available to all apps for that host, and then at the app level, just the
declaring app. As such Tomcat creates DS Mbeans at the app level, one for
each DS available to the app. This structure is reflected in the updated
Tomcat resource hierarchy. Although there is seeming redundancy for global
amd host level datasources, it seems to best reflect the TC intents, and
also the underlying mbeans.
For more on configuring datasources see:
http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html
http://tomcat.apache.org/tomcat-6.0-doc/config/context.html
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceComponent.java
new file mode 100644
index 0000000..df74483
--- /dev/null
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceComponent.java
@@ -0,0 +1,35 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.jboss.on.plugins.tomcat;
+
+import org.rhq.plugins.jmx.MBeanResourceComponent;
+
+/**
+ * Handle generic information about an application cache
+ *
+ * @author Jay Shaughnessy
+ *
+ */
+public class TomcatDatasourceComponent extends MBeanResourceComponent<TomcatWarComponent> {
+
+ public static final String PROPERTY_HOST = "host";
+ public static final String PROPERTY_PATH = "path";
+
+}
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceDiscoveryComponent.java
new file mode 100644
index 0000000..4749544
--- /dev/null
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceDiscoveryComponent.java
@@ -0,0 +1,63 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.jboss.on.plugins.tomcat;
+
+import java.util.Set;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent;
+
+/**
+ * Discover Application Datasource
+ *
+ * @author Jay Shaughnessy
+ */
+public class TomcatDatasourceDiscoveryComponent extends MBeanResourceDiscoveryComponent<TomcatWarComponent> {
+
+ @Override
+ public Set<DiscoveredResourceDetails> discoverResources(
+ ResourceDiscoveryContext<TomcatWarComponent> discoveryContext) {
+
+ Configuration defaultPluginConfig = discoveryContext.getDefaultPluginConfiguration();
+ String objectNameTemplate = defaultPluginConfig.getSimple(PROPERTY_OBJECT_NAME).getStringValue();
+ String host = discoveryContext.getParentResourceContext().getPluginConfiguration()
+ .getSimpleValue(TomcatWarComponent.PROPERTY_VHOST, null);
+ String path = discoveryContext.getParentResourceContext().getPluginConfiguration()
+ .getSimpleValue(TomcatWarComponent.PROPERTY_CONTEXT_ROOT, null);
+ objectNameTemplate = objectNameTemplate.replace("%host%", host);
+ objectNameTemplate = objectNameTemplate.replace("%path%", path);
+ defaultPluginConfig.put(new PropertySimple(PROPERTY_OBJECT_NAME, objectNameTemplate));
+
+ Set<DiscoveredResourceDetails> resources = super.performDiscovery(defaultPluginConfig,
+ discoveryContext.getParentResourceComponent(), discoveryContext.getResourceType());
+
+ for (DiscoveredResourceDetails detail : resources) {
+ Configuration pluginConfiguration = detail.getPluginConfiguration();
+ pluginConfiguration.put(new PropertySimple(TomcatDatasourceComponent.PROPERTY_HOST, host));
+ pluginConfiguration.put(new PropertySimple(TomcatDatasourceComponent.PROPERTY_PATH, path));
+ String resourceName = detail.getResourceName();
+ detail.setResourceName(resourceName);
+ }
+ return resources;
+ }
+}
diff --git a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
index a5277a8..e86f1d5 100644
--- a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
@@ -576,7 +576,103 @@
description="Pathname to a scratch directory to be provided by this Context for temporary read-write use by servlets within the associated web application. This directory will be made visible to servlets in the web application by a servlet context attribute (of type java.io.File) named javax.servlet.context.tempdir as described in the Servlet Specification. If not specified, a suitable directory underneath $CATALINA_BASE/work will be provided."
required="false" />
</c:group>
- </resource-configuration>
+ </resource-configuration>
+
+ <service
+ name="Tomcat Datasource"
+ discovery="TomcatDatasourceDiscoveryComponent"
+ class="TomcatDatasourceComponent"
+ description="A Tomcat Application (WAR) Datasource"
+ singleton="false">
+
+ <plugin-configuration>
+ <c:group name="General">
+ <c:simple-property
+ name="objectName"
+ readOnly="true"
+ default="Catalina:type=DataSource,path=%path%,host=%host%,class=javax.sql.DataSource,name=%name%" />
+ </c:group>
+
+ <c:group
+ name="Advanced"
+ hiddenByDefault="true">
+ <c:simple-property
+ name="name"
+ type="string"
+ readOnly="true"
+ description="The virtual host" />
+ <c:simple-property
+ name="host"
+ description="The datasource host"
+ readOnly="true" />
+ <c:simple-property
+ name="path"
+ description="The datasource application path"
+ readOnly="true" />
+ <c:simple-property
+ name="nameTemplate"
+ default="{name}" />
+ <c:simple-property
+ name="descriptionTemplate"
+ default="Tomcat Web Application Datasource"
+ readOnly="true" />
+ </c:group>
+ </plugin-configuration>
+
+ <metric
+ property="numActive"
+ displayType="summary"
+ description="Number of active connections in the pool" />
+ <metric
+ property="numIdle"
+ displayType="summary"
+ description="Number of idle connections in the pool" />
+
+ <resource-configuration>
+ <c:group name="Attributes">
+ <c:simple-property
+ name="initialSize"
+ type="integer"
+ description="The initial number of connections that are created when the pool is started. Default is 0." />
+ <c:simple-property
+ name="maxActive"
+ type="integer"
+ description="The maximum number of active connections that can be allocated from this pool at the same time, or negative for no limit. Default is 8." />
+ <c:simple-property
+ name="maxIdle"
+ type="integer"
+ description="The maximum number of connections that can remain idle in the pool, without extra ones being released, or negative for no limit. Default is 8." />
+ <c:simple-property
+ name="minIdle"
+ type="integer"
+ description="The minimum number of connections that can remain idle in the pool, without extra ones being created, or zero to create none. Default is 0." />
+ <c:simple-property
+ name="maxWait"
+ type="integer"
+ description="The maximum number of milliseconds that the pool will wait (when there are no available connections) for a connection to be returned before throwing an exception, or -1 to wait indefinitely. Default is indefinitely." />
+ <c:simple-property
+ name="poolPreparedStatements"
+ type="boolean"
+ description="Enable prepared statement pooling for this pool. Default is false." />
+ <c:simple-property
+ name="maxOpenPreparedStatements"
+ type="integer"
+ description="The maximum number of open statements that can be allocated from the statement pool at the same time, or zero for no limit. Default is unlimited." />
+ <c:simple-property
+ name="removeAbandoned"
+ type="boolean"
+ description="Flag to remove abandoned connections if they exceed the removeAbandonedTimout. If set to true a connection is considered abandoned and eligible for removal if it has been idle longer than the removeAbandonedTimeout. Setting this to true can recover db connections from poorly written applications which fail to close a connection. Default is false." />
+ <c:simple-property
+ name="removeAbandonedTimeout"
+ type="integer"
+ description="Timeout in seconds before an abandoned connection can be removed. Default is 300." />
+ <c:simple-property
+ name="logAbandoned"
+ type="boolean"
+ description="Flag to log stack traces for application code which abandoned a Statement or Connection. Logging of abandoned Statements and Connections adds overhead for every Connection open or new Statement because a stack trace has to be generated. Default is false." />
+ </c:group>
+ </resource-configuration>
+ </service>
<service
name="Tomcat Cache"
@@ -630,6 +726,7 @@
property="cacheMaxSize"
description="Maximum number of cache entries" />
</service>
+
</service>
</service>
commit ac2391109a7b141312f95595341a7dabed4551a4
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Jan 9 15:23:50 2012 -0500
[BZ 771984] is appears that trying to concurrently update a subject's user preferences fails when one of the updates involves inserting a new property. The problem appears from the GWT client, so at the GWT servlet layer, we will now ensure that no two GWT requests can concurrently update a subject.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
index b790b79..e175134 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
@@ -36,6 +36,7 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
private static final long serialVersionUID = 1L;
private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ private Object subjectLock = new Object(); // used to lock out concurrent subject updates
public void createPrincipal(String username, String password) throws RuntimeException {
try {
@@ -57,7 +58,7 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject createSubject(Subject subjectToCreate, String password) throws RuntimeException {
try {
return SerialUtility.prepare(subjectManager.createSubject(getSessionSubject(), subjectToCreate, password),
- "SubjectManager.createSubject");
+ "SubjectManager.createSubjectPW");
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
@@ -89,8 +90,12 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject updateSubject(Subject subjectToModify) throws RuntimeException {
try {
- Subject subject = SerialUtility.prepare(subjectManager.updateSubject(getSessionSubject(), subjectToModify),
- "SubjectManager.updateSubject");
+ Subject sessionSubject = getSessionSubject();
+ Subject modifiedSubject;
+ synchronized (subjectLock) {
+ modifiedSubject = subjectManager.updateSubject(sessionSubject, subjectToModify);
+ }
+ Subject subject = SerialUtility.prepare(modifiedSubject, "SubjectManager.updateSubject");
// Clear the prefs for this subject from the user prefs cache that portal-war uses, in case we just
// changed any prefs; otherwise the cache would contain stale prefs.
SubjectPreferencesCache.getInstance().clearConfiguration(subject.getId());
@@ -102,8 +107,16 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject updateSubject(Subject subjectToModify, String newPassword) throws RuntimeException {
try {
- return SerialUtility.prepare(subjectManager
- .updateSubject(getSessionSubject(), subjectToModify, newPassword), "SubjectManager.updateSubject");
+ Subject sessionSubject = getSessionSubject();
+ Subject modifiedSubject;
+ synchronized (subjectLock) {
+ modifiedSubject = subjectManager.updateSubject(sessionSubject, subjectToModify, newPassword);
+ }
+ Subject subject = SerialUtility.prepare(modifiedSubject, "SubjectManager.updateSubjectPW");
+ // Clear the prefs for this subject from the user prefs cache that portal-war uses, in case we just
+ // changed any prefs; otherwise the cache would contain stale prefs.
+ SubjectPreferencesCache.getInstance().clearConfiguration(subject.getId());
+ return subject;
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
commit 0e36c3ee8f1954486b1c12ee22ddd4b90cf7e685
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 9 16:57:11 2012 +0100
reverting the secured JNDI access... This functionality is still failing
some tests and so it won't re-emerge in master until I fix them.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
index 5822d44..894c953 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
@@ -20,7 +20,6 @@
package org.rhq.bindings;
import java.io.FilePermission;
-import java.io.SerializablePermission;
import java.lang.reflect.ReflectPermission;
import java.net.SocketPermission;
import java.security.Permission;
@@ -84,11 +83,6 @@ public class StandardScriptPermissions extends PermissionCollection {
add(new PropertyPermission("*", "read"));
add(new ReflectPermission("suppressAccessChecks"));
-
- //these 2 are required for server-side scripts to be able to
- //invoke remote EJBs.
- add(new SerializablePermission("enableSubclassImplementation"));
- add(new RuntimePermission("reflectionFactoryAccess"));
}
public void add(Permission permission) {
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 4dfd109..e777e21 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -17,35 +17,15 @@
<properties>
<persistence-api.version>1.0</persistence-api.version>
- <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
- <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
-
- <!-- dependency versions -->
- <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
-
- <clean.db>true</clean.db>
</properties>
<dependencies>
-
- <!-- Note, the test deps are intentionally placed above the other scoped deps because of classpath
- reasons. Maven orders the [test] classpath in the order listed in the pom. We specifically
- need the embeddable-ejb3 jar above the standard ejb3 jars because we need the embeddble packages
- loaded when testing. -->
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>${jboss-embeddable-ejb3.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-script-bindings</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -60,333 +40,20 @@
section. -->
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- Test deps - this insane list of deps is needed to get the embedded JBoss server with RHQ server deployed running -->
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- <!-- The Sun javamail jar isn't available from a public repo due to licensing issues,
- so use the Geronimo one instead. -->
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed by the PoolClass annotation used on some
- of our SLSB's -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbosssx</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbpm</artifactId>
- <version>3.1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- <!-- for the transaction interrupt EJB3 interceptor -->
- <dependency>
- <groupId>org.jboss.transaction</groupId>
- <artifactId>jboss-jta</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>5.5.20</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-jk</artifactId>
- <version>4.1.31</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Needed by com.jboss.jbossnetwork.apl.actions.xml.XPathProcessor; TODO: Remove once APL has been excised. -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.29</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jettison-provider</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-links</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.18</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- Everything but the web service tests, this is the standard test execution -->
- <configuration>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <groups>${rhq.testng.includedGroups}</groups>
- <systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
- <deploymentDirectory>target/test-classes</deploymentDirectory>
- <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- <clean.db>${clean.db}</clean.db>
- </systemPropertyVariables>
- <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
- <additionalClasspathElements>
- <!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <!-- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
+ -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> -->
</configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <!-- in order to get JMS to work properly in embedded test container, extract jms-rs.rar classes -->
- <execution>
- <id>Extract JMS classes from RAR needed for JMS tests</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <unzip src="src/test/resources/jms-ra.rar" dest="target">
- <patternset>
- <include name="jms-ra.jar"/>
- </patternset>
- </unzip>
- <unzip src="target/jms-ra.jar" dest="target/test-classes">
- <patternset>
- <include name="org/**"/>
- </patternset>
- </unzip>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ </plugin>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
index e9f1e4d..5f3ff90 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
@@ -20,8 +20,6 @@
package org.rhq.enterprise.client;
import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
import org.apache.commons.logging.Log;
@@ -56,21 +54,11 @@ public class LocalClientProxy extends AbstractRhqFacadeProxy<LocalClient> {
}
}
- protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, final Object[] args) throws Throwable {
+ protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, Object[] args) throws Throwable {
try {
- final Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes);
-
- //run this through the privileged block to elevate the privs of the script
- //the scripts don't have the AllowEjbAccessPermission but this code has
- //all perms (or at least all perms assigned to it by the current context,
- //which at the time of writing is defined by the rhq-server.policy file
- //which gives all code all permissions).
- return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
- @Override
- public Object run() throws Exception {
- return realMethod.invoke(localSLSB, args);
- }
- });
+ Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes);
+
+ return realMethod.invoke(localSLSB, args);
} catch (NoSuchMethodException e) {
throw new IllegalArgumentException("Method [" + originalMethod + "] does not have a desimplified counterpart with arguments " + Arrays.asList(argTypes) + ".", e);
}
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
deleted file mode 100644
index dc1fc83..0000000
--- a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.client.security.test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.SerializablePermission;
-import java.security.PermissionCollection;
-import java.util.Collections;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import org.rhq.bindings.SandboxedScriptEngine;
-import org.rhq.bindings.ScriptEngineFactory;
-import org.rhq.bindings.StandardBindings;
-import org.rhq.bindings.StandardScriptPermissions;
-import org.rhq.bindings.util.PackageFinder;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.client.LocalClient;
-import org.rhq.enterprise.server.test.AbstractEJB3Test;
-import org.rhq.enterprise.server.util.LookupUtil;
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-@Test
-public class EjbAccessTest extends AbstractEJB3Test {
-
- public void testEjbsAccessibleThroughPrivilegedCode() {
- LookupUtil.getSubjectManager().getOverlord();
- }
-
- public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- engine.eval("SubjectManager.getSubjectByName('rhqadmin');");
- }
-
- public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager = context.lookup('SubjectManagerBean/local');\n"
- + "subjectManager.getOverlord();");
-
- Assert.fail("The script shouldn't have been able to call local SLSB method.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager = context.lookup('SubjectManagerBean/remote');\n"
- + "subjectManager.getSubjectByName('rhqadmin');");
-
- Assert.fail("The script shouldn't have been able to call remote SLSB method directly.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testScriptCantUseSessionManagerMethods() throws Exception {
-
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- final ScriptEngine engine = getEngine(overlord);
-
- class G {
- private String sessionManager = ""
- + "org.rhq.enterprise.server.auth.SessionManager.getInstance().";
-
- public void testInvoke(String methodCall) throws ScriptException {
- String code = sessionManager + methodCall;
-
- try {
- engine.eval(code);
- Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall);
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
- };
- G manager = new G();
-
- manager.testInvoke("getlastAccess(0);");
- manager.testInvoke("getOverlord()");
- manager.testInvoke("getSubject(2);");
- manager.testInvoke("invalidate(0);");
- manager.testInvoke("invalidate(\"\");");
- manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());");
- manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);");
- }
-
- public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "datasource = context.lookup('java:/RHQDS');\n"
- + "con = datasource.getConnection();");
-
- Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testScriptCantUseEntityManager() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
-
- //try harder with manually specifying the initial context factory
- try {
- engine.eval(""
- + "env = new java.util.Hashtable();"
- + "env.put('java.naming.factory.initial', 'org.jnp.interfaces.LocalOnlyContextFactory');"
- + "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
- StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
- ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
-
- PermissionCollection perms = new StandardScriptPermissions();
- perms.add(new SerializablePermission("enableSubclassImplementation"));
-
- return new SandboxedScriptEngine(engine, perms);
- }
-
- private static void checkIsDesiredSecurityException(ScriptException e) {
- String message = e.getMessage();
- String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
-
- Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
- }
-}
diff --git a/modules/enterprise/server/client-api/src/test/resources/hibernate.properties b/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
deleted file mode 100644
index 1951b84..0000000
--- a/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
-# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
-# WORK IN THIS MODULE.
-
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-#hibernate.connection.release_mode=after_statement
-#hibernate.transaction.flush_before_completion=false
-#hibernate.transaction.auto_close_session=false
-#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-#hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-hibernate.bytecode.use_reflection_optimizer=false
-# I don't think this is honored, but EJB3Deployer uses it
-hibernate.bytecode.provider=javassist
-hibernate.jdbc.use_streams_for_binary=true
-hibernate.show_sql=false
-hibernate.format_sql=true
-hibernate.default_batch_fetch_size=16
-hibernate.jdbc.batch_size=20
diff --git a/modules/enterprise/server/client-api/src/test/resources/security.policy b/modules/enterprise/server/client-api/src/test/resources/security.policy
deleted file mode 100644
index 8860b47..0000000
--- a/modules/enterprise/server/client-api/src/test/resources/security.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-// We need the SecurityManager installed to enable sandboxing of CLI scripts
-// but we don't define any other security measures on the RHQ server itself.
-//
-// Granting all permissions allows us to run the RHQ server as if no security
-// manager was in place (which is assumed by default by JBoss AS) but be able
-// to use it when we need it for our own purposes.
-
-grant {
- permission java.security.AllPermission;
-};
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 0974431..b832b06 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -39,12 +39,6 @@
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <version>4.2.2.GA</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
deleted file mode 100644
index 3046af7..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-import javax.naming.event.EventContext;
-import javax.naming.event.EventDirContext;
-import javax.naming.ldap.LdapContext;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.InitialContextFactoryBuilder;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jnp.interfaces.NamingContextFactory;
-
-import org.rhq.jndi.context.AccessCheckingContextDecorator;
-import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
-import org.rhq.jndi.context.ContextDecorator;
-import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
-import org.rhq.jndi.util.DecoratorPicker;
-
-/**
- * This initial context factory builder is installed early on during the RHQ server startup
- * and is later on used for obtaining the {@link Context}s for all JNDI lookups in the
- * RHQ server.
- * <p>
- * We use a custom initial context factory builder to prevent the potential malicious 3rd party
- * code (like CLI alert scripts) from supplying custom environment variables to {@link InitialContext}
- * that would modify the JNDI lookup to skip our security access checks.
- * <p>
- * By using a builder we effectively take control of the initial context creation process
- * and are free to ignore whatever the script is trying to supply.
- * <p>
- * This builder makes sure to install the RHQ server's security access checks to whatever
- * initial context that is configured by the standard environment variables
- * ({@link Context#INITIAL_CONTEXT_FACTORY}, etc.)
- * <p>
- * This class is heavily inspired by the implementation of a similar builder in JBoss AS 7.
- *
- * @see AllowRhqServerInternalsAccessPermission
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingInitialContextFactoryBuilder implements InitialContextFactoryBuilder {
- private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
-
- /**
- * The list of JNDI name schemes that should be checked for security permissions
- * (in addition to the names with no scheme).
- *
- * @see AccessCheckingContextDecorator
- */
- private static final String[] CHECKED_SCHEMES = { "java" };
-
- private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
-
- static {
- SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
- SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
- SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
- SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
- SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
- SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
- }
-
- private static final Set<InetAddress> SERVER_BIND_IPS;
- static {
- SERVER_BIND_IPS = new HashSet<InetAddress>();
-
- try {
- String bindingAddressString = System.getProperty("jboss.bind.address");
- InetAddress bindingAddress = InetAddress.getByName(bindingAddressString);
-
- if (bindingAddress.isAnyLocalAddress()) {
- Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
- while (ifaces.hasMoreElements()) {
- NetworkInterface iface = ifaces.nextElement();
- SERVER_BIND_IPS.addAll(Collections.list(iface.getInetAddresses()));
- }
- } else {
- SERVER_BIND_IPS.add(bindingAddress);
- }
- } catch (SocketException e) {
- LOG.error("Could not obtain the list of local IPs", e);
- } catch (UnknownHostException e) {
- LOG.error("Failed to get the binding address of the RHQ server.", e);
- }
- }
-
- private static final int JNP_PORT = Integer.parseInt(System.getProperty("rhq.server.startup.namingservice.port",
- "2099"));
-
- /**
- * This is the default initial context factory that is returned when no other is
- * configured using the environment variables.
- * <p>
- * It uses {@link NamingContextFactory} as the underlying mechanism - the same
- * as the default configuration in JBoss 4.
- */
- private static final InitialContextFactory DEFAULT_FACTORY = new InitialContextFactory() {
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- return createSecureWrapper(new NamingContextFactory(), environment).getInitialContext(environment);
- }
- };
-
- /**
- * Create a InitialContext factory. If the environment does not override the factory class it will use the
- * default context factory.
- *
- * @param environment The environment
- * @return An initial context factory
- * @throws NamingException If an error occurs loading the factory class.
- */
- public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> environment) throws NamingException {
- final String factoryClassName = (String) environment.get(Context.INITIAL_CONTEXT_FACTORY);
- if (factoryClassName == null) {
- return DEFAULT_FACTORY;
- }
- final ClassLoader classLoader = getContextClassLoader();
- try {
- final Class<?> factoryClass = Class.forName(factoryClassName, true, classLoader);
- InitialContextFactory configuredFactory = (InitialContextFactory) factoryClass.newInstance();
- return createSecureWrapper(configuredFactory, environment);
- } catch (Exception e) {
- throw new NamingException("Failed instantiate InitialContextFactory " + factoryClassName
- + " from classloader " + classLoader);
- }
- }
-
- private ClassLoader getContextClassLoader() {
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
- public ClassLoader run() {
- return Thread.currentThread().getContextClassLoader();
- }
- });
- }
-
- private static InitialContextFactory
- createSecureWrapper(InitialContextFactory factory, Hashtable<?, ?> environment) {
- String providerUrl = (String) environment.get(Context.PROVIDER_URL);
-
- if (providerUrl == null) {
- return getAccessCheckingFactory(factory);
- } else {
- try {
- URI uri = new URI(providerUrl);
- InetAddress providerHost = InetAddress.getByName(uri.getHost());
-
- //check if we are accessing the RHQ server through some remoting
- //interface.
- if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
- return getAccessCheckingFactory(factory);
- } else {
- return getURLPreferringFactory(factory);
- }
- } catch (URISyntaxException e) {
- return getAccessCheckingFactory(factory);
- } catch (UnknownHostException e) {
- //let the factory deal with the unknown host...
- //this most probably shouldn't be secured because localhost addresses
- //should be resolvable.
- return getURLPreferringFactory(factory);
- }
- }
- }
-
- private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
- pickers.add(getURLPreferringDecoratorPicker());
- pickers.add(getAccessCheckingDecoratorPicker());
-
- return new DecoratingInitialContextFactory(original, pickers);
- }
-
- private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
- pickers.add(getURLPreferringDecoratorPicker());
-
- return new DecoratingInitialContextFactory(original, pickers);
- }
-
- private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
- ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
-
- return ret;
- }
-
- private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
- ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
-
- return ret;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej
new file mode 100644
index 0000000..445fa3a
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej
@@ -0,0 +1,122 @@
+--- modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
++++ modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+@@ -27,7 +27,7 @@
+ import java.net.UnknownHostException;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+-import java.util.ArrayList;
++import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.Enumeration;
+ import java.util.HashSet;
+@@ -37,10 +37,6 @@
+ import javax.naming.Context;
+ import javax.naming.InitialContext;
+ import javax.naming.NamingException;
+-import javax.naming.directory.DirContext;
+-import javax.naming.event.EventContext;
+-import javax.naming.event.EventDirContext;
+-import javax.naming.ldap.LdapContext;
+ import javax.naming.spi.InitialContextFactory;
+ import javax.naming.spi.InitialContextFactoryBuilder;
+
+@@ -49,10 +45,16 @@
+ import org.jnp.interfaces.NamingContextFactory;
+
+ import org.rhq.jndi.context.AccessCheckingContextDecorator;
+-import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
+-import org.rhq.jndi.context.ContextDecorator;
+-import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
+-import org.rhq.jndi.util.DecoratorPicker;
++import org.rhq.jndi.context.AccessCheckingDirContextDecorator;
++import org.rhq.jndi.context.AccessCheckingEventContextDecorator;
++import org.rhq.jndi.context.AccessCheckingEventDirContextDecorator;
++import org.rhq.jndi.context.AccessCheckingLdapContextDecorator;
++import org.rhq.jndi.context.ContextDecoratorPicker;
++import org.rhq.jndi.context.URLPreferringContextDecorator;
++import org.rhq.jndi.context.URLPreferringDirContextDecorator;
++import org.rhq.jndi.context.URLPreferringEventContextDecorator;
++import org.rhq.jndi.context.URLPreferringEventDirContextDecorator;
++import org.rhq.jndi.context.URLPreferringLdapContextDecorator;
+
+ /**
+ * This initial context factory builder is installed early on during the RHQ server startup
+@@ -87,17 +89,6 @@
+ */
+ private static final String[] CHECKED_SCHEMES = { "java" };
+
+- private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
+-
+- static {
+- SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
+- SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
+- SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
+- SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
+- SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
+- SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
+- }
+-
+ private static final Set<InetAddress> SERVER_BIND_IPS;
+ static {
+ SERVER_BIND_IPS = new HashSet<InetAddress>();
+@@ -200,31 +191,42 @@
+ }
+
+ private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
+- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+- pickers.add(getURLPreferringDecoratorPicker());
+- pickers.add(getAccessCheckingDecoratorPicker());
+-
+- return new DecoratingInitialContextFactory(original, pickers);
++ return new DecoratingInitialContextFactory(original, Arrays.asList(
++ getURLPreferringDecoratorPicker(), getAccessCheckingDecoratorPicker()));
+ }
+-
++
+ private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
+- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+- pickers.add(getURLPreferringDecoratorPicker());
+-
+- return new DecoratingInitialContextFactory(original, pickers);
++ return new DecoratingInitialContextFactory(original, Arrays.asList(
++ getURLPreferringDecoratorPicker()));
+ }
+
+- private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
+- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+- ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
+-
++ private static ContextDecoratorPicker getAccessCheckingDecoratorPicker() {
++ ContextDecoratorPicker ret = new ContextDecoratorPicker();
++
++ ret.setConstructorParameters(new Object[] { CHECKED_SCHEMES });
++ ret.setConstructorParameterTypes(new Class<?>[] { String[].class });
++
++ ret.getPossibleDecorators().add(AccessCheckingContextDecorator.class);
++ ret.getPossibleDecorators().add(AccessCheckingDirContextDecorator.class);
++ ret.getPossibleDecorators().add(AccessCheckingEventContextDecorator.class);
++ ret.getPossibleDecorators().add(AccessCheckingEventDirContextDecorator.class);
++ ret.getPossibleDecorators().add(AccessCheckingLdapContextDecorator.class);
++
+ return ret;
+ }
+
+- private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
+- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+- ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
+-
++ private static ContextDecoratorPicker getURLPreferringDecoratorPicker() {
++ ContextDecoratorPicker ret = new ContextDecoratorPicker();
++
++ ret.setConstructorParameters(null);
++ ret.setConstructorParameterTypes(null);
++
++ ret.getPossibleDecorators().add(URLPreferringContextDecorator.class);
++ ret.getPossibleDecorators().add(URLPreferringDirContextDecorator.class);
++ ret.getPossibleDecorators().add(URLPreferringEventContextDecorator.class);
++ ret.getPossibleDecorators().add(URLPreferringEventDirContextDecorator.class);
++ ret.getPossibleDecorators().add(URLPreferringLdapContextDecorator.class);
++
+ return ret;
+ }
+ }
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java
deleted file mode 100644
index aa807d6..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.security.BasicPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AllowRhqServerInternalsAccessPermission extends BasicPermission {
-
- private static final long serialVersionUID = 1L;
-
- public AllowRhqServerInternalsAccessPermission() {
- super("org.rhq.allow.server.internals.access");
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
deleted file mode 100644
index 19b30ea..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-import org.rhq.jndi.context.ContextDecorator;
-import org.rhq.jndi.util.DecoratorPicker;
-import org.rhq.jndi.util.DecoratingInvocationHandler;
-
-/**
- * This class implements an initial context factory that decorates the contexts
- * returned from a "wrapped" initial factory passed to this class in the constructor.
- * <p>
- * The contexts returned from the wrapped initial factory are hidden behind a proxy
- * that implements the intersection of interfaces from the <code>supportedContextInterfaces</code>
- * constructor parameter and the actual interfaces the wrapped context implements.
- * <p>
- * The proxy method calls are handled using the {@link DecoratingInvocationHandler} which is initialized
- * with the list of {@link DecoratorPicker pickers} that are used to intercept the method
- * calls on the wrapped context.
- *
- * @see DecoratorPicker
- * @see DecoratingInvocationHandler
- *
- * @author Lukas Krejci
- */
-public class DecoratingInitialContextFactory implements InitialContextFactory {
-
- List<DecoratorPicker<Context, ContextDecorator>> pickers;
- private InitialContextFactory factory;
- private Set<Class<? extends Context>> supportedContextInterfaces;
-
- public DecoratingInitialContextFactory(InitialContextFactory factory, List<DecoratorPicker<Context, ContextDecorator>> decoratorPickers) {
- this.factory = factory;
- this.pickers = decoratorPickers;
- this.supportedContextInterfaces = new HashSet<Class<? extends Context>>();
- for(DecoratorPicker<Context, ContextDecorator> picker : pickers) {
- supportedContextInterfaces.addAll(picker.getContext().getSupportedInterfaces());
- }
- }
-
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- Context ctx = factory.getInitialContext(environment);
-
- Set<Class<?>> implementedIfaces = getAllImplementedInterfaces(ctx.getClass());
- Class<?>[] ii = new Class<?>[implementedIfaces.size()];
- implementedIfaces.toArray(ii);
-
- return (Context) Proxy.newProxyInstance(ctx.getClass().getClassLoader(), ii, new DecoratingInvocationHandler<Context, ContextDecorator>(pickers, ctx));
- }
-
- private Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
- HashSet<Class<?>> ret = new HashSet<Class<?>>();
- getAllImplementedInterfaces(cls, ret);
-
- ret.retainAll(supportedContextInterfaces);
-
- return ret;
- }
-
- private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
- Class<?>[] ifaces = cls.getInterfaces();
-
- for (Class<?> iface : Arrays.asList(ifaces)) {
- output.add(iface);
- getAllImplementedInterfaces(iface, output);
- }
-
- if (cls.getSuperclass() != null) {
- getAllImplementedInterfaces(cls.getSuperclass(), output);
- }
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
deleted file mode 100644
index 6bfec7e..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
-
-/**
- * This is the "meat" of the RHQ's secured JNDI access. This {@link Context} decorator
- * applied security checks in each method (lookups, (un)bindings, etc).
- * <p>
- * The security check consists of checking if the current callstack has the {@link AllowRhqServerInternalsAccessPermission}.
- * <p>
- * This decorator applies the security check on any JNDI name without a scheme and
- * on any name that has a scheme listed in the {@link #checkedSchemes} list supplied
- * in the constructor.
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingContextDecorator implements Context, ContextDecorator, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private static final AllowRhqServerInternalsAccessPermission PERM = new AllowRhqServerInternalsAccessPermission();
- private Context original;
- private List<String> checkedSchemes;
-
- public AccessCheckingContextDecorator(String... checkedSchemes) {
- this.checkedSchemes = Arrays.asList(checkedSchemes);
- }
-
- public AccessCheckingContextDecorator(Context original, String... checkedSchemes) {
- this.original = original;
- this.checkedSchemes = Arrays.asList(checkedSchemes);
- }
-
- public void init(Context ctx) {
- this.original = ctx;
- }
-
- protected Context getOriginal() {
- return original;
- }
-
- protected static void check() {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(PERM);
- }
-
- private void checkScheme(String scheme) {
- if (scheme == null || checkedSchemes.contains(scheme)) {
- check();
- }
- }
-
- protected void check(String name) {
- checkScheme(getURLScheme(name));
- }
-
- protected void check(Name name) {
- if (name.size() == 0) {
- check();
- } else {
- String first = name.get(0);
- checkScheme(getURLScheme(first));
- }
- }
-
- public Object lookup(Name name) throws NamingException {
- check(name);
- return original.lookup(name);
- }
-
- public Object lookup(String name) throws NamingException {
- check(name);
- return original.lookup(name);
- }
-
- public void bind(Name name, Object obj) throws NamingException {
- check(name);
- original.bind(name, obj);
- }
-
- public void bind(String name, Object obj) throws NamingException {
- check(name);
- original.bind(name, obj);
- }
-
- public void rebind(Name name, Object obj) throws NamingException {
- check(name);
- original.rebind(name, obj);
- }
-
- public void rebind(String name, Object obj) throws NamingException {
- check(name);
- original.rebind(name, obj);
- }
-
- public void unbind(Name name) throws NamingException {
- check(name);
- original.unbind(name);
- }
-
- public void unbind(String name) throws NamingException {
- check(name);
- original.unbind(name);
- }
-
- public void rename(Name oldName, Name newName) throws NamingException {
- check(oldName);
- check(newName);
- original.rename(oldName, newName);
- }
-
- public void rename(String oldName, String newName) throws NamingException {
- check(oldName);
- check(newName);
- original.rename(oldName, newName);
- }
-
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
- check(name);
- return original.list(name);
- }
-
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
- check(name);
- return original.list(name);
- }
-
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
- check(name);
- return original.listBindings(name);
- }
-
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
- check(name);
- return original.listBindings(name);
- }
-
- public void destroySubcontext(Name name) throws NamingException {
- check(name);
- original.destroySubcontext(name);
- }
-
- public void destroySubcontext(String name) throws NamingException {
- check(name);
- original.destroySubcontext(name);
- }
-
- public Context createSubcontext(Name name) throws NamingException {
- check(name);
- return original.createSubcontext(name);
- }
-
- public Context createSubcontext(String name) throws NamingException {
- check(name);
- return original.createSubcontext(name);
- }
-
- public Object lookupLink(Name name) throws NamingException {
- check(name);
- return original.lookupLink(name);
- }
-
- public Object lookupLink(String name) throws NamingException {
- check(name);
- return original.lookupLink(name);
- }
-
- public NameParser getNameParser(Name name) throws NamingException {
- check(name);
- return original.getNameParser(name);
- }
-
- public NameParser getNameParser(String name) throws NamingException {
- check(name);
- return original.getNameParser(name);
- }
-
- public Name composeName(Name name, Name prefix) throws NamingException {
- check(name);
- return original.composeName(name, prefix);
- }
-
- public String composeName(String name, String prefix) throws NamingException {
- check(name);
- return original.composeName(name, prefix);
- }
-
- public Object addToEnvironment(String propName, Object propVal) throws NamingException {
- check();
- return original.addToEnvironment(propName, propVal);
- }
-
- public Object removeFromEnvironment(String propName) throws NamingException {
- check();
- return original.removeFromEnvironment(propName);
- }
-
- public Hashtable<?, ?> getEnvironment() throws NamingException {
- check();
- return original.getEnvironment();
- }
-
- public void close() throws NamingException {
- check();
- original.close();
- }
-
- public String getNameInNamespace() throws NamingException {
- check();
- return original.getNameInNamespace();
- }
-
- //copied from InitialContext
- private static String getURLScheme(String str) {
- int colon_posn = str.indexOf(':');
- int slash_posn = str.indexOf('/');
-
- if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
- return str.substring(0, colon_posn);
- return null;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
deleted file mode 100644
index 284fd0c..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.lang.reflect.Constructor;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.Context;
-
-import org.rhq.jndi.util.DecoratorSetContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
-
- private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
- static {
- HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
- tmp.add(AccessCheckingContextDecorator.class);
- tmp.add(AccessCheckingDirContextDecorator.class);
- tmp.add(AccessCheckingEventContextDecorator.class);
- tmp.add(AccessCheckingEventDirContextDecorator.class);
- tmp.add(AccessCheckingLdapContextDecorator.class);
-
- DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
- }
-
- private Set<Class<? extends Context>> supportedInterfaces;
- private String[] checkedSchemes;
-
- public AccessCheckingContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces, String... checkedSchemes) {
- this.supportedInterfaces = supportedInterfaces;
- this.checkedSchemes = checkedSchemes;
- }
-
- public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
- Constructor<? extends ContextDecorator> ctor = decoratorClass.getConstructor(String[].class);
-
- return ctor.newInstance((Object)checkedSchemes);
- }
-
- public Set<Class<? extends Context>> getSupportedInterfaces() {
- return supportedInterfaces;
- }
-
- public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
- return DECORATOR_CLASSES;
- }
-
- public void init(ContextDecorator decorator, Context object) throws Exception {
- decorator.init(object);
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
deleted file mode 100644
index 1614180..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-/**
- * A decorator of {@link DirContext}.
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingDirContextDecorator extends AccessCheckingContextDecorator implements DirContext {
-
- private static final long serialVersionUID = 1L;
-
- public AccessCheckingDirContextDecorator(String... checkedSchemes) {
- super(checkedSchemes);
- }
-
- public AccessCheckingDirContextDecorator(DirContext original, String... checkedSchemes) {
- super(original, checkedSchemes);
- }
-
- @Override
- protected DirContext getOriginal() {
- return (DirContext) super.getOriginal();
- }
-
- public Attributes getAttributes(Name name) throws NamingException {
- check(name);
- return getOriginal().getAttributes(name);
- }
-
- public Attributes getAttributes(String name) throws NamingException {
- check(name);
- return getOriginal().getAttributes(name);
- }
-
- public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
- check(name);
- return getOriginal().getAttributes(name, attrIds);
- }
-
- public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
- check(name);
- return getOriginal().getAttributes(name, attrIds);
- }
-
- public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().modifyAttributes(name, mod_op, attrs);
- }
-
- public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().modifyAttributes(name, mod_op, attrs);
- }
-
- public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
- check(name);
- getOriginal().modifyAttributes(name, mods);
- }
-
- public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
- check(name);
- getOriginal().modifyAttributes(name, mods);
- }
-
- public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().bind(name, obj, attrs);
- }
-
- public void bind(String name, Object obj, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().bind(name, obj, attrs);
- }
-
- public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().rebind(name, obj, attrs);
- }
-
- public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().rebind(name, obj, attrs);
- }
-
- public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
- check(name);
- return getOriginal().createSubcontext(name, attrs);
- }
-
- public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
- check(name);
- return getOriginal().createSubcontext(name, attrs);
- }
-
- public DirContext getSchema(Name name) throws NamingException {
- check(name);
- return getOriginal().getSchema(name);
- }
-
- public DirContext getSchema(String name) throws NamingException {
- check(name);
- return getOriginal().getSchema(name);
- }
-
- public DirContext getSchemaClassDefinition(Name name) throws NamingException {
- check(name);
- return getOriginal().getSchemaClassDefinition(name);
- }
-
- public DirContext getSchemaClassDefinition(String name) throws NamingException {
- check(name);
- return getOriginal().getSchema(name);
- }
-
- public NamingEnumeration<SearchResult>
- search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
- check(name);
- return getOriginal().search(name, matchingAttributes, attributesToReturn);
- }
-
- public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
- String[] attributesToReturn) throws NamingException {
- check(name);
- return getOriginal().search(name, matchingAttributes, attributesToReturn);
- }
-
- public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
- check(name);
- return getOriginal().search(name, matchingAttributes);
- }
-
- public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
- check(name);
- return getOriginal().search(name, matchingAttributes);
- }
-
- public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
- check(name);
- return getOriginal().search(name, filter, cons);
- }
-
- public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
- throws NamingException {
- check(name);
- return getOriginal().search(name, filter, cons);
- }
-
- public NamingEnumeration<SearchResult>
- search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
- check(name);
- return getOriginal().search(name, filterExpr, filterArgs, cons);
- }
-
- public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
- SearchControls cons) throws NamingException {
- check(name);
- return getOriginal().search(name, filterExpr, filterArgs, cons);
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
deleted file mode 100644
index 67a9527..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.event.EventContext;
-import javax.naming.event.NamingListener;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingEventContextDecorator extends AccessCheckingContextDecorator implements EventContext {
-
- private static final long serialVersionUID = 1L;
-
- public AccessCheckingEventContextDecorator(String... checkedSchemes) {
- super(checkedSchemes);
- }
-
- public AccessCheckingEventContextDecorator(EventContext original, String... checkedSchemes) {
- super(original, checkedSchemes);
- }
-
- @Override
- protected EventContext getOriginal() {
- return (EventContext) super.getOriginal();
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- check();
- getOriginal().removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- check();
- return getOriginal().targetMustExist();
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
deleted file mode 100644
index ed7a848..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.directory.SearchControls;
-import javax.naming.event.EventDirContext;
-import javax.naming.event.NamingListener;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingEventDirContextDecorator extends AccessCheckingDirContextDecorator implements
- EventDirContext {
-
- private static final long serialVersionUID = 1L;
-
- public AccessCheckingEventDirContextDecorator(String... checkedSchemes) {
- super(checkedSchemes);
- }
-
- public AccessCheckingEventDirContextDecorator(EventDirContext original, String... checkedSchemes) {
- super(original, checkedSchemes);
- }
-
- @Override
- protected EventDirContext getOriginal() {
- return (EventDirContext) super.getOriginal();
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- check();
- getOriginal().removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- check();
- return getOriginal().targetMustExist();
- }
-
- public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
- throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, filter, ctls, l);
- }
-
- public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
- throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, filter, ctls, l);
- }
-
- public void
- addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
- throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
- }
-
- public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
- NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
deleted file mode 100644
index e361db8..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.NamingException;
-import javax.naming.ldap.Control;
-import javax.naming.ldap.ExtendedRequest;
-import javax.naming.ldap.ExtendedResponse;
-import javax.naming.ldap.LdapContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingLdapContextDecorator extends AccessCheckingDirContextDecorator implements LdapContext {
-
- private static final long serialVersionUID = 1L;
-
- public AccessCheckingLdapContextDecorator(String... checkedSchemes) {
- super(checkedSchemes);
- }
-
- public AccessCheckingLdapContextDecorator(LdapContext original, String... checkedSchemes) {
- super(original, checkedSchemes);
- }
-
- @Override
- protected LdapContext getOriginal() {
- return (LdapContext) super.getOriginal();
- }
-
- public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
- check();
- return getOriginal().extendedOperation(request);
- }
-
- public LdapContext newInstance(Control[] requestControls) throws NamingException {
- check();
- return getOriginal().newInstance(requestControls);
- }
-
- public void reconnect(Control[] connCtls) throws NamingException {
- check();
- getOriginal().reconnect(connCtls);
- }
-
- public Control[] getConnectControls() throws NamingException {
- check();
- return getOriginal().getConnectControls();
- }
-
- public void setRequestControls(Control[] requestControls) throws NamingException {
- check();
- getOriginal().setRequestControls(requestControls);
- }
-
- public Control[] getRequestControls() throws NamingException {
- check();
- return getOriginal().getRequestControls();
- }
-
- public Control[] getResponseControls() throws NamingException {
- check();
- return getOriginal().getResponseControls();
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
deleted file mode 100644
index 5755ebd..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public interface ContextDecorator extends Context {
-
- void init(Context context) throws NamingException;
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
deleted file mode 100644
index 20077de..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.io.Serializable;
-import java.util.Hashtable;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
-
-/**
- * This is a wrapper class around another {@link Context} implementation that
- * prefers to use an URL context for some operation if the JNDI name contains
- * a scheme rather than the original. This is the behavior of {@link InitialContext}
- * which we need to restore in the contexts created by the {@link AccessCheckingInitialContextFactoryBuilder}
- * (which an {@link InitialContext} uses exclusively if the builder is set).
- * <p>
- * This is important because RHQ server has its own initial context factory
- * builder that creates factories that in turn create contexts. If the default
- * {@link InitialContext} implementation was used, we'd never be able to lookup
- * scheme-based names because the default implementation of the {@link InitialContext}
- * always uses the default context of the builder if one is installed no matter
- * the scheme in the name.
- * <p>
- * The {@link AccessCheckingInitialContextFactoryBuilder} wraps the context returned
- * by the factory in an instance of this class and thus is restoring the original
- * intended behavior of the {@link InitialContext}. It looks at the name being looked
- * up (bound or whatever) and prefers to use the URL context factories if the name
- * contains the scheme (as does the {@link InitialContext} if no builder is installed).
- * If the name doesn't contain a scheme, the provided default context factory is used to
- * look up the name.
- *
- * @author Lukas Krejci
- */
-public class URLPreferringContextDecorator implements Context, ContextDecorator, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Context original;
-
- public URLPreferringContextDecorator() {
-
- }
-
- public URLPreferringContextDecorator(Context ctx) {
- original = ctx;
- }
-
- public void init(Context context) {
- original = context;
- }
-
- protected Context getOriginal() throws NamingException {
- return original;
- }
-
- protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
- @SuppressWarnings("unchecked")
- Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
- return urlContext == null ? getOriginal() : urlContext;
- }
-
- protected Context getURLOrDefaultInitCtx(String name) throws NamingException {
- @SuppressWarnings("unchecked")
- Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
- return urlContext == null ? getOriginal() : urlContext;
- }
-
- public Object lookup(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).lookup(name);
- }
-
- public Object lookup(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).lookup(name);
- }
-
- public void bind(Name name, Object obj) throws NamingException {
- getURLOrDefaultInitCtx(name).bind(name, obj);
- }
-
- public void bind(String name, Object obj) throws NamingException {
- getURLOrDefaultInitCtx(name).bind(name, obj);
- }
-
- public void rebind(Name name, Object obj) throws NamingException {
- getURLOrDefaultInitCtx(name).rebind(name, obj);
- }
-
- public void rebind(String name, Object obj) throws NamingException {
- getURLOrDefaultInitCtx(name).rebind(name, obj);
- }
-
- public void unbind(Name name) throws NamingException {
- getURLOrDefaultInitCtx(name).unbind(name);
- }
-
- public void unbind(String name) throws NamingException {
- getURLOrDefaultInitCtx(name).unbind(name);
- }
-
- public void rename(Name oldName, Name newName) throws NamingException {
- getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
- }
-
- public void rename(String oldName, String newName) throws NamingException {
- getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
- }
-
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).list(name);
- }
-
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).list(name);
- }
-
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).listBindings(name);
- }
-
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).listBindings(name);
- }
-
- public void destroySubcontext(Name name) throws NamingException {
- getURLOrDefaultInitCtx(name).destroySubcontext(name);
- }
-
- public void destroySubcontext(String name) throws NamingException {
- getURLOrDefaultInitCtx(name).destroySubcontext(name);
- }
-
- public Context createSubcontext(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).createSubcontext(name);
- }
-
- public Context createSubcontext(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).createSubcontext(name);
- }
-
- public Object lookupLink(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).lookupLink(name);
- }
-
- public Object lookupLink(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).lookupLink(name);
- }
-
- public NameParser getNameParser(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getNameParser(name);
- }
-
- public NameParser getNameParser(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getNameParser(name);
- }
-
- public Name composeName(Name name, Name prefix) throws NamingException {
- return getOriginal().composeName(name, prefix);
- }
-
- public String composeName(String name, String prefix) throws NamingException {
- return getOriginal().composeName(name, prefix);
- }
-
- public Object addToEnvironment(String propName, Object propVal) throws NamingException {
- return getOriginal().addToEnvironment(propName, propVal);
- }
-
- public Object removeFromEnvironment(String propName) throws NamingException {
- return getOriginal().removeFromEnvironment(propName);
- }
-
- public Hashtable<?, ?> getEnvironment() throws NamingException {
- return getOriginal().getEnvironment();
- }
-
- public void close() throws NamingException {
- if (getOriginal() != null) {
- getOriginal().close();
- original = null;
- }
- }
-
- public String getNameInNamespace() throws NamingException {
- return getOriginal().getNameInNamespace();
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
deleted file mode 100644
index 6e7debc..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.spi.NamingManager;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringContextDecoratorHelper {
-
- private URLPreferringContextDecoratorHelper() {
-
- }
-
- public static Context getURLContext(String name, Hashtable<Object, Object> env) throws NamingException {
- String scheme = getURLScheme(name);
- if (scheme != null) {
- Context ctx = NamingManager.getURLContext(scheme, env);
- if (ctx != null) {
- return ctx;
- }
- }
-
- return null;
- }
-
- public static Context getURLContext(Name name, Hashtable<Object, Object> env) throws NamingException {
- if (name.size() > 0) {
- String first = name.get(0);
- String scheme = getURLScheme(first);
- if (scheme != null) {
- Context ctx = NamingManager.getURLContext(scheme, env);
- if (ctx != null) {
- return ctx;
- }
- }
- }
-
- return null;
- }
-
- //copied from InitialContext
- private static String getURLScheme(String str) {
- int colon_posn = str.indexOf(':');
- int slash_posn = str.indexOf('/');
-
- if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
- return str.substring(0, colon_posn);
- return null;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
deleted file mode 100644
index 828cd74..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.Context;
-
-import org.rhq.jndi.util.DecoratorSetContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
-
- private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
- static {
- HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
- tmp.add(URLPreferringContextDecorator.class);
- tmp.add(URLPreferringDirContextDecorator.class);
- tmp.add(URLPreferringEventContextDecorator.class);
- tmp.add(URLPreferringEventDirContextDecorator.class);
- tmp.add(URLPreferringLdapContextDecorator.class);
-
- DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
- }
-
- private Set<Class<? extends Context>> supportedInterfaces;
-
- public URLPreferringContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces) {
- this.supportedInterfaces = supportedInterfaces;
- }
-
- public Set<Class<? extends Context>> getSupportedInterfaces() {
- return supportedInterfaces;
- }
-
- public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
- return DECORATOR_CLASSES;
- }
-
- public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
- return decoratorClass.newInstance();
- }
-
- public void init(ContextDecorator decorator, Context object) throws Exception {
- decorator.init(object);
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
deleted file mode 100644
index 6a49942..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import javax.naming.NotContextException;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-/**
- * Akin to {@link URLPreferringContextDecorator} this class implements the similar logic
- * for {@link DirContext}s.
- *
- * @author Lukas Krejci
- */
-public class URLPreferringDirContextDecorator extends URLPreferringContextDecorator implements DirContext {
-
- private static final long serialVersionUID = 1L;
-
- public URLPreferringDirContextDecorator() {
- super(null);
- }
-
- public URLPreferringDirContextDecorator(DirContext ctx) {
- super(ctx);
- }
-
- protected DirContext checkAndCast(Context ctx) throws NamingException {
- if (!(ctx instanceof DirContext)) {
- if (ctx == null) {
- throw new NoInitialContextException();
- } else {
- throw new NotContextException(
- "Not an instance of DirContext");
- }
- }
-
- return (DirContext) ctx;
- }
-
- @Override
- protected DirContext getURLOrDefaultInitCtx(Name name) throws NamingException {
- Context ctx = super.getURLOrDefaultInitCtx(name);
- return checkAndCast(ctx);
- }
-
- @Override
- protected DirContext getURLOrDefaultInitCtx(String name) throws NamingException {
- Context ctx = super.getURLOrDefaultInitCtx(name);
- return checkAndCast(ctx);
- }
-
- public Attributes getAttributes(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getAttributes(name);
- }
-
- public Attributes getAttributes(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getAttributes(name);
- }
-
- public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
- return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
- }
-
- public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
- return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
- }
-
- public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
- }
-
- public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
- }
-
- public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
- getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
- }
-
- public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
- getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
- }
-
- public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
- }
-
- public void bind(String name, Object obj, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
- }
-
- public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
- }
-
- public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
- }
-
- public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
- return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
- }
-
- public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
- return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
- }
-
- public DirContext getSchema(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getSchema(name);
- }
-
- public DirContext getSchema(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getSchema(name);
- }
-
- public DirContext getSchemaClassDefinition(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
- }
-
- public DirContext getSchemaClassDefinition(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
- }
-
- public NamingEnumeration<SearchResult>
- search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
- }
-
- public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
- String[] attributesToReturn) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
- }
-
- public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
- }
-
- public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
- }
-
- public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, filter, cons);
- }
-
- public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
- throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, filter, cons);
- }
-
- public NamingEnumeration<SearchResult>
- search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
- }
-
- public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
- SearchControls cons) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
deleted file mode 100644
index e3298a0..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import javax.naming.NotContextException;
-import javax.naming.event.EventContext;
-import javax.naming.event.NamingListener;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringEventContextDecorator extends URLPreferringContextDecorator implements EventContext {
-
- private static final long serialVersionUID = 1L;
-
- public URLPreferringEventContextDecorator() {
- super(null);
- }
-
- public URLPreferringEventContextDecorator(EventContext ctx) {
- super(ctx);
- }
-
- protected EventContext checkAndCast(Context ctx) throws NamingException {
- if (!(ctx instanceof EventContext)) {
- if (ctx == null) {
- throw new NoInitialContextException();
- } else {
- throw new NotContextException(
- "Not an instance of EventContext");
- }
- }
-
- return (EventContext) ctx;
- }
-
- @Override
- protected EventContext getOriginal() throws NamingException {
- return checkAndCast(super.getOriginal());
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- getOriginal().removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- return getOriginal().targetMustExist();
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
deleted file mode 100644
index 4925297..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import javax.naming.NotContextException;
-import javax.naming.directory.SearchControls;
-import javax.naming.event.EventDirContext;
-import javax.naming.event.NamingListener;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringEventDirContextDecorator extends URLPreferringDirContextDecorator implements EventDirContext {
-
- private static final long serialVersionUID = 1L;
-
- public URLPreferringEventDirContextDecorator() {
- super(null);
- }
-
- public URLPreferringEventDirContextDecorator(EventDirContext ctx) {
- super(ctx);
- }
-
- @Override
- protected EventDirContext checkAndCast(Context ctx) throws NamingException {
- if (!(ctx instanceof EventDirContext)) {
- if (ctx == null) {
- throw new NoInitialContextException();
- } else {
- throw new NotContextException(
- "Not an instance of EventDirContext");
- }
- }
-
- return (EventDirContext) ctx;
- }
-
- @Override
- protected EventDirContext getOriginal() throws NamingException {
- return checkAndCast(super.getOriginal());
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- getOriginal().removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- return getOriginal().targetMustExist();
- }
-
- public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
- throws NamingException {
- getOriginal().addNamingListener(target, filter, ctls, l);
- }
-
- public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
- throws NamingException {
- getOriginal().addNamingListener(target, filter, ctls, l);
- }
-
- public void
- addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
- throws NamingException {
- getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
- }
-
- public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
- NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
deleted file mode 100644
index c74df39..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import javax.naming.NotContextException;
-import javax.naming.ldap.Control;
-import javax.naming.ldap.ExtendedRequest;
-import javax.naming.ldap.ExtendedResponse;
-import javax.naming.ldap.LdapContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringLdapContextDecorator extends URLPreferringDirContextDecorator implements LdapContext {
-
- private static final long serialVersionUID = 1L;
-
- public URLPreferringLdapContextDecorator() {
- super(null);
- }
-
- public URLPreferringLdapContextDecorator(LdapContext original) {
- super(original);
- }
-
- @Override
- protected LdapContext checkAndCast(Context ctx) throws NamingException {
- if (!(ctx instanceof LdapContext)) {
- if (ctx == null) {
- throw new NoInitialContextException();
- } else {
- throw new NotContextException("Not an instance of LdapContext");
- }
- }
-
- return (LdapContext) ctx;
- }
-
- @Override
- protected LdapContext getOriginal() throws NamingException {
- return checkAndCast(super.getOriginal());
- }
-
- public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
- return getOriginal().extendedOperation(request);
- }
-
- public LdapContext newInstance(Control[] requestControls) throws NamingException {
- return new URLPreferringLdapContextDecorator(getOriginal().newInstance(requestControls));
- }
-
- public void reconnect(Control[] connCtls) throws NamingException {
- getOriginal().reconnect(connCtls);
- }
-
- public Control[] getConnectControls() throws NamingException {
- return getOriginal().getConnectControls();
- }
-
- public void setRequestControls(Control[] requestControls) throws NamingException {
- getOriginal().setRequestControls(requestControls);
- }
-
- public Control[] getRequestControls() throws NamingException {
- return getOriginal().getRequestControls();
- }
-
- public Control[] getResponseControls() throws NamingException {
- return getOriginal().getResponseControls();
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
deleted file mode 100644
index d938c50..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.mbean;
-
-import javax.naming.spi.NamingManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingInitialContextFactoryBuilderInstaller implements AccessCheckingInitialContextFactoryBuilderInstallerMBean {
- private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
-
- public void start() throws Exception {
- LOG.info("Installing RHQ's access permission checking initial context factory builder");
-
- NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
- }
-
- public void stop() throws Exception {
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java
deleted file mode 100644
index 87d19ab..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.mbean;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public interface AccessCheckingInitialContextFactoryBuilderInstallerMBean {
-
- void start() throws Exception;
-
- void stop() throws Exception;
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
deleted file mode 100644
index 356a6e9..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.util;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.List;
-
-public class DecoratingInvocationHandler<Type, Decorator extends Type> implements InvocationHandler {
-
- private final List<DecoratorPicker<Type, Decorator>> pickers;
- private Type object;
-
- public DecoratingInvocationHandler(List<DecoratorPicker<Type, Decorator>> pickers, Type object) {
- this.pickers = pickers;
- this.object = object;
- }
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- Type target = object;
- Class<?> methodClass = method.getDeclaringClass();
-
- for(DecoratorPicker<Type, Decorator> picker : pickers) {
- target = picker.decorate(target, methodClass);
- }
-
- return method.invoke(target, args);
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
deleted file mode 100644
index 017d29f..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.util;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Given as set of decorators extending given type, this class can pick
- * the most appropriate set of decorators for a class or a method call.
- * <p>
- * To configure the decorator, one has to provide a {@link DecoratorSetContext} that
- * is then used to obtain the list of
- * {@link DecoratorSetContext#getSupportedInterfaces() supported interfaces}, which are
- * all the interfaces that should be used for decorator resolution (i.e. all other interfaces
- * that a class might implement are ignored during decorator resolution), the list of
- * {@link DecoratorSetContext#getDecoratorClasses() decorator classes}, which is a list
- * of decorators the picker can choose from and is also used to instantiate and initialize
- * the decorators.
- *
- * @author Lukas Krejci
- */
-public class DecoratorPicker<Type, Decorator extends Type> {
-
- private DecoratorSetContext<Type, Decorator> context;
-
- public DecoratorSetContext<Type, Decorator> getContext() {
- return context;
- }
-
- public void setContext(DecoratorSetContext<Type, Decorator> decoratorSetContext) {
- this.context = decoratorSetContext;
- }
-
- /**
- * Returns a set of decorators applicable for given method. The set is established based
- * on the declaring class of the method.
- *
- * @param method the method to inspect
- * @return the set of decorators that can be used to wrap a method call
- * @throws Exception
- */
- public Set<Decorator> getDecoratorsForMethod(Method method) throws Exception {
- return getDecoratorsForClass_Private(method.getDeclaringClass());
- }
-
- /**
- * Returns a set of decorators that can be used on instances of given class.
- * @param cls the class to inspect
- * @return
- * @throws Exception
- */
- public Set<Decorator> getDecoratorsForClass(Class<? extends Type> cls) throws Exception {
- return getDecoratorsForClass_Private(cls);
- }
-
- /**
- * This method first establishes the set of decorators to use based on the class of the supplied
- * object and then chains the decorators (in arbitrary order) with the supplied object at the
- * "root" of the chain.
- * <p>
- * If a method is then called on the returned object, the methods of all the decorators are called
- * in chain (each supposedly calling the next) and finally, at the end of the chain, the method on
- * the original object (the one supplied to this method) is called.
- * <p>
- * Note that the above is only an intended behavior and actually depends on the implementation of
- * the decorators that are resposinble for the chaining. Each decorator is initialized
- * (@{link {@link DecoratorSetContext#init(Object, Object)} which should set it up for such chaining.
- *
- * @param object
- * @return
- * @throws Exception
- */
- public Type decorate(Type object) throws Exception {
- Set<Decorator> decs = getDecoratorsForClass_Private(object.getClass());
- Type ret = object;
- for(Decorator d : decs) {
- context.init(d, ret);
- ret = d;
- }
-
- return ret;
- }
-
- /**
- * Similar to {@link #decorate(Object)} but instead of the class of the object itself,
- * uses the significantSuperClass as the basis for the decorator resolution.
- * <p>
- * This is important, because if the object implements two mutually incompatible sub-interfaces of <code>Type</code>,
- * the chained decorators might fail to execute a method later on if the decorator depends on the upper part
- * of the chain to implement certain sub-interface of <code>Type</code>.
- *
- * @param object the object to wrap in decorators
- * @param significantSuperClass the class to base the decorator resolution on
- * @return
- * @throws Exception
- */
- public Type decorate(Type object, Class<?> significantSuperClass) throws Exception {
- Set<Decorator> decs = getDecoratorsForClass_Private(significantSuperClass);
- Type ret = object;
- for(Decorator d : decs) {
- context.init(d, ret);
- ret = d;
- }
-
- return ret;
- }
-
- private Set<Decorator> getDecoratorsForClass_Private(Class<?> cls) throws Exception {
- Set<Class<? extends Type>> ifaces = getNearestApplicableInterfaces(cls);
-
- HashSet<Decorator> ret = new HashSet<Decorator>();
-
- for (Class<? extends Type> iface : ifaces) {
- for (Class<? extends Decorator> decClass : getMatch(iface)) {
- ret.add(context.instantiate(decClass));
- }
- }
-
- return ret;
- }
-
- private Set<Class<? extends Type>> getNearestApplicableInterfaces(Class<?> cls) {
- List<Class<? extends Type>> ifaces = new ArrayList<Class<? extends Type>>(getAllApplicableInterfaces(cls));
-
- //now compact the set to only contain the most concrete interfaces
-
- Iterator<Class<? extends Type>> it = ifaces.iterator();
- while (it.hasNext()) {
- Class<? extends Type> c = it.next();
-
- for (int i = 0; i < ifaces.size(); ++i) {
- Class<? extends Type> nextC = ifaces.get(i);
- if (!c.equals(nextC) && c.isAssignableFrom(nextC)) {
- it.remove();
- break;
- }
- }
- }
-
- return new HashSet<Class<? extends Type>>(ifaces);
- }
-
- private Set<Class<? extends Type>> getAllApplicableInterfaces(Class<?> cls) {
- Set<Class<? extends Type>> ifaces = new HashSet<Class<? extends Type>>();
-
- for (Class<? extends Type> iface : context.getSupportedInterfaces()) {
- if (iface.isAssignableFrom(cls)) {
- ifaces.add(iface);
- }
- }
-
- if (ifaces.isEmpty()) {
- throw new IllegalArgumentException("Class " + cls
- + " doesn't implement any of the applicable interfaces. Cannot find decorators for it.");
- }
-
- return ifaces;
- }
-
- private Set<Class<? extends Decorator>> getMatch(Class<?> targetIface) {
-
- Set<Class<? extends Decorator>> ret = new HashSet<Class<? extends Decorator>>();
-
- for (Class<? extends Decorator> cls : context.getDecoratorClasses()) {
- if (Arrays.asList(cls.getInterfaces()).contains(targetIface)) {
- ret.add(cls);
- }
- }
-
- return ret;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
deleted file mode 100644
index d7b1676..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.util;
-
-import java.util.Set;
-
-/**
- * Implementations of this interface provide a context to the {@link DecoratorPicker}.
- *
- * @author Lukas Krejci
- */
-public interface DecoratorSetContext<Type, Decorator> {
-
- /**
- * @return the set of interfaces that the decorators are able support.
- * Usually this should be just a union of all interfaces the decorators implement
- * but can be trimmed down.
- */
- Set<Class<? extends Type>> getSupportedInterfaces();
-
- /**
- * @return the set of all decorator classes in this set
- */
- Set<Class<? extends Decorator>> getDecoratorClasses();
-
- /**
- * Instantiates a new decorator of given class.
- * @param decoratorClass
- * @return
- * @throws Exception
- */
- Decorator instantiate(Class<? extends Decorator> decoratorClass) throws Exception;
-
- /**
- * Initializes the decorator to decorate given object.
- *
- * @param decorator
- * @param object
- * @throws Exception on error
- */
- void init(Decorator decorator, Type object) throws Exception;
-}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
deleted file mode 100644
index 45ba114..0000000
--- a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-import javax.naming.event.EventContext;
-import javax.naming.event.NamingListener;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.NamingManager;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-@Test
-public class DecoratingInvocationHandlerTest {
- private static final Set<String> INVOKED_METHODS = new HashSet<String>();
-
- private static final InvocationHandler NOTE_TAKING_HANDLER = new InvocationHandler() {
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- INVOKED_METHODS.add(method.getName());
-
- if ("hashCode".equals(method.getName())) {
- return 0;
- } else if ("equals".equals(method.getName())) {
- return false;
- }
-
- return null;
- }
- };
-
- private static Class<?>[] CONTEXT_INTERFACES;
-
- public static class Factory implements InitialContextFactory {
- public Context getInitialContext(Hashtable<?, ?> environment)
- throws NamingException {
-
- return (Context) Proxy.newProxyInstance(DecoratingInvocationHandlerTest.class.getClassLoader(), CONTEXT_INTERFACES, NOTE_TAKING_HANDLER);
- }
- }
-
- private static class DummyInitialEventContext extends InitialContext implements EventContext {
-
- /**
- * @param environment
- * @throws NamingException
- */
- public DummyInitialEventContext(Hashtable<?, ?> environment) throws NamingException {
- super(environment);
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- ((EventContext)getDefaultInitCtx()).removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- return ((EventContext)getDefaultInitCtx()).targetMustExist();
- }
-
-
- }
-
- @BeforeClass
- public void setBuilder() throws Exception {
- NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
- }
-
- public void testSimpleDispatch() throws Exception {
- INVOKED_METHODS.clear();
- Properties env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
-
- CONTEXT_INTERFACES = new Class<?>[] { Context.class };
-
- InitialContext ctx = new InitialContext(env);
-
- ctx.lookup("asdf");
-
- assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
- }
-
- public void testMultiInterfaceDispatch() throws Exception {
- INVOKED_METHODS.clear();
- Properties env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
-
- CONTEXT_INTERFACES = new Class<?>[] { EventContext.class, DirContext.class };
-
- InitialContext ctx = new InitialContext(env);
-
- ctx.lookup("asdf");
-
- DummyInitialEventContext ectx = new DummyInitialEventContext(env);
-
- ectx.addNamingListener("hodiny", 0, null);
-
- assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
- assert INVOKED_METHODS.contains("addNamingListener") : "The addNamingListener doesn't seem to have propagated to the actual context to be used.";
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
deleted file mode 100644
index e2d7429..0000000
--- a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.directory.DirContext;
-import javax.naming.event.EventContext;
-import javax.naming.ldap.LdapContext;
-
-import org.testng.annotations.Test;
-
-import org.rhq.jndi.util.DecoratorPicker;
-import org.rhq.jndi.util.DecoratorSetContext;
-
-/**
- * @author Lukas Krejci
- */
-@Test
-public class DecoratorPickerTest {
-
- private static final InvocationHandler DUMMY_HANDLER = new InvocationHandler() {
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- if ("hashCode".equals(method.getName())) {
- return 0;
- } else if ("equals".equals(method.getName())) {
- return false;
- }
-
- return null;
- }
- };
-
- private static final Class<?> TEST_OBJECT_CLASS1 = createProxyClass(Context.class);
- private static final Class<?> TEST_OBJECT_CLASS2 = createProxyClass(DirContext.class);
- private static final Class<?> TEST_OBJECT_CLASS3 = createProxyClass(LdapContext.class);
- private static final Class<?> TEST_OBJECT_CLASS4 = createProxyClass(LdapContext.class, EventContext.class);
- private static final Class<?> DECORATOR_CLASS1 = createProxyClass(Context.class);
- private static final Class<?> DECORATOR_CLASS2 = createProxyClass(EventContext.class);
- private static final Class<?> DECORATOR_CLASS3 = createProxyClass(LdapContext.class);
- private static final Class<?> DECORATOR_CLASS4 = createProxyClass(DirContext.class);
-
- public void testSimpleDecoratorIdentifiedByClass() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS1);
- assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for Context class");
- assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], Context.class);
- }
-
- public void testSuperClassDecoratorHasPrecedenceOverSubClassDecorator() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- //this tests that the LdapContext isn't returned even though it subclasses the DirContext
- Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS2);
- assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for DirContext class");
- assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], DirContext.class);
- }
-
- public void testSubClassDecoratorCorrectlyIdentified() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS3);
- assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for LdapContext class");
- assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
- }
-
- public void testMultipleDecoratorsDetectable() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- Set<Object> decorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS4);
- assertEquals(decorators.size(), 2,
- "Exactly 2 decorators should have been found for a class implementing 2 interfaces.");
-
- boolean ldapContextDecoratorFound = false;
- boolean eventContextDecoratorFound = false;
-
- for (Object d : decorators) {
- if (LdapContext.class.isAssignableFrom(d.getClass())) {
- ldapContextDecoratorFound = true;
- continue; //just to make sure that somehow the decorator doesn't implement both
- }
- if (EventContext.class.isAssignableFrom(d.getClass())) {
- eventContextDecoratorFound = true;
- }
- }
-
- assertTrue(ldapContextDecoratorFound && eventContextDecoratorFound,
- "The found decorators don't implement the desired interfaces.");
- }
-
- public void testDecoratorsIdentifiedByMethod() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- Set<Object> decorators =
- picker.getDecoratorsForMethod(LdapContext.class.getMethod("getConnectControls", (Class<?>[]) null));
- assertEquals(decorators.size(), 1,
- "Expected exactly one decorator for method 'getConnectControls()' from LdapContext class");
- assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
- }
-
- public void testMethodFromSubclassMatchesSubclassDecorator() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- //this is a method from the DirContext but we're asking for it from a class
- //that implements also an LdapContext
- //The LdapContext decorator also inherits from the DirContext decorator
- //(by the virtue of LdapContext interface inheriting from the DirContext)
- //The picker should therefore match the LdapContext decorator because its
- //the "closest" one to the actual class.
- Set<Object> decorators =
- picker.getDecoratorsForMethod(TEST_OBJECT_CLASS3.getMethod("getSchemaClassDefinition",
- new Class<?>[] { String.class }));
- assertEquals(decorators.size(), 1,
- "Expected exactly one decorator for method 'getSchemaClassDefinition(String)' from LdapContext class");
- assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
- }
-
- private static Class<?> createProxyClass(Class<?>... ifaces) {
- return Proxy.getProxyClass(DecoratorPickerTest.class.getClassLoader(), ifaces);
- }
-
- private static DecoratorPicker<Object, Object> createTestPicker() {
- DecoratorPicker<Object, Object> picker = new DecoratorPicker<Object, Object>();
-
- DecoratorSetContext<Object, Object> decSet = new DecoratorSetContext<Object, Object>() {
-
- public Object instantiate(Class<? extends Object> decoratorClass) throws Exception {
- Constructor<? extends Object> ctor = decoratorClass.getConstructor(InvocationHandler.class);
- return ctor.newInstance(DUMMY_HANDLER);
- }
-
- public void init(Object decorator, Object object) throws Exception {
- }
-
- @SuppressWarnings("unchecked")
- public Set<Class<? extends Object>> getSupportedInterfaces() {
- return new HashSet<Class<? extends Object>>(Arrays.asList(Context.class, EventContext.class,
- LdapContext.class, DirContext.class));
- }
-
- @SuppressWarnings("unchecked")
- public Set<Class<? extends Object>> getDecoratorClasses() {
- return new HashSet<Class<? extends Object>>(Arrays.asList(DECORATOR_CLASS1, DECORATOR_CLASS2, DECORATOR_CLASS3, DECORATOR_CLASS4));
- }
- };
-
- picker.setContext(decSet);
-
- return picker;
- }
-}
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
index f231f15..859b552 100644
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
+++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
@@ -225,13 +225,6 @@
<!-- JNDI -->
<!-- ==================================================================== -->
- <!-- This installs a custom initial context factory builder into the JVM
- that will ensure that all the default InitialContexts are going to check
- for the permission to access the RHQ internals. -->
- <mbean code="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
- name="org.rhq:service=AccessCheckingInitialContextFactoryBuilderInstaller">
- </mbean>
-
<!-- A simple mbean wrapper around the jndi Naming object. This
only handles an in memory instance. The NamingService uses this
as the JNDI store and exposes it remotely.
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 6898621..8753e6f 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -56,12 +56,6 @@
<dependency>
<groupId>org.rhq</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 92f4cf1..6eaf304 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -78,13 +78,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>com.googlecode.java-diff-utils</groupId>
<artifactId>diffutils</artifactId>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
index ecf2f6f..39b6076 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
@@ -26,41 +26,29 @@ import java.util.Random;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.server.util.LookupUtil;
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
/**
* This is the JON Server's own session ID generator. It is outside any container-provided session mechanism. Its sole
* purpose is to provide session IDs to logged in {@link Subject}s. It will timeout those sessions regardless of any
* container-provided session-timeout mechanism.
- * <p>
- * Because this is a very security-sensitive class, any public method requires the caller to
- * have the {@link AllowEjbAccessPermission} as any other calls to the EJB layer. This is so that the
- * malicious users can't trick the EJB layer into thinking that some users are logged in or log out other
- * users.
- * <p>
- * Also, for security reasons, this class is final so that malicious code can't subclass it and modify its
- * behavior.
- *
+ *
* <p>This object is a {@link #getInstance() singleton}.</p>
*/
-public final class SessionManager {
-
- private static final AllowRhqServerInternalsAccessPermission ACCESS_PERMISSION = new AllowRhqServerInternalsAccessPermission();
-
+public class SessionManager {
/**
* Our source for random session IDs.
*/
- private static final Random _random = new Random();
+ private static Random _random = new Random();
/**
* Our session cache that is keyed on the session ID.
*/
- private static final Map<Integer, AuthSession> _cache = new HashMap<Integer, AuthSession>();
+ private static Map<Integer, AuthSession> _cache = new HashMap<Integer, AuthSession>();
/**
* The singleton instance
*/
- private static final SessionManager _manager = new SessionManager();
+ private static SessionManager _manager = new SessionManager();
/**
* The timeout for all user sessions.
@@ -90,7 +78,7 @@ public final class SessionManager {
/**
* Return the singleton object.
- *
+ *
* @return the {@link SessionManager}
*/
public static SessionManager getInstance() {
@@ -107,7 +95,6 @@ public final class SessionManager {
* sessionId will be assigned.
*/
public Subject put(Subject subject) {
- checkPermission();
return put(subject, DEFAULT_TIMEOUT);
}
@@ -121,7 +108,6 @@ public final class SessionManager {
* that Subject is overlord). The sessionId will be assigned.
*/
public synchronized Subject put(Subject subject, long timeout) {
- checkPermission();
Integer key;
do {
@@ -155,7 +141,6 @@ public final class SessionManager {
* @throws SessionTimeoutException
*/
public synchronized Subject getSubject(int sessionId) throws SessionNotFoundException, SessionTimeoutException {
- checkPermission();
Integer id = new Integer(sessionId);
AuthSession session = _cache.get(id);
@@ -177,7 +162,6 @@ public final class SessionManager {
* @param sessionId session id to invalidate
*/
public synchronized void invalidate(int sessionId) {
- checkPermission();
_cache.remove(new Integer(sessionId));
// while we are here, let's go through the entire session cache and remove expired sessions
@@ -203,7 +187,6 @@ public final class SessionManager {
* @param username username for the sessions to be invalidated
*/
public synchronized void invalidate(String username) {
- checkPermission();
List<Integer> doomedSessionIds = new ArrayList<Integer>(_cache.size());
for (AuthSession s : _cache.values()) {
if (username.equals(s.getSubject(false).getName())) {
@@ -218,7 +201,6 @@ public final class SessionManager {
}
public long getlastAccess(int sessionId) {
- checkPermission();
AuthSession session = _cache.get(sessionId);
if (session == null) {
return -1;
@@ -227,7 +209,6 @@ public final class SessionManager {
}
public Subject getOverlord() {
- checkPermission();
if (overlordSubject == null) {
overlordSubject = LookupUtil.getSubjectManager().getSubjectById(OVERLORD_SUBJECT_ID);
@@ -275,9 +256,4 @@ public final class SessionManager {
return copy;
}
-
- private static void checkPermission() {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(ACCESS_PERMISSION);
- }
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml b/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
index 85e2fb3..05edefa 100644
--- a/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
+++ b/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
@@ -4,14 +4,6 @@
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
- <!-- This installs a custom initial context factory builder into the JVM
- that will ensure that all the default InitialContexts are going to check
- for the permission to access the RHQ internals. -->
- <bean class="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
- name="AccessCheckingInitialContextFactoryBuilderInstaller">
- </bean>
-
-
<bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
<bean name="InitialContextProperties" class="java.util.Hashtable">
@@ -28,7 +20,7 @@
</entry>
</map>
</parameter>
- </constructor>
+ </constructor>
</bean>
<bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
deleted file mode 100644
index 1991e0e..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>jndi-access-test-parent</artifactId>
- <groupId>org.rhq</groupId>
- <version>4.3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-test</artifactId>
- <packaging>jar</packaging>
-
- <name>JNDI access integration test</name>
- <description>Tests for local and remote JNDI access from within serverside scripts.</description>
-
- <properties>
- <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
- <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
- <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
- <jnp.port>54987</jnp.port>
- <jnp.rmiPort>54988</jnp.rmiPort>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>runtime</scope>
- </dependency>
-
- <!--================ Test Deps ================ -->
-
- <!-- Note, the test deps are intentionally placed above the other
- scoped deps because of classpath reasons. Maven orders the [test] classpath
- in the order listed in the pom. We specifically need the embeddable-ejb3
- jar above the standard ejb3 jars because we need the embeddble packages loaded
- when testing. -->
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-server-client-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-remote-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>${jboss-embeddable-ejb3.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- NOTE: The remaining test deps correspond to the classes contained
- in hibernate-all.jar and thirdparty-all.jar. -->
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- needed by embedded ejb container -->
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- <!-- needed by embedded ejb container -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <!-- 3rd Party Deps -->
-
- <!-- required by RHQ server classes, as well as EJB3 Embedded -->
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1-jboss</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed
- by the PoolClass annotation used on some of our SLSB's -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- for the transaction interrupt EJB3 interceptor -->
- <dependency>
- <groupId>org.jboss.transaction</groupId>
- <artifactId>jboss-jta</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
- </dependency>
-
- <!-- This is needed cglib which is in turn needed by hibernate -->
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.18</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!-- in order to get JMS to work properly in embedded
- test container, extract jms-rs.rar classes -->
- <execution>
- <id>Extract JMS classes from RAR needed for JMS tests</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <unzip src="src/test/resources/jms-ra.rar"
- dest="target">
- <patternset>
- <include name="jms-ra.jar" />
- </patternset>
- </unzip>
- <unzip src="target/jms-ra.jar"
- dest="target/test-classes">
- <patternset>
- <include name="org/**" />
- </patternset>
- </unzip>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- Everything but the web service tests, this is the standard
- test execution -->
- <configuration>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <groups>${rhq.testng.includedGroups}</groups>
- <systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
- <deploymentDirectory>target/test-classes</deploymentDirectory>
- <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- <clean.db>${clean.db}</clean.db>
- <test.server.jar.path>${settings.localRepository}/org/rhq/jndi-access-remote-server/${project.version}/jndi-access-remote-server-${project.version}.jar</test.server.jar.path>
- <jnp.port>${jnp.port}</jnp.port>
- <jnp.rmiPort>${jnp.rmiPort}</jnp.rmiPort>
- </systemPropertyVariables>
- <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
- <additionalClasspathElements>
- <!-- The below is required for tests to run against
- Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
-</project>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
deleted file mode 100644
index f20d4f1..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.test;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.SerializablePermission;
-import java.security.PermissionCollection;
-import java.util.Collections;
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-import org.rhq.bindings.SandboxedScriptEngine;
-import org.rhq.bindings.ScriptEngineFactory;
-import org.rhq.bindings.StandardBindings;
-import org.rhq.bindings.StandardScriptPermissions;
-import org.rhq.bindings.util.PackageFinder;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.client.LocalClient;
-import org.rhq.enterprise.server.test.AbstractEJB3Test;
-import org.rhq.enterprise.server.util.LookupUtil;
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-@Test
-public class JndiAccessTest extends AbstractEJB3Test {
- private static final Log JNP_SERVER_LOG = LogFactory.getLog("Test JNP Server");
-
- private Process testServerProcess;
- private Thread testServerStdErrReader;
- private Thread testServerStdOutReader;
-
- @BeforeClass
- @Parameters({"test.server.jar.path", "jnp.port", "jnp.rmiPort"})
- public void startTestJnpServer(String testServerJar, int jnpPort, int rmiPort) throws Exception {
- ProcessBuilder bld = new ProcessBuilder("java", "-Djnp.port=" + jnpPort, "-Djnp.rmiPort=" + rmiPort, "-jar", testServerJar);
-
- testServerProcess = bld.start();
-
- testServerStdErrReader = new Thread(new Runnable() {
- @Override
- public void run() {
- BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getErrorStream()));
- try {
- String line;
- while((line = rdr.readLine()) != null) {
- JNP_SERVER_LOG.warn(line);
- }
- } catch (IOException e) {
- JNP_SERVER_LOG.error("Reading test JNP server error output failed.", e);
- } finally {
- try {
- rdr.close();
- } catch (IOException e) {
- JNP_SERVER_LOG.error("Failed to close the test server error stream.", e);
- }
- }
- }
- });
- testServerStdErrReader.start();
-
- testServerStdOutReader = new Thread(new Runnable() {
- @Override
- public void run() {
- BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getInputStream()));
- try {
- String line;
- while((line = rdr.readLine()) != null) {
- JNP_SERVER_LOG.debug(line);
- }
- } catch (IOException e) {
- JNP_SERVER_LOG.error("Reading test JNP server standard output failed.", e);
- } finally {
- try {
- rdr.close();
- } catch (IOException e) {
- JNP_SERVER_LOG.error("Failed to close the test server standard output stream.", e);
- }
- }
- }
- });
- testServerStdOutReader.start();
-
- //give the JNP server some time to start up
- Thread.sleep(5000);
- }
-
- @AfterClass
- public void stopTestJnpServer() throws Exception {
- testServerProcess.destroy();
- testServerStdErrReader.join();
- testServerStdOutReader.join();
- }
-
- @Parameters("jnp.port")
- public void testRemoteConnectionWorkingFromJava(int jnpPort) throws Exception {
- Properties env = new Properties();
- env.put("java.naming.factory.initial", "org.jboss.naming.NamingContextFactory");
- env.put("java.naming.provider.url", "jnp://localhost:" + jnpPort);
- InitialContext ctx = new InitialContext(env);
- Object kachny = ctx.lookup("kachny");
-
- assert kachny != null;
- }
-
- public void testLocalJNDILookupFailsFromScripts() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- @Parameters("jnp.port")
- public void testRemoteJNDILookupWorksFromScripts(int jnpPort) throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "env = new java.util.Hashtable();"
- + "env.put('java.naming.factory.initial', 'org.jboss.naming.NamingContextFactory');"
- + "env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort + "');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "kachny = context.lookup('kachny');\n"
- + "assertNotNull(kachny);\n");
- } catch (ScriptException e) {
- Assert.fail("The script should have been able to access a remote JNDI server.", e);
- }
- }
-
- private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
- StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
- ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
-
- PermissionCollection perms = new StandardScriptPermissions();
-
- return new SandboxedScriptEngine(engine, perms);
- }
-
- private static void checkIsDesiredSecurityException(ScriptException e) {
- String message = e.getMessage();
- String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
-
- Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
- }
-}
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties
deleted file mode 100644
index 1951b84..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
-# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
-# WORK IN THIS MODULE.
-
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-#hibernate.connection.release_mode=after_statement
-#hibernate.transaction.flush_before_completion=false
-#hibernate.transaction.auto_close_session=false
-#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-#hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-hibernate.bytecode.use_reflection_optimizer=false
-# I don't think this is honored, but EJB3Deployer uses it
-hibernate.bytecode.provider=javassist
-hibernate.jdbc.use_streams_for_binary=true
-hibernate.show_sql=false
-hibernate.format_sql=true
-hibernate.default_batch_fetch_size=16
-hibernate.jdbc.batch_size=20
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml
deleted file mode 100644
index ec09ed7..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml 39945 2006-01-12 02:44:07Z bill $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="WARN"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Messagen -->
- <!--
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- -->
- <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="target/server-jar-test.log"/>
- <param name="Threshold" value="WARN"/>
- <param name="Append" value="false"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Messagen -->
- <!--
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- -->
- <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
- </layout>
- </appender>
-
- <category name="Test JNP Server">
- <priority value="DEBUG"/>
- </category>
-
- <!-- Hibernate logs WARNINGS frequent from this class, in test envs. -->
- <category name="org.hibernate.hql.ast.QueryTranslatorImpl">
- <priority value="ERROR"/>
- </category>
-
- <!-- hides the TIMER SERVICE IS NOT INSTALLED warning - we know embedded EJB3 container doesn't support timers -->
- <category name="org.jboss.ejb3.timerservice.jboss.JBossTimerServiceFactory">
- <priority value="ERROR"/>
- </category>
-
- <!-- hides the shutdown warnings - for some reason, the container spits out some warnings when shutting down -->
- <category name="org.jboss.kernel.plugins.dependency.StartStopLifecycleAction">
- <priority value="ERROR"/>
- </category>
-
- <!-- Hibernate SQL logs -->
- <!--
- <category name="org.hibernate.SQL">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy
deleted file mode 100644
index 8860b47..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-// We need the SecurityManager installed to enable sandboxing of CLI scripts
-// but we don't define any other security measures on the RHQ server itself.
-//
-// Granting all permissions allows us to run the RHQ server as if no security
-// manager was in place (which is assumed by default by JBoss AS) but be able
-// to use it when we need it for our own purposes.
-
-grant {
- permission java.security.AllPermission;
-};
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
deleted file mode 100644
index 6e9c673..0000000
--- a/modules/integration-tests/jndi-access/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>rhq-integration-tests</artifactId>
- <groupId>org.rhq</groupId>
- <version>4.3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-test-parent</artifactId>
- <packaging>pom</packaging>
-
- <name>JNDI access tests</name>
- <description>Tests for the secured JNDI access tests</description>
-
- <modules>
- <module>remote-server</module>
- <module>jndi-access-test</module>
- </modules>
-</project>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
deleted file mode 100644
index 9046e6f..0000000
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>jndi-access-test-parent</artifactId>
- <groupId>org.rhq</groupId>
- <version>4.3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-remote-server</artifactId>
- <packaging>jar</packaging>
-
- <name>Test JNDI-enabled remote server</name>
- <description>
- A testing JNDI-enabled server to test the ability to connect to remote servers without security
- checks from within the scripts running inside the RHQ server.
- </description>
-
- <dependencies>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <version>4.2.2.GA</version>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.2.2.GA</version>
- </dependency>
-
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals><goal>single</goal></goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.rhq.jndi.test.Server</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java b/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java
deleted file mode 100644
index 7bfb8e8..0000000
--- a/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.rhq.jndi.test;
-import java.util.Properties;
-
-import javax.naming.CompoundName;
-
-import org.jnp.server.Main;
-import org.jnp.server.NamingBeanImpl;
-
-import org.jboss.logging.Logger;
-
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class Server {
- private static final Logger LOG = Logger.getLogger(Server.class);
-
- private static Server INSTANCE;
-
- private Main jnpServer;
-
- public static void main(String[] args) throws Exception {
- LOG.debug("System properties: " + System.getProperties());
- Server.start();
- }
-
- private Server() {
- jnpServer = new Main("org.rhq.jndi.access.test.server");
- }
-
- public static synchronized Server getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new Server();
- }
-
- return INSTANCE;
- }
-
- public static void start() throws Exception {
- LOG.debug("Initializing the JNP server");
-
- NamingBeanImpl nbi = new NamingBeanImpl();
- getInstance().jnpServer.setNamingInfo(nbi);
- nbi.start();
-
- LOG.debug("Binding kachny");
-
- nbi.getNamingInstance().bind(new CompoundName("kachny", new Properties()), "KACHNY!", String.class.getName());
-
- LOG.debug("Starting the JNP server");
-
- getInstance().jnpServer.start();
- }
-
- public static void stop() {
- LOG.debug("Stopping the JNP server");
- getInstance().jnpServer.stop();
- }
-}
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties b/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties
deleted file mode 100644
index a45f2ce..0000000
--- a/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-java.naming.factory.initial=org.jboss.naming.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties b/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties
deleted file mode 100644
index 2d41f83..0000000
--- a/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootCategory=TRACE, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 969b94a..0290729 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -62,7 +62,6 @@
<id>integration-tests</id>
<modules>
<module>apache-plugin-test</module>
- <module>jndi-access</module>
<!--<module>mod_cluster-plugin-test</module>-->
</modules>
</profile>
commit 772e9d247e524071a86d6a25b8e1615ed77e9fcf
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 9 14:05:09 2012 +0100
Fixing the application of various decorators to JNDI contexts to support
contexts that implement more than 1 context interface (like LdapCtx which
implements both LdapContext and EventDirContext).
This should fix the RHQ's LDAP integration for good.
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
index 60e9bf6..3046af7 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -27,7 +27,7 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
@@ -37,6 +37,10 @@ import java.util.Set;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.event.EventDirContext;
+import javax.naming.ldap.LdapContext;
import javax.naming.spi.InitialContextFactory;
import javax.naming.spi.InitialContextFactoryBuilder;
@@ -45,16 +49,10 @@ import org.apache.commons.logging.LogFactory;
import org.jnp.interfaces.NamingContextFactory;
import org.rhq.jndi.context.AccessCheckingContextDecorator;
-import org.rhq.jndi.context.AccessCheckingDirContextDecorator;
-import org.rhq.jndi.context.AccessCheckingEventContextDecorator;
-import org.rhq.jndi.context.AccessCheckingEventDirContextDecorator;
-import org.rhq.jndi.context.AccessCheckingLdapContextDecorator;
-import org.rhq.jndi.context.ContextDecoratorPicker;
-import org.rhq.jndi.context.URLPreferringContextDecorator;
-import org.rhq.jndi.context.URLPreferringDirContextDecorator;
-import org.rhq.jndi.context.URLPreferringEventContextDecorator;
-import org.rhq.jndi.context.URLPreferringEventDirContextDecorator;
-import org.rhq.jndi.context.URLPreferringLdapContextDecorator;
+import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
+import org.rhq.jndi.context.ContextDecorator;
+import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
+import org.rhq.jndi.util.DecoratorPicker;
/**
* This initial context factory builder is installed early on during the RHQ server startup
@@ -89,6 +87,17 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
*/
private static final String[] CHECKED_SCHEMES = { "java" };
+ private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
+
+ static {
+ SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
+ SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
+ }
+
private static final Set<InetAddress> SERVER_BIND_IPS;
static {
SERVER_BIND_IPS = new HashSet<InetAddress>();
@@ -191,42 +200,31 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
}
private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
- return new DecoratingInitialContextFactory(original, Arrays.asList(
- getURLPreferringDecoratorPicker(), getAccessCheckingDecoratorPicker()));
- }
-
- private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
- return new DecoratingInitialContextFactory(original, Arrays.asList(
- getURLPreferringDecoratorPicker()));
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+ pickers.add(getURLPreferringDecoratorPicker());
+ pickers.add(getAccessCheckingDecoratorPicker());
+
+ return new DecoratingInitialContextFactory(original, pickers);
}
- private static ContextDecoratorPicker getAccessCheckingDecoratorPicker() {
- ContextDecoratorPicker ret = new ContextDecoratorPicker();
-
- ret.setConstructorParameters(new Object[] { CHECKED_SCHEMES });
- ret.setConstructorParameterTypes(new Class<?>[] { String[].class });
+ private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+ pickers.add(getURLPreferringDecoratorPicker());
- ret.getPossibleDecorators().add(AccessCheckingContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingDirContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingEventContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingEventDirContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingLdapContextDecorator.class);
+ return new DecoratingInitialContextFactory(original, pickers);
+ }
+ private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
+ DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+ ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
+
return ret;
}
- private static ContextDecoratorPicker getURLPreferringDecoratorPicker() {
- ContextDecoratorPicker ret = new ContextDecoratorPicker();
-
- ret.setConstructorParameters(null);
- ret.setConstructorParameterTypes(null);
-
- ret.getPossibleDecorators().add(URLPreferringContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringDirContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringEventContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringEventDirContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringLdapContextDecorator.class);
-
+ private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
+ DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+ ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
+
return ret;
}
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
index 2414c98..19b30ea 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
@@ -19,45 +19,82 @@
package org.rhq.jndi;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
+import java.util.Set;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import org.rhq.jndi.context.ContextDecoratorPicker;
+import org.rhq.jndi.context.ContextDecorator;
+import org.rhq.jndi.util.DecoratorPicker;
+import org.rhq.jndi.util.DecoratingInvocationHandler;
/**
+ * This class implements an initial context factory that decorates the contexts
+ * returned from a "wrapped" initial factory passed to this class in the constructor.
+ * <p>
+ * The contexts returned from the wrapped initial factory are hidden behind a proxy
+ * that implements the intersection of interfaces from the <code>supportedContextInterfaces</code>
+ * constructor parameter and the actual interfaces the wrapped context implements.
+ * <p>
+ * The proxy method calls are handled using the {@link DecoratingInvocationHandler} which is initialized
+ * with the list of {@link DecoratorPicker pickers} that are used to intercept the method
+ * calls on the wrapped context.
+ *
+ * @see DecoratorPicker
+ * @see DecoratingInvocationHandler
*
- *
* @author Lukas Krejci
*/
public class DecoratingInitialContextFactory implements InitialContextFactory {
- private List<ContextDecoratorPicker> pickers;
+ List<DecoratorPicker<Context, ContextDecorator>> pickers;
private InitialContextFactory factory;
+ private Set<Class<? extends Context>> supportedContextInterfaces;
- public DecoratingInitialContextFactory(InitialContextFactory factory, List<ContextDecoratorPicker> decoratorPickers) {
+ public DecoratingInitialContextFactory(InitialContextFactory factory, List<DecoratorPicker<Context, ContextDecorator>> decoratorPickers) {
this.factory = factory;
this.pickers = decoratorPickers;
+ this.supportedContextInterfaces = new HashSet<Class<? extends Context>>();
+ for(DecoratorPicker<Context, ContextDecorator> picker : pickers) {
+ supportedContextInterfaces.addAll(picker.getContext().getSupportedInterfaces());
+ }
}
public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
Context ctx = factory.getInitialContext(environment);
- try {
- for(ContextDecoratorPicker picker : pickers) {
- ctx = picker.wrapInAppropriateDecorator(ctx);
- }
- } catch (IllegalArgumentException e) {
- NamingException ex = new NamingException();
- ex.initCause(ex);
-
- throw e;
- }
+ Set<Class<?>> implementedIfaces = getAllImplementedInterfaces(ctx.getClass());
+ Class<?>[] ii = new Class<?>[implementedIfaces.size()];
+ implementedIfaces.toArray(ii);
- return ctx;
+ return (Context) Proxy.newProxyInstance(ctx.getClass().getClassLoader(), ii, new DecoratingInvocationHandler<Context, ContextDecorator>(pickers, ctx));
+ }
+
+ private Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
+ HashSet<Class<?>> ret = new HashSet<Class<?>>();
+ getAllImplementedInterfaces(cls, ret);
+
+ ret.retainAll(supportedContextInterfaces);
+
+ return ret;
}
+ private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
+ Class<?>[] ifaces = cls.getInterfaces();
+
+ for (Class<?> iface : Arrays.asList(ifaces)) {
+ output.add(iface);
+ getAllImplementedInterfaces(iface, output);
+ }
+
+ if (cls.getSuperclass() != null) {
+ getAllImplementedInterfaces(cls.getSuperclass(), output);
+ }
+ }
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
new file mode 100644
index 0000000..284fd0c
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
@@ -0,0 +1,75 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.Constructor;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
+
+ private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
+ static {
+ HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
+ tmp.add(AccessCheckingContextDecorator.class);
+ tmp.add(AccessCheckingDirContextDecorator.class);
+ tmp.add(AccessCheckingEventContextDecorator.class);
+ tmp.add(AccessCheckingEventDirContextDecorator.class);
+ tmp.add(AccessCheckingLdapContextDecorator.class);
+
+ DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
+ }
+
+ private Set<Class<? extends Context>> supportedInterfaces;
+ private String[] checkedSchemes;
+
+ public AccessCheckingContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces, String... checkedSchemes) {
+ this.supportedInterfaces = supportedInterfaces;
+ this.checkedSchemes = checkedSchemes;
+ }
+
+ public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
+ Constructor<? extends ContextDecorator> ctor = decoratorClass.getConstructor(String[].class);
+
+ return ctor.newInstance((Object)checkedSchemes);
+ }
+
+ public Set<Class<? extends Context>> getSupportedInterfaces() {
+ return supportedInterfaces;
+ }
+
+ public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
+ return DECORATOR_CLASSES;
+ }
+
+ public void init(ContextDecorator decorator, Context object) throws Exception {
+ decorator.init(object);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
deleted file mode 100644
index a088aa2..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-/**
- * @author Lukas Krejci
- */
-public class ContextDecoratorPicker {
-
- private Set<Class<? extends ContextDecorator>> possibleDecorators = new HashSet<Class<? extends ContextDecorator>>();
- private Class<?>[] constructorParameterTypes;
- private Object[] constructorParameters;
-
- public ContextDecoratorPicker() {
- }
-
- public ContextDecoratorPicker(Collection<? extends Class<? extends ContextDecorator>> c) {
- possibleDecorators.addAll(c);
- }
-
- public Set<Class<? extends ContextDecorator>> getPossibleDecorators() {
- return possibleDecorators;
- }
-
- public Class<?>[] getConstructorParameterTypes() {
- return constructorParameterTypes;
- }
-
- public void setConstructorParameterTypes(Class<?>[] constructorParameterTypes) {
- this.constructorParameterTypes = constructorParameterTypes;
- }
-
- public Object[] getConstructorParameters() {
- return constructorParameters;
- }
-
- public void setConstructorParameters(Object[] constructorParameters) {
- this.constructorParameters = constructorParameters;
- }
-
- public Context wrapInAppropriateDecorator(Context context) throws NamingException {
- Class<? extends ContextDecorator> cls = getMatchByInterfaces(context, possibleDecorators);
-
- if (cls == null) {
- throw new IllegalArgumentException("Could not find a matching context decorator for " + context.getClass() + " in " + this);
- }
-
- Constructor<? extends ContextDecorator> ctor = null;
- try {
- ctor = cls.getConstructor(constructorParameterTypes);
- ContextDecorator ctx = ctor.newInstance(constructorParameters);
-
- ctx.init(context);
-
- return ctx;
- } catch (SecurityException e) {
- throw new IllegalStateException("Could not instantiate a class through reflection.", e);
- } catch (NoSuchMethodException e) {
- throw new IllegalArgumentException(
- "Could not construct a context decorator - unable to find a constructor with parameters "
- + (constructorParameterTypes == null ? "[no parameters]" : Arrays.asList(constructorParameterTypes)) + " on class " + cls.getName(), e);
- } catch (IllegalArgumentException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (InstantiationException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (IllegalAccessException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (InvocationTargetException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- }
- }
-
- private static <T> Class<? extends T> getMatchByInterfaces(Object obj, Set<Class<? extends T>> classes) {
- Set<Class<?>> ifaces = getAllImplementedInterfaces(obj.getClass());
-
- Class<? extends T> match = null;
- int maxMatchCnt = Integer.MIN_VALUE;
-
- for(Class<? extends T> cls : classes) {
- int cnt = getBestMatchByIfaces(cls, ifaces);
- if (cnt > maxMatchCnt) {
- maxMatchCnt = cnt;
- match = cls;
- }
- }
-
- return match;
- }
-
- private static int getBestMatchByIfaces(Class<?> cls, Set<Class<?>> ifaces) {
- int ret = 0;
-
- //count how many interfaces from the supplied array the class implements
- for(Class<?> iface : ifaces) {
- if (iface.isAssignableFrom(cls)) {
- ++ret;
- } else {
- --ret;
- }
- }
-
- //that's not all - to get the best possible match, we need to take into account
- //the fact that the class might implement more than just the interfaces provided
- Set<Class<?>> clsIfaces = getAllImplementedInterfaces(cls);
-
- for(Class<?> clsIface : clsIfaces) {
- if (!(ifaces.contains(clsIface))) {
- --ret;
- }
- }
-
- return ret;
- }
-
- private static Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
- HashSet<Class<?>> ret = new HashSet<Class<?>>();
- getAllImplementedInterfaces(cls, ret);
-
- return ret;
- }
-
- private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
- Class<?>[] ifaces = cls.getInterfaces();
-
- for(Class<?> iface : Arrays.asList(ifaces)) {
- output.add(iface);
- getAllImplementedInterfaces(iface, output);
- }
-
- if (cls.getSuperclass() != null) {
- getAllImplementedInterfaces(cls.getSuperclass(), output);
- }
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
new file mode 100644
index 0000000..828cd74
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
@@ -0,0 +1,71 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
+
+ private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
+ static {
+ HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
+ tmp.add(URLPreferringContextDecorator.class);
+ tmp.add(URLPreferringDirContextDecorator.class);
+ tmp.add(URLPreferringEventContextDecorator.class);
+ tmp.add(URLPreferringEventDirContextDecorator.class);
+ tmp.add(URLPreferringLdapContextDecorator.class);
+
+ DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
+ }
+
+ private Set<Class<? extends Context>> supportedInterfaces;
+
+ public URLPreferringContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces) {
+ this.supportedInterfaces = supportedInterfaces;
+ }
+
+ public Set<Class<? extends Context>> getSupportedInterfaces() {
+ return supportedInterfaces;
+ }
+
+ public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
+ return DECORATOR_CLASSES;
+ }
+
+ public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
+ return decoratorClass.newInstance();
+ }
+
+ public void init(ContextDecorator decorator, Context object) throws Exception {
+ decorator.init(object);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
new file mode 100644
index 0000000..356a6e9
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
@@ -0,0 +1,46 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.List;
+
+public class DecoratingInvocationHandler<Type, Decorator extends Type> implements InvocationHandler {
+
+ private final List<DecoratorPicker<Type, Decorator>> pickers;
+ private Type object;
+
+ public DecoratingInvocationHandler(List<DecoratorPicker<Type, Decorator>> pickers, Type object) {
+ this.pickers = pickers;
+ this.object = object;
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ Type target = object;
+ Class<?> methodClass = method.getDeclaringClass();
+
+ for(DecoratorPicker<Type, Decorator> picker : pickers) {
+ target = picker.decorate(target, methodClass);
+ }
+
+ return method.invoke(target, args);
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
new file mode 100644
index 0000000..017d29f
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
@@ -0,0 +1,195 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Given as set of decorators extending given type, this class can pick
+ * the most appropriate set of decorators for a class or a method call.
+ * <p>
+ * To configure the decorator, one has to provide a {@link DecoratorSetContext} that
+ * is then used to obtain the list of
+ * {@link DecoratorSetContext#getSupportedInterfaces() supported interfaces}, which are
+ * all the interfaces that should be used for decorator resolution (i.e. all other interfaces
+ * that a class might implement are ignored during decorator resolution), the list of
+ * {@link DecoratorSetContext#getDecoratorClasses() decorator classes}, which is a list
+ * of decorators the picker can choose from and is also used to instantiate and initialize
+ * the decorators.
+ *
+ * @author Lukas Krejci
+ */
+public class DecoratorPicker<Type, Decorator extends Type> {
+
+ private DecoratorSetContext<Type, Decorator> context;
+
+ public DecoratorSetContext<Type, Decorator> getContext() {
+ return context;
+ }
+
+ public void setContext(DecoratorSetContext<Type, Decorator> decoratorSetContext) {
+ this.context = decoratorSetContext;
+ }
+
+ /**
+ * Returns a set of decorators applicable for given method. The set is established based
+ * on the declaring class of the method.
+ *
+ * @param method the method to inspect
+ * @return the set of decorators that can be used to wrap a method call
+ * @throws Exception
+ */
+ public Set<Decorator> getDecoratorsForMethod(Method method) throws Exception {
+ return getDecoratorsForClass_Private(method.getDeclaringClass());
+ }
+
+ /**
+ * Returns a set of decorators that can be used on instances of given class.
+ * @param cls the class to inspect
+ * @return
+ * @throws Exception
+ */
+ public Set<Decorator> getDecoratorsForClass(Class<? extends Type> cls) throws Exception {
+ return getDecoratorsForClass_Private(cls);
+ }
+
+ /**
+ * This method first establishes the set of decorators to use based on the class of the supplied
+ * object and then chains the decorators (in arbitrary order) with the supplied object at the
+ * "root" of the chain.
+ * <p>
+ * If a method is then called on the returned object, the methods of all the decorators are called
+ * in chain (each supposedly calling the next) and finally, at the end of the chain, the method on
+ * the original object (the one supplied to this method) is called.
+ * <p>
+ * Note that the above is only an intended behavior and actually depends on the implementation of
+ * the decorators that are resposinble for the chaining. Each decorator is initialized
+ * (@{link {@link DecoratorSetContext#init(Object, Object)} which should set it up for such chaining.
+ *
+ * @param object
+ * @return
+ * @throws Exception
+ */
+ public Type decorate(Type object) throws Exception {
+ Set<Decorator> decs = getDecoratorsForClass_Private(object.getClass());
+ Type ret = object;
+ for(Decorator d : decs) {
+ context.init(d, ret);
+ ret = d;
+ }
+
+ return ret;
+ }
+
+ /**
+ * Similar to {@link #decorate(Object)} but instead of the class of the object itself,
+ * uses the significantSuperClass as the basis for the decorator resolution.
+ * <p>
+ * This is important, because if the object implements two mutually incompatible sub-interfaces of <code>Type</code>,
+ * the chained decorators might fail to execute a method later on if the decorator depends on the upper part
+ * of the chain to implement certain sub-interface of <code>Type</code>.
+ *
+ * @param object the object to wrap in decorators
+ * @param significantSuperClass the class to base the decorator resolution on
+ * @return
+ * @throws Exception
+ */
+ public Type decorate(Type object, Class<?> significantSuperClass) throws Exception {
+ Set<Decorator> decs = getDecoratorsForClass_Private(significantSuperClass);
+ Type ret = object;
+ for(Decorator d : decs) {
+ context.init(d, ret);
+ ret = d;
+ }
+
+ return ret;
+ }
+
+ private Set<Decorator> getDecoratorsForClass_Private(Class<?> cls) throws Exception {
+ Set<Class<? extends Type>> ifaces = getNearestApplicableInterfaces(cls);
+
+ HashSet<Decorator> ret = new HashSet<Decorator>();
+
+ for (Class<? extends Type> iface : ifaces) {
+ for (Class<? extends Decorator> decClass : getMatch(iface)) {
+ ret.add(context.instantiate(decClass));
+ }
+ }
+
+ return ret;
+ }
+
+ private Set<Class<? extends Type>> getNearestApplicableInterfaces(Class<?> cls) {
+ List<Class<? extends Type>> ifaces = new ArrayList<Class<? extends Type>>(getAllApplicableInterfaces(cls));
+
+ //now compact the set to only contain the most concrete interfaces
+
+ Iterator<Class<? extends Type>> it = ifaces.iterator();
+ while (it.hasNext()) {
+ Class<? extends Type> c = it.next();
+
+ for (int i = 0; i < ifaces.size(); ++i) {
+ Class<? extends Type> nextC = ifaces.get(i);
+ if (!c.equals(nextC) && c.isAssignableFrom(nextC)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+
+ return new HashSet<Class<? extends Type>>(ifaces);
+ }
+
+ private Set<Class<? extends Type>> getAllApplicableInterfaces(Class<?> cls) {
+ Set<Class<? extends Type>> ifaces = new HashSet<Class<? extends Type>>();
+
+ for (Class<? extends Type> iface : context.getSupportedInterfaces()) {
+ if (iface.isAssignableFrom(cls)) {
+ ifaces.add(iface);
+ }
+ }
+
+ if (ifaces.isEmpty()) {
+ throw new IllegalArgumentException("Class " + cls
+ + " doesn't implement any of the applicable interfaces. Cannot find decorators for it.");
+ }
+
+ return ifaces;
+ }
+
+ private Set<Class<? extends Decorator>> getMatch(Class<?> targetIface) {
+
+ Set<Class<? extends Decorator>> ret = new HashSet<Class<? extends Decorator>>();
+
+ for (Class<? extends Decorator> cls : context.getDecoratorClasses()) {
+ if (Arrays.asList(cls.getInterfaces()).contains(targetIface)) {
+ ret.add(cls);
+ }
+ }
+
+ return ret;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
new file mode 100644
index 0000000..d7b1676
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
@@ -0,0 +1,59 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.util.Set;
+
+/**
+ * Implementations of this interface provide a context to the {@link DecoratorPicker}.
+ *
+ * @author Lukas Krejci
+ */
+public interface DecoratorSetContext<Type, Decorator> {
+
+ /**
+ * @return the set of interfaces that the decorators are able support.
+ * Usually this should be just a union of all interfaces the decorators implement
+ * but can be trimmed down.
+ */
+ Set<Class<? extends Type>> getSupportedInterfaces();
+
+ /**
+ * @return the set of all decorator classes in this set
+ */
+ Set<Class<? extends Decorator>> getDecoratorClasses();
+
+ /**
+ * Instantiates a new decorator of given class.
+ * @param decoratorClass
+ * @return
+ * @throws Exception
+ */
+ Decorator instantiate(Class<? extends Decorator> decoratorClass) throws Exception;
+
+ /**
+ * Initializes the decorator to decorate given object.
+ *
+ * @param decorator
+ * @param object
+ * @throws Exception on error
+ */
+ void init(Decorator decorator, Type object) throws Exception;
+}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
new file mode 100644
index 0000000..45ba114
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
@@ -0,0 +1,145 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.NamingManager;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class DecoratingInvocationHandlerTest {
+ private static final Set<String> INVOKED_METHODS = new HashSet<String>();
+
+ private static final InvocationHandler NOTE_TAKING_HANDLER = new InvocationHandler() {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ INVOKED_METHODS.add(method.getName());
+
+ if ("hashCode".equals(method.getName())) {
+ return 0;
+ } else if ("equals".equals(method.getName())) {
+ return false;
+ }
+
+ return null;
+ }
+ };
+
+ private static Class<?>[] CONTEXT_INTERFACES;
+
+ public static class Factory implements InitialContextFactory {
+ public Context getInitialContext(Hashtable<?, ?> environment)
+ throws NamingException {
+
+ return (Context) Proxy.newProxyInstance(DecoratingInvocationHandlerTest.class.getClassLoader(), CONTEXT_INTERFACES, NOTE_TAKING_HANDLER);
+ }
+ }
+
+ private static class DummyInitialEventContext extends InitialContext implements EventContext {
+
+ /**
+ * @param environment
+ * @throws NamingException
+ */
+ public DummyInitialEventContext(Hashtable<?, ?> environment) throws NamingException {
+ super(environment);
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ ((EventContext)getDefaultInitCtx()).removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return ((EventContext)getDefaultInitCtx()).targetMustExist();
+ }
+
+
+ }
+
+ @BeforeClass
+ public void setBuilder() throws Exception {
+ NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
+ }
+
+ public void testSimpleDispatch() throws Exception {
+ INVOKED_METHODS.clear();
+ Properties env = new Properties();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
+
+ CONTEXT_INTERFACES = new Class<?>[] { Context.class };
+
+ InitialContext ctx = new InitialContext(env);
+
+ ctx.lookup("asdf");
+
+ assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
+ }
+
+ public void testMultiInterfaceDispatch() throws Exception {
+ INVOKED_METHODS.clear();
+ Properties env = new Properties();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
+
+ CONTEXT_INTERFACES = new Class<?>[] { EventContext.class, DirContext.class };
+
+ InitialContext ctx = new InitialContext(env);
+
+ ctx.lookup("asdf");
+
+ DummyInitialEventContext ectx = new DummyInitialEventContext(env);
+
+ ectx.addNamingListener("hodiny", 0, null);
+
+ assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
+ assert INVOKED_METHODS.contains("addNamingListener") : "The addNamingListener doesn't seem to have propagated to the actual context to be used.";
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
new file mode 100644
index 0000000..e2d7429
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
@@ -0,0 +1,180 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.ldap.LdapContext;
+
+import org.testng.annotations.Test;
+
+import org.rhq.jndi.util.DecoratorPicker;
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ * @author Lukas Krejci
+ */
+@Test
+public class DecoratorPickerTest {
+
+ private static final InvocationHandler DUMMY_HANDLER = new InvocationHandler() {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ if ("hashCode".equals(method.getName())) {
+ return 0;
+ } else if ("equals".equals(method.getName())) {
+ return false;
+ }
+
+ return null;
+ }
+ };
+
+ private static final Class<?> TEST_OBJECT_CLASS1 = createProxyClass(Context.class);
+ private static final Class<?> TEST_OBJECT_CLASS2 = createProxyClass(DirContext.class);
+ private static final Class<?> TEST_OBJECT_CLASS3 = createProxyClass(LdapContext.class);
+ private static final Class<?> TEST_OBJECT_CLASS4 = createProxyClass(LdapContext.class, EventContext.class);
+ private static final Class<?> DECORATOR_CLASS1 = createProxyClass(Context.class);
+ private static final Class<?> DECORATOR_CLASS2 = createProxyClass(EventContext.class);
+ private static final Class<?> DECORATOR_CLASS3 = createProxyClass(LdapContext.class);
+ private static final Class<?> DECORATOR_CLASS4 = createProxyClass(DirContext.class);
+
+ public void testSimpleDecoratorIdentifiedByClass() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS1);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for Context class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], Context.class);
+ }
+
+ public void testSuperClassDecoratorHasPrecedenceOverSubClassDecorator() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ //this tests that the LdapContext isn't returned even though it subclasses the DirContext
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS2);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for DirContext class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], DirContext.class);
+ }
+
+ public void testSubClassDecoratorCorrectlyIdentified() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS3);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for LdapContext class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ public void testMultipleDecoratorsDetectable() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> decorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS4);
+ assertEquals(decorators.size(), 2,
+ "Exactly 2 decorators should have been found for a class implementing 2 interfaces.");
+
+ boolean ldapContextDecoratorFound = false;
+ boolean eventContextDecoratorFound = false;
+
+ for (Object d : decorators) {
+ if (LdapContext.class.isAssignableFrom(d.getClass())) {
+ ldapContextDecoratorFound = true;
+ continue; //just to make sure that somehow the decorator doesn't implement both
+ }
+ if (EventContext.class.isAssignableFrom(d.getClass())) {
+ eventContextDecoratorFound = true;
+ }
+ }
+
+ assertTrue(ldapContextDecoratorFound && eventContextDecoratorFound,
+ "The found decorators don't implement the desired interfaces.");
+ }
+
+ public void testDecoratorsIdentifiedByMethod() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> decorators =
+ picker.getDecoratorsForMethod(LdapContext.class.getMethod("getConnectControls", (Class<?>[]) null));
+ assertEquals(decorators.size(), 1,
+ "Expected exactly one decorator for method 'getConnectControls()' from LdapContext class");
+ assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ public void testMethodFromSubclassMatchesSubclassDecorator() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ //this is a method from the DirContext but we're asking for it from a class
+ //that implements also an LdapContext
+ //The LdapContext decorator also inherits from the DirContext decorator
+ //(by the virtue of LdapContext interface inheriting from the DirContext)
+ //The picker should therefore match the LdapContext decorator because its
+ //the "closest" one to the actual class.
+ Set<Object> decorators =
+ picker.getDecoratorsForMethod(TEST_OBJECT_CLASS3.getMethod("getSchemaClassDefinition",
+ new Class<?>[] { String.class }));
+ assertEquals(decorators.size(), 1,
+ "Expected exactly one decorator for method 'getSchemaClassDefinition(String)' from LdapContext class");
+ assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ private static Class<?> createProxyClass(Class<?>... ifaces) {
+ return Proxy.getProxyClass(DecoratorPickerTest.class.getClassLoader(), ifaces);
+ }
+
+ private static DecoratorPicker<Object, Object> createTestPicker() {
+ DecoratorPicker<Object, Object> picker = new DecoratorPicker<Object, Object>();
+
+ DecoratorSetContext<Object, Object> decSet = new DecoratorSetContext<Object, Object>() {
+
+ public Object instantiate(Class<? extends Object> decoratorClass) throws Exception {
+ Constructor<? extends Object> ctor = decoratorClass.getConstructor(InvocationHandler.class);
+ return ctor.newInstance(DUMMY_HANDLER);
+ }
+
+ public void init(Object decorator, Object object) throws Exception {
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<Class<? extends Object>> getSupportedInterfaces() {
+ return new HashSet<Class<? extends Object>>(Arrays.asList(Context.class, EventContext.class,
+ LdapContext.class, DirContext.class));
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<Class<? extends Object>> getDecoratorClasses() {
+ return new HashSet<Class<? extends Object>>(Arrays.asList(DECORATOR_CLASS1, DECORATOR_CLASS2, DECORATOR_CLASS3, DECORATOR_CLASS4));
+ }
+ };
+
+ picker.setContext(decSet);
+
+ return picker;
+ }
+}
commit d61a7d5a1852c017a75a13636d0f410b6d6a5dd4
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 9 11:07:36 2012 +0100
Add a graph where each days metrics consist of a certain color
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 7162c24..80472f6 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -29,6 +29,7 @@ an empty database (meaning resource ids and schedule ids starting at 10001).
<li><a href="whisker2.html">Multiple Whisker charts</a></li>
<li><a href="tree.html">Resource tree</a></li>
<li><a href="raw_graph.html">7 days of raw metrics as dot- or line- chart</a></li>
+ <li><a href="raw_graph7.html">7 days of raw metrics as dot- or line- chart - comparing daily values</a></li>
</ul>
</body>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
new file mode 100644
index 0000000..62b2ec5
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Raw mertic last 7 days</title>
+ <script type="text/javascript" src="js/d3.js"></script>
+ <script type="text/javascript" src="js/d3.layout.js"></script>
+ <script type="text/javascript" src="js/d3.time.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <style type="text/css">
+
+svg {
+ width: 960px;
+ height: 600px;
+ border: solid 1px #ccc;
+ font: 10px sans-serif;
+ shape-rendering: crispEdges;
+}
+.axis text
+{
+ fill: #333;
+ font-family: sans-serif;
+ font-size: 10px;
+}
+.axis .domain
+{
+ opacity: 0;
+}
+.tick
+{
+ stroke: #ccc;
+ stroke-dasharray: 1 5;
+}
+
+path {
+ stroke: steelblue;
+ stroke-width: 2;
+ fill: none;
+}
+
+line {
+ stroke: black;
+}
+
+ </style>
+ </head>
+ <body>
+ <h1 id="resId">Resource</h1>
+ <h2 id="header">Schedule</h2>
+<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="lineButton" onClick="transitionLine()"/>Lines</button>
+<button id="bothButton" onClick="transitionBoth()"/>Both</button>
+
+ <div id="one"></div>
+ <script type="text/javascript">
+
+// Width and height of the chart to print
+var w = 960,
+ h = 600;
+
+// Get the platforms and then the first one
+$.getJSON('/rest/1/resource/platforms.json', function (json) {
+ var res = json[0];
+ var rid = res.resourceId;
+ $("#resId").text("Resource " + rid + " (" + res.resourceName + ")");
+
+ // Now get the metrical schedules of the platform
+ $.getJSON("/rest/1/resource/"+rid+"/schedules.json?type=metric", function (json2) {
+
+ // Take the first and render it
+ var schId = json2[0].scheduleId;
+ $("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + "), base unit: " + json2[0].unit);
+
+
+// '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ d3.json(
+ '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ function (jsondata) {
+
+
+
+ var w = 960,
+ h = 600;
+ // compute min/max values for x and y a
+ var minVal = d3.min(jsondata,function(d) { return d.value;});
+ var maxVal = d3.max(jsondata,function(d) { return d.value;});
+ var minTsD = 0;
+ var maxTsD = 86400*1000;
+
+ var minTimestamp = d3.min(jsondata,function(d) { return d.timeStamp;});
+
+ var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
+
+
+
+ WIDTH = w;
+ HEIGHT = h;
+ MARGINS = {top: 10, right: 10, bottom: 20, left: 10};
+
+ var xRange = d3.time.scale().range ([MARGINS.left, WIDTH - MARGINS.right]).domain([new Date(minTsD),new Date(maxTsD)]);
+ var yRange = d3.scale.linear().range ([HEIGHT - MARGINS.top, MARGINS.bottom]).domain([minVal, maxVal]);
+
+ // X axis range goes from lowest to highest timestamp
+ var x = d3.time.scale().domain([new Date(0),new Date(86400*1000)]).range([50, w-10]); // 50-> make room for label
+//var x = xRange;
+ var y = yRange;
+ // Y axis range goes from lowest to highest value
+ // var y = d3.scale.linear().domain([minVal, maxVal]).rangeRound([0, h]);
+ format = d3.time.format("%H:%M");
+
+
+ xAxis = d3.svg.axis() // generate an axis
+ .scale(x) // set the range of the axis
+ .tickSize(580) // height of the ticks
+ .tickSubdivide(true); // display ticks between text labels
+ yAxis = d3.svg.axis() // generate an axis
+ .scale(yRange) // set the range of the axis
+ .tickSize(3) // width of the ticks
+ .orient("right") // have the text labels on the right hand side
+ .tickFormat(d3.format("0e"))
+ .tickSubdivide(true); // display ticks between text labels
+
+// create the SVG
+ var svg = d3.select("body").append("svg:svg")
+ .attr("width", w)
+ .attr("height", h);
+
+// Create axes
+ svg.append("svg:g")
+ .attr("class","x axis")
+ .call(xAxis);
+
+ svg.append("svg:g")
+ .attr("class","y axis")
+ .attr("transform", "translate(" + (MARGINS.left) + ",0)")
+ .call(yAxis);
+
+ svg.append("svg:line")
+ .attr("x1","50")
+ .attr("x2","950")
+ .attr("y1",y(avg))
+ .attr("y2",y(avg))
+ .style("stroke","red")
+ .attr("style","stroke-dasharray:2 2; stroke:red")
+ ;
+
+// split the data into 7 data sets (1 per day)
+
+//var dat = d3.split(jsondata,function(d) { return (d.timeStamp-minTimestamp % 86400*1000) < 3*60*0000; });
+
+var colors = ["black","blue","green","cyan","red","orange","yellow"];
+var dat = putToBuckets(jsondata,7);
+
+for (day = 0 ; day < 7 ; day ++ ) {
+ var daydat = dat[day];
+ // Now lets "loop" over the data and show the dots
+ var lines = svg.append("svg:g").attr("class","linechart")
+ .attr("opacity","0");
+;
+ var dayMinTs = d3.min(daydat,function(d) { return d.timeStamp;});
+
+var line = d3.svg.line()
+ .x(function(d,i) { return x(d.timeStamp-dayMinTs); })
+ .y(function(d) { return y(d.value); })
+
+lines.append("svg:path").attr("d", line(daydat)).style("stroke",colors[day]);
+
+
+ var dot = svg.append("svg:g").attr("class","dotschart")
+ .selectAll("dot").data(jsondata)
+
+ dot.enter().append("svg:circle")
+ .attr("cx", function (d) {
+ return x(d.timeStamp-dayMinTs);
+ })
+ .attr("cy", function (d) {
+ return y(d.value);
+ })
+ .style("stroke", colors[day])
+ .attr("r", 1)
+
+}
+ });
+ })
+})
+
+function transitionDots() {
+ $(".linechart").attr("opacity",0);
+ $(".dotschart").attr("opacity",1);
+}
+
+function transitionLine() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",0);
+}
+function transitionBoth() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",1);
+}
+
+// put the data in d into n buckets
+function putToBuckets(data,n) {
+
+ var band = d3.extent(data,function(d){ return d.timeStamp;});
+ var bs = band[1] - band[0];
+// var bs = bs / n;
+ var bs = 86400*1000;
+
+console.log("bs : " + bs );
+console.log("min ts : " + band[0]);
+
+var dat = new Array(n);
+for (i = 0; i < n ; i++ ) {
+ dat[i]=new Array();
+}
+
+data.forEach(function (d) {
+ var diff = d.timeStamp-band[0];
+ var bucket = parseInt(diff / bs);
+console.log(d.timeStamp + ", " + diff + " buck : " + bucket);
+ dat[bucket].push(d);
+});
+
+return dat;
+}
+
+ </script>
+ </body>
+</html>
commit 9ada46462f71b39e160e215fce7b4676e2aadd87
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sun Jan 8 17:15:57 2012 +0100
Allow to also show lines and dots.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
index 598a0b8..44c42a5 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
@@ -46,8 +46,9 @@ line {
<body>
<h1 id="resId">Resource</h1>
<h2 id="header">Schedule</h2>
-<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="dotsButton" onClick="transitionDots()">Dots</button>
<button id="lineButton" onClick="transitionLine()">Lines</button>
+<button id="bothButton" onClick="transitionBoth()">Both</button>
<div id="one"></div>
<script type="text/javascript">
@@ -174,6 +175,10 @@ function transitionLine() {
$(".linechart").attr("opacity",1);
$(".dotschart").attr("opacity",0);
}
+function transitionBoth() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",1);
+}
</script>
</body>
</html>
commit 3fa0177b1a7c943bd83291f35f4027c128f26984
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Jan 6 14:16:40 2012 +0100
Add an example of graphing raw data with D3.js as dots or lines.
Use D3 helpers for max/min, draw a line for the avg.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 9e96d76..7162c24 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -1,7 +1,7 @@
<html>
<body>
<h2>RHQ Rest API</h2>
-<b>Please note: the API is not stable at this point. Do not rely on it.</b><br/>
+<strong>Please note: the API is not stable at this point. Do not rely on it.</strong><br/>
Join us in making it great by providing feedback and contributions of code and examples
that use the api.
@@ -28,6 +28,7 @@ an empty database (meaning resource ids and schedule ids starting at 10001).
<li><a href="whisker.html">Whisker chart 1</a></li>
<li><a href="whisker2.html">Multiple Whisker charts</a></li>
<li><a href="tree.html">Resource tree</a></li>
+ <li><a href="raw_graph.html">7 days of raw metrics as dot- or line- chart</a></li>
</ul>
</body>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
new file mode 100644
index 0000000..598a0b8
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Raw mertic last 7 days</title>
+ <script type="text/javascript" src="js/d3.js"></script>
+ <script type="text/javascript" src="js/d3.layout.js"></script>
+ <script type="text/javascript" src="js/d3.time.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <style type="text/css">
+
+svg {
+ width: 960px;
+ height: 600px;
+ border: solid 1px #ccc;
+ font: 10px sans-serif;
+ shape-rendering: crispEdges;
+}
+.axis text
+{
+ fill: #333;
+ font-family: sans-serif;
+ font-size: 10px;
+}
+.axis .domain
+{
+ opacity: 0;
+}
+.tick
+{
+ stroke: #ccc;
+ stroke-dasharray: 1 5;
+}
+
+path {
+ stroke: steelblue;
+ stroke-width: 2;
+ fill: none;
+}
+
+line {
+ stroke: black;
+}
+
+ </style>
+ </head>
+ <body>
+ <h1 id="resId">Resource</h1>
+ <h2 id="header">Schedule</h2>
+<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="lineButton" onClick="transitionLine()">Lines</button>
+
+ <div id="one"></div>
+ <script type="text/javascript">
+
+// Width and height of the chart to print
+var w = 960,
+ h = 600;
+
+// Get the platforms and then the first one
+$.getJSON('/rest/1/resource/platforms.json', function (json) {
+ var res = json[0];
+ var rid = res.resourceId;
+ $("#resId").text("Resource " + rid + " (" + res.resourceName + ")");
+
+ // Now get the metrical schedules of the platform
+ $.getJSON("/rest/1/resource/"+rid+"/schedules.json?type=metric", function (json2) {
+
+ // Take the first and render it
+ var schId = json2[0].scheduleId;
+ $("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + "), base unit: " + json2[0].unit);
+
+ d3.json(
+ '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ function (jsondata) {
+
+ var w = 960,
+ h = 600;
+ // compute min/max values for x and y
+ var minVal = d3.min(jsondata,function(d) { return d.value;});
+ var maxVal = d3.max(jsondata,function(d) { return d.value;});
+ var minTsD = d3.min(jsondata,function(d) { return d.timeStamp;});
+ var maxTsD = d3.max(jsondata,function(d) { return d.timeStamp;});
+
+ var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
+
+
+ WIDTH = w;
+ HEIGHT = h;
+ MARGINS = {top: 10, right: 10, bottom: 20, left: 10};
+
+ var xRange = d3.time.scale().range ([MARGINS.left, WIDTH - MARGINS.right]).domain([new Date(minTsD),new Date(maxTsD)]);
+ var yRange = d3.scale.linear().range ([HEIGHT - MARGINS.top, MARGINS.bottom]).domain([minVal, maxVal]);
+
+ // X axis range goes from lowest to highest timestamp
+ var x = d3.time.scale().domain([new Date(minTsD),new Date(maxTsD)]).range([50, w-10]); // 50-> make room for label
+ var y = yRange;
+ // Y axis range goes from lowest to highest value
+ // var y = d3.scale.linear().domain([minVal, maxVal]).rangeRound([0, h]);
+ format = d3.time.format("%H:%M");
+
+
+ xAxis = d3.svg.axis() // generate an axis
+ .scale(x) // set the range of the axis
+ .tickSize(580) // height of the ticks
+ .tickSubdivide(true); // display ticks between text labels
+ yAxis = d3.svg.axis() // generate an axis
+ .scale(yRange) // set the range of the axis
+ .tickSize(3) // width of the ticks
+ .orient("right") // have the text labels on the right hand side
+ .tickFormat(d3.format("0e"))
+ .tickSubdivide(true); // display ticks between text labels
+
+ // create the SVG
+ var svg = d3.select("body").append("svg:svg")
+ .attr("width", w)
+ .attr("height", h);
+
+ // Create axes
+ svg.append("svg:g")
+ .attr("class","x axis")
+ .call(xAxis);
+
+ svg.append("svg:g")
+ .attr("class","y axis")
+ .attr("transform", "translate(" + (MARGINS.left) + ",0)")
+ .call(yAxis);
+
+ // create horizontal line for avg
+ svg.append("svg:line")
+ .attr("x1","50")
+ .attr("x2","950")
+ .attr("y1",y(avg))
+ .attr("y2",y(avg))
+ .style("stroke","red")
+ .attr("style","stroke-dasharray:2 2; stroke:red")
+ ;
+
+
+ // Now lets "loop" over the data and show the dots
+ var lines = svg.append("svg:g").attr("class","linechart")
+ .attr("opacity","0");
+
+ var line = d3.svg.line()
+ .x(function(d,i) { return x(d.timeStamp); })
+ .y(function(d) { return y(d.value); });
+
+ lines.append("svg:path").attr("d", line(jsondata));
+
+
+ var dot = svg.append("svg:g").attr("class","dotschart")
+ .selectAll("dot").data(jsondata);
+
+ dot.enter().append("svg:circle")
+ .attr("cx", function (d) {
+ return x(d.timeStamp);
+ })
+ .attr("cy", function (d) {
+ return y(d.value);
+ })
+ .style("stroke", "blue")
+ .attr("r", 1)
+
+
+ });
+ })
+});
+
+function transitionDots() {
+ $(".linechart").attr("opacity",0);
+ $(".dotschart").attr("opacity",1);
+}
+
+function transitionLine() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",0);
+}
+ </script>
+ </body>
+</html>
commit 625f20d6922eaa4cad999cb583821a90ba9cef44
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jan 5 22:18:14 2012 +0100
Upgrade D3.js to version 2.7.1
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js
new file mode 100644
index 0000000..7565b83
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js
@@ -0,0 +1,92 @@
+(function(){d3.csv = function(url, callback) {
+ d3.text(url, "text/csv", function(text) {
+ callback(text && d3.csv.parse(text));
+ });
+};
+d3.csv.parse = function(text) {
+ var header;
+ return d3.csv.parseRows(text, function(row, i) {
+ if (i) {
+ var o = {}, j = -1, m = header.length;
+ while (++j < m) o[header[j]] = row[j];
+ return o;
+ } else {
+ header = row;
+ return null;
+ }
+ });
+};
+
+d3.csv.parseRows = function(text, f) {
+ var EOL = {}, // sentinel value for end-of-line
+ EOF = {}, // sentinel value for end-of-file
+ rows = [], // output rows
+ re = /\r\n|[,\r\n]/g, // field separator regex
+ n = 0, // the current line number
+ t, // the current token
+ eol; // is the current token followed by EOL?
+
+ re.lastIndex = 0; // work-around bug in FF 3.6
+
+ /** @private Returns the next token. */
+ function token() {
+ if (re.lastIndex >= text.length) return EOF; // special case: end of file
+ if (eol) { eol = false; return EOL; } // special case: end of line
+
+ // special case: quotes
+ var j = re.lastIndex;
+ if (text.charCodeAt(j) === 34) {
+ var i = j;
+ while (i++ < text.length) {
+ if (text.charCodeAt(i) === 34) {
+ if (text.charCodeAt(i + 1) !== 34) break;
+ i++;
+ }
+ }
+ re.lastIndex = i + 2;
+ var c = text.charCodeAt(i + 1);
+ if (c === 13) {
+ eol = true;
+ if (text.charCodeAt(i + 2) === 10) re.lastIndex++;
+ } else if (c === 10) {
+ eol = true;
+ }
+ return text.substring(j + 1, i).replace(/""/g, "\"");
+ }
+
+ // common case
+ var m = re.exec(text);
+ if (m) {
+ eol = m[0].charCodeAt(0) !== 44;
+ return text.substring(j, m.index);
+ }
+ re.lastIndex = text.length;
+ return text.substring(j);
+ }
+
+ while ((t = token()) !== EOF) {
+ var a = [];
+ while ((t !== EOL) && (t !== EOF)) {
+ a.push(t);
+ t = token();
+ }
+ if (f && !(a = f(a, n++))) continue;
+ rows.push(a);
+ }
+
+ return rows;
+};
+d3.csv.format = function(rows) {
+ return rows.map(d3_csv_formatRow).join("\n");
+};
+
+function d3_csv_formatRow(row) {
+ return row.map(d3_csv_formatValue).join(",");
+}
+
+function d3_csv_formatValue(text) {
+ return /[",\n]/.test(text)
+ ? "\"" + text.replace(/\"/g, "\"\"") + "\""
+ : text;
+}
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js
new file mode 100644
index 0000000..2b40252
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js
@@ -0,0 +1,938 @@
+(function(){d3.geo = {};
+
+var d3_geo_radians = Math.PI / 180;
+// TODO clip input coordinates on opposite hemisphere
+d3.geo.azimuthal = function() {
+ var mode = "orthographic", // or stereographic, gnomonic, equidistant or equalarea
+ origin,
+ scale = 200,
+ translate = [480, 250],
+ x0,
+ y0,
+ cy0,
+ sy0;
+
+ function azimuthal(coordinates) {
+ var x1 = coordinates[0] * d3_geo_radians - x0,
+ y1 = coordinates[1] * d3_geo_radians,
+ cx1 = Math.cos(x1),
+ sx1 = Math.sin(x1),
+ cy1 = Math.cos(y1),
+ sy1 = Math.sin(y1),
+ cc = mode !== "orthographic" ? sy0 * sy1 + cy0 * cy1 * cx1 : null,
+ c,
+ k = mode === "stereographic" ? 1 / (1 + cc)
+ : mode === "gnomonic" ? 1 / cc
+ : mode === "equidistant" ? (c = Math.acos(cc), c ? c / Math.sin(c) : 0)
+ : mode === "equalarea" ? Math.sqrt(2 / (1 + cc))
+ : 1,
+ x = k * cy1 * sx1,
+ y = k * (sy0 * cy1 * cx1 - cy0 * sy1);
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ azimuthal.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale,
+ p = Math.sqrt(x * x + y * y),
+ c = mode === "stereographic" ? 2 * Math.atan(p)
+ : mode === "gnomonic" ? Math.atan(p)
+ : mode === "equidistant" ? p
+ : mode === "equalarea" ? 2 * Math.asin(.5 * p)
+ : Math.asin(p),
+ sc = Math.sin(c),
+ cc = Math.cos(c);
+ return [
+ (x0 + Math.atan2(x * sc, p * cy0 * cc + y * sy0 * sc)) / d3_geo_radians,
+ Math.asin(cc * sy0 - (p ? (y * sc * cy0) / p : 0)) / d3_geo_radians
+ ];
+ };
+
+ azimuthal.mode = function(x) {
+ if (!arguments.length) return mode;
+ mode = x + "";
+ return azimuthal;
+ };
+
+ azimuthal.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ x0 = origin[0] * d3_geo_radians;
+ y0 = origin[1] * d3_geo_radians;
+ cy0 = Math.cos(y0);
+ sy0 = Math.sin(y0);
+ return azimuthal;
+ };
+
+ azimuthal.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return azimuthal;
+ };
+
+ azimuthal.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return azimuthal;
+ };
+
+ return azimuthal.origin([0, 0]);
+};
+// Derived from Tom Carden's Albers implementation for Protovis.
+// http://gist.github.com/476238
+// http://mathworld.wolfram.com/AlbersEqual-AreaConicProjection.html
+
+d3.geo.albers = function() {
+ var origin = [-98, 38],
+ parallels = [29.5, 45.5],
+ scale = 1000,
+ translate = [480, 250],
+ lng0, // d3_geo_radians * origin[0]
+ n,
+ C,
+ p0;
+
+ function albers(coordinates) {
+ var t = n * (d3_geo_radians * coordinates[0] - lng0),
+ p = Math.sqrt(C - 2 * n * Math.sin(d3_geo_radians * coordinates[1])) / n;
+ return [
+ scale * p * Math.sin(t) + translate[0],
+ scale * (p * Math.cos(t) - p0) + translate[1]
+ ];
+ }
+
+ albers.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale,
+ p0y = p0 + y,
+ t = Math.atan2(x, p0y),
+ p = Math.sqrt(x * x + p0y * p0y);
+ return [
+ (lng0 + t / n) / d3_geo_radians,
+ Math.asin((C - p * p * n * n) / (2 * n)) / d3_geo_radians
+ ];
+ };
+
+ function reload() {
+ var phi1 = d3_geo_radians * parallels[0],
+ phi2 = d3_geo_radians * parallels[1],
+ lat0 = d3_geo_radians * origin[1],
+ s = Math.sin(phi1),
+ c = Math.cos(phi1);
+ lng0 = d3_geo_radians * origin[0];
+ n = .5 * (s + Math.sin(phi2));
+ C = c * c + 2 * n * s;
+ p0 = Math.sqrt(C - 2 * n * Math.sin(lat0)) / n;
+ return albers;
+ }
+
+ albers.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = [+x[0], +x[1]];
+ return reload();
+ };
+
+ albers.parallels = function(x) {
+ if (!arguments.length) return parallels;
+ parallels = [+x[0], +x[1]];
+ return reload();
+ };
+
+ albers.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return albers;
+ };
+
+ albers.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return albers;
+ };
+
+ return reload();
+};
+
+// A composite projection for the United States, 960x500. The set of standard
+// parallels for each region comes from USGS, which is published here:
+// http://egsc.usgs.gov/isb/pubs/MapProjections/projections.html#albers
+// TODO allow the composite projection to be rescaled?
+d3.geo.albersUsa = function() {
+ var lower48 = d3.geo.albers();
+
+ var alaska = d3.geo.albers()
+ .origin([-160, 60])
+ .parallels([55, 65]);
+
+ var hawaii = d3.geo.albers()
+ .origin([-160, 20])
+ .parallels([8, 18]);
+
+ var puertoRico = d3.geo.albers()
+ .origin([-60, 10])
+ .parallels([8, 18]);
+
+ function albersUsa(coordinates) {
+ var lon = coordinates[0],
+ lat = coordinates[1];
+ return (lat > 50 ? alaska
+ : lon < -140 ? hawaii
+ : lat < 21 ? puertoRico
+ : lower48)(coordinates);
+ }
+
+ albersUsa.scale = function(x) {
+ if (!arguments.length) return lower48.scale();
+ lower48.scale(x);
+ alaska.scale(x * .6);
+ hawaii.scale(x);
+ puertoRico.scale(x * 1.5);
+ return albersUsa.translate(lower48.translate());
+ };
+
+ albersUsa.translate = function(x) {
+ if (!arguments.length) return lower48.translate();
+ var dz = lower48.scale() / 1000,
+ dx = x[0],
+ dy = x[1];
+ lower48.translate(x);
+ alaska.translate([dx - 400 * dz, dy + 170 * dz]);
+ hawaii.translate([dx - 190 * dz, dy + 200 * dz]);
+ puertoRico.translate([dx + 580 * dz, dy + 430 * dz]);
+ return albersUsa;
+ };
+
+ return albersUsa.scale(lower48.scale());
+};
+d3.geo.bonne = function() {
+ var scale = 200,
+ translate = [480, 250],
+ x0, // origin longitude in radians
+ y0, // origin latitude in radians
+ y1, // parallel latitude in radians
+ c1; // cot(y1)
+
+ function bonne(coordinates) {
+ var x = coordinates[0] * d3_geo_radians - x0,
+ y = coordinates[1] * d3_geo_radians - y0;
+ if (y1) {
+ var p = c1 + y1 - y, E = x * Math.cos(y) / p;
+ x = p * Math.sin(E);
+ y = p * Math.cos(E) - c1;
+ } else {
+ x *= Math.cos(y);
+ y *= -1;
+ }
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ bonne.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ if (y1) {
+ var c = c1 + y, p = Math.sqrt(x * x + c * c);
+ y = c1 + y1 - p;
+ x = x0 + p * Math.atan2(x, c) / Math.cos(y);
+ } else {
+ y *= -1;
+ x /= Math.cos(y);
+ }
+ return [
+ x / d3_geo_radians,
+ y / d3_geo_radians
+ ];
+ };
+
+ // 90° for Werner, 0° for Sinusoidal
+ bonne.parallel = function(x) {
+ if (!arguments.length) return y1 / d3_geo_radians;
+ c1 = 1 / Math.tan(y1 = x * d3_geo_radians);
+ return bonne;
+ };
+
+ bonne.origin = function(x) {
+ if (!arguments.length) return [x0 / d3_geo_radians, y0 / d3_geo_radians];
+ x0 = x[0] * d3_geo_radians;
+ y0 = x[1] * d3_geo_radians;
+ return bonne;
+ };
+
+ bonne.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return bonne;
+ };
+
+ bonne.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return bonne;
+ };
+
+ return bonne.origin([0, 0]).parallel(45);
+};
+d3.geo.equirectangular = function() {
+ var scale = 500,
+ translate = [480, 250];
+
+ function equirectangular(coordinates) {
+ var x = coordinates[0] / 360,
+ y = -coordinates[1] / 360;
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ equirectangular.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ return [
+ 360 * x,
+ -360 * y
+ ];
+ };
+
+ equirectangular.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return equirectangular;
+ };
+
+ equirectangular.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return equirectangular;
+ };
+
+ return equirectangular;
+};
+d3.geo.mercator = function() {
+ var scale = 500,
+ translate = [480, 250];
+
+ function mercator(coordinates) {
+ var x = coordinates[0] / 360,
+ y = -(Math.log(Math.tan(Math.PI / 4 + coordinates[1] * d3_geo_radians / 2)) / d3_geo_radians) / 360;
+ return [
+ scale * x + translate[0],
+ scale * Math.max(-.5, Math.min(.5, y)) + translate[1]
+ ];
+ }
+
+ mercator.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ return [
+ 360 * x,
+ 2 * Math.atan(Math.exp(-360 * y * d3_geo_radians)) / d3_geo_radians - 90
+ ];
+ };
+
+ mercator.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return mercator;
+ };
+
+ mercator.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return mercator;
+ };
+
+ return mercator;
+};
+function d3_geo_type(types, defaultValue) {
+ return function(object) {
+ return object && object.type in types ? types[object.type](object) : defaultValue;
+ };
+}
+/**
+ * Returns a function that, given a GeoJSON object (e.g., a feature), returns
+ * the corresponding SVG path. The function can be customized by overriding the
+ * projection. Point features are mapped to circles with a default radius of
+ * 4.5px; the radius can be specified either as a constant or a function that
+ * is evaluated per object.
+ */
+d3.geo.path = function() {
+ var pointRadius = 4.5,
+ pointCircle = d3_path_circle(pointRadius),
+ projection = d3.geo.albersUsa();
+
+ function path(d, i) {
+ if (typeof pointRadius === "function") {
+ pointCircle = d3_path_circle(pointRadius.apply(this, arguments));
+ }
+ return pathType(d) || null;
+ }
+
+ function project(coordinates) {
+ return projection(coordinates).join(",");
+ }
+
+ var pathType = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var path = [],
+ features = o.features,
+ i = -1, // features.index
+ n = features.length;
+ while (++i < n) path.push(pathType(features[i].geometry));
+ return path.join("");
+ },
+
+ Feature: function(o) {
+ return pathType(o.geometry);
+ },
+
+ Point: function(o) {
+ return "M" + project(o.coordinates) + pointCircle;
+ },
+
+ MultiPoint: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) path.push("M", project(coordinates[i]), pointCircle);
+ return path.join("");
+ },
+
+ LineString: function(o) {
+ var path = ["M"],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) path.push(project(coordinates[i]), "L");
+ path.pop();
+ return path.join("");
+ },
+
+ MultiLineString: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates.index
+ m; // subcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ m = subcoordinates.length;
+ path.push("M");
+ while (++j < m) path.push(project(subcoordinates[j]), "L");
+ path.pop();
+ }
+ return path.join("");
+ },
+
+ Polygon: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates.index
+ m; // subcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ if ((m = subcoordinates.length - 1) > 0) {
+ path.push("M");
+ while (++j < m) path.push(project(subcoordinates[j]), "L");
+ path[path.length - 1] = "Z";
+ }
+ }
+ return path.join("");
+ },
+
+ MultiPolygon: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates index
+ m, // subcoordinates.length
+ subsubcoordinates, // subcoordinates[j]
+ k, // subsubcoordinates index
+ p; // subsubcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ m = subcoordinates.length;
+ while (++j < m) {
+ subsubcoordinates = subcoordinates[j];
+ k = -1;
+ if ((p = subsubcoordinates.length - 1) > 0) {
+ path.push("M");
+ while (++k < p) path.push(project(subsubcoordinates[k]), "L");
+ path[path.length - 1] = "Z";
+ }
+ }
+ }
+ return path.join("");
+ },
+
+ GeometryCollection: function(o) {
+ var path = [],
+ geometries = o.geometries,
+ i = -1, // geometries index
+ n = geometries.length;
+ while (++i < n) path.push(pathType(geometries[i]));
+ return path.join("");
+ }
+
+ });
+
+ var areaType = path.area = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var area = 0,
+ features = o.features,
+ i = -1, // features.index
+ n = features.length;
+ while (++i < n) area += areaType(features[i]);
+ return area;
+ },
+
+ Feature: function(o) {
+ return areaType(o.geometry);
+ },
+
+ Polygon: function(o) {
+ return polygonArea(o.coordinates);
+ },
+
+ MultiPolygon: function(o) {
+ var sum = 0,
+ coordinates = o.coordinates,
+ i = -1, // coordinates index
+ n = coordinates.length;
+ while (++i < n) sum += polygonArea(coordinates[i]);
+ return sum;
+ },
+
+ GeometryCollection: function(o) {
+ var sum = 0,
+ geometries = o.geometries,
+ i = -1, // geometries index
+ n = geometries.length;
+ while (++i < n) sum += areaType(geometries[i]);
+ return sum;
+ }
+
+ }, 0);
+
+ function polygonArea(coordinates) {
+ var sum = area(coordinates[0]), // exterior ring
+ i = 0, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) sum -= area(coordinates[i]); // holes
+ return sum;
+ }
+
+ function polygonCentroid(coordinates) {
+ var polygon = d3.geom.polygon(coordinates[0].map(projection)), // exterior ring
+ area = polygon.area(),
+ centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1),
+ x = centroid[0],
+ y = centroid[1],
+ z = area,
+ i = 0, // coordinates index
+ n = coordinates.length;
+ while (++i < n) {
+ polygon = d3.geom.polygon(coordinates[i].map(projection)); // holes
+ area = polygon.area();
+ centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1);
+ x -= centroid[0];
+ y -= centroid[1];
+ z -= area;
+ }
+ return [x, y, 6 * z]; // weighted centroid
+ }
+
+ var centroidType = path.centroid = d3_geo_type({
+
+ // TODO FeatureCollection
+ // TODO Point
+ // TODO MultiPoint
+ // TODO LineString
+ // TODO MultiLineString
+ // TODO GeometryCollection
+
+ Feature: function(o) {
+ return centroidType(o.geometry);
+ },
+
+ Polygon: function(o) {
+ var centroid = polygonCentroid(o.coordinates);
+ return [centroid[0] / centroid[2], centroid[1] / centroid[2]];
+ },
+
+ MultiPolygon: function(o) {
+ var area = 0,
+ coordinates = o.coordinates,
+ centroid,
+ x = 0,
+ y = 0,
+ z = 0,
+ i = -1, // coordinates index
+ n = coordinates.length;
+ while (++i < n) {
+ centroid = polygonCentroid(coordinates[i]);
+ x += centroid[0];
+ y += centroid[1];
+ z += centroid[2];
+ }
+ return [x / z, y / z];
+ }
+
+ });
+
+ function area(coordinates) {
+ return Math.abs(d3.geom.polygon(coordinates.map(projection)).area());
+ }
+
+ path.projection = function(x) {
+ projection = x;
+ return path;
+ };
+
+ path.pointRadius = function(x) {
+ if (typeof x === "function") pointRadius = x;
+ else {
+ pointRadius = +x;
+ pointCircle = d3_path_circle(pointRadius);
+ }
+ return path;
+ };
+
+ return path;
+};
+
+function d3_path_circle(radius) {
+ return "m0," + radius
+ + "a" + radius + "," + radius + " 0 1,1 0," + (-2 * radius)
+ + "a" + radius + "," + radius + " 0 1,1 0," + (+2 * radius)
+ + "z";
+}
+/**
+ * Given a GeoJSON object, returns the corresponding bounding box. The bounding
+ * box is represented by a two-dimensional array: [[left, bottom], [right,
+ * top]], where left is the minimum longitude, bottom is the minimum latitude,
+ * right is maximum longitude, and top is the maximum latitude.
+ */
+d3.geo.bounds = function(feature) {
+ var left = Infinity,
+ bottom = Infinity,
+ right = -Infinity,
+ top = -Infinity;
+ d3_geo_bounds(feature, function(x, y) {
+ if (x < left) left = x;
+ if (x > right) right = x;
+ if (y < bottom) bottom = y;
+ if (y > top) top = y;
+ });
+ return [[left, bottom], [right, top]];
+};
+
+function d3_geo_bounds(o, f) {
+ if (o.type in d3_geo_boundsTypes) d3_geo_boundsTypes[o.type](o, f);
+}
+
+var d3_geo_boundsTypes = {
+ Feature: d3_geo_boundsFeature,
+ FeatureCollection: d3_geo_boundsFeatureCollection,
+ GeometryCollection: d3_geo_boundsGeometryCollection,
+ LineString: d3_geo_boundsLineString,
+ MultiLineString: d3_geo_boundsMultiLineString,
+ MultiPoint: d3_geo_boundsLineString,
+ MultiPolygon: d3_geo_boundsMultiPolygon,
+ Point: d3_geo_boundsPoint,
+ Polygon: d3_geo_boundsPolygon
+};
+
+function d3_geo_boundsFeature(o, f) {
+ d3_geo_bounds(o.geometry, f);
+}
+
+function d3_geo_boundsFeatureCollection(o, f) {
+ for (var a = o.features, i = 0, n = a.length; i < n; i++) {
+ d3_geo_bounds(a[i].geometry, f);
+ }
+}
+
+function d3_geo_boundsGeometryCollection(o, f) {
+ for (var a = o.geometries, i = 0, n = a.length; i < n; i++) {
+ d3_geo_bounds(a[i], f);
+ }
+}
+
+function d3_geo_boundsLineString(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ f.apply(null, a[i]);
+ }
+}
+
+function d3_geo_boundsMultiLineString(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ for (var b = a[i], j = 0, m = b.length; j < m; j++) {
+ f.apply(null, b[j]);
+ }
+ }
+}
+
+function d3_geo_boundsMultiPolygon(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ for (var b = a[i][0], j = 0, m = b.length; j < m; j++) {
+ f.apply(null, b[j]);
+ }
+ }
+}
+
+function d3_geo_boundsPoint(o, f) {
+ f.apply(null, o.coordinates);
+}
+
+function d3_geo_boundsPolygon(o, f) {
+ for (var a = o.coordinates[0], i = 0, n = a.length; i < n; i++) {
+ f.apply(null, a[i]);
+ }
+}
+// TODO breakAtDateLine?
+
+d3.geo.circle = function() {
+ var origin = [0, 0],
+ degrees = 90 - 1e-2,
+ radians = degrees * d3_geo_radians,
+ arc = d3.geo.greatArc().target(Object);
+
+ function circle() {
+ // TODO render a circle as a Polygon
+ }
+
+ function visible(point) {
+ return arc.distance(point) < radians;
+ }
+
+ circle.clip = function(d) {
+ arc.source(typeof origin === "function" ? origin.apply(this, arguments) : origin);
+ return clipType(d);
+ };
+
+ var clipType = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var features = o.features.map(clipType).filter(Object);
+ return features && (o = Object.create(o), o.features = features, o);
+ },
+
+ Feature: function(o) {
+ var geometry = clipType(o.geometry);
+ return geometry && (o = Object.create(o), o.geometry = geometry, o);
+ },
+
+ Point: function(o) {
+ return visible(o.coordinates) && o;
+ },
+
+ MultiPoint: function(o) {
+ var coordinates = o.coordinates.filter(visible);
+ return coordinates.length && {
+ type: o.type,
+ coordinates: coordinates
+ };
+ },
+
+ LineString: function(o) {
+ var coordinates = clip(o.coordinates);
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ MultiLineString: function(o) {
+ var coordinates = o.coordinates.map(clip).filter(function(d) { return d.length; });
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ Polygon: function(o) {
+ var coordinates = o.coordinates.map(clip);
+ return coordinates[0].length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ MultiPolygon: function(o) {
+ var coordinates = o.coordinates.map(function(d) { return d.map(clip); }).filter(function(d) { return d[0].length; });
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ GeometryCollection: function(o) {
+ var geometries = o.geometries.map(clipType).filter(Object);
+ return geometries.length && (o = Object.create(o), o.geometries = geometries, o);
+ }
+
+ });
+
+ function clip(coordinates) {
+ var i = -1,
+ n = coordinates.length,
+ clipped = [],
+ p0,
+ p1,
+ p2,
+ d0,
+ d1;
+
+ while (++i < n) {
+ d1 = arc.distance(p2 = coordinates[i]);
+ if (d1 < radians) {
+ if (p1) clipped.push(d3_geo_greatArcInterpolate(p1, p2)((d0 - radians) / (d0 - d1)));
+ clipped.push(p2);
+ p0 = p1 = null;
+ } else {
+ p1 = p2;
+ if (!p0 && clipped.length) {
+ clipped.push(d3_geo_greatArcInterpolate(clipped[clipped.length - 1], p1)((radians - d0) / (d1 - d0)));
+ p0 = p1;
+ }
+ }
+ d0 = d1;
+ }
+
+ if (p1 && clipped.length) {
+ d1 = arc.distance(p2 = clipped[0]);
+ clipped.push(d3_geo_greatArcInterpolate(p1, p2)((d0 - radians) / (d0 - d1)));
+ }
+
+ return resample(clipped);
+ }
+
+ // Resample coordinates, creating great arcs between each.
+ function resample(coordinates) {
+ var i = 0,
+ n = coordinates.length,
+ j,
+ m,
+ resampled = n ? [coordinates[0]] : coordinates,
+ resamples,
+ origin = arc.source();
+
+ while (++i < n) {
+ resamples = arc.source(coordinates[i - 1])(coordinates[i]).coordinates;
+ for (j = 0, m = resamples.length; ++j < m;) resampled.push(resamples[j]);
+ }
+
+ arc.source(origin);
+ return resampled;
+ }
+
+ circle.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ return circle;
+ };
+
+ circle.angle = function(x) {
+ if (!arguments.length) return degrees;
+ radians = (degrees = +x) * d3_geo_radians;
+ return circle;
+ };
+
+ // Precision is specified in degrees.
+ circle.precision = function(x) {
+ if (!arguments.length) return arc.precision();
+ arc.precision(x);
+ return circle;
+ };
+
+ return circle;
+}
+d3.geo.greatArc = function() {
+ var source = d3_geo_greatArcSource,
+ target = d3_geo_greatArcTarget,
+ precision = 6 * d3_geo_radians;
+
+ function greatArc() {
+ var a = typeof source === "function" ? source.apply(this, arguments) : source,
+ b = typeof target === "function" ? target.apply(this, arguments) : target,
+ i = d3_geo_greatArcInterpolate(a, b),
+ dt = precision / i.d,
+ t = 0,
+ coordinates = [a];
+ while ((t += dt) < 1) coordinates.push(i(t));
+ coordinates.push(b);
+ return {
+ type: "LineString",
+ coordinates: coordinates
+ };
+ }
+
+ // Length returned in radians; multiply by radius for distance.
+ greatArc.distance = function() {
+ var a = typeof source === "function" ? source.apply(this, arguments) : source,
+ b = typeof target === "function" ? target.apply(this, arguments) : target;
+ return d3_geo_greatArcInterpolate(a, b).d;
+ };
+
+ greatArc.source = function(x) {
+ if (!arguments.length) return source;
+ source = x;
+ return greatArc;
+ };
+
+ greatArc.target = function(x) {
+ if (!arguments.length) return target;
+ target = x;
+ return greatArc;
+ };
+
+ // Precision is specified in degrees.
+ greatArc.precision = function(x) {
+ if (!arguments.length) return precision / d3_geo_radians;
+ precision = x * d3_geo_radians;
+ return greatArc;
+ };
+
+ return greatArc;
+};
+
+function d3_geo_greatArcSource(d) {
+ return d.source;
+}
+
+function d3_geo_greatArcTarget(d) {
+ return d.target;
+}
+
+function d3_geo_greatArcInterpolate(a, b) {
+ var x0 = a[0] * d3_geo_radians, cx0 = Math.cos(x0), sx0 = Math.sin(x0),
+ y0 = a[1] * d3_geo_radians, cy0 = Math.cos(y0), sy0 = Math.sin(y0),
+ x1 = b[0] * d3_geo_radians, cx1 = Math.cos(x1), sx1 = Math.sin(x1),
+ y1 = b[1] * d3_geo_radians, cy1 = Math.cos(y1), sy1 = Math.sin(y1),
+ d = interpolate.d = Math.acos(Math.max(-1, Math.min(1, sy0 * sy1 + cy0 * cy1 * Math.cos(x1 - x0)))),
+ sd = Math.sin(d);
+
+ // From http://williams.best.vwh.net/avform.htm#Intermediate
+ function interpolate(t) {
+ var A = Math.sin(d - (t *= d)) / sd,
+ B = Math.sin(t) / sd,
+ x = A * cy0 * cx0 + B * cy1 * cx1,
+ y = A * cy0 * sx0 + B * cy1 * sx1,
+ z = A * sy0 + B * sy1;
+ return [
+ Math.atan2(y, x) / d3_geo_radians,
+ Math.atan2(z, Math.sqrt(x * x + y * y)) / d3_geo_radians
+ ];
+ }
+
+ return interpolate;
+}
+d3.geo.greatCircle = d3.geo.circle;
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js
new file mode 100644
index 0000000..d860c2b
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js
@@ -0,0 +1,835 @@
+(function(){d3.geom = {};
+/**
+ * Computes a contour for a given input grid function using the <a
+ * href="http://en.wikipedia.org/wiki/Marching_squares">marching
+ * squares</a> algorithm. Returns the contour polygon as an array of points.
+ *
+ * @param grid a two-input function(x, y) that returns true for values
+ * inside the contour and false for values outside the contour.
+ * @param start an optional starting point [x, y] on the grid.
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.contour = function(grid, start) {
+ var s = start || d3_geom_contourStart(grid), // starting point
+ c = [], // contour polygon
+ x = s[0], // current x position
+ y = s[1], // current y position
+ dx = 0, // next x direction
+ dy = 0, // next y direction
+ pdx = NaN, // previous x direction
+ pdy = NaN, // previous y direction
+ i = 0;
+
+ do {
+ // determine marching squares index
+ i = 0;
+ if (grid(x-1, y-1)) i += 1;
+ if (grid(x, y-1)) i += 2;
+ if (grid(x-1, y )) i += 4;
+ if (grid(x, y )) i += 8;
+
+ // determine next direction
+ if (i === 6) {
+ dx = pdy === -1 ? -1 : 1;
+ dy = 0;
+ } else if (i === 9) {
+ dx = 0;
+ dy = pdx === 1 ? -1 : 1;
+ } else {
+ dx = d3_geom_contourDx[i];
+ dy = d3_geom_contourDy[i];
+ }
+
+ // update contour polygon
+ if (dx != pdx && dy != pdy) {
+ c.push([x, y]);
+ pdx = dx;
+ pdy = dy;
+ }
+
+ x += dx;
+ y += dy;
+ } while (s[0] != x || s[1] != y);
+
+ return c;
+};
+
+// lookup tables for marching directions
+var d3_geom_contourDx = [1, 0, 1, 1,-1, 0,-1, 1,0, 0,0,0,-1, 0,-1,NaN],
+ d3_geom_contourDy = [0,-1, 0, 0, 0,-1, 0, 0,1,-1,1,1, 0,-1, 0,NaN];
+
+function d3_geom_contourStart(grid) {
+ var x = 0,
+ y = 0;
+
+ // search for a starting point; begin at origin
+ // and proceed along outward-expanding diagonals
+ while (true) {
+ if (grid(x,y)) {
+ return [x,y];
+ }
+ if (x === 0) {
+ x = y + 1;
+ y = 0;
+ } else {
+ x = x - 1;
+ y = y + 1;
+ }
+ }
+}
+/**
+ * Computes the 2D convex hull of a set of points using Graham's scanning
+ * algorithm. The algorithm has been implemented as described in Cormen,
+ * Leiserson, and Rivest's Introduction to Algorithms. The running time of
+ * this algorithm is O(n log n), where n is the number of input points.
+ *
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.hull = function(vertices) {
+ if (vertices.length < 3) return [];
+
+ var len = vertices.length,
+ plen = len - 1,
+ points = [],
+ stack = [],
+ i, j, h = 0, x1, y1, x2, y2, u, v, a, sp;
+
+ // find the starting ref point: leftmost point with the minimum y coord
+ for (i=1; i<len; ++i) {
+ if (vertices[i][1] < vertices[h][1]) {
+ h = i;
+ } else if (vertices[i][1] == vertices[h][1]) {
+ h = (vertices[i][0] < vertices[h][0] ? i : h);
+ }
+ }
+
+ // calculate polar angles from ref point and sort
+ for (i=0; i<len; ++i) {
+ if (i === h) continue;
+ y1 = vertices[i][1] - vertices[h][1];
+ x1 = vertices[i][0] - vertices[h][0];
+ points.push({angle: Math.atan2(y1, x1), index: i});
+ }
+ points.sort(function(a, b) { return a.angle - b.angle; });
+
+ // toss out duplicate angles
+ a = points[0].angle;
+ v = points[0].index;
+ u = 0;
+ for (i=1; i<plen; ++i) {
+ j = points[i].index;
+ if (a == points[i].angle) {
+ // keep angle for point most distant from the reference
+ x1 = vertices[v][0] - vertices[h][0];
+ y1 = vertices[v][1] - vertices[h][1];
+ x2 = vertices[j][0] - vertices[h][0];
+ y2 = vertices[j][1] - vertices[h][1];
+ if ((x1*x1 + y1*y1) >= (x2*x2 + y2*y2)) {
+ points[i].index = -1;
+ } else {
+ points[u].index = -1;
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+ } else {
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+ }
+
+ // initialize the stack
+ stack.push(h);
+ for (i=0, j=0; i<2; ++j) {
+ if (points[j].index !== -1) {
+ stack.push(points[j].index);
+ i++;
+ }
+ }
+ sp = stack.length;
+
+ // do graham's scan
+ for (; j<plen; ++j) {
+ if (points[j].index === -1) continue; // skip tossed out points
+ while (!d3_geom_hullCCW(stack[sp-2], stack[sp-1], points[j].index, vertices)) {
+ --sp;
+ }
+ stack[sp++] = points[j].index;
+ }
+
+ // construct the hull
+ var poly = [];
+ for (i=0; i<sp; ++i) {
+ poly.push(vertices[stack[i]]);
+ }
+ return poly;
+}
+
+// are three points in counter-clockwise order?
+function d3_geom_hullCCW(i1, i2, i3, v) {
+ var t, a, b, c, d, e, f;
+ t = v[i1]; a = t[0]; b = t[1];
+ t = v[i2]; c = t[0]; d = t[1];
+ t = v[i3]; e = t[0]; f = t[1];
+ return ((f-b)*(c-a) - (d-b)*(e-a)) > 0;
+}
+// Note: requires coordinates to be counterclockwise and convex!
+d3.geom.polygon = function(coordinates) {
+
+ coordinates.area = function() {
+ var i = 0,
+ n = coordinates.length,
+ a = coordinates[n - 1][0] * coordinates[0][1],
+ b = coordinates[n - 1][1] * coordinates[0][0];
+ while (++i < n) {
+ a += coordinates[i - 1][0] * coordinates[i][1];
+ b += coordinates[i - 1][1] * coordinates[i][0];
+ }
+ return (b - a) * .5;
+ };
+
+ coordinates.centroid = function(k) {
+ var i = -1,
+ n = coordinates.length - 1,
+ x = 0,
+ y = 0,
+ a,
+ b,
+ c;
+ if (!arguments.length) k = -1 / (6 * coordinates.area());
+ while (++i < n) {
+ a = coordinates[i];
+ b = coordinates[i + 1];
+ c = a[0] * b[1] - b[0] * a[1];
+ x += (a[0] + b[0]) * c;
+ y += (a[1] + b[1]) * c;
+ }
+ return [x * k, y * k];
+ };
+
+ // The Sutherland-Hodgman clipping algorithm.
+ coordinates.clip = function(subject) {
+ var input,
+ i = -1,
+ n = coordinates.length,
+ j,
+ m,
+ a = coordinates[n - 1],
+ b,
+ c,
+ d;
+ while (++i < n) {
+ input = subject.slice();
+ subject.length = 0;
+ b = coordinates[i];
+ c = input[(m = input.length) - 1];
+ j = -1;
+ while (++j < m) {
+ d = input[j];
+ if (d3_geom_polygonInside(d, a, b)) {
+ if (!d3_geom_polygonInside(c, a, b)) {
+ subject.push(d3_geom_polygonIntersect(c, d, a, b));
+ }
+ subject.push(d);
+ } else if (d3_geom_polygonInside(c, a, b)) {
+ subject.push(d3_geom_polygonIntersect(c, d, a, b));
+ }
+ c = d;
+ }
+ a = b;
+ }
+ return subject;
+ };
+
+ return coordinates;
+};
+
+function d3_geom_polygonInside(p, a, b) {
+ return (b[0] - a[0]) * (p[1] - a[1]) < (b[1] - a[1]) * (p[0] - a[0]);
+}
+
+// Intersect two infinite lines cd and ab.
+function d3_geom_polygonIntersect(c, d, a, b) {
+ var x1 = c[0], x2 = d[0], x3 = a[0], x4 = b[0],
+ y1 = c[1], y2 = d[1], y3 = a[1], y4 = b[1],
+ x13 = x1 - x3,
+ x21 = x2 - x1,
+ x43 = x4 - x3,
+ y13 = y1 - y3,
+ y21 = y2 - y1,
+ y43 = y4 - y3,
+ ua = (x43 * y13 - y43 * x13) / (y43 * x21 - x43 * y21);
+ return [x1 + ua * x21, y1 + ua * y21];
+}
+// Adapted from Nicolas Garcia Belmonte's JIT implementation:
+// http://blog.thejit.org/2010/02/12/voronoi-tessellation/
+// http://blog.thejit.org/assets/voronoijs/voronoi.js
+// See lib/jit/LICENSE for details.
+
+// Notes:
+//
+// This implementation does not clip the returned polygons, so if you want to
+// clip them to a particular shape you will need to do that either in SVG or by
+// post-processing with d3.geom.polygon's clip method.
+//
+// If any vertices are coincident or have NaN positions, the behavior of this
+// method is undefined. Most likely invalid polygons will be returned. You
+// should filter invalid points, and consolidate coincident points, before
+// computing the tessellation.
+
+/**
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygons [[[x1, y1], [x2, y2], …], …]
+ */
+d3.geom.voronoi = function(vertices) {
+ var polygons = vertices.map(function() { return []; });
+
+ d3_voronoi_tessellate(vertices, function(e) {
+ var s1,
+ s2,
+ x1,
+ x2,
+ y1,
+ y2;
+ if (e.a === 1 && e.b >= 0) {
+ s1 = e.ep.r;
+ s2 = e.ep.l;
+ } else {
+ s1 = e.ep.l;
+ s2 = e.ep.r;
+ }
+ if (e.a === 1) {
+ y1 = s1 ? s1.y : -1e6;
+ x1 = e.c - e.b * y1;
+ y2 = s2 ? s2.y : 1e6;
+ x2 = e.c - e.b * y2;
+ } else {
+ x1 = s1 ? s1.x : -1e6;
+ y1 = e.c - e.a * x1;
+ x2 = s2 ? s2.x : 1e6;
+ y2 = e.c - e.a * x2;
+ }
+ var v1 = [x1, y1],
+ v2 = [x2, y2];
+ polygons[e.region.l.index].push(v1, v2);
+ polygons[e.region.r.index].push(v1, v2);
+ });
+
+ // Reconnect the polygon segments into counterclockwise loops.
+ return polygons.map(function(polygon, i) {
+ var cx = vertices[i][0],
+ cy = vertices[i][1];
+ polygon.forEach(function(v) {
+ v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+ });
+ return polygon.sort(function(a, b) {
+ return a.angle - b.angle;
+ }).filter(function(d, i) {
+ return !i || (d.angle - polygon[i - 1].angle > 1e-10);
+ });
+ });
+};
+
+var d3_voronoi_opposite = {"l": "r", "r": "l"};
+
+function d3_voronoi_tessellate(vertices, callback) {
+
+ var Sites = {
+ list: vertices
+ .map(function(v, i) {
+ return {
+ index: i,
+ x: v[0],
+ y: v[1]
+ };
+ })
+ .sort(function(a, b) {
+ return a.y < b.y ? -1
+ : a.y > b.y ? 1
+ : a.x < b.x ? -1
+ : a.x > b.x ? 1
+ : 0;
+ }),
+ bottomSite: null
+ };
+
+ var EdgeList = {
+ list: [],
+ leftEnd: null,
+ rightEnd: null,
+
+ init: function() {
+ EdgeList.leftEnd = EdgeList.createHalfEdge(null, "l");
+ EdgeList.rightEnd = EdgeList.createHalfEdge(null, "l");
+ EdgeList.leftEnd.r = EdgeList.rightEnd;
+ EdgeList.rightEnd.l = EdgeList.leftEnd;
+ EdgeList.list.unshift(EdgeList.leftEnd, EdgeList.rightEnd);
+ },
+
+ createHalfEdge: function(edge, side) {
+ return {
+ edge: edge,
+ side: side,
+ vertex: null,
+ "l": null,
+ "r": null
+ };
+ },
+
+ insert: function(lb, he) {
+ he.l = lb;
+ he.r = lb.r;
+ lb.r.l = he;
+ lb.r = he;
+ },
+
+ leftBound: function(p) {
+ var he = EdgeList.leftEnd;
+ do {
+ he = he.r;
+ } while (he != EdgeList.rightEnd && Geom.rightOf(he, p));
+ he = he.l;
+ return he;
+ },
+
+ del: function(he) {
+ he.l.r = he.r;
+ he.r.l = he.l;
+ he.edge = null;
+ },
+
+ right: function(he) {
+ return he.r;
+ },
+
+ left: function(he) {
+ return he.l;
+ },
+
+ leftRegion: function(he) {
+ return he.edge == null
+ ? Sites.bottomSite
+ : he.edge.region[he.side];
+ },
+
+ rightRegion: function(he) {
+ return he.edge == null
+ ? Sites.bottomSite
+ : he.edge.region[d3_voronoi_opposite[he.side]];
+ }
+ };
+
+ var Geom = {
+
+ bisect: function(s1, s2) {
+ var newEdge = {
+ region: {"l": s1, "r": s2},
+ ep: {"l": null, "r": null}
+ };
+
+ var dx = s2.x - s1.x,
+ dy = s2.y - s1.y,
+ adx = dx > 0 ? dx : -dx,
+ ady = dy > 0 ? dy : -dy;
+
+ newEdge.c = s1.x * dx + s1.y * dy
+ + (dx * dx + dy * dy) * .5;
+
+ if (adx > ady) {
+ newEdge.a = 1;
+ newEdge.b = dy / dx;
+ newEdge.c /= dx;
+ } else {
+ newEdge.b = 1;
+ newEdge.a = dx / dy;
+ newEdge.c /= dy;
+ }
+
+ return newEdge;
+ },
+
+ intersect: function(el1, el2) {
+ var e1 = el1.edge,
+ e2 = el2.edge;
+ if (!e1 || !e2 || (e1.region.r == e2.region.r)) {
+ return null;
+ }
+ var d = (e1.a * e2.b) - (e1.b * e2.a);
+ if (Math.abs(d) < 1e-10) {
+ return null;
+ }
+ var xint = (e1.c * e2.b - e2.c * e1.b) / d,
+ yint = (e2.c * e1.a - e1.c * e2.a) / d,
+ e1r = e1.region.r,
+ e2r = e2.region.r,
+ el,
+ e;
+ if ((e1r.y < e2r.y) ||
+ (e1r.y == e2r.y && e1r.x < e2r.x)) {
+ el = el1;
+ e = e1;
+ } else {
+ el = el2;
+ e = e2;
+ }
+ var rightOfSite = (xint >= e.region.r.x);
+ if ((rightOfSite && (el.side === "l")) ||
+ (!rightOfSite && (el.side === "r"))) {
+ return null;
+ }
+ return {
+ x: xint,
+ y: yint
+ };
+ },
+
+ rightOf: function(he, p) {
+ var e = he.edge,
+ topsite = e.region.r,
+ rightOfSite = (p.x > topsite.x);
+
+ if (rightOfSite && (he.side === "l")) {
+ return 1;
+ }
+ if (!rightOfSite && (he.side === "r")) {
+ return 0;
+ }
+ if (e.a === 1) {
+ var dyp = p.y - topsite.y,
+ dxp = p.x - topsite.x,
+ fast = 0,
+ above = 0;
+
+ if ((!rightOfSite && (e.b < 0)) ||
+ (rightOfSite && (e.b >= 0))) {
+ above = fast = (dyp >= e.b * dxp);
+ } else {
+ above = ((p.x + p.y * e.b) > e.c);
+ if (e.b < 0) {
+ above = !above;
+ }
+ if (!above) {
+ fast = 1;
+ }
+ }
+ if (!fast) {
+ var dxs = topsite.x - e.region.l.x;
+ above = (e.b * (dxp * dxp - dyp * dyp)) <
+ (dxs * dyp * (1 + 2 * dxp / dxs + e.b * e.b));
+
+ if (e.b < 0) {
+ above = !above;
+ }
+ }
+ } else /* e.b == 1 */ {
+ var yl = e.c - e.a * p.x,
+ t1 = p.y - yl,
+ t2 = p.x - topsite.x,
+ t3 = yl - topsite.y;
+
+ above = (t1 * t1) > (t2 * t2 + t3 * t3);
+ }
+ return he.side === "l" ? above : !above;
+ },
+
+ endPoint: function(edge, side, site) {
+ edge.ep[side] = site;
+ if (!edge.ep[d3_voronoi_opposite[side]]) return;
+ callback(edge);
+ },
+
+ distance: function(s, t) {
+ var dx = s.x - t.x,
+ dy = s.y - t.y;
+ return Math.sqrt(dx * dx + dy * dy);
+ }
+ };
+
+ var EventQueue = {
+ list: [],
+
+ insert: function(he, site, offset) {
+ he.vertex = site;
+ he.ystar = site.y + offset;
+ for (var i=0, list=EventQueue.list, l=list.length; i<l; i++) {
+ var next = list[i];
+ if (he.ystar > next.ystar ||
+ (he.ystar == next.ystar &&
+ site.x > next.vertex.x)) {
+ continue;
+ } else {
+ break;
+ }
+ }
+ list.splice(i, 0, he);
+ },
+
+ del: function(he) {
+ for (var i=0, ls=EventQueue.list, l=ls.length; i<l && (ls[i] != he); ++i) {}
+ ls.splice(i, 1);
+ },
+
+ empty: function() { return EventQueue.list.length === 0; },
+
+ nextEvent: function(he) {
+ for (var i=0, ls=EventQueue.list, l=ls.length; i<l; ++i) {
+ if (ls[i] == he) return ls[i+1];
+ }
+ return null;
+ },
+
+ min: function() {
+ var elem = EventQueue.list[0];
+ return {
+ x: elem.vertex.x,
+ y: elem.ystar
+ };
+ },
+
+ extractMin: function() {
+ return EventQueue.list.shift();
+ }
+ };
+
+ EdgeList.init();
+ Sites.bottomSite = Sites.list.shift();
+
+ var newSite = Sites.list.shift(), newIntStar;
+ var lbnd, rbnd, llbnd, rrbnd, bisector;
+ var bot, top, temp, p, v;
+ var e, pm;
+
+ while (true) {
+ if (!EventQueue.empty()) {
+ newIntStar = EventQueue.min();
+ }
+ if (newSite && (EventQueue.empty()
+ || newSite.y < newIntStar.y
+ || (newSite.y == newIntStar.y
+ && newSite.x < newIntStar.x))) { //new site is smallest
+ lbnd = EdgeList.leftBound(newSite);
+ rbnd = EdgeList.right(lbnd);
+ bot = EdgeList.rightRegion(lbnd);
+ e = Geom.bisect(bot, newSite);
+ bisector = EdgeList.createHalfEdge(e, "l");
+ EdgeList.insert(lbnd, bisector);
+ p = Geom.intersect(lbnd, bisector);
+ if (p) {
+ EventQueue.del(lbnd);
+ EventQueue.insert(lbnd, p, Geom.distance(p, newSite));
+ }
+ lbnd = bisector;
+ bisector = EdgeList.createHalfEdge(e, "r");
+ EdgeList.insert(lbnd, bisector);
+ p = Geom.intersect(bisector, rbnd);
+ if (p) {
+ EventQueue.insert(bisector, p, Geom.distance(p, newSite));
+ }
+ newSite = Sites.list.shift();
+ } else if (!EventQueue.empty()) { //intersection is smallest
+ lbnd = EventQueue.extractMin();
+ llbnd = EdgeList.left(lbnd);
+ rbnd = EdgeList.right(lbnd);
+ rrbnd = EdgeList.right(rbnd);
+ bot = EdgeList.leftRegion(lbnd);
+ top = EdgeList.rightRegion(rbnd);
+ v = lbnd.vertex;
+ Geom.endPoint(lbnd.edge, lbnd.side, v);
+ Geom.endPoint(rbnd.edge, rbnd.side, v);
+ EdgeList.del(lbnd);
+ EventQueue.del(rbnd);
+ EdgeList.del(rbnd);
+ pm = "l";
+ if (bot.y > top.y) {
+ temp = bot;
+ bot = top;
+ top = temp;
+ pm = "r";
+ }
+ e = Geom.bisect(bot, top);
+ bisector = EdgeList.createHalfEdge(e, pm);
+ EdgeList.insert(llbnd, bisector);
+ Geom.endPoint(e, d3_voronoi_opposite[pm], v);
+ p = Geom.intersect(llbnd, bisector);
+ if (p) {
+ EventQueue.del(llbnd);
+ EventQueue.insert(llbnd, p, Geom.distance(p, bot));
+ }
+ p = Geom.intersect(bisector, rrbnd);
+ if (p) {
+ EventQueue.insert(bisector, p, Geom.distance(p, bot));
+ }
+ } else {
+ break;
+ }
+ }//end while
+
+ for (lbnd = EdgeList.right(EdgeList.leftEnd);
+ lbnd != EdgeList.rightEnd;
+ lbnd = EdgeList.right(lbnd)) {
+ callback(lbnd.edge);
+ }
+}
+/**
+* @param vertices [[x1, y1], [x2, y2], …]
+* @returns triangles [[[x1, y1], [x2, y2], [x3, y3]], …]
+ */
+d3.geom.delaunay = function(vertices) {
+ var edges = vertices.map(function() { return []; }),
+ triangles = [];
+
+ // Use the Voronoi tessellation to determine Delaunay edges.
+ d3_voronoi_tessellate(vertices, function(e) {
+ edges[e.region.l.index].push(vertices[e.region.r.index]);
+ });
+
+ // Reconnect the edges into counterclockwise triangles.
+ edges.forEach(function(edge, i) {
+ var v = vertices[i],
+ cx = v[0],
+ cy = v[1];
+ edge.forEach(function(v) {
+ v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+ });
+ edge.sort(function(a, b) {
+ return a.angle - b.angle;
+ });
+ for (var j = 0, m = edge.length - 1; j < m; j++) {
+ triangles.push([v, edge[j], edge[j + 1]]);
+ }
+ });
+
+ return triangles;
+};
+// Constructs a new quadtree for the specified array of points. A quadtree is a
+// two-dimensional recursive spatial subdivision. This implementation uses
+// square partitions, dividing each square into four equally-sized squares. Each
+// point exists in a unique node; if multiple points are in the same position,
+// some points may be stored on internal nodes rather than leaf nodes. Quadtrees
+// can be used to accelerate various spatial operations, such as the Barnes-Hut
+// approximation for computing n-body forces, or collision detection.
+d3.geom.quadtree = function(points, x1, y1, x2, y2) {
+ var p,
+ i = -1,
+ n = points.length;
+
+ // Type conversion for deprecated API.
+ if (n && isNaN(points[0].x)) points = points.map(d3_geom_quadtreePoint);
+
+ // Allow bounds to be specified explicitly.
+ if (arguments.length < 5) {
+ if (arguments.length === 3) {
+ y2 = x2 = y1;
+ y1 = x1;
+ } else {
+ x1 = y1 = Infinity;
+ x2 = y2 = -Infinity;
+
+ // Compute bounds.
+ while (++i < n) {
+ p = points[i];
+ if (p.x < x1) x1 = p.x;
+ if (p.y < y1) y1 = p.y;
+ if (p.x > x2) x2 = p.x;
+ if (p.y > y2) y2 = p.y;
+ }
+
+ // Squarify the bounds.
+ var dx = x2 - x1,
+ dy = y2 - y1;
+ if (dx > dy) y2 = y1 + dx;
+ else x2 = x1 + dy;
+ }
+ }
+
+ // Recursively inserts the specified point p at the node n or one of its
+ // descendants. The bounds are defined by [x1, x2] and [y1, y2].
+ function insert(n, p, x1, y1, x2, y2) {
+ if (isNaN(p.x) || isNaN(p.y)) return; // ignore invalid points
+ if (n.leaf) {
+ var v = n.point;
+ if (v) {
+ // If the point at this leaf node is at the same position as the new
+ // point we are adding, we leave the point associated with the
+ // internal node while adding the new point to a child node. This
+ // avoids infinite recursion.
+ if ((Math.abs(v.x - p.x) + Math.abs(v.y - p.y)) < .01) {
+ insertChild(n, p, x1, y1, x2, y2);
+ } else {
+ n.point = null;
+ insertChild(n, v, x1, y1, x2, y2);
+ insertChild(n, p, x1, y1, x2, y2);
+ }
+ } else {
+ n.point = p;
+ }
+ } else {
+ insertChild(n, p, x1, y1, x2, y2);
+ }
+ }
+
+ // Recursively inserts the specified point p into a descendant of node n. The
+ // bounds are defined by [x1, x2] and [y1, y2].
+ function insertChild(n, p, x1, y1, x2, y2) {
+ // Compute the split point, and the quadrant in which to insert p.
+ var sx = (x1 + x2) * .5,
+ sy = (y1 + y2) * .5,
+ right = p.x >= sx,
+ bottom = p.y >= sy,
+ i = (bottom << 1) + right;
+
+ // Recursively insert into the child node.
+ n.leaf = false;
+ n = n.nodes[i] || (n.nodes[i] = d3_geom_quadtreeNode());
+
+ // Update the bounds as we recurse.
+ if (right) x1 = sx; else x2 = sx;
+ if (bottom) y1 = sy; else y2 = sy;
+ insert(n, p, x1, y1, x2, y2);
+ }
+
+ // Create the root node.
+ var root = d3_geom_quadtreeNode();
+
+ root.add = function(p) {
+ insert(root, p, x1, y1, x2, y2);
+ };
+
+ root.visit = function(f) {
+ d3_geom_quadtreeVisit(f, root, x1, y1, x2, y2);
+ };
+
+ // Insert all points.
+ points.forEach(root.add);
+ return root;
+};
+
+function d3_geom_quadtreeNode() {
+ return {
+ leaf: true,
+ nodes: [],
+ point: null
+ };
+}
+
+function d3_geom_quadtreeVisit(f, node, x1, y1, x2, y2) {
+ if (!f(node, x1, y1, x2, y2)) {
+ var sx = (x1 + x2) * .5,
+ sy = (y1 + y2) * .5,
+ children = node.nodes;
+ if (children[0]) d3_geom_quadtreeVisit(f, children[0], x1, y1, sx, sy);
+ if (children[1]) d3_geom_quadtreeVisit(f, children[1], sx, y1, x2, sy);
+ if (children[2]) d3_geom_quadtreeVisit(f, children[2], x1, sy, sx, y2);
+ if (children[3]) d3_geom_quadtreeVisit(f, children[3], sx, sy, x2, y2);
+ }
+}
+
+function d3_geom_quadtreePoint(p) {
+ return {
+ x: p[0],
+ y: p[1]
+ };
+}
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
index bfbc7ee..77ee372 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
@@ -1,22 +1,26 @@
-(function(){d3 = {version: "1.29.1"}; // semver
-if (!Date.now) Date.now = function() {
+(function(){if (!Date.now) Date.now = function() {
return +new Date;
};
-if (!Object.create) Object.create = function(o) {
- /** @constructor */ function f() {}
- f.prototype = o;
- return new f;
-};
+try {
+ document.createElement("div").style.setProperty("opacity", 0, "");
+} catch (error) {
+ var d3_style_prototype = CSSStyleDeclaration.prototype,
+ d3_style_setProperty = d3_style_prototype.setProperty;
+ d3_style_prototype.setProperty = function(name, value, priority) {
+ d3_style_setProperty.call(this, name, value + "", priority);
+ };
+}
+d3 = {version: "2.7.1"}; // semver
var d3_array = d3_arraySlice; // conversion for NodeLists
-function d3_arrayCopy(psuedoarray) {
- var i = -1, n = psuedoarray.length, array = [];
- while (++i < n) array.push(psuedoarray[i]);
+function d3_arrayCopy(pseudoarray) {
+ var i = -1, n = pseudoarray.length, array = [];
+ while (++i < n) array.push(pseudoarray[i]);
return array;
}
-function d3_arraySlice(psuedoarray) {
- return Array.prototype.slice.call(psuedoarray);
+function d3_arraySlice(pseudoarray) {
+ return Array.prototype.slice.call(pseudoarray);
}
try {
@@ -24,21 +28,63 @@ try {
} catch(e) {
d3_array = d3_arrayCopy;
}
+
+var d3_arraySubclass = [].__proto__?
+
+// Until ECMAScript supports array subclassing, prototype injection works well.
+function(array, prototype) {
+ array.__proto__ = prototype;
+}:
+
+// And if your browser doesn't support __proto__, we'll use direct extension.
+function(array, prototype) {
+ for (var property in prototype) array[property] = prototype[property];
+};
+function d3_this() {
+ return this;
+}
d3.functor = function(v) {
return typeof v === "function" ? v : function() { return v; };
};
-// A getter-setter method that preserves the appropriate `this` context.
-d3.rebind = function(object, method) {
+// Copies a variable number of methods from source to target.
+d3.rebind = function(target, source) {
+ var i = 1, n = arguments.length, method;
+ while (++i < n) target[method = arguments[i]] = d3_rebind(target, source, source[method]);
+ return target;
+};
+
+// Method is assumed to be a standard D3 getter-setter:
+// If passed with no arguments, gets the value.
+// If passed with arguments, sets the value and returns the target.
+function d3_rebind(target, source, method) {
return function() {
- var x = method.apply(object, arguments);
- return arguments.length ? object : x;
+ var value = method.apply(source, arguments);
+ return arguments.length ? target : value;
};
-};
+}
d3.ascending = function(a, b) {
- return a < b ? -1 : a > b ? 1 : 0;
+ return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
};
d3.descending = function(a, b) {
- return b < a ? -1 : b > a ? 1 : 0;
+ return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
+};
+d3.mean = function(array, f) {
+ var n = array.length,
+ a,
+ m = 0,
+ i = -1,
+ j = 0;
+ if (arguments.length === 1) {
+ while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+ } else {
+ while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+ }
+ return j ? m : undefined;
+};
+d3.median = function(array, f) {
+ if (arguments.length > 1) array = array.map(f);
+ array = array.filter(d3_number);
+ return array.length ? d3.quantile(array.sort(d3.ascending), .5) : undefined;
};
d3.min = function(array, f) {
var i = -1,
@@ -68,6 +114,45 @@ d3.max = function(array, f) {
}
return a;
};
+d3.extent = function(array, f) {
+ var i = -1,
+ n = array.length,
+ a,
+ b,
+ c;
+ if (arguments.length === 1) {
+ while (++i < n && ((a = c = array[i]) == null || a != a)) a = c = undefined;
+ while (++i < n) if ((b = array[i]) != null) {
+ if (a > b) a = b;
+ if (c < b) c = b;
+ }
+ } else {
+ while (++i < n && ((a = c = f.call(array, array[i], i)) == null || a != a)) a = undefined;
+ while (++i < n) if ((b = f.call(array, array[i], i)) != null) {
+ if (a > b) a = b;
+ if (c < b) c = b;
+ }
+ }
+ return [a, c];
+};
+d3.random = {
+ normal: function(mean, deviation) {
+ if (arguments.length < 2) deviation = 1;
+ if (arguments.length < 1) mean = 0;
+ return function() {
+ var x, y, r;
+ do {
+ x = Math.random() * 2 - 1;
+ y = Math.random() * 2 - 1;
+ r = x * x + y * y;
+ } while (!r || r > 1);
+ return mean + deviation * x * Math.sqrt(-2 * Math.log(r) / r);
+ };
+ }
+};
+function d3_number(x) {
+ return x != null && !isNaN(x);
+}
d3.sum = function(array, f) {
var s = 0,
n = array.length,
@@ -90,6 +175,9 @@ d3.quantile = function(values, p) {
e = H - h;
return e ? v + e * (values[h] - v) : v;
};
+d3.transpose = function(matrix) {
+ return d3.zip.apply(d3, matrix);
+};
d3.zip = function() {
if (!(n = arguments.length)) return [];
for (var i = -1, m = d3.min(arguments, d3_zipLength), zips = new Array(m); ++i < m;) {
@@ -303,27 +391,19 @@ function d3_splitter(d) {
function d3_collapse(s) {
return s.replace(/(^\s+)|(\s+$)/g, "").replace(/\s+/g, " ");
}
-//
-// Note: assigning to the arguments array simultaneously changes the value of
-// the corresponding argument!
-//
-// TODO The `this` argument probably shouldn't be the first argument to the
-// callback, anyway, since it's redundant. However, that will require a major
-// version bump due to backwards compatibility, so I'm not changing it right
-// away.
-//
-function d3_call(callback) {
- callback.apply(this, (arguments[0] = this, arguments));
- return this;
-}
/**
* @param {number} start
* @param {number=} stop
* @param {number=} step
*/
d3.range = function(start, stop, step) {
- if (arguments.length === 1) { stop = start; start = 0; }
- if (step == null) step = 1;
+ if (arguments.length < 3) {
+ step = 1;
+ if (arguments.length < 2) {
+ stop = start;
+ start = 0;
+ }
+ }
if ((stop - start) / step == Infinity) throw new Error("infinite range");
var range = [],
i = -1,
@@ -336,7 +416,7 @@ d3.requote = function(s) {
return s.replace(d3_requote_re, "\\$&");
};
-var d3_requote_re = /[\\\^\$\*\+\?\[\]\(\)\.\{\}]/g;
+var d3_requote_re = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
d3.round = function(x, n) {
return n
? Math.round(x * Math.pow(10, n)) * Math.pow(10, -n)
@@ -344,9 +424,10 @@ d3.round = function(x, n) {
};
d3.xhr = function(url, mime, callback) {
var req = new XMLHttpRequest;
- if (arguments.length < 3) callback = mime;
+ if (arguments.length < 3) callback = mime, mime = null;
else if (mime && req.overrideMimeType) req.overrideMimeType(mime);
req.open("GET", url, true);
+ if (mime) req.setRequestHeader("Accept", mime);
req.onreadystatechange = function() {
if (req.readyState === 4) callback(req.status < 300 ? req : null);
};
@@ -387,66 +468,79 @@ d3.xml = function(url, mime, callback) {
}
d3.xhr(url, mime, ready);
};
-d3.ns = {
-
- prefix: {
- svg: "http://www.w3.org/2000/svg",
- xhtml: "http://www.w3.org/1999/xhtml",
- xlink: "http://www.w3.org/1999/xlink",
- xml: "http://www.w3.org/XML/1998/namespace",
- xmlns: "http://www.w3.org/2000/xmlns/"
- },
+var d3_nsPrefix = {
+ svg: "http://www.w3.org/2000/svg",
+ xhtml: "http://www.w3.org/1999/xhtml",
+ xlink: "http://www.w3.org/1999/xlink",
+ xml: "http://www.w3.org/XML/1998/namespace",
+ xmlns: "http://www.w3.org/2000/xmlns/"
+};
+d3.ns = {
+ prefix: d3_nsPrefix,
qualify: function(name) {
var i = name.indexOf(":");
- return i < 0 ? name : {
- space: d3.ns.prefix[name.substring(0, i)],
- local: name.substring(i + 1)
- };
+ return i < 0 ? (name in d3_nsPrefix
+ ? {space: d3_nsPrefix[name], local: name} : name)
+ : {space: d3_nsPrefix[name.substring(0, i)], local: name.substring(i + 1)};
}
-
};
-/** @param {...string} types */
-d3.dispatch = function(types) {
- var dispatch = {},
- type;
- for (var i = 0, n = arguments.length; i < n; i++) {
- type = arguments[i];
- dispatch[type] = d3_dispatch(type);
- }
+d3.dispatch = function() {
+ var dispatch = new d3_dispatch(),
+ i = -1,
+ n = arguments.length;
+ while (++i < n) dispatch[arguments[i]] = d3_dispatch_event();
return dispatch;
};
-function d3_dispatch(type) {
- var dispatch = {},
- listeners = [];
+function d3_dispatch() {}
- dispatch.add = function(listener) {
- for (var i = 0; i < listeners.length; i++) {
- if (listeners[i].listener == listener) return dispatch; // already registered
- }
- listeners.push({listener: listener, on: true});
- return dispatch;
- };
+d3_dispatch.prototype.on = function(type, listener) {
+ var i = type.indexOf("."),
+ name = "";
- dispatch.remove = function(listener) {
- for (var i = 0; i < listeners.length; i++) {
- var l = listeners[i];
- if (l.listener == listener) {
- l.on = false;
- listeners = listeners.slice(0, i).concat(listeners.slice(i + 1));
- break;
- }
+ // Extract optional namespace, e.g., "click.foo"
+ if (i > 0) {
+ name = type.substring(i + 1);
+ type = type.substring(0, i);
+ }
+
+ return arguments.length < 2
+ ? this[type].on(name)
+ : (this[type].on(name, listener), this);
+};
+
+function d3_dispatch_event() {
+ var listeners = [],
+ listenerByName = {};
+
+ function dispatch() {
+ var z = listeners, // defensive reference
+ i = -1,
+ n = z.length,
+ l;
+ while (++i < n) if (l = z[i].on) l.apply(this, arguments);
+ }
+
+ dispatch.on = function(name, listener) {
+ var l, i;
+
+ // return the current listener, if any
+ if (arguments.length < 2) return (l = listenerByName[name]) && l.on;
+
+ // remove the old listener, if any (with copy-on-write)
+ if (l = listenerByName[name]) {
+ l.on = null;
+ listeners = listeners.slice(0, i = listeners.indexOf(l)).concat(listeners.slice(i + 1));
+ delete listenerByName[name];
}
- return dispatch;
- };
- dispatch.dispatch = function() {
- var ls = listeners; // defensive reference
- for (var i = 0, n = ls.length; i < n; i++) {
- var l = ls[i];
- if (l.on) l.listener.apply(this, arguments);
+ // add the new listener, if any
+ if (listener) {
+ listeners.push(listenerByName[name] = {on: listener});
}
+
+ return dispatch;
};
return dispatch;
@@ -461,10 +555,11 @@ d3.format = function(specifier) {
comma = match[7],
precision = match[8],
type = match[9],
- percentage = false,
+ scale = 1,
+ suffix = "",
integer = false;
- if (precision) precision = precision.substring(1);
+ if (precision) precision = +precision.substring(1);
if (zfill) {
fill = "0"; // TODO align = "=";
@@ -473,22 +568,36 @@ d3.format = function(specifier) {
switch (type) {
case "n": comma = true; type = "g"; break;
- case "%": percentage = true; type = "f"; break;
- case "p": percentage = true; type = "r"; break;
- case "d": integer = true; precision = "0"; break;
+ case "%": scale = 100; suffix = "%"; type = "f"; break;
+ case "p": scale = 100; suffix = "%"; type = "r"; break;
+ case "d": integer = true; precision = 0; break;
+ case "s": scale = -1; type = "r"; break;
}
+ // If no precision is specified for r, fallback to general notation.
+ if (type == "r" && !precision) type = "g";
+
type = d3_format_types[type] || d3_format_typeDefault;
return function(value) {
- var number = percentage ? value * 100 : +value,
- negative = (number < 0) && (number = -number) ? "\u2212" : sign;
// Return the empty string for floats formatted as ints.
- if (integer && (number % 1)) return "";
+ if (integer && (value % 1)) return "";
+
+ // Convert negative to positive, and record the sign prefix.
+ var negative = (value < 0) && (value = -value) ? "\u2212" : sign;
- // Convert the input value to the desired precision.
- value = type(number, precision);
+ // Apply the scale, computing it from the value's exponent for si format.
+ if (scale < 0) {
+ var prefix = d3.formatPrefix(value, precision);
+ value *= prefix.scale;
+ suffix = prefix.symbol;
+ } else {
+ value *= scale;
+ }
+
+ // Convert to the desired precision.
+ value = type(value, precision);
// If the fill character is 0, the sign and group is applied after the fill.
if (zfill) {
@@ -505,9 +614,8 @@ d3.format = function(specifier) {
var length = value.length;
if (length < width) value = new Array(width - length + 1).join(fill) + value;
}
- if (percentage) value += "%";
- return value;
+ return value + suffix;
};
};
@@ -518,12 +626,13 @@ var d3_format_types = {
g: function(x, p) { return x.toPrecision(p); },
e: function(x, p) { return x.toExponential(p); },
f: function(x, p) { return x.toFixed(p); },
- r: function(x, p) {
- var n = 1 + Math.floor(1e-15 + Math.log(x) / Math.LN10);
- return d3.round(x, p - n).toFixed(Math.max(0, p - n));
- }
+ r: function(x, p) { return d3.round(x, p = d3_format_precision(x, p)).toFixed(Math.max(0, Math.min(20, p))); }
};
+function d3_format_precision(x, p) {
+ return p - (x ? 1 + Math.floor(Math.log(x + Math.pow(10, 1 + Math.floor(Math.log(x) / Math.LN10) - p)) / Math.LN10) : 1);
+}
+
function d3_format_typeDefault(x) {
return x + "";
}
@@ -536,6 +645,26 @@ function d3_format_group(value) {
while (i > 0) t.push(value.substring(i -= 3, i + 3));
return t.reverse().join(",") + f;
}
+var d3_formatPrefixes = ["y","z","a","f","p","n","μ","m","","k","M","G","T","P","E","Z","Y"].map(d3_formatPrefix);
+
+d3.formatPrefix = function(value, precision) {
+ var i = 0;
+ if (value) {
+ if (value < 0) value *= -1;
+ if (precision) value = d3.round(value, d3_format_precision(value, precision));
+ i = 1 + Math.floor(1e-12 + Math.log(value) / Math.LN10);
+ i = Math.max(-24, Math.min(24, Math.floor((i <= 0 ? i + 1 : i - 1) / 3) * 3));
+ }
+ return d3_formatPrefixes[8 + i / 3];
+};
+
+function d3_formatPrefix(d, i) {
+ return {
+ scale: Math.pow(10, (8 - i) * 3),
+ symbol: d
+ };
+}
+
/*
* TERMS OF USE - EASING EQUATIONS
*
@@ -598,9 +727,15 @@ d3.ease = function(name) {
var i = name.indexOf("-"),
t = i >= 0 ? name.substring(0, i) : name,
m = i >= 0 ? name.substring(i + 1) : "in";
- return d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1)));
+ return d3_ease_clamp(d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1))));
};
+function d3_ease_clamp(f) {
+ return function(t) {
+ return t <= 0 ? 0 : t >= 1 ? 1 : f(t);
+ };
+}
+
function d3_ease_reverse(f) {
return function(t) {
return 1 - f(1 - t);
@@ -628,7 +763,7 @@ function d3_ease_sin(t) {
}
function d3_ease_exp(t) {
- return t ? Math.pow(2, 10 * (t - 1)) - 1e-3 : 0;
+ return Math.pow(2, 10 * (t - 1));
}
function d3_ease_circle(t) {
@@ -659,6 +794,11 @@ function d3_ease_bounce(t) {
: 7.5625 * (t -= 2.625 / 2.75) * t + .984375;
}
d3.event = null;
+
+function d3_eventCancel() {
+ d3.event.stopPropagation();
+ d3.event.preventDefault();
+}
d3.interpolate = function(a, b) {
var i = d3.interpolators.length, f;
while (--i >= 0 && !(f = d3.interpolators[i](a, b)));
@@ -753,6 +893,10 @@ d3.interpolateString = function(a, b) {
};
};
+d3.interpolateTransform = function(a, b) {
+ return d3.interpolateString(d3.transform(a) + "", d3.transform(b) + "");
+};
+
d3.interpolateRgb = function(a, b) {
a = d3.rgb(a);
b = d3.rgb(b);
@@ -763,10 +907,10 @@ d3.interpolateRgb = function(a, b) {
bg = b.g - ag,
bb = b.b - ab;
return function(t) {
- return "rgb(" + Math.round(ar + br * t)
- + "," + Math.round(ag + bg * t)
- + "," + Math.round(ab + bb * t)
- + ")";
+ return "#"
+ + d3_rgb_hex(Math.round(ar + br * t))
+ + d3_rgb_hex(Math.round(ag + bg * t))
+ + d3_rgb_hex(Math.round(ab + bb * t));
};
};
@@ -823,34 +967,34 @@ d3.interpolateObject = function(a, b) {
};
}
-var d3_interpolate_number = /[-+]?(?:\d+\.\d+|\d+\.|\.\d+|\d+)(?:[eE][-]?\d+)?/g,
- d3_interpolate_rgb = {background: 1, fill: 1, stroke: 1};
+var d3_interpolate_number = /[-+]?(?:\d*\.?\d+)(?:[eE][-+]?\d+)?/g;
function d3_interpolateByName(n) {
- return n in d3_interpolate_rgb || /\bcolor\b/.test(n)
- ? d3.interpolateRgb
+ return n == "transform"
+ ? d3.interpolateTransform
: d3.interpolate;
}
d3.interpolators = [
d3.interpolateObject,
function(a, b) { return (b instanceof Array) && d3.interpolateArray(a, b); },
- function(a, b) { return (typeof b === "string") && d3.interpolateString(String(a), b); },
- function(a, b) { return (b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b)) && d3.interpolateRgb(String(a), b); },
- function(a, b) { return (typeof b === "number") && d3.interpolateNumber(+a, b); }
+ function(a, b) { return (typeof a === "string" || typeof b === "string") && d3.interpolateString(a + "", b + ""); },
+ function(a, b) { return (typeof b === "string" ? b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Rgb || b instanceof d3_Hsl) && d3.interpolateRgb(a, b); },
+ function(a, b) { return !isNaN(a = +a) && !isNaN(b = +b) && d3.interpolateNumber(a, b); }
];
function d3_uninterpolateNumber(a, b) {
- b = 1 / (b - (a = +a));
+ b = b - (a = +a) ? 1 / (b - a) : 0;
return function(x) { return (x - a) * b; };
}
function d3_uninterpolateClamp(a, b) {
- b = 1 / (b - (a = +a));
+ b = b - (a = +a) ? 1 / (b - a) : 0;
return function(x) { return Math.max(0, Math.min(1, (x - a) * b)); };
}
d3.rgb = function(r, g, b) {
return arguments.length === 1
- ? d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb)
+ ? (r instanceof d3_Rgb ? d3_rgb(r.r, r.g, r.b)
+ : d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb))
: d3_rgb(~~r, ~~g, ~~b);
};
@@ -875,17 +1019,17 @@ d3_Rgb.prototype.brighter = function(k) {
if (g && g < i) g = i;
if (b && b < i) b = i;
return d3_rgb(
- Math.min(255, Math.floor(r / k)),
- Math.min(255, Math.floor(g / k)),
- Math.min(255, Math.floor(b / k)));
+ Math.min(255, Math.floor(r / k)),
+ Math.min(255, Math.floor(g / k)),
+ Math.min(255, Math.floor(b / k)));
};
d3_Rgb.prototype.darker = function(k) {
k = Math.pow(0.7, arguments.length ? k : 1);
return d3_rgb(
- Math.max(0, Math.floor(k * this.r)),
- Math.max(0, Math.floor(k * this.g)),
- Math.max(0, Math.floor(k * this.b)));
+ Math.floor(k * this.r),
+ Math.floor(k * this.g),
+ Math.floor(k * this.b));
};
d3_Rgb.prototype.hsl = function() {
@@ -897,7 +1041,9 @@ d3_Rgb.prototype.toString = function() {
};
function d3_rgb_hex(v) {
- return v < 0x10 ? "0" + v.toString(16) : v.toString(16);
+ return v < 0x10
+ ? "0" + Math.max(0, v).toString(16)
+ : Math.min(255, v).toString(16);
}
function d3_rgb_parse(format, rgb, hsl) {
@@ -1134,7 +1280,8 @@ for (var d3_rgb_name in d3_rgb_names) {
}
d3.hsl = function(h, s, l) {
return arguments.length === 1
- ? d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl)
+ ? (h instanceof d3_Hsl ? d3_hsl(h.h, h.s, h.l)
+ : d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl))
: d3_hsl(+h, +s, +l);
};
@@ -1163,7 +1310,7 @@ d3_Hsl.prototype.rgb = function() {
};
d3_Hsl.prototype.toString = function() {
- return "hsl(" + this.h + "," + this.s * 100 + "%," + this.l * 100 + "%)";
+ return this.rgb().toString();
};
function d3_hsl_rgb(h, s, l) {
@@ -1194,906 +1341,859 @@ function d3_hsl_rgb(h, s, l) {
return d3_rgb(vv(h + 120), vv(h), vv(h - 120));
}
+function d3_selection(groups) {
+ d3_arraySubclass(groups, d3_selectionPrototype);
+ return groups;
+}
+
var d3_select = function(s, n) { return n.querySelector(s); },
- d3_selectAll = function(s, n) { return d3_array(n.querySelectorAll(s)); };
+ d3_selectAll = function(s, n) { return n.querySelectorAll(s); },
+ d3_selectRoot = document.documentElement,
+ d3_selectMatcher = d3_selectRoot.matchesSelector || d3_selectRoot.webkitMatchesSelector || d3_selectRoot.mozMatchesSelector || d3_selectRoot.msMatchesSelector || d3_selectRoot.oMatchesSelector,
+ d3_selectMatches = function(n, s) { return d3_selectMatcher.call(n, s); };
-// Use Sizzle, if available.
+// Prefer Sizzle, if available.
if (typeof Sizzle === "function") {
d3_select = function(s, n) { return Sizzle(s, n)[0]; };
d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
+ d3_selectMatches = Sizzle.matchesSelector;
}
-var d3_root = d3_selection([[document]]);
-d3_root[0].parentNode = document.documentElement;
-
-// TODO fast singleton implementation!
-d3.select = function(selector) {
- return typeof selector === "string"
- ? d3_root.select(selector)
- : d3_selection([[selector]]); // assume node
-};
+var d3_selectionPrototype = [];
-d3.selectAll = function(selector) {
- return typeof selector === "string"
- ? d3_root.selectAll(selector)
- : d3_selection([d3_array(selector)]); // assume node[]
+d3.selection = function() {
+ return d3_selectionRoot;
};
-function d3_selection(groups) {
-
- function select(select) {
- var subgroups = [],
- subgroup,
- subnode,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroup.push(subnode = select(node));
- if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
- } else {
- subgroup.push(null);
- }
- }
- }
- return d3_selection(subgroups);
- }
-
- function selectAll(selectAll) {
- var subgroups = [],
- subgroup,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroups.push(subgroup = selectAll(node));
- subgroup.parentNode = node;
- }
- }
- }
- return d3_selection(subgroups);
- }
-
- // TODO select(function)?
- groups.select = function(selector) {
- return select(function(node) {
- return d3_select(selector, node);
- });
- };
-
- // TODO selectAll(function)?
- groups.selectAll = function(selector) {
- return selectAll(function(node) {
- return d3_selectAll(selector, node);
- });
- };
-
- // TODO preserve null elements to maintain index?
- groups.filter = function(filter) {
- var subgroups = [],
- subgroup,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if ((node = group[i]) && filter.call(node, node.__data__, i)) {
- subgroup.push(node);
- }
- }
- }
- return d3_selection(subgroups);
- };
-
- groups.map = function(map) {
- var group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) node.__data__ = map.call(node, node.__data__, i);
- }
- }
- return groups;
- };
-
- // TODO data(null) for clearing data?
- groups.data = function(data, join) {
- var enter = [],
- update = [],
- exit = [];
-
- function bind(group, groupData) {
- var i = 0,
- n = group.length,
- m = groupData.length,
- n0 = Math.min(n, m),
- n1 = Math.max(n, m),
- updateNodes = [],
- enterNodes = [],
- exitNodes = [],
- node,
- nodeData;
-
- if (join) {
- var nodeByKey = {},
- keys = [],
- key,
- j = groupData.length;
-
- for (i = 0; i < n; i++) {
- key = join.call(node = group[i], node.__data__, i);
- if (key in nodeByKey) {
- exitNodes[j++] = node; // duplicate key
- } else {
- nodeByKey[key] = node;
- }
- keys.push(key);
- }
-
- for (i = 0; i < m; i++) {
- node = nodeByKey[key = join.call(groupData, nodeData = groupData[i], i)];
- if (node) {
- node.__data__ = nodeData;
- updateNodes[i] = node;
- enterNodes[i] = exitNodes[i] = null;
- } else {
- enterNodes[i] = d3_selection_enterNode(nodeData);
- updateNodes[i] = exitNodes[i] = null;
- }
- delete nodeByKey[key];
- }
-
- for (i = 0; i < n; i++) {
- if (keys[i] in nodeByKey) {
- exitNodes[i] = group[i];
- }
- }
+d3.selection.prototype = d3_selectionPrototype;
+d3_selectionPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ group,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selector(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = (group = this[j]).parentNode;
+ for (var i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroup.push(subnode = selector.call(node, node.__data__, i));
+ if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
} else {
- for (; i < n0; i++) {
- node = group[i];
- nodeData = groupData[i];
- if (node) {
- node.__data__ = nodeData;
- updateNodes[i] = node;
- enterNodes[i] = exitNodes[i] = null;
- } else {
- enterNodes[i] = d3_selection_enterNode(nodeData);
- updateNodes[i] = exitNodes[i] = null;
- }
- }
- for (; i < m; i++) {
- enterNodes[i] = d3_selection_enterNode(groupData[i]);
- updateNodes[i] = exitNodes[i] = null;
- }
- for (; i < n1; i++) {
- exitNodes[i] = group[i];
- enterNodes[i] = updateNodes[i] = null;
- }
- }
-
- enterNodes.parentNode
- = updateNodes.parentNode
- = exitNodes.parentNode
- = group.parentNode;
-
- enter.push(enterNodes);
- update.push(updateNodes);
- exit.push(exitNodes);
- }
-
- var i = -1,
- n = groups.length,
- group;
- if (typeof data === "function") {
- while (++i < n) {
- bind(group = groups[i], data.call(group, group.parentNode.__data__, i));
- }
- } else {
- while (++i < n) {
- bind(group = groups[i], data);
+ subgroup.push(null);
}
}
+ }
- var selection = d3_selection(update);
- selection.enter = function() {
- return d3_selectionEnter(enter);
- };
- selection.exit = function() {
- return d3_selection(exit);
- };
- return selection;
- };
+ return d3_selection(subgroups);
+};
- // TODO mask forEach? or rename for eachData?
- // TODO offer the same semantics for map, reduce, etc.?
- groups.each = function(callback) {
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- var node = group[i];
- if (node) callback.call(node, node.__data__, i);
- }
- }
- return groups;
+function d3_selection_selector(selector) {
+ return function() {
+ return d3_select(selector, this);
};
-
- function first(callback) {
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- var node = group[i];
- if (node) return callback.call(node, node.__data__, i);
+}
+d3_selectionPrototype.selectAll = function(selector) {
+ var subgroups = [],
+ subgroup,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selectorAll(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroups.push(subgroup = d3_array(selector.call(node, node.__data__, i)));
+ subgroup.parentNode = node;
}
}
- return null;
}
- groups.empty = function() {
- return !first(function() { return true; });
- };
+ return d3_selection(subgroups);
+};
- groups.node = function() {
- return first(function() { return this; });
+function d3_selection_selectorAll(selector) {
+ return function() {
+ return d3_selectAll(selector, this);
};
+}
+d3_selectionPrototype.attr = function(name, value) {
+ name = d3.ns.qualify(name);
+
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) {
+ var node = this.node();
+ return name.local
+ ? node.getAttributeNS(name.space, name.local)
+ : node.getAttribute(name);
+ }
- groups.attr = function(name, value) {
- name = d3.ns.qualify(name);
-
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(name.local
- ? function() { return this.getAttributeNS(name.space, name.local); }
- : function() { return this.getAttribute(name); });
- }
-
- /** @this {Element} */
- function attrNull() {
- this.removeAttribute(name);
- }
+ function attrNull() {
+ this.removeAttribute(name);
+ }
- /** @this {Element} */
- function attrNullNS() {
- this.removeAttributeNS(name.space, name.local);
- }
+ function attrNullNS() {
+ this.removeAttributeNS(name.space, name.local);
+ }
- /** @this {Element} */
- function attrConstant() {
- this.setAttribute(name, value);
- }
+ function attrConstant() {
+ this.setAttribute(name, value);
+ }
- /** @this {Element} */
- function attrConstantNS() {
- this.setAttributeNS(name.space, name.local, value);
- }
+ function attrConstantNS() {
+ this.setAttributeNS(name.space, name.local, value);
+ }
- /** @this {Element} */
- function attrFunction() {
- var x = value.apply(this, arguments);
- if (x == null) this.removeAttribute(name);
- else this.setAttribute(name, x);
- }
+ function attrFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.removeAttribute(name);
+ else this.setAttribute(name, x);
+ }
- /** @this {Element} */
- function attrFunctionNS() {
- var x = value.apply(this, arguments);
- if (x == null) this.removeAttributeNS(name.space, name.local);
- else this.setAttributeNS(name.space, name.local, x);
- }
+ function attrFunctionNS() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.removeAttributeNS(name.space, name.local);
+ else this.setAttributeNS(name.space, name.local, x);
+ }
- return groups.each(value == null
- ? (name.local ? attrNullNS : attrNull) : (typeof value === "function"
- ? (name.local ? attrFunctionNS : attrFunction)
- : (name.local ? attrConstantNS : attrConstant)));
- };
+ return this.each(value == null
+ ? (name.local ? attrNullNS : attrNull) : (typeof value === "function"
+ ? (name.local ? attrFunctionNS : attrFunction)
+ : (name.local ? attrConstantNS : attrConstant)));
+};
+d3_selectionPrototype.classed = function(name, value) {
+ var names = name.split(d3_selection_classedWhitespace),
+ n = names.length,
+ i = -1;
+ if (arguments.length > 1) {
+ while (++i < n) d3_selection_classed.call(this, names[i], value);
+ return this;
+ } else {
+ while (++i < n) if (!d3_selection_classed.call(this, names[i])) return false;
+ return true;
+ }
+};
- groups.classed = function(name, value) {
- var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
+var d3_selection_classedWhitespace = /\s+/g;
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- if (c = this.classList) return c.contains(name);
- var c = this.className;
- re.lastIndex = 0;
- return re.test(c.baseVal != null ? c.baseVal : c);
- });
- }
+function d3_selection_classed(name, value) {
+ var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
- /** @this {Element} */
- function classedAdd() {
- if (c = this.classList) return c.add(name);
- var c = this.className,
- cb = c.baseVal != null,
- cv = cb ? c.baseVal : c;
- re.lastIndex = 0;
- if (!re.test(cv)) {
- cv = d3_collapse(cv + " " + name);
- if (cb) c.baseVal = cv;
- else this.className = cv;
- }
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) {
+ var node = this.node();
+ if (c = node.classList) return c.contains(name);
+ var c = node.className;
+ re.lastIndex = 0;
+ return re.test(c.baseVal != null ? c.baseVal : c);
+ }
- /** @this {Element} */
- function classedRemove() {
- if (c = this.classList) return c.remove(name);
- var c = this.className,
- cb = c.baseVal != null,
- cv = cb ? c.baseVal : c;
- cv = d3_collapse(cv.replace(re, " "));
+ function classedAdd() {
+ if (c = this.classList) return c.add(name);
+ var c = this.className,
+ cb = c.baseVal != null,
+ cv = cb ? c.baseVal : c;
+ re.lastIndex = 0;
+ if (!re.test(cv)) {
+ cv = d3_collapse(cv + " " + name);
if (cb) c.baseVal = cv;
else this.className = cv;
}
+ }
- /** @this {Element} */
- function classedFunction() {
- (value.apply(this, arguments)
- ? classedAdd
- : classedRemove).call(this);
- }
+ function classedRemove() {
+ if (c = this.classList) return c.remove(name);
+ var c = this.className,
+ cb = c.baseVal != null,
+ cv = cb ? c.baseVal : c;
+ cv = d3_collapse(cv.replace(re, " "));
+ if (cb) c.baseVal = cv;
+ else this.className = cv;
+ }
- return groups.each(typeof value === "function"
- ? classedFunction : value
+ function classedFunction() {
+ (value.apply(this, arguments)
? classedAdd
- : classedRemove);
- };
-
- groups.style = function(name, value, priority) {
- if (arguments.length < 3) priority = "";
+ : classedRemove).call(this);
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- return window.getComputedStyle(this, null).getPropertyValue(name);
- });
- }
+ return this.each(typeof value === "function"
+ ? classedFunction : value
+ ? classedAdd
+ : classedRemove);
+}
+d3_selectionPrototype.style = function(name, value, priority) {
+ if (arguments.length < 3) priority = "";
- /** @this {Element} */
- function styleNull() {
- this.style.removeProperty(name);
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) return window
+ .getComputedStyle(this.node(), null)
+ .getPropertyValue(name);
- /** @this {Element} */
- function styleConstant() {
- this.style.setProperty(name, value, priority);
- }
+ function styleNull() {
+ this.style.removeProperty(name);
+ }
- /** @this {Element} */
- function styleFunction() {
- var x = value.apply(this, arguments);
- if (x == null) this.style.removeProperty(name);
- else this.style.setProperty(name, x, priority);
- }
+ function styleConstant() {
+ this.style.setProperty(name, value, priority);
+ }
- return groups.each(value == null
- ? styleNull : (typeof value === "function"
- ? styleFunction : styleConstant));
- };
+ function styleFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.style.removeProperty(name);
+ else this.style.setProperty(name, x, priority);
+ }
- groups.property = function(name, value) {
- name = d3.ns.qualify(name);
+ return this.each(value == null
+ ? styleNull : (typeof value === "function"
+ ? styleFunction : styleConstant));
+};
+d3_selectionPrototype.property = function(name, value) {
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- return this[name];
- });
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) return this.node()[name];
- /** @this {Element} */
- function propertyNull() {
- delete this[name];
- }
+ function propertyNull() {
+ delete this[name];
+ }
- /** @this {Element} */
- function propertyConstant() {
- this[name] = value;
- }
+ function propertyConstant() {
+ this[name] = value;
+ }
- /** @this {Element} */
- function propertyFunction() {
- var x = value.apply(this, arguments);
- if (x == null) delete this[name];
- else this[name] = x;
- }
+ function propertyFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) delete this[name];
+ else this[name] = x;
+ }
- return groups.each(value == null
- ? propertyNull : (typeof value === "function"
- ? propertyFunction : propertyConstant));
- };
+ return this.each(value == null
+ ? propertyNull : (typeof value === "function"
+ ? propertyFunction : propertyConstant));
+};
+d3_selectionPrototype.text = function(value) {
+ return arguments.length < 1
+ ? this.node().textContent : this.each(typeof value === "function"
+ ? function() { var v = value.apply(this, arguments); this.textContent = v == null ? "" : v; } : value == null
+ ? function() { this.textContent = ""; }
+ : function() { this.textContent = value; });
+};
+d3_selectionPrototype.html = function(value) {
+ return arguments.length < 1
+ ? this.node().innerHTML : this.each(typeof value === "function"
+ ? function() { var v = value.apply(this, arguments); this.innerHTML = v == null ? "" : v; } : value == null
+ ? function() { this.innerHTML = ""; }
+ : function() { this.innerHTML = value; });
+};
+// TODO append(node)?
+// TODO append(function)?
+d3_selectionPrototype.append = function(name) {
+ name = d3.ns.qualify(name);
- groups.text = function(value) {
+ function append() {
+ return this.appendChild(document.createElementNS(this.namespaceURI, name));
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 1) {
- return first(function() {
- return this.textContent;
- });
- }
+ function appendNS() {
+ return this.appendChild(document.createElementNS(name.space, name.local));
+ }
- /** @this {Element} */
- function textConstant() {
- this.textContent = value;
- }
+ return this.select(name.local ? appendNS : append);
+};
+// TODO insert(node, function)?
+// TODO insert(function, string)?
+// TODO insert(function, function)?
+d3_selectionPrototype.insert = function(name, before) {
+ name = d3.ns.qualify(name);
+
+ function insert() {
+ return this.insertBefore(
+ document.createElementNS(this.namespaceURI, name),
+ d3_select(before, this));
+ }
- /** @this {Element} */
- function textFunction() {
- this.textContent = value.apply(this, arguments);
- }
+ function insertNS() {
+ return this.insertBefore(
+ document.createElementNS(name.space, name.local),
+ d3_select(before, this));
+ }
- return groups.each(typeof value === "function"
- ? textFunction : textConstant);
- };
+ return this.select(name.local ? insertNS : insert);
+};
+// TODO remove(selector)?
+// TODO remove(node)?
+// TODO remove(function)?
+d3_selectionPrototype.remove = function() {
+ return this.each(function() {
+ var parent = this.parentNode;
+ if (parent) parent.removeChild(this);
+ });
+};
+// TODO data(null) for clearing data?
+d3_selectionPrototype.data = function(data, join) {
+ var enter = [],
+ update = [],
+ exit = [];
+
+ function bind(group, groupData) {
+ var i,
+ n = group.length,
+ m = groupData.length,
+ n0 = Math.min(n, m),
+ n1 = Math.max(n, m),
+ updateNodes = [],
+ enterNodes = [],
+ exitNodes = [],
+ node,
+ nodeData;
+
+ if (join) {
+ var nodeByKey = {},
+ keys = [],
+ key,
+ j = groupData.length;
+
+ for (i = -1; ++i < n;) {
+ key = join.call(node = group[i], node.__data__, i);
+ if (key in nodeByKey) {
+ exitNodes[j++] = node; // duplicate key
+ } else {
+ nodeByKey[key] = node;
+ }
+ keys.push(key);
+ }
- groups.html = function(value) {
+ for (i = -1; ++i < m;) {
+ node = nodeByKey[key = join.call(groupData, nodeData = groupData[i], i)];
+ if (node) {
+ node.__data__ = nodeData;
+ updateNodes[i] = node;
+ enterNodes[i] = exitNodes[i] = null;
+ } else {
+ enterNodes[i] = d3_selection_dataNode(nodeData);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ delete nodeByKey[key];
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 1) {
- return first(function() {
- return this.innerHTML;
- });
- }
-
- /** @this {Element} */
- function htmlConstant() {
- this.innerHTML = value;
+ for (i = -1; ++i < n;) {
+ if (keys[i] in nodeByKey) {
+ exitNodes[i] = group[i];
+ }
+ }
+ } else {
+ for (i = -1; ++i < n0;) {
+ node = group[i];
+ nodeData = groupData[i];
+ if (node) {
+ node.__data__ = nodeData;
+ updateNodes[i] = node;
+ enterNodes[i] = exitNodes[i] = null;
+ } else {
+ enterNodes[i] = d3_selection_dataNode(nodeData);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ }
+ for (; i < m; ++i) {
+ enterNodes[i] = d3_selection_dataNode(groupData[i]);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ for (; i < n1; ++i) {
+ exitNodes[i] = group[i];
+ enterNodes[i] = updateNodes[i] = null;
+ }
}
- /** @this {Element} */
- function htmlFunction() {
- this.innerHTML = value.apply(this, arguments);
- }
+ enterNodes.update
+ = updateNodes;
- return groups.each(typeof value === "function"
- ? htmlFunction : htmlConstant);
- };
+ enterNodes.parentNode
+ = updateNodes.parentNode
+ = exitNodes.parentNode
+ = group.parentNode;
- // TODO append(node)?
- // TODO append(function)?
- groups.append = function(name) {
- name = d3.ns.qualify(name);
+ enter.push(enterNodes);
+ update.push(updateNodes);
+ exit.push(exitNodes);
+ }
- function append(node) {
- return node.appendChild(document.createElement(name));
+ var i = -1,
+ n = this.length,
+ group;
+ if (typeof data === "function") {
+ while (++i < n) {
+ bind(group = this[i], data.call(group, group.parentNode.__data__, i));
}
-
- function appendNS(node) {
- return node.appendChild(document.createElementNS(name.space, name.local));
+ } else {
+ while (++i < n) {
+ bind(group = this[i], data);
}
+ }
- return select(name.local ? appendNS : append);
- };
-
- // TODO insert(node, function)?
- // TODO insert(function, string)?
- // TODO insert(function, function)?
- groups.insert = function(name, before) {
- name = d3.ns.qualify(name);
+ var selection = d3_selection(update);
+ selection.enter = function() { return d3_selection_enter(enter); };
+ selection.exit = function() { return d3_selection(exit); };
+ return selection;
+};
- function insert(node) {
- return node.insertBefore(
- document.createElement(name),
- d3_select(before, node));
+function d3_selection_dataNode(data) {
+ return {__data__: data};
+}
+d3_selectionPrototype.filter = function(filter) {
+ var subgroups = [],
+ subgroup,
+ group,
+ node;
+
+ if (typeof filter !== "function") filter = d3_selection_filter(filter);
+
+ for (var j = 0, m = this.length; j < m; j++) {
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = (group = this[j]).parentNode;
+ for (var i = 0, n = group.length; i < n; i++) {
+ if ((node = group[i]) && filter.call(node, node.__data__, i)) {
+ subgroup.push(node);
+ }
}
+ }
- function insertNS(node) {
- return node.insertBefore(
- document.createElementNS(name.space, name.local),
- d3_select(before, node));
- }
+ return d3_selection(subgroups);
+};
- return select(name.local ? insertNS : insert);
+function d3_selection_filter(selector) {
+ return function() {
+ return d3_selectMatches(this, selector);
};
+}
+d3_selectionPrototype.map = function(map) {
+ return this.each(function() {
+ this.__data__ = map.apply(this, arguments);
+ });
+};
+d3_selectionPrototype.order = function() {
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = group.length - 1, next = group[i], node; --i >= 0;) {
+ if (node = group[i]) {
+ if (next) next.parentNode.insertBefore(node, next);
+ next = node;
+ }
+ }
+ }
+ return this;
+};
+d3_selectionPrototype.sort = function(comparator) {
+ comparator = d3_selection_sortComparator.apply(this, arguments);
+ for (var j = -1, m = this.length; ++j < m;) this[j].sort(comparator);
+ return this.order();
+};
- // TODO remove(selector)?
- // TODO remove(node)?
- // TODO remove(function)?
- groups.remove = function() {
- return groups.each(function() {
- var parent = this.parentNode;
- if (parent) parent.removeChild(this);
- });
+function d3_selection_sortComparator(comparator) {
+ if (!arguments.length) comparator = d3.ascending;
+ return function(a, b) {
+ return comparator(a && a.__data__, b && b.__data__);
};
-
- groups.sort = function(comparator) {
- comparator = d3_selection_comparator.apply(this, arguments);
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- group.sort(comparator);
- for (var i = 1, n = group.length, prev = group[0]; i < n; i++) {
- var node = group[i];
- if (node) {
- if (prev) prev.parentNode.insertBefore(node, prev.nextSibling);
- prev = node;
- }
+}
+// type can be namespaced, e.g., "click.foo"
+// listener can be null for removal
+d3_selectionPrototype.on = function(type, listener, capture) {
+ if (arguments.length < 3) capture = false;
+
+ // parse the type specifier
+ var name = "__on" + type, i = type.indexOf(".");
+ if (i > 0) type = type.substring(0, i);
+
+ // if called with only one argument, return the current listener
+ if (arguments.length < 2) return (i = this.node()[name]) && i._;
+
+ // remove the old event listener, and add the new event listener
+ return this.each(function(d, i) {
+ var node = this;
+
+ if (node[name]) node.removeEventListener(type, node[name], capture);
+ if (listener) node.addEventListener(type, node[name] = l, capture);
+
+ // wrapped event listener that preserves i
+ function l(e) {
+ var o = d3.event; // Events can be reentrant (e.g., focus).
+ d3.event = e;
+ try {
+ listener.call(node, node.__data__, i);
+ } finally {
+ d3.event = o;
}
}
- return groups;
- };
-
- // type can be namespaced, e.g., "click.foo"
- // listener can be null for removal
- groups.on = function(type, listener, capture) {
- if (arguments.length < 3) capture = false;
-
- // parse the type specifier
- var i = type.indexOf("."),
- typo = i === -1 ? type : type.substring(0, i),
- name = "__on" + type;
- // remove the old event listener, and add the new event listener
- return groups.each(function(d, i) {
- if (this[name]) this.removeEventListener(typo, this[name], capture);
- if (listener) this.addEventListener(typo, this[name] = l, capture);
-
- // wrapped event listener that preserves i
- var node = this;
- function l(e) {
- var o = d3.event; // Events can be reentrant (e.g., focus).
- d3.event = e;
- try {
- listener.call(this, node.__data__, i);
- } finally {
- d3.event = o;
- }
- }
- });
- };
+ // stash the unwrapped listener for retrieval
+ l._ = listener;
+ });
+};
+d3_selectionPrototype.each = function(callback) {
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ var node = group[i];
+ if (node) callback.call(node, node.__data__, i, j);
+ }
+ }
+ return this;
+};
+//
+// Note: assigning to the arguments array simultaneously changes the value of
+// the corresponding argument!
+//
+// TODO The `this` argument probably shouldn't be the first argument to the
+// callback, anyway, since it's redundant. However, that will require a major
+// version bump due to backwards compatibility, so I'm not changing it right
+// away.
+//
+d3_selectionPrototype.call = function(callback) {
+ callback.apply(this, (arguments[0] = this, arguments));
+ return this;
+};
+d3_selectionPrototype.empty = function() {
+ return !this.node();
+};
+d3_selectionPrototype.node = function(callback) {
+ for (var j = 0, m = this.length; j < m; j++) {
+ for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+ var node = group[i];
+ if (node) return node;
+ }
+ }
+ return null;
+};
+d3_selectionPrototype.transition = function() {
+ var subgroups = [],
+ subgroup,
+ node;
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ subgroup.push((node = group[i]) ? {node: node, delay: 0, duration: 250} : null);
+ }
+ }
- // TODO slice?
+ return d3_transition(subgroups, d3_transitionInheritId || ++d3_transitionId, Date.now());
+};
+var d3_selectionRoot = d3_selection([[document]]);
- groups.transition = function() {
- return d3_transition(groups);
- };
+d3_selectionRoot[0].parentNode = d3_selectRoot;
- groups.call = d3_call;
+// TODO fast singleton implementation!
+// TODO select(function)
+d3.select = function(selector) {
+ return typeof selector === "string"
+ ? d3_selectionRoot.select(selector)
+ : d3_selection([[selector]]); // assume node
+};
- return groups;
+// TODO selectAll(function)
+d3.selectAll = function(selector) {
+ return typeof selector === "string"
+ ? d3_selectionRoot.selectAll(selector)
+ : d3_selection([d3_array(selector)]); // assume node[]
+};
+function d3_selection_enter(selection) {
+ d3_arraySubclass(selection, d3_selection_enterPrototype);
+ return selection;
}
-function d3_selectionEnter(groups) {
-
- function select(select) {
- var subgroups = [],
- subgroup,
- subnode,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroup.push(subnode = select(group.parentNode));
- subnode.__data__ = node.__data__;
- } else {
- subgroup.push(null);
- }
+var d3_selection_enterPrototype = [];
+
+d3_selection_enterPrototype.append = d3_selectionPrototype.append;
+d3_selection_enterPrototype.insert = d3_selectionPrototype.insert;
+d3_selection_enterPrototype.empty = d3_selectionPrototype.empty;
+d3_selection_enterPrototype.node = d3_selectionPrototype.node;
+d3_selection_enterPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ upgroup,
+ group,
+ node;
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ upgroup = (group = this[j]).update;
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = group.parentNode;
+ for (var i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroup.push(upgroup[i] = subnode = selector.call(group.parentNode, node.__data__, i));
+ subnode.__data__ = node.__data__;
+ } else {
+ subgroup.push(null);
}
}
- return d3_selection(subgroups);
}
- // TODO append(node)?
- // TODO append(function)?
- groups.append = function(name) {
- name = d3.ns.qualify(name);
-
- function append(node) {
- return node.appendChild(document.createElement(name));
- }
-
- function appendNS(node) {
- return node.appendChild(document.createElementNS(name.space, name.local));
- }
-
- return select(name.local ? appendNS : append);
- };
+ return d3_selection(subgroups);
+};
+function d3_transition(groups, id, time) {
+ d3_arraySubclass(groups, d3_transitionPrototype);
- // TODO insert(node, function)?
- // TODO insert(function, string)?
- // TODO insert(function, function)?
- groups.insert = function(name, before) {
- name = d3.ns.qualify(name);
+ var tweens = {},
+ event = d3.dispatch("start", "end"),
+ ease = d3_transitionEase;
- function insert(node) {
- return node.insertBefore(
- document.createElement(name),
- d3_select(before, node));
- }
+ groups.id = id;
- function insertNS(node) {
- return node.insertBefore(
- document.createElementNS(name.space, name.local),
- d3_select(before, node));
- }
+ groups.time = time;
- return select(name.local ? insertNS : insert);
+ groups.tween = function(name, tween) {
+ if (arguments.length < 2) return tweens[name];
+ if (tween == null) delete tweens[name];
+ else tweens[name] = tween;
+ return groups;
};
- return groups;
-}
+ groups.ease = function(value) {
+ if (!arguments.length) return ease;
+ ease = typeof value === "function" ? value : d3.ease.apply(d3, arguments);
+ return groups;
+ };
-function d3_selection_comparator(comparator) {
- if (!arguments.length) comparator = d3.ascending;
- return function(a, b) {
- return comparator(a && a.__data__, b && b.__data__);
+ groups.each = function(type, listener) {
+ if (arguments.length < 2) return d3_transition_each.call(groups, type);
+ event.on(type, listener);
+ return groups;
};
-}
-function d3_selection_enterNode(data) {
- return {__data__: data};
-}
-d3.transition = d3_root.transition;
+ d3.timer(function(elapsed) {
+ groups.each(function(d, i, j) {
+ var tweened = [],
+ node = this,
+ delay = groups[j][i].delay,
+ duration = groups[j][i].duration,
+ lock = node.__transition__ || (node.__transition__ = {active: 0, count: 0});
-var d3_transitionId = 0,
- d3_transitionInheritId = 0;
+ ++lock.count;
-function d3_transition(groups) {
- var transition = {},
- transitionId = d3_transitionInheritId || ++d3_transitionId,
- tweens = {},
- interpolators = [],
- remove = false,
- event = d3.dispatch("start", "end"),
- stage = [],
- delay = [],
- duration = [],
- durationMax,
- ease = d3.ease("cubic-in-out");
-
- //
- // Be careful with concurrent transitions!
- //
- // Say transition A causes an exit. Before A finishes, a transition B is
- // created, and believes it only needs to do an update, because the elements
- // haven't been removed yet (which happens at the very end of the exit
- // transition).
- //
- // Even worse, what if either transition A or B has a staggered delay? Then,
- // some elements may be removed, while others remain. Transition B does not
- // know to enter the elements because they were still present at the time
- // the transition B was created (but not yet started).
- //
- // To prevent such confusion, we only trigger end events for transitions if
- // the transition ending is the only one scheduled for the given element.
- // Similarly, we only allow one transition to be active for any given
- // element, so that concurrent transitions do not overwrite each other's
- // properties.
- //
- // TODO Support transition namespaces, so that transitions can proceed
- // concurrently on the same element if needed. Hopefully, this is rare!
- //
-
- groups.each(function() {
- (this.__transition__ || (this.__transition__ = {})).owner = transitionId;
- });
+ delay <= elapsed ? start(elapsed) : d3.timer(start, delay, time);
- function step(elapsed) {
- var clear = true,
- k = -1;
- groups.each(function() {
- if (stage[++k] === 2) return; // ended
- var t = (elapsed - delay[k]) / duration[k],
- tx = this.__transition__,
- te, // ease(t)
- tk, // tween key
- ik = interpolators[k];
-
- // Check if the (un-eased) time is outside the range [0,1].
- if (t < 1) {
- clear = false;
- if (t < 0) return;
- } else {
- t = 1;
- }
+ function start(elapsed) {
+ if (lock.active > id) return stop();
+ lock.active = id;
- // Determine the stage of this transition.
- // 0 - Not yet started.
- // 1 - In progress.
- // 2 - Ended.
- if (stage[k]) {
- if (!tx || tx.active !== transitionId) {
- stage[k] = 2;
- return;
- }
- } else if (!tx || tx.active > transitionId) {
- stage[k] = 2;
- return;
- } else {
- stage[k] = 1;
- event.start.dispatch.apply(this, arguments);
- ik = interpolators[k] = {};
- tx.active = transitionId;
- for (tk in tweens) {
- if (te = tweens[tk].apply(this, arguments)) {
- ik[tk] = te;
+ for (var tween in tweens) {
+ if (tween = tweens[tween].call(node, d, i)) {
+ tweened.push(tween);
}
}
+
+ event.start.call(node, d, i);
+ if (!tick(elapsed)) d3.timer(tick, 0, time);
+ return 1;
}
- // Apply the interpolators!
- te = ease(t);
- for (tk in ik) ik[tk].call(this, te);
-
- // Handle ending transitions.
- if (t === 1) {
- stage[k] = 2;
- if (tx.active === transitionId) {
- var owner = tx.owner;
- if (owner === transitionId) {
- delete this.__transition__;
- if (remove && this.parentNode) this.parentNode.removeChild(this);
- }
- d3_transitionInheritId = transitionId;
- event.end.dispatch.apply(this, arguments);
+ function tick(elapsed) {
+ if (lock.active !== id) return stop();
+
+ var t = (elapsed - delay) / duration,
+ e = ease(t),
+ n = tweened.length;
+
+ while (n > 0) {
+ tweened[--n].call(node, e);
+ }
+
+ if (t >= 1) {
+ stop();
+ d3_transitionInheritId = id;
+ event.end.call(node, d, i);
d3_transitionInheritId = 0;
- tx.owner = owner;
+ return 1;
}
}
- });
- return clear;
- }
- transition.delay = function(value) {
- var delayMin = Infinity,
- k = -1;
- if (typeof value === "function") {
- groups.each(function(d, i) {
- var x = delay[++k] = +value.apply(this, arguments);
- if (x < delayMin) delayMin = x;
- });
- } else {
- delayMin = +value;
- groups.each(function(d, i) {
- delay[++k] = delayMin;
- });
- }
- d3_timer(step, delayMin);
- return transition;
- };
-
- transition.duration = function(value) {
- var k = -1;
- if (typeof value === "function") {
- durationMax = 0;
- groups.each(function(d, i) {
- var x = duration[++k] = +value.apply(this, arguments);
- if (x > durationMax) durationMax = x;
- });
- } else {
- durationMax = +value;
- groups.each(function(d, i) {
- duration[++k] = durationMax;
- });
- }
- return transition;
- };
+ function stop() {
+ if (!--lock.count) delete node.__transition__;
+ return 1;
+ }
+ });
+ return 1;
+ }, 0, time);
- transition.ease = function(value) {
- ease = typeof value === "function" ? value : d3.ease.apply(d3, arguments);
- return transition;
- };
+ return groups;
+}
- transition.attrTween = function(name, tween) {
+var d3_transitionRemove = {};
- /** @this {Element} */
- function attrTween(d, i) {
- var f = tween.call(this, d, i, this.getAttribute(name));
- return f && function(t) {
- this.setAttribute(name, f(t));
- };
- }
+function d3_transitionNull(d, i, a) {
+ return a != "" && d3_transitionRemove;
+}
- /** @this {Element} */
- function attrTweenNS(d, i) {
- var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
- return f && function(t) {
- this.setAttributeNS(name.space, name.local, f(t));
- };
- }
+function d3_transitionTween(name, b) {
+ var interpolate = d3_interpolateByName(name);
- tweens["attr." + name] = name.local ? attrTweenNS : attrTween;
- return transition;
- };
+ function transitionFunction(d, i, a) {
+ var v = b.call(this, d, i);
+ return v == null
+ ? a != "" && d3_transitionRemove
+ : a != v && interpolate(a, v);
+ }
- transition.attr = function(name, value) {
- return transition.attrTween(name, d3_transitionTween(value));
- };
+ function transitionString(d, i, a) {
+ return a != b && interpolate(a, b);
+ }
- transition.styleTween = function(name, tween, priority) {
- if (arguments.length < 3) priority = null;
+ return typeof b === "function" ? transitionFunction
+ : b == null ? d3_transitionNull
+ : (b += "", transitionString);
+}
- /** @this {Element} */
- function styleTween(d, i) {
- var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
- return f && function(t) {
- this.style.setProperty(name, f(t), priority);
- };
- }
+var d3_transitionPrototype = [],
+ d3_transitionId = 0,
+ d3_transitionInheritId = 0,
+ d3_transitionEase = d3.ease("cubic-in-out");
- tweens["style." + name] = styleTween;
- return transition;
- };
+d3_transitionPrototype.call = d3_selectionPrototype.call;
- transition.style = function(name, value, priority) {
- if (arguments.length < 3) priority = null;
- return transition.styleTween(name, d3_transitionTween(value), priority);
- };
+d3.transition = function() {
+ return d3_selectionRoot.transition();
+};
- transition.text = function(value) {
- tweens.text = function(d, i) {
- this.textContent = typeof value === "function"
- ? value.call(this, d, i)
- : value;
- };
- return transition;
- };
+d3.transition.prototype = d3_transitionPrototype;
+d3_transitionPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selector(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if ((node = group[i]) && (subnode = selector.call(node.node, node.node.__data__, i))) {
+ if ("__data__" in node.node) subnode.__data__ = node.node.__data__;
+ subgroup.push({node: subnode, delay: node.delay, duration: node.duration});
+ } else {
+ subgroup.push(null);
+ }
+ }
+ }
- transition.select = function(query) {
- var k, t = d3_transition(groups.select(query)).ease(ease);
- k = -1; t.delay(function(d, i) { return delay[++k]; });
- k = -1; t.duration(function(d, i) { return duration[++k]; });
- return t;
- };
+ return d3_transition(subgroups, this.id, this.time).ease(this.ease());
+};
+d3_transitionPrototype.selectAll = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnodes,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selectorAll(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subnodes = selector.call(node.node, node.node.__data__, i);
+ subgroups.push(subgroup = []);
+ for (var k = -1, o = subnodes.length; ++k < o;) {
+ subgroup.push({node: subnodes[k], delay: node.delay, duration: node.duration});
+ }
+ }
+ }
+ }
- transition.selectAll = function(query) {
- var k, t = d3_transition(groups.selectAll(query)).ease(ease);
- k = -1; t.delay(function(d, i) { return delay[i ? k : ++k]; })
- k = -1; t.duration(function(d, i) { return duration[i ? k : ++k]; });
- return t;
- };
+ return d3_transition(subgroups, this.id, this.time).ease(this.ease());
+};
+d3_transitionPrototype.attr = function(name, value) {
+ return this.attrTween(name, d3_transitionTween(name, value));
+};
- transition.remove = function() {
- remove = true;
- return transition;
- };
+d3_transitionPrototype.attrTween = function(nameNS, tween) {
+ var name = d3.ns.qualify(nameNS);
- transition.each = function(type, listener) {
- event[type].add(listener);
- return transition;
- };
+ function attrTween(d, i) {
+ var f = tween.call(this, d, i, this.getAttribute(name));
+ return f === d3_transitionRemove
+ ? (this.removeAttribute(name), null)
+ : f && function(t) { this.setAttribute(name, f(t)); };
+ }
- transition.call = d3_call;
+ function attrTweenNS(d, i) {
+ var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
+ return f === d3_transitionRemove
+ ? (this.removeAttributeNS(name.space, name.local), null)
+ : f && function(t) { this.setAttributeNS(name.space, name.local, f(t)); };
+ }
- return transition.delay(0).duration(250);
-}
+ return this.tween("attr." + nameNS, name.local ? attrTweenNS : attrTween);
+};
+d3_transitionPrototype.style = function(name, value, priority) {
+ if (arguments.length < 3) priority = "";
+ return this.styleTween(name, d3_transitionTween(name, value), priority);
+};
-function d3_transitionTween(b) {
- return typeof b === "function"
- ? function(d, i, a) { var v = b.call(this, d, i) + ""; return a != v && d3.interpolate(a, v); }
- : (b = b + "", function(d, i, a) { return a != b && d3.interpolate(a, b); });
+d3_transitionPrototype.styleTween = function(name, tween, priority) {
+ if (arguments.length < 3) priority = "";
+ return this.tween("style." + name, function(d, i) {
+ var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
+ return f === d3_transitionRemove
+ ? (this.style.removeProperty(name), null)
+ : f && function(t) { this.style.setProperty(name, f(t), priority); };
+ });
+};
+d3_transitionPrototype.text = function(value) {
+ return this.tween("text", function(d, i) {
+ this.textContent = typeof value === "function"
+ ? value.call(this, d, i)
+ : value;
+ });
+};
+d3_transitionPrototype.remove = function() {
+ return this.each("end", function() {
+ var p;
+ if (!this.__transition__ && (p = this.parentNode)) p.removeChild(this);
+ });
+};
+d3_transitionPrototype.delay = function(value) {
+ var groups = this;
+ return groups.each(typeof value === "function"
+ ? function(d, i, j) { groups[j][i].delay = +value.apply(this, arguments); }
+ : (value = +value, function(d, i, j) { groups[j][i].delay = value; }));
+};
+d3_transitionPrototype.duration = function(value) {
+ var groups = this;
+ return groups.each(typeof value === "function"
+ ? function(d, i, j) { groups[j][i].duration = +value.apply(this, arguments); }
+ : (value = +value, function(d, i, j) { groups[j][i].duration = value; }));
+};
+function d3_transition_each(callback) {
+ for (var j = 0, m = this.length; j < m; j++) {
+ for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+ var node = group[i];
+ if (node) callback.call(node = node.node, node.__data__, i, j);
+ }
+ }
+ return this;
}
+d3_transitionPrototype.transition = function() {
+ return this.select(d3_this);
+};
var d3_timer_queue = null,
d3_timer_interval, // is an interval (or frame) active?
d3_timer_timeout; // is a timeout active?
// The timer will continue to fire until callback returns true.
-d3.timer = function(callback) {
- d3_timer(callback, 0);
-};
-
-function d3_timer(callback, delay) {
- var now = Date.now(),
- found = false,
+d3.timer = function(callback, delay, then) {
+ var found = false,
t0,
t1 = d3_timer_queue;
- if (!isFinite(delay)) return;
+ if (arguments.length < 3) {
+ if (arguments.length < 2) delay = 0;
+ else if (!isFinite(delay)) return;
+ then = Date.now();
+ }
// See if the callback's already in the queue.
while (t1) {
if (t1.callback === callback) {
- t1.then = now;
+ t1.then = then;
t1.delay = delay;
found = true;
break;
@@ -2105,7 +2205,7 @@ function d3_timer(callback, delay) {
// Otherwise, add the callback to the queue.
if (!found) d3_timer_queue = {
callback: callback,
- then: now,
+ then: then,
delay: delay,
next: d3_timer_queue
};
@@ -2125,7 +2225,7 @@ function d3_timer_step() {
while (t1) {
elapsed = now - t1.then;
- if (elapsed > t1.delay) t1.flush = t1.callback(elapsed);
+ if (elapsed >= t1.delay) t1.flush = t1.callback(elapsed);
t1 = t1.next;
}
@@ -2178,6 +2278,66 @@ var d3_timer_frame = window.requestAnimationFrame
|| window.oRequestAnimationFrame
|| window.msRequestAnimationFrame
|| function(callback) { setTimeout(callback, 17); };
+d3.transform = function(string) {
+ var g = document.createElementNS(d3.ns.prefix.svg, "g"),
+ identity = {a: 1, b: 0, c: 0, d: 1, e: 0, f: 0};
+ return (d3.transform = function(string) {
+ g.setAttribute("transform", string);
+ var t = g.transform.baseVal.consolidate();
+ return new d3_transform(t ? t.matrix : identity);
+ })(string);
+};
+
+// Compute x-scale and normalize the first row.
+// Compute shear and make second row orthogonal to first.
+// Compute y-scale and normalize the second row.
+// Finally, compute the rotation.
+function d3_transform(m) {
+ var r0 = [m.a, m.b],
+ r1 = [m.c, m.d],
+ kx = d3_transformNormalize(r0),
+ kz = d3_transformDot(r0, r1),
+ ky = d3_transformNormalize(d3_transformCombine(r1, r0, -kz)) || 0;
+ if (r0[0] * r1[1] < r1[0] * r0[1]) {
+ r0[0] *= -1;
+ r0[1] *= -1;
+ kx *= -1;
+ kz *= -1;
+ }
+ this.rotate = (kx ? Math.atan2(r0[1], r0[0]) : Math.atan2(-r1[0], r1[1])) * d3_transformDegrees;
+ this.translate = [m.e, m.f];
+ this.scale = [kx, ky];
+ this.skew = ky ? Math.atan2(kz, ky) * d3_transformDegrees : 0;
+};
+
+d3_transform.prototype.toString = function() {
+ return "translate(" + this.translate
+ + ")rotate(" + this.rotate
+ + ")skewX(" + this.skew
+ + ")scale(" + this.scale
+ + ")";
+};
+
+function d3_transformDot(a, b) {
+ return a[0] * b[0] + a[1] * b[1];
+}
+
+function d3_transformNormalize(a) {
+ var k = Math.sqrt(d3_transformDot(a, a));
+ if (k) {
+ a[0] /= k;
+ a[1] /= k;
+ }
+ return k;
+}
+
+function d3_transformCombine(a, b, k) {
+ a[0] += k * b[0];
+ a[1] += k * b[1];
+ return a;
+}
+
+var d3_transformDegrees = 180 / Math.PI;
function d3_noop() {}
d3.scale = {};
@@ -2185,6 +2345,10 @@ function d3_scaleExtent(domain) {
var start = domain[0], stop = domain[domain.length - 1];
return start < stop ? [start, stop] : [stop, start];
}
+
+function d3_scaleRange(scale) {
+ return scale.rangeExtent ? scale.rangeExtent() : d3_scaleExtent(scale.range());
+}
function d3_scale_nice(domain, nice) {
var i0 = 0,
i1 = domain.length - 1,
@@ -2197,9 +2361,12 @@ function d3_scale_nice(domain, nice) {
dx = x0; x0 = x1; x1 = dx;
}
- nice = nice(x1 - x0);
- domain[i0] = nice.floor(x0);
- domain[i1] = nice.ceil(x1);
+ if (dx = x1 - x0) {
+ nice = nice(dx);
+ domain[i0] = nice.floor(x0);
+ domain[i1] = nice.ceil(x1);
+ }
+
return domain;
}
@@ -2207,11 +2374,11 @@ function d3_scale_niceDefault() {
return Math;
}
d3.scale.linear = function() {
- var domain = [0, 1],
- range = [0, 1],
- interpolate = d3.interpolate,
- clamp = false,
- output,
+ return d3_scale_linear([0, 1], [0, 1], d3.interpolate, false);
+};
+
+function d3_scale_linear(domain, range, interpolate, clamp) {
+ var output,
input;
function rescale() {
@@ -2272,15 +2439,15 @@ d3.scale.linear = function() {
return rescale();
};
+ scale.copy = function() {
+ return d3_scale_linear(domain, range, interpolate, clamp);
+ };
+
return rescale();
};
function d3_scale_linearRebind(scale, linear) {
- scale.range = d3.rebind(scale, linear.range);
- scale.rangeRound = d3.rebind(scale, linear.rangeRound);
- scale.interpolate = d3.rebind(scale, linear.interpolate);
- scale.clamp = d3.rebind(scale, linear.clamp);
- return scale;
+ return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
}
function d3_scale_linearNice(dx) {
@@ -2341,9 +2508,11 @@ function d3_scale_polylinear(domain, range, uninterpolate, interpolate) {
};
}
d3.scale.log = function() {
- var linear = d3.scale.linear(),
- log = d3_scale_log,
- pow = log.pow;
+ return d3_scale_log(d3.scale.linear(), d3_scale_logp);
+};
+
+function d3_scale_log(linear, log) {
+ var pow = log.pow;
function scale(x) {
return linear(log(x));
@@ -2355,7 +2524,7 @@ d3.scale.log = function() {
scale.domain = function(x) {
if (!arguments.length) return linear.domain().map(pow);
- log = x[0] < 0 ? d3_scale_logn : d3_scale_log;
+ log = x[0] < 0 ? d3_scale_logn : d3_scale_logp;
pow = log.pow;
linear.domain(x.map(log));
return scale;
@@ -2388,14 +2557,27 @@ d3.scale.log = function() {
return ticks;
};
- scale.tickFormat = function() {
- return d3_scale_logTickFormat;
+ scale.tickFormat = function(n, format) {
+ if (arguments.length < 2) format = d3_scale_logFormat;
+ if (arguments.length < 1) return format;
+ var k = n / scale.ticks().length,
+ f = log === d3_scale_logn ? (e = -1e-12, Math.floor) : (e = 1e-12, Math.ceil),
+ e;
+ return function(d) {
+ return d / pow(f(log(d) + e)) < k ? format(d) : "";
+ };
+ };
+
+ scale.copy = function() {
+ return d3_scale_log(linear.copy(), log);
};
return d3_scale_linearRebind(scale, linear);
};
-function d3_scale_log(x) {
+var d3_scale_logFormat = d3.format(".0e");
+
+function d3_scale_logp(x) {
return Math.log(x) / Math.LN10;
}
@@ -2403,22 +2585,20 @@ function d3_scale_logn(x) {
return -Math.log(-x) / Math.LN10;
}
-d3_scale_log.pow = function(x) {
+d3_scale_logp.pow = function(x) {
return Math.pow(10, x);
};
d3_scale_logn.pow = function(x) {
return -Math.pow(10, -x);
};
-
-function d3_scale_logTickFormat(d) {
- return d.toPrecision(1);
-}
d3.scale.pow = function() {
- var linear = d3.scale.linear(),
- exponent = 1,
- powp = Number,
- powb = powp;
+ return d3_scale_pow(d3.scale.linear(), 1);
+};
+
+function d3_scale_pow(linear, exponent) {
+ var powp = d3_scale_powPow(exponent),
+ powb = d3_scale_powPow(1 / exponent);
function scale(x) {
return linear(powp(x));
@@ -2430,8 +2610,6 @@ d3.scale.pow = function() {
scale.domain = function(x) {
if (!arguments.length) return linear.domain().map(powb);
- powp = d3_scale_powPow(exponent);
- powb = d3_scale_powPow(1 / exponent);
linear.domain(x.map(powp));
return scale;
};
@@ -2451,10 +2629,15 @@ d3.scale.pow = function() {
scale.exponent = function(x) {
if (!arguments.length) return exponent;
var domain = scale.domain();
- exponent = x;
+ powp = d3_scale_powPow(exponent = x);
+ powb = d3_scale_powPow(1 / exponent);
return scale.domain(domain);
};
+ scale.copy = function() {
+ return d3_scale_pow(linear.copy(), exponent);
+ };
+
return d3_scale_linearRebind(scale, linear);
};
@@ -2467,73 +2650,69 @@ d3.scale.sqrt = function() {
return d3.scale.pow().exponent(.5);
};
d3.scale.ordinal = function() {
- var domain = [],
- index = {},
- range = [],
- rangeBand = 0,
- rerange = d3_noop;
+ return d3_scale_ordinal([], {t: "range", x: []});
+};
+
+function d3_scale_ordinal(domain, ranger) {
+ var index,
+ range,
+ rangeBand;
function scale(x) {
- var i = x in index ? index[x] : (index[x] = domain.push(x) - 1);
- return range[i % range.length];
+ return range[((index[x] || (index[x] = domain.push(x))) - 1) % range.length];
+ }
+
+ function steps(start, step) {
+ return d3.range(domain.length).map(function(i) { return start + step * i; });
}
scale.domain = function(x) {
if (!arguments.length) return domain;
- domain = x;
+ domain = [];
index = {};
- var i = -1, j = -1, n = domain.length; while (++i < n) {
- x = domain[i];
- if (!(x in index)) index[x] = ++j;
- }
- rerange();
- return scale;
+ var i = -1, n = x.length, xi;
+ while (++i < n) if (!index[xi = x[i]]) index[xi] = domain.push(xi);
+ return scale[ranger.t](ranger.x, ranger.p);
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- rerange = d3_noop;
+ rangeBand = 0;
+ ranger = {t: "range", x: x};
return scale;
};
scale.rangePoints = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- step = (stop - start) / (domain.length - 1 + padding);
- range = domain.length == 1
- ? [(start + stop) / 2]
- : d3.range(start + step * padding / 2, stop + step / 2, step);
- rangeBand = 0;
- })();
+ var start = x[0],
+ stop = x[1],
+ step = (stop - start) / (domain.length - 1 + padding);
+ range = steps(domain.length < 2 ? (start + stop) / 2 : start + step * padding / 2, step);
+ rangeBand = 0;
+ ranger = {t: "rangePoints", x: x, p: padding};
return scale;
};
scale.rangeBands = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- step = (stop - start) / (domain.length + padding);
- range = d3.range(start + step * padding, stop, step);
- rangeBand = step * (1 - padding);
- })();
+ var start = x[0],
+ stop = x[1],
+ step = (stop - start) / (domain.length + padding);
+ range = steps(start + step * padding, step);
+ rangeBand = step * (1 - padding);
+ ranger = {t: "rangeBands", x: x, p: padding};
return scale;
};
scale.rangeRoundBands = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- diff = stop - start,
- step = Math.floor(diff / (domain.length + padding)),
- err = diff - (domain.length - padding) * step;
- range = d3.range(start + Math.round(err / 2), stop, step);
- rangeBand = Math.round(step * (1 - padding));
- })();
+ var start = x[0],
+ stop = x[1],
+ step = Math.floor((stop - start) / (domain.length + padding));
+ range = steps(start + Math.round((stop - start - (domain.length - padding) * step) / 2), step);
+ rangeBand = Math.round(step * (1 - padding));
+ ranger = {t: "rangeRoundBands", x: x, p: padding};
return scale;
};
@@ -2541,7 +2720,15 @@ d3.scale.ordinal = function() {
return rangeBand;
};
- return scale;
+ scale.rangeExtent = function() {
+ return ranger.t === "range" ? d3_scaleExtent(ranger.x) : ranger.x;
+ };
+
+ scale.copy = function() {
+ return d3_scale_ordinal(domain, ranger);
+ };
+
+ return scale.domain(domain);
};
/*
* This product includes color specifications and designs developed by Cynthia
@@ -2598,16 +2785,19 @@ var d3_category20c = [
"#636363", "#969696", "#bdbdbd", "#d9d9d9"
];
d3.scale.quantile = function() {
- var domain = [],
- range = [],
- thresholds = [];
+ return d3_scale_quantile([], []);
+};
+
+function d3_scale_quantile(domain, range) {
+ var thresholds;
function rescale() {
var k = 0,
n = domain.length,
q = range.length;
- thresholds.length = Math.max(0, q - 1);
+ thresholds = [];
while (++k < q) thresholds[k - 1] = d3.quantile(domain, k / q);
+ return scale;
}
function scale(x) {
@@ -2618,51 +2808,60 @@ d3.scale.quantile = function() {
scale.domain = function(x) {
if (!arguments.length) return domain;
domain = x.filter(function(d) { return !isNaN(d); }).sort(d3.ascending);
- rescale();
- return scale;
+ return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- rescale();
- return scale;
+ return rescale();
};
scale.quantiles = function() {
return thresholds;
};
- return scale;
+ scale.copy = function() {
+ return d3_scale_quantile(domain, range); // copy on write!
+ };
+
+ return rescale();
};
d3.scale.quantize = function() {
- var x0 = 0,
- x1 = 1,
- kx = 2,
- i = 1,
- range = [0, 1];
+ return d3_scale_quantize(0, 1, [0, 1]);
+};
+
+function d3_scale_quantize(x0, x1, range) {
+ var kx, i;
function scale(x) {
return range[Math.max(0, Math.min(i, Math.floor(kx * (x - x0))))];
}
- scale.domain = function(x) {
- if (!arguments.length) return [x0, x1];
- x0 = x[0];
- x1 = x[1];
+ function rescale() {
kx = range.length / (x1 - x0);
+ i = range.length - 1;
return scale;
+ }
+
+ scale.domain = function(x) {
+ if (!arguments.length) return [x0, x1];
+ x0 = +x[0];
+ x1 = +x[x.length - 1];
+ return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- kx = range.length / (x1 - x0);
- i = range.length - 1;
- return scale;
+ return rescale();
+ };
+
+ scale.copy = function() {
+ return d3_scale_quantize(x0, x1, range); // copy on write
};
- return scale;
+ return rescale();
};
d3.svg = {};
d3.svg.arc = function() {
@@ -2676,7 +2875,7 @@ d3.svg.arc = function() {
r1 = outerRadius.apply(this, arguments),
a0 = startAngle.apply(this, arguments) + d3_svg_arcOffset,
a1 = endAngle.apply(this, arguments) + d3_svg_arcOffset,
- da = a1 - a0,
+ da = (a1 < a0 && (da = a0, a0 = a1, a1 = da), a1 - a0),
df = da < Math.PI ? "0" : "1",
c0 = Math.cos(a0),
s0 = Math.sin(a0),
@@ -2688,8 +2887,8 @@ d3.svg.arc = function() {
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
+ "M0," + r0
- + "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
- + "A" + r0 + "," + r0 + " 0 1,1 0," + r0
+ + "A" + r0 + "," + r0 + " 0 1,0 0," + (-r0)
+ + "A" + r0 + "," + r0 + " 0 1,0 0," + r0
+ "Z"
: "M0," + r1
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
@@ -2855,33 +3054,30 @@ var d3_svg_lineInterpolators = {
// Linear interpolation; generates "L" commands.
function d3_svg_lineLinear(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("L", (p = points[i])[0], ",", p[1]);
return path.join("");
}
// Step interpolation; generates "H" and "V" commands.
function d3_svg_lineStepBefore(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("V", (p = points[i])[1], "H", p[0]);
return path.join("");
}
// Step interpolation; generates "H" and "V" commands.
function d3_svg_lineStepAfter(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("H", (p = points[i])[0], "V", p[1]);
return path.join("");
}
@@ -2979,15 +3175,14 @@ function d3_svg_lineCardinalTangents(points, tension) {
// B-spline interpolation; generates "C" commands.
function d3_svg_lineBasis(points) {
if (points.length < 3) return d3_svg_lineLinear(points);
- var path = [],
- i = 1,
+ var i = 1,
n = points.length,
pi = points[0],
x0 = pi[0],
y0 = pi[1],
px = [x0, x0, x0, (pi = points[1])[0]],
- py = [y0, y0, y0, pi[1]];
- path.push(x0, ",", y0);
+ py = [y0, y0, y0, pi[1]],
+ path = [x0, ",", y0];
d3_svg_lineBasisBezier(path, px, py);
while (++i < n) {
pi = points[i];
@@ -3206,16 +3401,17 @@ function d3_svg_area(projection) {
x1 = d3_svg_lineX,
y0 = 0,
y1 = d3_svg_lineY,
- interpolate = "linear",
- interpolator = d3_svg_lineInterpolators[interpolate],
+ interpolate,
+ i0,
+ i1,
tension = .7;
function area(d) {
if (d.length < 1) return null;
var points0 = d3_svg_linePoints(this, d, x0, y0),
points1 = d3_svg_linePoints(this, d, x0 === x1 ? d3_svg_areaX(points0) : x1, y0 === y1 ? d3_svg_areaY(points0) : y1);
- return "M" + interpolator(projection(points1), tension)
- + "L" + interpolator(projection(points0.reverse()), tension)
+ return "M" + i0(projection(points1), tension)
+ + "L" + i1(projection(points0.reverse()), tension)
+ "Z";
}
@@ -3257,7 +3453,8 @@ function d3_svg_area(projection) {
area.interpolate = function(x) {
if (!arguments.length) return interpolate;
- interpolator = d3_svg_lineInterpolators[interpolate = x];
+ i0 = d3_svg_lineInterpolators[interpolate = x];
+ i1 = i0.reverse || i0;
return area;
};
@@ -3267,9 +3464,12 @@ function d3_svg_area(projection) {
return area;
};
- return area;
+ return area.interpolate("linear");
}
+d3_svg_lineStepBefore.reverse = d3_svg_lineStepAfter;
+d3_svg_lineStepAfter.reverse = d3_svg_lineStepBefore;
+
d3.svg.area = function() {
return d3_svg_area(Object);
};
@@ -3308,10 +3508,10 @@ d3.svg.chord = function() {
var s = subgroup(this, source, d, i),
t = subgroup(this, target, d, i);
return "M" + s.p0
- + arc(s.r, s.p1) + (equals(s, t)
+ + arc(s.r, s.p1, s.a1 - s.a0) + (equals(s, t)
? curve(s.r, s.p1, s.r, s.p0)
: curve(s.r, s.p1, t.r, t.p0)
- + arc(t.r, t.p1)
+ + arc(t.r, t.p1, t.a1 - t.a0)
+ curve(t.r, t.p1, s.r, s.p0))
+ "Z";
}
@@ -3334,8 +3534,8 @@ d3.svg.chord = function() {
return a.a0 == b.a0 && a.a1 == b.a1;
}
- function arc(r, p) {
- return "A" + r + "," + r + " 0 0,1 " + p;
+ function arc(r, p, a) {
+ return "A" + r + "," + r + " 0 " + +(a > Math.PI) + ",1 " + p;
}
function curve(r0, p0, r1, p1) {
@@ -3465,7 +3665,7 @@ function d3_svg_mousePoint(container, e) {
var point = (container.ownerSVGElement || container).createSVGPoint();
if ((d3_mouse_bug44083 < 0) && (window.scrollX || window.scrollY)) {
var svg = d3.select(document.body)
- .append("svg:svg")
+ .append("svg")
.style("position", "absolute")
.style("top", 0)
.style("left", 0);
@@ -3483,8 +3683,9 @@ function d3_svg_mousePoint(container, e) {
point = point.matrixTransform(container.getScreenCTM().inverse());
return [point.x, point.y];
};
-d3.svg.touches = function(container) {
- var touches = d3.event.touches;
+d3.svg.touches = function(container, touches) {
+ if (arguments.length < 2) touches = d3.event.touches;
+
return touches ? d3_array(touches).map(function(touch) {
var point = d3_svg_mousePoint(container, touch);
point.identifier = touch.identifier;
@@ -3589,4 +3790,906 @@ d3.svg.symbolTypes = d3.keys(d3_svg_symbols);
var d3_svg_symbolSqrt3 = Math.sqrt(3),
d3_svg_symbolTan30 = Math.tan(30 * Math.PI / 180);
+d3.svg.axis = function() {
+ var scale = d3.scale.linear(),
+ orient = "bottom",
+ tickMajorSize = 6,
+ tickMinorSize = 6,
+ tickEndSize = 6,
+ tickPadding = 3,
+ tickArguments_ = [10],
+ tickFormat_,
+ tickSubdivide = 0;
+
+ function axis(selection) {
+ selection.each(function(d, i, j) {
+ var g = d3.select(this);
+
+ // If selection is a transition, create subtransitions.
+ var transition = selection.delay ? function(o) {
+ var id = d3_transitionInheritId;
+ try {
+ d3_transitionInheritId = selection.id;
+ return o.transition()
+ .delay(selection[j][i].delay)
+ .duration(selection[j][i].duration)
+ .ease(selection.ease());
+ } finally {
+ d3_transitionInheritId = id;
+ }
+ } : Object;
+
+ // Ticks, or domain values for ordinal scales.
+ var ticks = scale.ticks ? scale.ticks.apply(scale, tickArguments_) : scale.domain(),
+ tickFormat = tickFormat_ == null ? (scale.tickFormat ? scale.tickFormat.apply(scale, tickArguments_) : String) : tickFormat_;
+
+ // Minor ticks.
+ var subticks = d3_svg_axisSubdivide(scale, ticks, tickSubdivide),
+ subtick = g.selectAll(".minor").data(subticks, String),
+ subtickEnter = subtick.enter().insert("line", "g").attr("class", "tick minor").style("opacity", 1e-6),
+ subtickExit = transition(subtick.exit()).style("opacity", 1e-6).remove(),
+ subtickUpdate = transition(subtick).style("opacity", 1);
+
+ // Major ticks.
+ var tick = g.selectAll("g").data(ticks, String),
+ tickEnter = tick.enter().insert("g", "path").style("opacity", 1e-6),
+ tickExit = transition(tick.exit()).style("opacity", 1e-6).remove(),
+ tickUpdate = transition(tick).style("opacity", 1),
+ tickTransform;
+
+ // Domain.
+ var range = d3_scaleRange(scale),
+ path = g.selectAll(".domain").data([0]),
+ pathEnter = path.enter().append("path").attr("class", "domain"),
+ pathUpdate = transition(path);
+
+ // Stash a snapshot of the new scale, and retrieve the old snapshot.
+ var scale1 = scale.copy(),
+ scale0 = this.__chart__ || scale1;
+ this.__chart__ = scale1;
+
+ tickEnter.append("line").attr("class", "tick");
+ tickEnter.append("text");
+ tickUpdate.select("text").text(tickFormat);
+
+ switch (orient) {
+ case "bottom": {
+ tickTransform = d3_svg_axisX;
+ subtickUpdate.attr("x2", 0).attr("y2", tickMinorSize);
+ tickUpdate.select("line").attr("x2", 0).attr("y2", tickMajorSize);
+ tickUpdate.select("text").attr("x", 0).attr("y", Math.max(tickMajorSize, 0) + tickPadding).attr("dy", ".71em").attr("text-anchor", "middle");
+ pathUpdate.attr("d", "M" + range[0] + "," + tickEndSize + "V0H" + range[1] + "V" + tickEndSize);
+ break;
+ }
+ case "top": {
+ tickTransform = d3_svg_axisX;
+ subtickUpdate.attr("x2", 0).attr("y2", -tickMinorSize);
+ tickUpdate.select("line").attr("x2", 0).attr("y2", -tickMajorSize);
+ tickUpdate.select("text").attr("x", 0).attr("y", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("dy", "0em").attr("text-anchor", "middle");
+ pathUpdate.attr("d", "M" + range[0] + "," + -tickEndSize + "V0H" + range[1] + "V" + -tickEndSize);
+ break;
+ }
+ case "left": {
+ tickTransform = d3_svg_axisY;
+ subtickUpdate.attr("x2", -tickMinorSize).attr("y2", 0);
+ tickUpdate.select("line").attr("x2", -tickMajorSize).attr("y2", 0);
+ tickUpdate.select("text").attr("x", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "end");
+ pathUpdate.attr("d", "M" + -tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + -tickEndSize);
+ break;
+ }
+ case "right": {
+ tickTransform = d3_svg_axisY;
+ subtickUpdate.attr("x2", tickMinorSize).attr("y2", 0);
+ tickUpdate.select("line").attr("x2", tickMajorSize).attr("y2", 0);
+ tickUpdate.select("text").attr("x", Math.max(tickMajorSize, 0) + tickPadding).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "start");
+ pathUpdate.attr("d", "M" + tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + tickEndSize);
+ break;
+ }
+ }
+
+ // For quantitative scales:
+ // - enter new ticks from the old scale
+ // - exit old ticks to the new scale
+ if (scale.ticks) {
+ tickEnter.call(tickTransform, scale0);
+ tickUpdate.call(tickTransform, scale1);
+ tickExit.call(tickTransform, scale1);
+ subtickEnter.call(tickTransform, scale0);
+ subtickUpdate.call(tickTransform, scale1);
+ subtickExit.call(tickTransform, scale1);
+ }
+
+ // For ordinal scales:
+ // - any entering ticks are undefined in the old scale
+ // - any exiting ticks are undefined in the new scale
+ // Therefore, we only need to transition updating ticks.
+ else {
+ var dx = scale1.rangeBand() / 2, x = function(d) { return scale1(d) + dx; };
+ tickEnter.call(tickTransform, x);
+ tickUpdate.call(tickTransform, x);
+ }
+ });
+ }
+
+ axis.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = x;
+ return axis;
+ };
+
+ axis.orient = function(x) {
+ if (!arguments.length) return orient;
+ orient = x;
+ return axis;
+ };
+
+ axis.ticks = function() {
+ if (!arguments.length) return tickArguments_;
+ tickArguments_ = arguments;
+ return axis;
+ };
+
+ axis.tickFormat = function(x) {
+ if (!arguments.length) return tickFormat_;
+ tickFormat_ = x;
+ return axis;
+ };
+
+ axis.tickSize = function(x, y, z) {
+ if (!arguments.length) return tickMajorSize;
+ var n = arguments.length - 1;
+ tickMajorSize = +x;
+ tickMinorSize = n > 1 ? +y : tickMajorSize;
+ tickEndSize = n > 0 ? +arguments[n] : tickMajorSize;
+ return axis;
+ };
+
+ axis.tickPadding = function(x) {
+ if (!arguments.length) return tickPadding;
+ tickPadding = +x;
+ return axis;
+ };
+
+ axis.tickSubdivide = function(x) {
+ if (!arguments.length) return tickSubdivide;
+ tickSubdivide = +x;
+ return axis;
+ };
+
+ return axis;
+};
+
+function d3_svg_axisX(selection, x) {
+ selection.attr("transform", function(d) { return "translate(" + x(d) + ",0)"; });
+}
+
+function d3_svg_axisY(selection, y) {
+ selection.attr("transform", function(d) { return "translate(0," + y(d) + ")"; });
+}
+
+function d3_svg_axisSubdivide(scale, ticks, m) {
+ subticks = [];
+ if (m && ticks.length > 1) {
+ var extent = d3_scaleExtent(scale.domain()),
+ subticks,
+ i = -1,
+ n = ticks.length,
+ d = (ticks[1] - ticks[0]) / ++m,
+ j,
+ v;
+ while (++i < n) {
+ for (j = m; --j > 0;) {
+ if ((v = +ticks[i] - j * d) >= extent[0]) {
+ subticks.push(v);
+ }
+ }
+ }
+ for (--i, j = 0; ++j < m && (v = +ticks[i] + j * d) < extent[1];) {
+ subticks.push(v);
+ }
+ }
+ return subticks;
+}
+d3.svg.brush = function() {
+ var event = d3.dispatch("brushstart", "brush", "brushend"),
+ x, // x-scale, optional
+ y, // y-scale, optional
+ extent = [[0, 0], [0, 0]]; // [x0, y0], [x1, y1]
+
+ function brush(g) {
+ var resizes = x && y ? ["n", "e", "s", "w", "nw", "ne", "se", "sw"]
+ : x ? ["e", "w"]
+ : y ? ["n", "s"]
+ : [];
+
+ g.each(function() {
+ var g = d3.select(this).on("mousedown.brush", down),
+ bg = g.selectAll(".background").data([,]),
+ fg = g.selectAll(".extent").data([,]),
+ tz = g.selectAll(".resize").data(resizes, String),
+ e;
+
+ // An invisible, mouseable area for starting a new brush.
+ bg.enter().append("rect")
+ .attr("class", "background")
+ .style("visibility", "hidden")
+ .style("pointer-events", "all")
+ .style("cursor", "crosshair");
+
+ // The visible brush extent; style this as you like!
+ fg.enter().append("rect")
+ .attr("class", "extent")
+ .style("cursor", "move");
+
+ // More invisible rects for resizing the extent.
+ tz.enter().append("rect")
+ .attr("class", function(d) { return "resize " + d; })
+ .attr("width", 6)
+ .attr("height", 6)
+ .style("visibility", "hidden")
+ .style("pointer-events", brush.empty() ? "none" : "all")
+ .style("cursor", function(d) { return d3_svg_brushCursor[d]; });
+
+ // Remove any superfluous resizers.
+ tz.exit().remove();
+
+ // Initialize the background to fill the defined range.
+ // If the range isn't defined, you can post-process.
+ if (x) {
+ e = d3_scaleRange(x);
+ bg.attr("x", e[0]).attr("width", e[1] - e[0]);
+ d3_svg_brushRedrawX(g, extent);
+ }
+ if (y) {
+ e = d3_scaleRange(y);
+ bg.attr("y", e[0]).attr("height", e[1] - e[0]);
+ d3_svg_brushRedrawY(g, extent);
+ }
+ });
+ }
+
+ function down() {
+ var target = d3.select(d3.event.target);
+
+ // Store some global state for the duration of the brush gesture.
+ d3_svg_brush = brush;
+ d3_svg_brushTarget = this;
+ d3_svg_brushExtent = extent;
+ d3_svg_brushOffset = d3.svg.mouse(d3_svg_brushTarget);
+
+ // If the extent was clicked on, drag rather than brush;
+ // store the offset between the mouse and extent origin instead.
+ if (d3_svg_brushDrag = target.classed("extent")) {
+ d3_svg_brushOffset[0] = extent[0][0] - d3_svg_brushOffset[0];
+ d3_svg_brushOffset[1] = extent[0][1] - d3_svg_brushOffset[1];
+ }
+
+ // If a resizer was clicked on, record which side is to be resized.
+ // Also, set the offset to the opposite side.
+ else if (target.classed("resize")) {
+ d3_svg_brushResize = d3.event.target.__data__;
+ d3_svg_brushOffset[0] = extent[+/w$/.test(d3_svg_brushResize)][0];
+ d3_svg_brushOffset[1] = extent[+/^n/.test(d3_svg_brushResize)][1];
+ }
+
+ // If the ALT key is down when starting a brush, the center is at the mouse.
+ else if (d3.event.altKey) {
+ d3_svg_brushCenter = d3_svg_brushOffset.slice();
+ }
+
+ // Restrict which dimensions are resized.
+ d3_svg_brushX = !/^(n|s)$/.test(d3_svg_brushResize) && x;
+ d3_svg_brushY = !/^(e|w)$/.test(d3_svg_brushResize) && y;
+
+ // Notify listeners.
+ d3_svg_brushDispatch = dispatcher(this, arguments);
+ d3_svg_brushDispatch("brushstart");
+ d3_svg_brushMove();
+ d3_eventCancel();
+ }
+
+ function dispatcher(that, argumentz) {
+ return function(type) {
+ var e = d3.event;
+ try {
+ d3.event = {type: type, target: brush};
+ event[type].apply(that, argumentz);
+ } finally {
+ d3.event = e;
+ }
+ };
+ }
+
+ brush.x = function(z) {
+ if (!arguments.length) return x;
+ x = z;
+ return brush;
+ };
+
+ brush.y = function(z) {
+ if (!arguments.length) return y;
+ y = z;
+ return brush;
+ };
+
+ brush.extent = function(z) {
+ var x0, x1, y0, y1, t;
+
+ // Invert the pixel extent to data-space.
+ if (!arguments.length) {
+ if (x) {
+ x0 = extent[0][0], x1 = extent[1][0];
+ if (x.invert) x0 = x.invert(x0), x1 = x.invert(x1);
+ if (x1 < x0) t = x0, x0 = x1, x1 = t;
+ }
+ if (y) {
+ y0 = extent[0][1], y1 = extent[1][1];
+ if (y.invert) y0 = y.invert(y0), y1 = y.invert(y1);
+ if (y1 < y0) t = y0, y0 = y1, y1 = t;
+ }
+ return x && y ? [[x0, y0], [x1, y1]] : x ? [x0, x1] : y && [y0, y1];
+ }
+
+ // Scale the data-space extent to pixels.
+ if (x) {
+ x0 = z[0], x1 = z[1];
+ if (y) x0 = x0[0], x1 = x1[0];
+ if (x.invert) x0 = x(x0), x1 = x(x1);
+ if (x1 < x0) t = x0, x0 = x1, x1 = t;
+ extent[0][0] = x0, extent[1][0] = x1;
+ }
+ if (y) {
+ y0 = z[0], y1 = z[1];
+ if (x) y0 = y0[1], y1 = y1[1];
+ if (y.invert) y0 = y(y0), y1 = y(y1);
+ if (y1 < y0) t = y0, y0 = y1, y1 = t;
+ extent[0][1] = y0, extent[1][1] = y1;
+ }
+
+ return brush;
+ };
+
+ brush.clear = function() {
+ extent[0][0] =
+ extent[0][1] =
+ extent[1][0] =
+ extent[1][1] = 0;
+ return brush;
+ };
+
+ brush.empty = function() {
+ return (x && extent[0][0] === extent[1][0])
+ || (y && extent[0][1] === extent[1][1]);
+ };
+
+ d3.select(window)
+ .on("mousemove.brush", d3_svg_brushMove)
+ .on("mouseup.brush", d3_svg_brushUp)
+ .on("keydown.brush", d3_svg_brushKeydown)
+ .on("keyup.brush", d3_svg_brushKeyup);
+
+ return d3.rebind(brush, event, "on");
+};
+
+var d3_svg_brush,
+ d3_svg_brushDispatch,
+ d3_svg_brushTarget,
+ d3_svg_brushX,
+ d3_svg_brushY,
+ d3_svg_brushExtent,
+ d3_svg_brushDrag,
+ d3_svg_brushResize,
+ d3_svg_brushCenter,
+ d3_svg_brushOffset;
+
+function d3_svg_brushRedrawX(g, extent) {
+ g.select(".extent").attr("x", extent[0][0]);
+ g.selectAll(".n,.s,.w,.nw,.sw").attr("x", extent[0][0] - 2);
+ g.selectAll(".e,.ne,.se").attr("x", extent[1][0] - 3);
+ g.selectAll(".extent,.n,.s").attr("width", extent[1][0] - extent[0][0]);
+}
+
+function d3_svg_brushRedrawY(g, extent) {
+ g.select(".extent").attr("y", extent[0][1]);
+ g.selectAll(".n,.e,.w,.nw,.ne").attr("y", extent[0][1] - 3);
+ g.selectAll(".s,.se,.sw").attr("y", extent[1][1] - 4);
+ g.selectAll(".extent,.e,.w").attr("height", extent[1][1] - extent[0][1]);
+}
+
+function d3_svg_brushKeydown() {
+ if (d3.event.keyCode == 32 && d3_svg_brushTarget && !d3_svg_brushDrag) {
+ d3_svg_brushCenter = null;
+ d3_svg_brushOffset[0] -= d3_svg_brushExtent[1][0];
+ d3_svg_brushOffset[1] -= d3_svg_brushExtent[1][1];
+ d3_svg_brushDrag = 2;
+ d3_eventCancel();
+ }
+}
+
+function d3_svg_brushKeyup() {
+ if (d3.event.keyCode == 32 && d3_svg_brushDrag == 2) {
+ d3_svg_brushOffset[0] += d3_svg_brushExtent[1][0];
+ d3_svg_brushOffset[1] += d3_svg_brushExtent[1][1];
+ d3_svg_brushDrag = 0;
+ d3_eventCancel();
+ }
+}
+
+function d3_svg_brushMove() {
+ if (d3_svg_brushOffset) {
+ var mouse = d3.svg.mouse(d3_svg_brushTarget),
+ g = d3.select(d3_svg_brushTarget);
+
+ if (!d3_svg_brushDrag) {
+
+ // If needed, determine the center from the current extent.
+ if (d3.event.altKey) {
+ if (!d3_svg_brushCenter) {
+ d3_svg_brushCenter = [
+ (d3_svg_brushExtent[0][0] + d3_svg_brushExtent[1][0]) / 2,
+ (d3_svg_brushExtent[0][1] + d3_svg_brushExtent[1][1]) / 2
+ ];
+ }
+
+ // Update the offset, for when the ALT key is released.
+ d3_svg_brushOffset[0] = d3_svg_brushExtent[+(mouse[0] < d3_svg_brushCenter[0])][0];
+ d3_svg_brushOffset[1] = d3_svg_brushExtent[+(mouse[1] < d3_svg_brushCenter[1])][1];
+ }
+
+ // When the ALT key is released, we clear the center.
+ else d3_svg_brushCenter = null;
+ }
+
+ // Update the brush extent for each dimension.
+ if (d3_svg_brushX) {
+ d3_svg_brushMove1(mouse, d3_svg_brushX, 0);
+ d3_svg_brushRedrawX(g, d3_svg_brushExtent);
+ }
+ if (d3_svg_brushY) {
+ d3_svg_brushMove1(mouse, d3_svg_brushY, 1);
+ d3_svg_brushRedrawY(g, d3_svg_brushExtent);
+ }
+
+ // Notify listeners.
+ d3_svg_brushDispatch("brush");
+ }
+}
+
+function d3_svg_brushMove1(mouse, scale, i) {
+ var range = d3_scaleRange(scale),
+ r0 = range[0],
+ r1 = range[1],
+ offset = d3_svg_brushOffset[i],
+ size = d3_svg_brushExtent[1][i] - d3_svg_brushExtent[0][i],
+ min,
+ max;
+
+ // When dragging, reduce the range by the extent size and offset.
+ if (d3_svg_brushDrag) {
+ r0 -= offset;
+ r1 -= size + offset;
+ }
+
+ // Clamp the mouse so that the extent fits within the range extent.
+ min = Math.max(r0, Math.min(r1, mouse[i]));
+
+ // Compute the new extent bounds.
+ if (d3_svg_brushDrag) {
+ max = (min += offset) + size;
+ } else {
+
+ // If the ALT key is pressed, then preserve the center of the extent.
+ if (d3_svg_brushCenter) offset = Math.max(r0, Math.min(r1, 2 * d3_svg_brushCenter[i] - min));
+
+ // Compute the min and max of the offset and mouse.
+ if (offset < min) {
+ max = min;
+ min = offset;
+ } else {
+ max = offset;
+ }
+ }
+
+ // Update the stored bounds.
+ d3_svg_brushExtent[0][i] = min;
+ d3_svg_brushExtent[1][i] = max;
+}
+
+function d3_svg_brushUp() {
+ if (d3_svg_brushOffset) {
+ d3_svg_brushMove();
+ d3.select(d3_svg_brushTarget).selectAll(".resize").style("pointer-events", d3_svg_brush.empty() ? "none" : "all");
+ d3_svg_brushDispatch("brushend");
+ d3_svg_brush =
+ d3_svg_brushDispatch =
+ d3_svg_brushTarget =
+ d3_svg_brushX =
+ d3_svg_brushY =
+ d3_svg_brushExtent =
+ d3_svg_brushDrag =
+ d3_svg_brushResize =
+ d3_svg_brushCenter =
+ d3_svg_brushOffset = null;
+ d3_eventCancel();
+ }
+}
+
+var d3_svg_brushCursor = {
+ n: "ns-resize",
+ e: "ew-resize",
+ s: "ns-resize",
+ w: "ew-resize",
+ nw: "nwse-resize",
+ ne: "nesw-resize",
+ se: "nwse-resize",
+ sw: "nesw-resize"
+};
+d3.behavior = {};
+// TODO Track touch points by identifier.
+
+d3.behavior.drag = function() {
+ var event = d3.dispatch("drag", "dragstart", "dragend"),
+ origin = null;
+
+ function drag() {
+ this
+ .on("mousedown.drag", mousedown)
+ .on("touchstart.drag", mousedown);
+
+ d3.select(window)
+ .on("mousemove.drag", d3_behavior_dragMove)
+ .on("touchmove.drag", d3_behavior_dragMove)
+ .on("mouseup.drag", d3_behavior_dragUp, true)
+ .on("touchend.drag", d3_behavior_dragUp, true)
+ .on("click.drag", d3_behavior_dragClick, true);
+ }
+
+ // snapshot the local context for subsequent dispatch
+ function start() {
+ d3_behavior_dragEvent = event;
+ d3_behavior_dragEventTarget = d3.event.target;
+ d3_behavior_dragTarget = this;
+ d3_behavior_dragArguments = arguments;
+ d3_behavior_dragOrigin = d3_behavior_dragPoint();
+ if (origin) {
+ d3_behavior_dragOffset = origin.apply(d3_behavior_dragTarget, d3_behavior_dragArguments);
+ d3_behavior_dragOffset = [d3_behavior_dragOffset.x - d3_behavior_dragOrigin[0], d3_behavior_dragOffset.y - d3_behavior_dragOrigin[1]];
+ } else {
+ d3_behavior_dragOffset = [0, 0];
+ }
+ d3_behavior_dragMoved = 0;
+ }
+
+ function mousedown() {
+ start.apply(this, arguments);
+ d3_behavior_dragDispatch("dragstart");
+ }
+
+ drag.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ return drag;
+ };
+
+ return d3.rebind(drag, event, "on");
+};
+
+var d3_behavior_dragEvent,
+ d3_behavior_dragEventTarget,
+ d3_behavior_dragTarget,
+ d3_behavior_dragArguments,
+ d3_behavior_dragOffset,
+ d3_behavior_dragOrigin,
+ d3_behavior_dragMoved;
+
+function d3_behavior_dragDispatch(type) {
+ var p = d3_behavior_dragPoint(),
+ o = d3.event,
+ e = d3.event = {type: type};
+
+ if (p) {
+ e.x = p[0] + d3_behavior_dragOffset[0];
+ e.y = p[1] + d3_behavior_dragOffset[1];
+ e.dx = p[0] - d3_behavior_dragOrigin[0];
+ e.dy = p[1] - d3_behavior_dragOrigin[1];
+ d3_behavior_dragMoved |= e.dx | e.dy;
+ d3_behavior_dragOrigin = p;
+ }
+
+ try {
+ d3_behavior_dragEvent[type].apply(d3_behavior_dragTarget, d3_behavior_dragArguments);
+ } finally {
+ d3.event = o;
+ }
+
+ o.stopPropagation();
+ o.preventDefault();
+}
+
+function d3_behavior_dragPoint() {
+ var p = d3_behavior_dragTarget.parentNode,
+ t = d3.event.changedTouches;
+ return p && (t
+ ? d3.svg.touches(p, t)[0]
+ : d3.svg.mouse(p));
+}
+
+function d3_behavior_dragMove() {
+ if (!d3_behavior_dragTarget) return;
+ var parent = d3_behavior_dragTarget.parentNode;
+
+ // O NOES! The drag element was removed from the DOM.
+ if (!parent) return d3_behavior_dragUp();
+
+ d3_behavior_dragDispatch("drag");
+ d3_eventCancel();
+}
+
+function d3_behavior_dragUp() {
+ if (!d3_behavior_dragTarget) return;
+ d3_behavior_dragDispatch("dragend");
+
+ // If the node was moved, prevent the mouseup from propagating.
+ // Also prevent the subsequent click from propagating (e.g., for anchors).
+ if (d3_behavior_dragMoved) {
+ d3_eventCancel();
+ d3_behavior_dragMoved = d3.event.target === d3_behavior_dragEventTarget;
+ }
+
+ d3_behavior_dragEvent =
+ d3_behavior_dragEventTarget =
+ d3_behavior_dragTarget =
+ d3_behavior_dragArguments =
+ d3_behavior_dragOffset =
+ d3_behavior_dragOrigin = null;
+}
+
+function d3_behavior_dragClick() {
+ if (d3_behavior_dragMoved) {
+ d3_eventCancel();
+ d3_behavior_dragMoved = 0;
+ }
+}
+// TODO unbind zoom behavior?
+d3.behavior.zoom = function() {
+ var xyz = [0, 0, 0],
+ event = d3.dispatch("zoom"),
+ extent = d3_behavior_zoomInfiniteExtent;
+
+ function zoom() {
+ this
+ .on("mousedown.zoom", mousedown)
+ .on("mousewheel.zoom", mousewheel)
+ .on("DOMMouseScroll.zoom", mousewheel)
+ .on("dblclick.zoom", dblclick)
+ .on("touchstart.zoom", touchstart);
+
+ d3.select(window)
+ .on("mousemove.zoom", d3_behavior_zoomMousemove)
+ .on("mouseup.zoom", d3_behavior_zoomMouseup)
+ .on("touchmove.zoom", d3_behavior_zoomTouchmove)
+ .on("touchend.zoom", d3_behavior_zoomTouchup)
+ .on("click.zoom", d3_behavior_zoomClick, true);
+ }
+
+ // snapshot the local context for subsequent dispatch
+ function start() {
+ d3_behavior_zoomXyz = xyz;
+ d3_behavior_zoomExtent = extent;
+ d3_behavior_zoomDispatch = event.zoom;
+ d3_behavior_zoomEventTarget = d3.event.target;
+ d3_behavior_zoomTarget = this;
+ d3_behavior_zoomArguments = arguments;
+ }
+
+ function mousedown() {
+ start.apply(this, arguments);
+ d3_behavior_zoomPanning = d3_behavior_zoomLocation(d3.svg.mouse(d3_behavior_zoomTarget));
+ d3_behavior_zoomMoved = 0;
+ d3.event.preventDefault();
+ window.focus();
+ }
+
+ // store starting mouse location
+ function mousewheel() {
+ start.apply(this, arguments);
+ if (!d3_behavior_zoomZooming) d3_behavior_zoomZooming = d3_behavior_zoomLocation(d3.svg.mouse(d3_behavior_zoomTarget));
+ d3_behavior_zoomTo(d3_behavior_zoomDelta() + xyz[2], d3.svg.mouse(d3_behavior_zoomTarget), d3_behavior_zoomZooming);
+ }
+
+ function dblclick() {
+ start.apply(this, arguments);
+ var mouse = d3.svg.mouse(d3_behavior_zoomTarget);
+ d3_behavior_zoomTo(d3.event.shiftKey ? Math.ceil(xyz[2] - 1) : Math.floor(xyz[2] + 1), mouse, d3_behavior_zoomLocation(mouse));
+ }
+
+ // doubletap detection
+ function touchstart() {
+ start.apply(this, arguments);
+ var touches = d3_behavior_zoomTouchup(),
+ touch,
+ now = Date.now();
+ if ((touches.length === 1) && (now - d3_behavior_zoomLast < 300)) {
+ d3_behavior_zoomTo(1 + Math.floor(xyz[2]), touch = touches[0], d3_behavior_zoomLocations[touch.identifier]);
+ }
+ d3_behavior_zoomLast = now;
+ }
+
+ zoom.extent = function(x) {
+ if (!arguments.length) return extent;
+ extent = x == null ? d3_behavior_zoomInfiniteExtent : x;
+ return zoom;
+ };
+
+ return d3.rebind(zoom, event, "on");
+};
+
+var d3_behavior_zoomDiv,
+ d3_behavior_zoomPanning,
+ d3_behavior_zoomZooming,
+ d3_behavior_zoomLocations = {}, // identifier -> location
+ d3_behavior_zoomLast = 0,
+ d3_behavior_zoomXyz,
+ d3_behavior_zoomExtent,
+ d3_behavior_zoomDispatch,
+ d3_behavior_zoomEventTarget,
+ d3_behavior_zoomTarget,
+ d3_behavior_zoomArguments,
+ d3_behavior_zoomMoved;
+
+function d3_behavior_zoomLocation(point) {
+ return [
+ point[0] - d3_behavior_zoomXyz[0],
+ point[1] - d3_behavior_zoomXyz[1],
+ d3_behavior_zoomXyz[2]
+ ];
+}
+
+// detect the pixels that would be scrolled by this wheel event
+function d3_behavior_zoomDelta() {
+
+ // mousewheel events are totally broken!
+ // https://bugs.webkit.org/show_bug.cgi?id=40441
+ // not only that, but Chrome and Safari differ in re. to acceleration!
+ if (!d3_behavior_zoomDiv) {
+ d3_behavior_zoomDiv = d3.select("body").append("div")
+ .style("visibility", "hidden")
+ .style("top", 0)
+ .style("height", 0)
+ .style("width", 0)
+ .style("overflow-y", "scroll")
+ .append("div")
+ .style("height", "2000px")
+ .node().parentNode;
+ }
+
+ var e = d3.event, delta;
+ try {
+ d3_behavior_zoomDiv.scrollTop = 1000;
+ d3_behavior_zoomDiv.dispatchEvent(e);
+ delta = 1000 - d3_behavior_zoomDiv.scrollTop;
+ } catch (error) {
+ delta = e.wheelDelta || (-e.detail * 5);
+ }
+
+ return delta * .005;
+}
+
+// Note: Since we don't rotate, it's possible for the touches to become
+// slightly detached from their original positions. Thus, we recompute the
+// touch points on touchend as well as touchstart!
+function d3_behavior_zoomTouchup() {
+ var touches = d3.svg.touches(d3_behavior_zoomTarget),
+ i = -1,
+ n = touches.length,
+ touch;
+ while (++i < n) d3_behavior_zoomLocations[(touch = touches[i]).identifier] = d3_behavior_zoomLocation(touch);
+ return touches;
+}
+
+function d3_behavior_zoomTouchmove() {
+ var touches = d3.svg.touches(d3_behavior_zoomTarget);
+ switch (touches.length) {
+
+ // single-touch pan
+ case 1: {
+ var touch = touches[0];
+ d3_behavior_zoomTo(d3_behavior_zoomXyz[2], touch, d3_behavior_zoomLocations[touch.identifier]);
+ break;
+ }
+
+ // double-touch pan + zoom
+ case 2: {
+ var p0 = touches[0],
+ p1 = touches[1],
+ p2 = [(p0[0] + p1[0]) / 2, (p0[1] + p1[1]) / 2],
+ l0 = d3_behavior_zoomLocations[p0.identifier],
+ l1 = d3_behavior_zoomLocations[p1.identifier],
+ l2 = [(l0[0] + l1[0]) / 2, (l0[1] + l1[1]) / 2, l0[2]];
+ d3_behavior_zoomTo(Math.log(d3.event.scale) / Math.LN2 + l0[2], p2, l2);
+ break;
+ }
+ }
+}
+
+function d3_behavior_zoomMousemove() {
+ d3_behavior_zoomZooming = null;
+ if (d3_behavior_zoomPanning) {
+ d3_behavior_zoomMoved = 1;
+ d3_behavior_zoomTo(d3_behavior_zoomXyz[2], d3.svg.mouse(d3_behavior_zoomTarget), d3_behavior_zoomPanning);
+ }
+}
+
+function d3_behavior_zoomMouseup() {
+ if (d3_behavior_zoomPanning) {
+ if (d3_behavior_zoomMoved) {
+ d3_eventCancel();
+ d3_behavior_zoomMoved = d3_behavior_zoomEventTarget === d3.event.target;
+ }
+
+ d3_behavior_zoomXyz =
+ d3_behavior_zoomExtent =
+ d3_behavior_zoomDispatch =
+ d3_behavior_zoomEventTarget =
+ d3_behavior_zoomTarget =
+ d3_behavior_zoomArguments =
+ d3_behavior_zoomPanning = null;
+ }
+}
+
+function d3_behavior_zoomClick() {
+ if (d3_behavior_zoomMoved) {
+ d3_eventCancel();
+ d3_behavior_zoomMoved = 0;
+ }
+}
+
+function d3_behavior_zoomTo(z, x0, x1) {
+ z = d3_behavior_zoomExtentClamp(z, 2);
+ var j = Math.pow(2, d3_behavior_zoomXyz[2]),
+ k = Math.pow(2, z),
+ K = Math.pow(2, (d3_behavior_zoomXyz[2] = z) - x1[2]),
+ x_ = d3_behavior_zoomXyz[0],
+ y_ = d3_behavior_zoomXyz[1],
+ x = d3_behavior_zoomXyz[0] = d3_behavior_zoomExtentClamp((x0[0] - x1[0] * K), 0, k),
+ y = d3_behavior_zoomXyz[1] = d3_behavior_zoomExtentClamp((x0[1] - x1[1] * K), 1, k),
+ o = d3.event; // Events can be reentrant (e.g., focus).
+
+ d3.event = {
+ scale: k,
+ translate: [x, y],
+ transform: function(sx, sy) {
+ if (sx) transform(sx, x_, x);
+ if (sy) transform(sy, y_, y);
+ }
+ };
+
+ function transform(scale, a, b) {
+ scale.domain(scale.range().map(function(v) { return scale.invert(((v - b) * j) / k + a); }));
+ }
+
+ try {
+ d3_behavior_zoomDispatch.apply(d3_behavior_zoomTarget, d3_behavior_zoomArguments);
+ } finally {
+ d3.event = o;
+ }
+
+ o.preventDefault();
+}
+
+var d3_behavior_zoomInfiniteExtent = [
+ [-Infinity, Infinity],
+ [-Infinity, Infinity],
+ [-Infinity, Infinity]
+];
+
+function d3_behavior_zoomExtentClamp(x, i, k) {
+ var range = d3_behavior_zoomExtent[i],
+ r0 = range[0],
+ r1 = range[1];
+ return arguments.length === 3
+ ? Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
+ Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k
+ : Math.max(r0, Math.min(r1, x));
+}
})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
index 76ddee0..24bcc42 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
@@ -113,16 +113,19 @@ d3.layout.chord = function() {
k = (2 * Math.PI - padding * n) / k;
// Compute the start and end angle for each group and subgroup.
+ // Note: Opera has a bug reordering object literal properties!
x = 0, i = -1; while (++i < n) {
x0 = x, j = -1; while (++j < n) {
var di = groupIndex[i],
- dj = subgroupIndex[i][j],
- v = matrix[di][dj];
+ dj = subgroupIndex[di][j],
+ v = matrix[di][dj],
+ a0 = x,
+ a1 = x += v * k;
subgroups[di + "-" + dj] = {
index: di,
subindex: dj,
- startAngle: x,
- endAngle: x += v * k,
+ startAngle: a0,
+ endAngle: a1,
value: v
};
}
@@ -143,7 +146,7 @@ d3.layout.chord = function() {
if (source.value || target.value) {
chords.push(source.value < target.value
? {source: target, target: source}
- : {source: source, target: target})
+ : {source: source, target: target});
}
}
}
@@ -153,7 +156,9 @@ d3.layout.chord = function() {
function resort() {
chords.sort(function(a, b) {
- return sortChords(a.target.value, b.target.value);
+ return sortChords(
+ (a.source.value + a.target.value) / 2,
+ (b.source.value + b.target.value) / 2);
});
}
@@ -209,6 +214,7 @@ d3.layout.force = function() {
var force = {},
event = d3.dispatch("tick"),
size = [1, 1],
+ drag,
alpha,
friction = .9,
linkDistance = d3_layout_forceLinkDistance,
@@ -220,9 +226,10 @@ d3.layout.force = function() {
nodes = [],
links = [],
distances,
- strengths;
+ strengths,
+ charges;
- function repulse(node, kc) {
+ function repulse(node) {
return function(quad, x1, y1, x2, y2) {
if (quad.point !== node) {
var dx = quad.cx - node.x,
@@ -231,30 +238,32 @@ d3.layout.force = function() {
/* Barnes-Hut criterion. */
if ((x2 - x1) * dn < theta) {
- var k = kc * quad.count * dn * dn;
- node.x += dx * k;
- node.y += dy * k;
+ var k = quad.charge * dn * dn;
+ node.px -= dx * k;
+ node.py -= dy * k;
return true;
}
if (quad.point && isFinite(dn)) {
- var k = kc * dn * dn;
- node.x += dx * k;
- node.y += dy * k;
+ var k = quad.pointCharge * dn * dn;
+ node.px -= dx * k;
+ node.py -= dy * k;
}
}
+ return !quad.charge;
};
}
function tick() {
var n = nodes.length,
m = links.length,
- q = d3.geom.quadtree(nodes),
+ q,
i, // current index
o, // current object
s, // current source
t, // current target
l, // current distance
+ k, // current force
x, // x-distance
y; // y-distance
@@ -269,30 +278,32 @@ d3.layout.force = function() {
l = alpha * strengths[i] * ((l = Math.sqrt(l)) - distances[i]) / l;
x *= l;
y *= l;
- t.x -= x;
- t.y -= y;
- s.x += x;
- s.y += y;
+ t.x -= x * (k = s.weight / (t.weight + s.weight));
+ t.y -= y * k;
+ s.x += x * (k = 1 - k);
+ s.y += y * k;
}
}
// apply gravity forces
- var kg = alpha * gravity;
- x = size[0] / 2;
- y = size[1] / 2;
- i = -1; while (++i < n) {
- o = nodes[i];
- o.x += (x - o.x) * kg;
- o.y += (y - o.y) * kg;
+ if (k = alpha * gravity) {
+ x = size[0] / 2;
+ y = size[1] / 2;
+ i = -1; if (k) while (++i < n) {
+ o = nodes[i];
+ o.x += (x - o.x) * k;
+ o.y += (y - o.y) * k;
+ }
}
- // compute quadtree center of mass
- d3_layout_forceAccumulate(q);
-
- // apply charge forces
- var kc = alpha * charge;
- i = -1; while (++i < n) {
- q.visit(repulse(nodes[i], kc));
+ // compute quadtree center of mass and apply charge forces
+ if (charge) {
+ d3_layout_forceAccumulate(q = d3.geom.quadtree(nodes), alpha, charges);
+ i = -1; while (++i < n) {
+ if (!(o = nodes[i]).fixed) {
+ q.visit(repulse(o));
+ }
+ }
}
// position verlet integration
@@ -307,17 +318,12 @@ d3.layout.force = function() {
}
}
- event.tick.dispatch({type: "tick", alpha: alpha});
+ event.tick({type: "tick", alpha: alpha});
// simulated annealing, basically
return (alpha *= .99) < .005;
}
- force.on = function(type, listener) {
- event[type].add(listener);
- return force;
- };
-
force.nodes = function(x) {
if (!arguments.length) return nodes;
nodes = x;
@@ -359,7 +365,7 @@ d3.layout.force = function() {
force.charge = function(x) {
if (!arguments.length) return charge;
- charge = x;
+ charge = typeof x === "function" ? x : +x;
return force;
};
@@ -387,6 +393,7 @@ d3.layout.force = function() {
for (i = 0; i < n; ++i) {
(o = nodes[i]).index = i;
+ o.weight = 0;
}
distances = [];
@@ -397,6 +404,8 @@ d3.layout.force = function() {
if (typeof o.target == "number") o.target = nodes[o.target];
distances[i] = linkDistance.call(this, o, i);
strengths[i] = linkStrength.call(this, o, i);
+ ++o.source.weight;
+ ++o.target.weight;
}
for (i = 0; i < n; ++i) {
@@ -407,6 +416,17 @@ d3.layout.force = function() {
if (isNaN(o.py)) o.py = o.y;
}
+ charges = [];
+ if (typeof charge === "function") {
+ for (i = 0; i < n; ++i) {
+ charges[i] = +charge.call(this, nodes[i], i);
+ }
+ } else {
+ for (i = 0; i < n; ++i) {
+ charges[i] = charge;
+ }
+ }
+
// initialize node position based on first neighbor
function position(dimension, size) {
var neighbors = neighbor(i),
@@ -449,116 +469,52 @@ d3.layout.force = function() {
// use `node.call(force.drag)` to make nodes draggable
force.drag = function() {
-
- this
- .on("mouseover.force", d3_layout_forceDragOver)
- .on("mouseout.force", d3_layout_forceDragOut)
- .on("mousedown.force", dragdown)
- .on("touchstart.force", dragdown);
-
- d3.select(window)
- .on("mousemove.force", d3_layout_forceDragMove)
- .on("touchmove.force", d3_layout_forceDragMove)
- .on("mouseup.force", d3_layout_forceDragUp, true)
- .on("touchend.force", d3_layout_forceDragUp, true)
- .on("click.force", d3_layout_forceDragClick, true);
-
- return force;
+ if (!drag) drag = d3.behavior.drag()
+ .origin(Object)
+ .on("dragstart", dragstart)
+ .on("drag", d3_layout_forceDrag)
+ .on("dragend", d3_layout_forceDragEnd);
+
+ this.on("mouseover.force", d3_layout_forceDragOver)
+ .on("mouseout.force", d3_layout_forceDragOut)
+ .call(drag);
};
- function dragdown(d, i) {
- var m = d3_layout_forcePoint(this.parentNode);
- (d3_layout_forceDragNode = d).fixed = true;
- d3_layout_forceDragMoved = false;
- d3_layout_forceDragElement = this;
+ function dragstart(d) {
+ d3_layout_forceDragOver(d3_layout_forceDragNode = d);
d3_layout_forceDragForce = force;
- d3_layout_forceDragOffset = [m[0] - d.x, m[1] - d.y];
- d3_layout_forceCancel();
}
- return force;
+ return d3.rebind(force, event, "on");
};
var d3_layout_forceDragForce,
- d3_layout_forceDragNode,
- d3_layout_forceDragMoved,
- d3_layout_forceDragOffset,
- d3_layout_forceStopClick,
- d3_layout_forceDragElement;
+ d3_layout_forceDragNode;
function d3_layout_forceDragOver(d) {
- d.fixed = true;
+ d.fixed |= 2;
}
function d3_layout_forceDragOut(d) {
- if (d !== d3_layout_forceDragNode) {
- d.fixed = false;
- }
+ if (d !== d3_layout_forceDragNode) d.fixed &= 1;
}
-function d3_layout_forcePoint(container) {
- return d3.event.touches
- ? d3.svg.touches(container)[0]
- : d3.svg.mouse(container);
+function d3_layout_forceDragEnd() {
+ d3_layout_forceDrag();
+ d3_layout_forceDragNode.fixed &= 1;
+ d3_layout_forceDragForce = d3_layout_forceDragNode = null;
}
-function d3_layout_forceDragMove() {
- if (!d3_layout_forceDragNode) return;
- var parent = d3_layout_forceDragElement.parentNode;
-
- // O NOES! The drag element was removed from the DOM.
- if (!parent) {
- d3_layout_forceDragNode.fixed = false;
- d3_layout_forceDragOffset = d3_layout_forceDragNode = d3_layout_forceDragElement = null;
- return;
- }
-
- var m = d3_layout_forcePoint(parent);
- d3_layout_forceDragMoved = true;
- d3_layout_forceDragNode.px = m[0] - d3_layout_forceDragOffset[0];
- d3_layout_forceDragNode.py = m[1] - d3_layout_forceDragOffset[1];
- d3_layout_forceCancel();
+function d3_layout_forceDrag() {
+ d3_layout_forceDragNode.px = d3.event.x;
+ d3_layout_forceDragNode.py = d3.event.y;
d3_layout_forceDragForce.resume(); // restart annealing
}
-function d3_layout_forceDragUp() {
- if (!d3_layout_forceDragNode) return;
-
- // If the node was moved, prevent the mouseup from propagating.
- // Also prevent the subsequent click from propagating (e.g., for anchors).
- if (d3_layout_forceDragMoved) {
- d3_layout_forceStopClick = true;
- d3_layout_forceCancel();
- }
-
- // Don't trigger this for touchend.
- if (d3.event.type === "mouseup") {
- d3_layout_forceDragMove();
- }
-
- d3_layout_forceDragNode.fixed = false;
- d3_layout_forceDragForce =
- d3_layout_forceDragOffset =
- d3_layout_forceDragNode =
- d3_layout_forceDragElement = null;
-}
-
-function d3_layout_forceDragClick() {
- if (d3_layout_forceStopClick) {
- d3_layout_forceCancel();
- d3_layout_forceStopClick = false;
- }
-}
-
-function d3_layout_forceCancel() {
- d3.event.stopPropagation();
- d3.event.preventDefault();
-}
-
-function d3_layout_forceAccumulate(quad) {
+function d3_layout_forceAccumulate(quad, alpha, charges) {
var cx = 0,
cy = 0;
- quad.count = 0;
+ quad.charge = 0;
if (!quad.leaf) {
var nodes = quad.nodes,
n = nodes.length,
@@ -567,10 +523,10 @@ function d3_layout_forceAccumulate(quad) {
while (++i < n) {
c = nodes[i];
if (c == null) continue;
- d3_layout_forceAccumulate(c);
- quad.count += c.count;
- cx += c.count * c.cx;
- cy += c.count * c.cy;
+ d3_layout_forceAccumulate(c, alpha, charges);
+ quad.charge += c.charge;
+ cx += c.charge * c.cx;
+ cy += c.charge * c.cy;
}
}
if (quad.point) {
@@ -579,12 +535,13 @@ function d3_layout_forceAccumulate(quad) {
quad.point.x += Math.random() - .5;
quad.point.y += Math.random() - .5;
}
- quad.count++;
- cx += quad.point.x;
- cy += quad.point.y;
+ var k = alpha * charges[quad.point.index];
+ quad.charge += quad.pointCharge = k;
+ cx += k * quad.point.x;
+ cy += k * quad.point.y;
}
- quad.cx = cx / quad.count;
- quad.cy = cy / quad.count;
+ quad.cx = cx / quad.charge;
+ quad.cy = cy / quad.charge;
}
function d3_layout_forceLinkDistance(link) {
@@ -604,12 +561,12 @@ d3.layout.partition = function() {
node.y = node.depth * dy;
node.dx = dx;
node.dy = dy;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length,
+ n,
c,
d;
- dx /= node.value;
+ dx = node.value ? dx / node.value : 0;
while (++i < n) {
position(c = children[i], x, d = c.value * dx, dy);
x += d;
@@ -620,9 +577,9 @@ d3.layout.partition = function() {
function depth(node) {
var children = node.children,
d = 0;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length;
+ n;
while (++i < n) d = Math.max(d, depth(children[i]));
}
return 1 + d;
@@ -644,48 +601,44 @@ d3.layout.partition = function() {
};
d3.layout.pie = function() {
var value = Number,
- sort = null,
+ sort = d3_layout_pieSortByValue,
startAngle = 0,
endAngle = 2 * Math.PI;
function pie(data, i) {
+ // Compute the numeric values for each data element.
+ var values = data.map(function(d, i) { return +value.call(pie, d, i); });
+
// Compute the start angle.
var a = +(typeof startAngle === "function"
? startAngle.apply(this, arguments)
: startAngle);
- // Compute the angular range (end - start).
- var k = (typeof endAngle === "function"
+ // Compute the angular scale factor: from value to radians.
+ var k = ((typeof endAngle === "function"
? endAngle.apply(this, arguments)
- : endAngle) - startAngle;
+ : endAngle) - startAngle)
+ / d3.sum(values);
// Optionally sort the data.
var index = d3.range(data.length);
- if (sort != null) index.sort(function(i, j) {
- return sort(data[i], data[j]);
- });
-
- // Compute the numeric values for each data element.
- var values = data.map(value);
-
- // Convert k into a scale factor from value to angle, using the sum.
- k /= values.reduce(function(p, d) { return p + d; }, 0);
+ if (sort != null) index.sort(sort === d3_layout_pieSortByValue
+ ? function(i, j) { return values[j] - values[i]; }
+ : function(i, j) { return sort(data[i], data[j]); });
// Compute the arcs!
- var arcs = index.map(function(i) {
- return {
+ // They are stored in the original data's order.
+ var arcs = [];
+ index.forEach(function(i) {
+ arcs[i] = {
data: data[i],
value: d = values[i],
startAngle: a,
endAngle: a += d * k
};
});
-
- // Return the arcs in the original data's order.
- return data.map(function(d, i) {
- return arcs[index[i]];
- });
+ return arcs;
}
/**
@@ -737,6 +690,8 @@ d3.layout.pie = function() {
return pie;
};
+
+var d3_layout_pieSortByValue = {};
// data is two-dimensional array of x,y; we populate y0
d3.layout.stack = function() {
var values = Object,
@@ -1088,9 +1043,9 @@ d3.layout.hierarchy = function() {
node = d3_layout_hierarchyInline ? data : {data: data};
node.depth = depth;
nodes.push(node);
- if (childs) {
+ if (childs && (n = childs.length)) {
var i = -1,
- n = childs.length,
+ n,
c = node.children = [],
v = 0,
j = depth + 1;
@@ -1103,7 +1058,7 @@ d3.layout.hierarchy = function() {
if (sort) c.sort(sort);
if (value) node.value = v;
} else if (value) {
- node.value = value.call(hierarchy, data, depth);
+ node.value = +value.call(hierarchy, data, depth) || 0;
}
return node;
}
@@ -1112,13 +1067,13 @@ d3.layout.hierarchy = function() {
function revalue(node, depth) {
var children = node.children,
v = 0;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length,
+ n,
j = depth + 1;
while (++i < n) v += revalue(children[i], j);
} else if (value) {
- v = value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth);
+ v = +value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth) || 0;
}
if (value) node.value = v;
return v;
@@ -1159,10 +1114,10 @@ d3.layout.hierarchy = function() {
// A method assignment helper for hierarchy subclasses.
function d3_layout_hierarchyRebind(object, hierarchy) {
- object.sort = d3.rebind(object, hierarchy.sort);
- object.children = d3.rebind(object, hierarchy.children);
+ d3.rebind(object, hierarchy, "sort", "children", "value");
+
+ // Add an alias for links, for convenience.
object.links = d3_layout_hierarchyLinks;
- object.value = d3.rebind(object, hierarchy.value);
// If the new API is used, enabling inlining.
object.nodes = function(d) {
@@ -1362,7 +1317,7 @@ function d3_layout_packUnlink(node) {
function d3_layout_packTree(node) {
var children = node.children;
- if (children) {
+ if (children && children.length) {
children.forEach(d3_layout_packTree);
node.r = d3_layout_packCircle(children);
} else {
@@ -1382,19 +1337,22 @@ function d3_layout_packTransform(node, x, y, k) {
}
function d3_layout_packPlace(a, b, c) {
- var da = b.r + c.r,
- db = a.r + c.r,
+ var db = a.r + c.r,
dx = b.x - a.x,
- dy = b.y - a.y,
- dc = Math.sqrt(dx * dx + dy * dy),
- cos = (db * db + dc * dc - da * da) / (2 * db * dc),
- theta = Math.acos(cos),
- x = cos * db,
- h = Math.sin(theta) * db;
- dx /= dc;
- dy /= dc;
- c.x = a.x + x * dx + h * dy;
- c.y = a.y + x * dy - h * dx;
+ dy = b.y - a.y;
+ if (db && (dx || dy)) {
+ var da = b.r + c.r,
+ dc = Math.sqrt(dx * dx + dy * dy),
+ cos = Math.max(-1, Math.min(1, (db * db + dc * dc - da * da) / (2 * db * dc))),
+ theta = Math.acos(cos),
+ x = cos * (db /= dc),
+ y = Math.sin(theta) * db;
+ c.x = a.x + x * dx + y * dy;
+ c.y = a.y + x * dy - y * dx;
+ } else {
+ c.x = a.x + db;
+ c.y = a.y;
+ }
}
// Implements a hierarchical layout using the cluster (or dendogram) algorithm.
d3.layout.cluster = function() {
@@ -1412,9 +1370,10 @@ d3.layout.cluster = function() {
// First walk, computing the initial x & y values.
d3_layout_treeVisitAfter(root, function(node) {
- if (node.children) {
- node.x = d3_layout_clusterX(node.children);
- node.y = d3_layout_clusterY(node.children);
+ var children = node.children;
+ if (children && children.length) {
+ node.x = d3_layout_clusterX(children);
+ node.y = d3_layout_clusterY(children);
} else {
node.x = previousNode ? x += separation(node, previousNode) : 0;
node.y = 0;
@@ -1431,7 +1390,7 @@ d3.layout.cluster = function() {
// Second walk, normalizing x & y to the desired size.
d3_layout_treeVisitAfter(root, function(node) {
node.x = (node.x - x0) / (x1 - x0) * size[0];
- node.y = (1 - node.y / root.y) * size[1];
+ node.y = (1 - (root.y ? node.y / root.y : 1)) * size[1];
});
return nodes;
@@ -1466,12 +1425,12 @@ function d3_layout_clusterX(children) {
function d3_layout_clusterLeft(node) {
var children = node.children;
- return children ? d3_layout_clusterLeft(children[0]) : node;
+ return children && children.length ? d3_layout_clusterLeft(children[0]) : node;
}
function d3_layout_clusterRight(node) {
- var children = node.children;
- return children ? d3_layout_clusterRight(children[children.length - 1]) : node;
+ var children = node.children, n;
+ return children && (n = children.length) ? d3_layout_clusterRight(children[n - 1]) : node;
}
// Node-link tree diagram using the Reingold-Tilford "tidy" algorithm
d3.layout.tree = function() {
@@ -1486,8 +1445,8 @@ d3.layout.tree = function() {
function firstWalk(node, previousSibling) {
var children = node.children,
layout = node._tree;
- if (children && children.length) {
- var n = children.length,
+ if (children && (n = children.length)) {
+ var n,
firstChild = children[0],
previousChild,
ancestor = firstChild,
@@ -1517,9 +1476,9 @@ d3.layout.tree = function() {
function secondWalk(node, x) {
node.x = node._tree.prelim + x;
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length;
+ n;
x += node._tree.mod;
while (++i < n) {
secondWalk(children[i], x);
@@ -1624,18 +1583,21 @@ function d3_layout_treeSeparation(a, b) {
// }
function d3_layout_treeLeft(node) {
- return node.children ? node.children[0] : node._tree.thread;
+ var children = node.children;
+ return children && children.length ? children[0] : node._tree.thread;
}
function d3_layout_treeRight(node) {
- return node.children ? node.children[node.children.length - 1] : node._tree.thread;
+ var children = node.children,
+ n;
+ return children && (n = children.length) ? children[n - 1] : node._tree.thread;
}
function d3_layout_treeSearch(node, compare) {
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var child,
- n = children.length,
+ n,
i = -1;
while (++i < n) {
if (compare(child = d3_layout_treeSearch(children[i], compare), node) > 0) {
@@ -1661,11 +1623,11 @@ function d3_layout_treeDeepest(a, b) {
function d3_layout_treeVisitAfter(node, callback) {
function visit(node, previousSibling) {
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var child,
previousChild = null,
i = -1,
- n = children.length;
+ n;
while (++i < n) {
child = children[i];
visit(child, previousChild);
@@ -1733,57 +1695,61 @@ d3.layout.treemap = function() {
// Recursively arranges the specified node's children into squarified rows.
function squarify(node) {
- if (!node.children) return;
- var rect = pad(node),
- row = [],
- children = node.children.slice(), // copy-on-write
- child,
- best = Infinity, // the best row score so far
- score, // the current row score
- u = Math.min(rect.dx, rect.dy), // initial orientation
- n;
- scale(children, rect.dx * rect.dy / node.value);
- row.area = 0;
- while ((n = children.length) > 0) {
- row.push(child = children[n - 1]);
- row.area += child.area;
- if ((score = worst(row, u)) <= best) { // continue with this orientation
- children.pop();
- best = score;
- } else { // abort, and try a different orientation
- row.area -= row.pop().area;
- position(row, u, rect, false);
- u = Math.min(rect.dx, rect.dy);
+ var children = node.children;
+ if (children && children.length) {
+ var rect = pad(node),
+ row = [],
+ remaining = children.slice(), // copy-on-write
+ child,
+ best = Infinity, // the best row score so far
+ score, // the current row score
+ u = Math.min(rect.dx, rect.dy), // initial orientation
+ n;
+ scale(remaining, rect.dx * rect.dy / node.value);
+ row.area = 0;
+ while ((n = remaining.length) > 0) {
+ row.push(child = remaining[n - 1]);
+ row.area += child.area;
+ if ((score = worst(row, u)) <= best) { // continue with this orientation
+ remaining.pop();
+ best = score;
+ } else { // abort, and try a different orientation
+ row.area -= row.pop().area;
+ position(row, u, rect, false);
+ u = Math.min(rect.dx, rect.dy);
+ row.length = row.area = 0;
+ best = Infinity;
+ }
+ }
+ if (row.length) {
+ position(row, u, rect, true);
row.length = row.area = 0;
- best = Infinity;
}
+ children.forEach(squarify);
}
- if (row.length) {
- position(row, u, rect, true);
- row.length = row.area = 0;
- }
- node.children.forEach(squarify);
}
// Recursively resizes the specified node's children into existing rows.
// Preserves the existing layout!
function stickify(node) {
- if (!node.children) return;
- var rect = pad(node),
- children = node.children.slice(), // copy-on-write
- child,
- row = [];
- scale(children, rect.dx * rect.dy / node.value);
- row.area = 0;
- while (child = children.pop()) {
- row.push(child);
- row.area += child.area;
- if (child.z != null) {
- position(row, child.z ? rect.dx : rect.dy, rect, !children.length);
- row.length = row.area = 0;
+ var children = node.children;
+ if (children && children.length) {
+ var rect = pad(node),
+ remaining = children.slice(), // copy-on-write
+ child,
+ row = [];
+ scale(remaining, rect.dx * rect.dy / node.value);
+ row.area = 0;
+ while (child = remaining.pop()) {
+ row.push(child);
+ row.area += child.area;
+ if (child.z != null) {
+ position(row, child.z ? rect.dx : rect.dy, rect, !remaining.length);
+ row.length = row.area = 0;
+ }
}
+ children.forEach(stickify);
}
- node.children.forEach(stickify);
}
// Computes the score for the specified row, as the worst aspect ratio.
@@ -1815,7 +1781,7 @@ d3.layout.treemap = function() {
v = u ? round(row.area / u) : 0,
o;
if (u == rect.dx) { // horizontal subdivision
- if (flush || v > rect.dy) v = rect.dy; // over+underflow
+ if (flush || v > rect.dy) v = v ? rect.dy : 0; // over+underflow
while (++i < n) {
o = row[i];
o.x = x;
@@ -1828,7 +1794,7 @@ d3.layout.treemap = function() {
rect.y += v;
rect.dy -= v;
} else { // vertical subdivision
- if (flush || v > rect.dx) v = rect.dx; // over+underflow
+ if (flush || v > rect.dx) v = v ? rect.dx : 0; // over+underflow
while (++i < n) {
o = row[i];
o.x = x;
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
index 3a3409f..4c1cda4 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
@@ -78,6 +78,7 @@ var d3_time_formats = {
H: function(d) { return d3_time_zfill2(d.getHours()); },
I: function(d) { return d3_time_zfill2(d.getHours() % 12 || 12); },
j: d3_time_dayOfYear,
+ L: function(d) { return d3_time_zfill3(d.getMilliseconds()); },
m: function(d) { return d3_time_zfill2(d.getMonth() + 1); },
M: function(d) { return d3_time_zfill2(d.getMinutes()); },
p: function(d) { return d.getHours() >= 12 ? "PM" : "AM"; },
@@ -104,6 +105,7 @@ var d3_time_parsers = {
H: d3_time_parseHour24,
I: d3_time_parseHour12,
// j: function(d, s, i) { /*TODO day of year [001,366] */ return i; },
+ L: d3_time_parseMilliseconds,
m: d3_time_parseMonthNumber,
M: d3_time_parseMinutes,
p: d3_time_parseAmPm,
@@ -277,6 +279,12 @@ function d3_time_parseSeconds(date, string, i) {
return n ? (date.setSeconds(+n[0]), i += n[0].length) : -1;
}
+function d3_time_parseMilliseconds(date, string, i) {
+ d3_time_numberRe.lastIndex = 0;
+ var n = d3_time_numberRe.exec(string.substring(i, i + 3));
+ return n ? (date.setMilliseconds(+n[0]), i += n[0].length) : -1;
+}
+
// Note: we don't look at the next directive.
var d3_time_numberRe = /\s*\d+/;
@@ -294,18 +302,22 @@ function d3_time_year(d) {
return new d3_time(d.getFullYear(), 0, 1);
}
+function d3_time_daysElapsed(d0, d1) {
+ return ~~((d1 - d0) / 864e5 - (d1.getTimezoneOffset() - d0.getTimezoneOffset()) / 1440);
+}
+
function d3_time_dayOfYear(d) {
- return d3_time_zfill3(1 + ~~((d - d3_time_year(d)) / 864e5));
+ return d3_time_zfill3(1 + d3_time_daysElapsed(d3_time_year(d), d));
}
function d3_time_weekNumberSunday(d) {
var d0 = d3_time_year(d);
- return d3_time_zfill2(~~(((d - d0) / 864e5 + d0.getDay()) / 7));
+ return d3_time_zfill2(~~((d3_time_daysElapsed(d0, d) + d0.getDay()) / 7));
}
function d3_time_weekNumberMonday(d) {
var d0 = d3_time_year(d);
- return d3_time_zfill2(~~(((d - d0) / 864e5 + (d0.getDay() + 6) % 7) / 7));
+ return d3_time_zfill2(~~((d3_time_daysElapsed(d0, d) + (d0.getDay() + 6) % 7) / 7));
}
// TODO table of time zone offset names?
@@ -320,9 +332,14 @@ d3.time.format.utc = function(template) {
var local = d3.time.format(template);
function format(date) {
- var utc = new d3_time_format_utc();
- utc._ = date;
- return local(utc);
+ try {
+ d3_time = d3_time_format_utc;
+ var utc = new d3_time();
+ utc._ = date;
+ return local(utc);
+ } finally {
+ d3_time = Date;
+ }
}
format.parse = function(string) {
@@ -364,7 +381,19 @@ d3_time_format_utc.prototype = {
setMonth: function(x) { this._.setUTCMonth(x); },
setSeconds: function(x) { this._.setUTCSeconds(x); }
};
-d3.time.format.iso = d3.time.format.utc("%Y-%m-%dT%H:%M:%SZ");
+var d3_time_formatIso = d3.time.format.utc("%Y-%m-%dT%H:%M:%S.%LZ");
+
+d3.time.format.iso = Date.prototype.toISOString ? d3_time_formatIsoNative : d3_time_formatIso;
+
+function d3_time_formatIsoNative(date) {
+ return date.toISOString();
+}
+
+d3_time_formatIsoNative.parse = function(string) {
+ return new Date(string);
+};
+
+d3_time_formatIsoNative.toString = d3_time_formatIso.toString;
function d3_time_range(floor, step, number) {
return function(t0, t1, dt) {
var time = floor(t0), times = [];
@@ -502,8 +531,7 @@ d3.time.years.utc = d3_time_range(d3.time.year.utc, function(date) {
return date.getUTCFullYear();
});
// TODO nice
-function d3_time_scale(methods, format) {
- var linear = d3.scale.linear();
+function d3_time_scale(linear, methods, format) {
function scale(x) {
return linear(x);
@@ -537,13 +565,12 @@ function d3_time_scale(methods, format) {
return format;
};
- // TOOD expose d3_scale_linear_rebind?
- scale.range = d3.rebind(scale, linear.range);
- scale.rangeRound = d3.rebind(scale, linear.rangeRound);
- scale.interpolate = d3.rebind(scale, linear.interpolate);
- scale.clamp = d3.rebind(scale, linear.clamp);
+ scale.copy = function() {
+ return d3_time_scale(linear.copy(), methods, format);
+ };
- return scale;
+ // TOOD expose d3_scale_linear_rebind?
+ return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
}
// TODO expose d3_scaleExtent?
@@ -619,7 +646,7 @@ var d3_time_scaleLocalFormats = [
var d3_time_scaleLocalFormat = d3_time_scaleFormat(d3_time_scaleLocalFormats);
d3.time.scale = function() {
- return d3_time_scale(d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
+ return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
};
var d3_time_scaleUTCMethods = [
[d3.time.seconds.utc, 1],
@@ -655,6 +682,6 @@ var d3_time_scaleUTCFormats = [
var d3_time_scaleUTCFormat = d3_time_scaleFormat(d3_time_scaleUTCFormats);
d3.time.scale.utc = function() {
- return d3_time_scale(d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
+ return d3_time_scale(d3.scale.linear(), d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
};
})();
commit 3f2e1dd08dfcfb38ef22aba22d6609c1a44b20da
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Jan 6 16:18:07 2012 -0600
[BZ 765795] Removed the recursive call that was creating StackOverflowError and added the correct call to create a resource.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
index 2395503..37131c2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
@@ -521,9 +521,9 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
@XmlJavaTypeAdapter(value = ConfigurationAdapter.class)//
Configuration deploymentTimeConfiguration, byte[] packageBits, Integer timeout) {
- return createPackageBackedResource(subject, parentResourceId, newResourceTypeId, newResourceName,//
+ return createResource(subject, parentResourceId, newResourceTypeId, newResourceName,//
pluginConfiguration, packageName, packageVersionNumber, architectureId,//
- deploymentTimeConfiguration, packageBits, (Integer) null);
+ deploymentTimeConfiguration, new ByteArrayInputStream(packageBits), (Map<String, String>) null, timeout);
}
@Override
commit 38ca523ad95e2fdc3adec301fef5f88951c6dd2a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Jan 6 09:15:14 2012 -0500
[Bug 771201 - EPP 5.2 discovery fails with java.lang.StringIndexOutOfBoundsException]
EPP 5.2 has changed the format of its Implementation-Version string in the
manifest (5.1.1 was different). Add support for the new format. Also,
in general, fail more gracefully when encountering an unexpected version
string.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
index fe13a7a..cae73f3 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
@@ -40,6 +40,7 @@ public class JBossInstallationInfo {
private static final String LOCALHOST_ADDRESS = "127.0.0.1";
private static final String SOA_IMPL_VERSION_PREFIX = "SOA-";
private static final String EAP_IMPL_VERSION_PREFIX = "EAP-";
+ private static final String EPP_IMPL_VERSION_PREFIX = "JBoss-EPP";
private static final ComparableVersion VERSION_4_2 = new ComparableVersion("4.2");
private final JBossProductType productType;
@@ -53,11 +54,15 @@ public class JBossInstallationInfo {
File runJar = new File(binDir, "run.jar");
if (!runJar.exists()) {
throw new RuntimeException(runJar + " does not exist - " + installationDir
- + " does not appear to be a JBoss installation/home directory.");
+ + " does not appear to be a JBoss installation/home directory.");
}
Attributes jarManifestAttributes = loadManifestAttributesFromJar(runJar);
this.productType = JBossProductType.determineJBossProductType(jarManifestAttributes);
this.version = getVersion(jarManifestAttributes);
+ int majorVersionIndex = version.indexOf('.');
+ if (-1 == majorVersionIndex) {
+ throw new RuntimeException("Unexpected run.jar implementation version, can't parse: " + this.version);
+ }
this.defaultBindAddress = getDefaultServerName(this.version);
this.isEap = determineEap(jarManifestAttributes);
this.majorVersion = version.substring(0, version.indexOf('.'));
@@ -112,6 +117,10 @@ public class JBossInstallationInfo {
String implementationVersion = jarManifestAttributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
// e.g. AS 5.1: "Implementation-Version: 5.1.0.GA (build: SVNTag=JBoss_5_1_0_GA date=200905221634)"
// e.g. EAP 5.0: "Implementation-Version: 5.0.0.Beta (build: SVNTag=JBPAPP_5_0_0_Beta date=200906191731)"
+ if (implementationVersion.startsWith(EPP_IMPL_VERSION_PREFIX)) {
+ implementationVersion = implementationVersion.substring(EPP_IMPL_VERSION_PREFIX.length()).trim();
+ }
+
int spaceIndex = validateImplementationVersion(implementationVersion);
String version = implementationVersion.substring(0, spaceIndex);
if (version.startsWith(SOA_IMPL_VERSION_PREFIX)) {
@@ -120,6 +129,7 @@ public class JBossInstallationInfo {
if (version.startsWith(EAP_IMPL_VERSION_PREFIX)) {
version = version.substring(EAP_IMPL_VERSION_PREFIX.length());
}
+
return version;
}
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java
index 20e7e81..13e1304 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java
@@ -38,6 +38,7 @@ import org.apache.maven.artifact.versioning.ComparableVersion;
public class JBossInstallationInfo {
private static final String ANY_ADDRESS = "0.0.0.0";
private static final String LOCALHOST_ADDRESS = "127.0.0.1";
+ private static final String EPP_IMPL_VERSION_PREFIX = "JBoss-EPP";
private static final String SOA_IMPL_VERSION_PREFIX = "SOA-";
private static final ComparableVersion VERSION_4_2 = new ComparableVersion("4.2");
@@ -56,8 +57,12 @@ public class JBossInstallationInfo {
Attributes jarManifestAttributes = loadManifestAttributesFromJar(runJar);
this.productType = JBossProductType.determineJBossProductType(jarManifestAttributes);
this.version = getVersion(jarManifestAttributes);
+ int majorVersionIndex = version.indexOf('.');
+ if (-1 == majorVersionIndex) {
+ throw new RuntimeException("Unexpected run.jar implementation version, can't parse: " + this.version);
+ }
this.defaultBindAddress = getDefaultServerName(this.version);
- this.majorVersion = version.substring(0, version.indexOf('.'));
+ this.majorVersion = version.substring(0, majorVersionIndex);
}
public JBossProductType getProductType() {
@@ -103,15 +108,21 @@ public class JBossInstallationInfo {
throw new IllegalStateException("'" + Attributes.Name.IMPLEMENTATION_VERSION
+ "' MANIFEST.MF attribute not found.");
}
+ if (implementationVersion.startsWith(EPP_IMPL_VERSION_PREFIX)) {
+ implementationVersion = implementationVersion.substring(EPP_IMPL_VERSION_PREFIX.length()).trim();
+ }
+
int spaceIndex = implementationVersion.indexOf(' ');
if (spaceIndex == -1) {
throw new IllegalStateException("'" + Attributes.Name.IMPLEMENTATION_VERSION
+ "' MANIFEST.MF attribute has an invalid value: " + implementationVersion);
}
+
String version = implementationVersion.substring(0, spaceIndex);
if (version.startsWith(SOA_IMPL_VERSION_PREFIX)) {
version = version.substring(SOA_IMPL_VERSION_PREFIX.length());
}
+
return version;
}
commit 27f562a09d9334d5b0df1d81ae500ed304717481
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jan 5 16:42:29 2012 -0500
Fix Calculate AutoBaselines Admin option (although it should be used with
great care as nothing stops it from running concurrently with the data
purge job)
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
index dd81dfb..0261703 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
@@ -155,11 +155,6 @@
}
else if ("calculateAutoBaselines".equals(mode))
{
- // for now, baselines aren't calculated until we hit our day limit, we force it here
- java.util.Properties props = systemManager.getSystemConfiguration(subjectManager.getOverlord());
- props.put("CAM_BASELINE_LASTTIME", "0");
- systemManager.setSystemConfiguration(subjectManager.getOverlord(), props,true);
-
measurementBaselineManager.calculateAutoBaselines();
}
else if ("calculateOOBs".equals(mode))
commit 723653fea5586b683fc8df76cdbeb81ecc65ca5d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jan 5 16:40:55 2012 -0500
trivial, fix reference link in comments
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
index 3add80f..606eefe 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
@@ -511,11 +511,8 @@ public class StartupServlet extends HttpServlet {
// Data Purge Job
try {
- // Let's leave this non-volatile - in case we fail to schedule any jobs above, then at least
- // our old schedule from a previous run will still be there - we want to be able to make sure we run
- // db maintenance when the server starts.
// TODO [mazz]: make the data purge job's cron string configurable via SystemManagerBean
- // For Quartz cron syntax, see: http://www.opensymphony.com/quartz/wikidocs/CronTriggers%20Tutorial.html
+ // For Quartz cron syntax, see: http://www.quartz-scheduler.org/documentation/quartz-2.1.x/tutorials/crontr…
String cronString = "0 0 * * * ?"; // every hour, on the hour
scheduler.scheduleSimpleCronJob(DataPurgeJob.class, true, false, cronString);
} catch (Exception e) {
1
0
[rhq] Branch 'feature/rest' - 126 commits - .classpath etc/cli-scripts etc/eclipse-tools modules/common modules/core modules/enterprise modules/integration-tests modules/plugins modules/test-utils
by Heiko W. Rupp 15 Feb '12
by Heiko W. Rupp 15 Feb '12
15 Feb '12
.classpath | 2
etc/cli-scripts/create_files.js | 186
etc/eclipse-tools/maven/RHQ | 11
modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetReaderImpl.java | 37
modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java | 28
modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java | 23
modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java | 45
modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java | 6
modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetReaderImplTest.java | 43
modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java | 41
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java | 2
modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java | 20
modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java | 27
modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java | 2
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftPathDirectoryDatabaseUpgradeTask.java | 71
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java | 116
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 63
modules/core/dbutils/src/test/java/org/rhq/core/db/ant/dbupdate/SchemaVersionTest.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/drift/Filter.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java | 5
modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java | 8
modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 54
modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java | 39
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManager.java | 8
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManagerImpl.java | 47
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftClient.java | 3
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java | 1
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java | 457 +
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java | 120
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java | 181
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueue.java | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueueImpl.java | 31
modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 13
modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java | 4
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java | 4
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftClientTestStub.java | 11
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java | 274
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java | 150
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java | 55
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftTest.java | 6
modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java | 5
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 4
modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java | 6
modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java | 98
modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java | 58
modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java | 2
modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java | 61
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/IsLongValidator.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizard.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java | 38
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 87
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 60
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java | 112
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardInfoStep.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java | 38
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 37
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java | 29
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 504 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 4
modules/enterprise/gui/installer-war/pom.xml | 4
modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 6
modules/enterprise/gui/installer-war/src/main/webapp/start.jsp | 17
modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java | 19
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 58
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 9
modules/enterprise/gui/rest-war/src/main/webapp/index.html | 5
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js | 92
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js | 938 ++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js | 835 ++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js | 3135 ++++++----
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js | 454 -
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js | 61
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html | 151
modules/enterprise/pom.xml | 2
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 1
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java | 1
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java | 4
modules/enterprise/remoting/cli/src/main/samples/drift.js | 60
modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java | 2
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java | 506 -
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java | 101
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java | 506 +
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClientProxy.java | 101
modules/enterprise/server/client-api/pom.xml | 347 +
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java | 20
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java | 198
modules/enterprise/server/client-api/src/test/resources/hibernate.properties | 26
modules/enterprise/server/client-api/src/test/resources/jms-ra.rar |binary
modules/enterprise/server/client-api/src/test/resources/security.policy | 10
modules/enterprise/server/container-lib/pom.xml | 6
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java | 232
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java | 36
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java | 63
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java | 254
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java | 187
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java | 69
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java | 96
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java | 85
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java | 33
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java | 162
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java | 212
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java | 76
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java | 185
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java | 81
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java | 104
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java | 94
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java | 45
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java | 32
modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js | 467 +
modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt | 17
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml | 6
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml | 7
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html | 6
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf | 2
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf | 2
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 25
modules/enterprise/server/itests/pom.xml | 14
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 112
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java | 127
modules/enterprise/server/jar/pom.xml | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 28
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 169
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java | 24
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java | 29
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java | 40
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUtil.java | 59
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 239
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 45
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 278
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java | 70
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java | 28
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 4
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java | 93
modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml | 10
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 16
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java | 4
modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java | 6
modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java | 8
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 315 +
modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java | 193
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties | 26
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/jms-ra.rar |binary
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml | 78
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy | 10
modules/integration-tests/jndi-access/pom.xml | 21
modules/integration-tests/jndi-access/remote-server/pom.xml | 72
modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java | 79
modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties | 2
modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties | 5
modules/integration-tests/pom.xml | 1
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 18
modules/plugins/jboss-as-7/d2d.sh | 2
modules/plugins/jboss-as-7/pom.xml | 15
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java | 26
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 35
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java | 6
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 269
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 10
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 19
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 63
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java | 9
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 57
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java | 57
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java | 4
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 8
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java | 27
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java | 2
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 418 -
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java | 30
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java | 47
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java | 61
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java | 3
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java | 133
modules/plugins/jboss-as-7/src/test/resources/host1.xml | 92
modules/plugins/jboss-as-7/src/test/resources/host2.xml | 91
modules/plugins/jboss-as-7/src/test/resources/standalone70.xml | 433 +
modules/plugins/jboss-as-7/src/test/resources/standalone71.xml | 453 +
modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 15
modules/plugins/jboss-as-7/src/test/resources/web.json | 62
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java | 96
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 51
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java | 11
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java | 2
modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java | 2
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java | 2
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java | 4
modules/test-utils/src/main/java/org/rhq/test/DuplicatePackagesDetector.java | 194
225 files changed, 15113 insertions(+), 3960 deletions(-)
New commits:
commit 1ea538e624b06de5146a49cf7ebe447429e78298
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Jan 6 14:16:40 2012 +0100
Add an example of graphing raw data with D3.js
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 9e96d76..60c9072 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -28,6 +28,7 @@ an empty database (meaning resource ids and schedule ids starting at 10001).
<li><a href="whisker.html">Whisker chart 1</a></li>
<li><a href="whisker2.html">Multiple Whisker charts</a></li>
<li><a href="tree.html">Resource tree</a></li>
+ <li><a href="raw_graph.html">7 days of raw metrics</a></li>
</ul>
</body>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
new file mode 100644
index 0000000..b91665f
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Raw mertic last 7 days</title>
+ <script type="text/javascript" src="js/d3.js"></script>
+ <script type="text/javascript" src="js/d3.layout.js"></script>
+ <script type="text/javascript" src="js/d3.time.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <style type="text/css">
+
+svg {
+ width: 960px;
+ height: 600px;
+ border: solid 1px #ccc;
+ font: 10px sans-serif;
+ shape-rendering: crispEdges;
+}
+.axis text
+{
+ fill: #333;
+ font-family: sans-serif;
+ font-size: 10px;
+}
+.axis .domain
+{
+ opacity: 0;
+}
+.tick
+{
+ stroke: #ccc;
+ stroke-dasharray: 1 5;
+}
+
+
+ </style>
+ </head>
+ <body>
+ <h1 id="resId">Resource</h1>
+ <h2 id="header">Schedule</h2>
+
+ <div id="one"></div>
+ <script type="text/javascript">
+
+// Width and height of the chart to print
+var w = 960,
+ h = 600;
+
+// Get the platforms and then the first one
+$.getJSON('/rest/1/resource/platforms.json', function (json) {
+ var res = json[0];
+ var rid = res.resourceId;
+ $("#resId").text("Resource " + rid + " (" + res.resourceName + ")");
+
+ // Now get the metrical schedules of the platform
+ $.getJSON("/rest/1/resource/"+rid+"/schedules.json?type=metric", function (json2) {
+
+ // Take the first and render it
+ var schId = json2[0].scheduleId;
+ $("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + "), base unit: " + json2[0].unit);
+
+ d3.json(
+ '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ function (jsondata) {
+
+ var w = 960,
+ h = 600;
+ // compute min/max values for x and y a
+ var minTsD = Number.MAX_VALUE;
+ var maxTsD = Number.MIN_VALUE;
+ var minVal = Number.MAX_VALUE;
+ var maxVal = Number.MIN_VALUE;
+ for (i = 0; i < jsondata.length; i++) {
+ var v = jsondata[i].value;
+ minVal = Math.min(v, minVal);
+ maxVal = Math.max(v, maxVal);
+ var td = jsondata[i].timeStamp;
+ minTsD = Math.min(td, minTsD);
+ maxTsD = Math.max(td, maxTsD);
+ }
+
+ WIDTH = w;
+ HEIGHT = h;
+ MARGINS = {top: 10, right: 10, bottom: 20, left: 10};
+
+ var xRange = d3.time.scale().range ([MARGINS.left, WIDTH - MARGINS.right]).domain([new Date(minTsD),new Date(maxTsD)]);
+ var yRange = d3.scale.linear().range ([HEIGHT - MARGINS.top, MARGINS.bottom]).domain([minVal, maxVal]);
+
+ // X axis range goes from lowest to highest timestamp
+ var x = d3.time.scale().domain([new Date(minTsD),new Date(maxTsD)]).range([50, w-10]); // 50-> make room for label
+//var x = xRange;
+ var y = yRange;
+ // Y axis range goes from lowest to highest value
+ // var y = d3.scale.linear().domain([minVal, maxVal]).rangeRound([0, h]);
+ format = d3.time.format("%H:%M");
+
+
+ xAxis = d3.svg.axis() // generate an axis
+ .scale(x) // set the range of the axis
+ .tickSize(10) // height of the ticks
+ .tickSubdivide(true); // display ticks between text labels
+ yAxis = d3.svg.axis() // generate an axis
+ .scale(yRange) // set the range of the axis
+ .tickSize(3) // width of the ticks
+ .orient("right") // have the text labels on the right hand side
+ .tickFormat(d3.format("0e"))
+ .tickSubdivide(true); // display ticks between text labels
+
+
+
+ var svg = d3.select("body").append("svg:svg")
+ .attr("width", w)
+ .attr("height", h);
+
+ svg.append("svg:g")
+ .attr("class","x axis")
+// .attr("transform", "translate(0," + (HEIGHT - MARGINS.bottom) + ")")
+ .call(xAxis);
+
+ svg.append("svg:g")
+ .attr("class","y axis")
+ .attr("transform", "translate(" + (MARGINS.left) + ",0)")
+ .call(yAxis);
+
+ // Now lets "loop" over the data and show the dots
+ var dot = svg.append("svg:g")
+ .selectAll("dot").data(jsondata)
+ ;
+
+ dot.enter().append("svg:circle")
+ .attr("cx", function (d) {
+ return x(d.timeStamp);
+ })
+ .attr("cy", function (d) {
+ return y(d.value);
+ })
+ .style("stroke", "blue")
+ .attr("stroke", "blue")
+ .attr("r", 1)
+
+
+
+ });
+
+ })
+})
+
+
+
+ </script>
+ </body>
+</html>
commit 3f03625c3c6c8ff4ea5f4d1e01c9951871e20099
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jan 5 22:18:14 2012 +0100
Upgrade D3.js to version 2.7.1
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js
new file mode 100644
index 0000000..7565b83
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js
@@ -0,0 +1,92 @@
+(function(){d3.csv = function(url, callback) {
+ d3.text(url, "text/csv", function(text) {
+ callback(text && d3.csv.parse(text));
+ });
+};
+d3.csv.parse = function(text) {
+ var header;
+ return d3.csv.parseRows(text, function(row, i) {
+ if (i) {
+ var o = {}, j = -1, m = header.length;
+ while (++j < m) o[header[j]] = row[j];
+ return o;
+ } else {
+ header = row;
+ return null;
+ }
+ });
+};
+
+d3.csv.parseRows = function(text, f) {
+ var EOL = {}, // sentinel value for end-of-line
+ EOF = {}, // sentinel value for end-of-file
+ rows = [], // output rows
+ re = /\r\n|[,\r\n]/g, // field separator regex
+ n = 0, // the current line number
+ t, // the current token
+ eol; // is the current token followed by EOL?
+
+ re.lastIndex = 0; // work-around bug in FF 3.6
+
+ /** @private Returns the next token. */
+ function token() {
+ if (re.lastIndex >= text.length) return EOF; // special case: end of file
+ if (eol) { eol = false; return EOL; } // special case: end of line
+
+ // special case: quotes
+ var j = re.lastIndex;
+ if (text.charCodeAt(j) === 34) {
+ var i = j;
+ while (i++ < text.length) {
+ if (text.charCodeAt(i) === 34) {
+ if (text.charCodeAt(i + 1) !== 34) break;
+ i++;
+ }
+ }
+ re.lastIndex = i + 2;
+ var c = text.charCodeAt(i + 1);
+ if (c === 13) {
+ eol = true;
+ if (text.charCodeAt(i + 2) === 10) re.lastIndex++;
+ } else if (c === 10) {
+ eol = true;
+ }
+ return text.substring(j + 1, i).replace(/""/g, "\"");
+ }
+
+ // common case
+ var m = re.exec(text);
+ if (m) {
+ eol = m[0].charCodeAt(0) !== 44;
+ return text.substring(j, m.index);
+ }
+ re.lastIndex = text.length;
+ return text.substring(j);
+ }
+
+ while ((t = token()) !== EOF) {
+ var a = [];
+ while ((t !== EOL) && (t !== EOF)) {
+ a.push(t);
+ t = token();
+ }
+ if (f && !(a = f(a, n++))) continue;
+ rows.push(a);
+ }
+
+ return rows;
+};
+d3.csv.format = function(rows) {
+ return rows.map(d3_csv_formatRow).join("\n");
+};
+
+function d3_csv_formatRow(row) {
+ return row.map(d3_csv_formatValue).join(",");
+}
+
+function d3_csv_formatValue(text) {
+ return /[",\n]/.test(text)
+ ? "\"" + text.replace(/\"/g, "\"\"") + "\""
+ : text;
+}
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js
new file mode 100644
index 0000000..2b40252
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js
@@ -0,0 +1,938 @@
+(function(){d3.geo = {};
+
+var d3_geo_radians = Math.PI / 180;
+// TODO clip input coordinates on opposite hemisphere
+d3.geo.azimuthal = function() {
+ var mode = "orthographic", // or stereographic, gnomonic, equidistant or equalarea
+ origin,
+ scale = 200,
+ translate = [480, 250],
+ x0,
+ y0,
+ cy0,
+ sy0;
+
+ function azimuthal(coordinates) {
+ var x1 = coordinates[0] * d3_geo_radians - x0,
+ y1 = coordinates[1] * d3_geo_radians,
+ cx1 = Math.cos(x1),
+ sx1 = Math.sin(x1),
+ cy1 = Math.cos(y1),
+ sy1 = Math.sin(y1),
+ cc = mode !== "orthographic" ? sy0 * sy1 + cy0 * cy1 * cx1 : null,
+ c,
+ k = mode === "stereographic" ? 1 / (1 + cc)
+ : mode === "gnomonic" ? 1 / cc
+ : mode === "equidistant" ? (c = Math.acos(cc), c ? c / Math.sin(c) : 0)
+ : mode === "equalarea" ? Math.sqrt(2 / (1 + cc))
+ : 1,
+ x = k * cy1 * sx1,
+ y = k * (sy0 * cy1 * cx1 - cy0 * sy1);
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ azimuthal.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale,
+ p = Math.sqrt(x * x + y * y),
+ c = mode === "stereographic" ? 2 * Math.atan(p)
+ : mode === "gnomonic" ? Math.atan(p)
+ : mode === "equidistant" ? p
+ : mode === "equalarea" ? 2 * Math.asin(.5 * p)
+ : Math.asin(p),
+ sc = Math.sin(c),
+ cc = Math.cos(c);
+ return [
+ (x0 + Math.atan2(x * sc, p * cy0 * cc + y * sy0 * sc)) / d3_geo_radians,
+ Math.asin(cc * sy0 - (p ? (y * sc * cy0) / p : 0)) / d3_geo_radians
+ ];
+ };
+
+ azimuthal.mode = function(x) {
+ if (!arguments.length) return mode;
+ mode = x + "";
+ return azimuthal;
+ };
+
+ azimuthal.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ x0 = origin[0] * d3_geo_radians;
+ y0 = origin[1] * d3_geo_radians;
+ cy0 = Math.cos(y0);
+ sy0 = Math.sin(y0);
+ return azimuthal;
+ };
+
+ azimuthal.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return azimuthal;
+ };
+
+ azimuthal.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return azimuthal;
+ };
+
+ return azimuthal.origin([0, 0]);
+};
+// Derived from Tom Carden's Albers implementation for Protovis.
+// http://gist.github.com/476238
+// http://mathworld.wolfram.com/AlbersEqual-AreaConicProjection.html
+
+d3.geo.albers = function() {
+ var origin = [-98, 38],
+ parallels = [29.5, 45.5],
+ scale = 1000,
+ translate = [480, 250],
+ lng0, // d3_geo_radians * origin[0]
+ n,
+ C,
+ p0;
+
+ function albers(coordinates) {
+ var t = n * (d3_geo_radians * coordinates[0] - lng0),
+ p = Math.sqrt(C - 2 * n * Math.sin(d3_geo_radians * coordinates[1])) / n;
+ return [
+ scale * p * Math.sin(t) + translate[0],
+ scale * (p * Math.cos(t) - p0) + translate[1]
+ ];
+ }
+
+ albers.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale,
+ p0y = p0 + y,
+ t = Math.atan2(x, p0y),
+ p = Math.sqrt(x * x + p0y * p0y);
+ return [
+ (lng0 + t / n) / d3_geo_radians,
+ Math.asin((C - p * p * n * n) / (2 * n)) / d3_geo_radians
+ ];
+ };
+
+ function reload() {
+ var phi1 = d3_geo_radians * parallels[0],
+ phi2 = d3_geo_radians * parallels[1],
+ lat0 = d3_geo_radians * origin[1],
+ s = Math.sin(phi1),
+ c = Math.cos(phi1);
+ lng0 = d3_geo_radians * origin[0];
+ n = .5 * (s + Math.sin(phi2));
+ C = c * c + 2 * n * s;
+ p0 = Math.sqrt(C - 2 * n * Math.sin(lat0)) / n;
+ return albers;
+ }
+
+ albers.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = [+x[0], +x[1]];
+ return reload();
+ };
+
+ albers.parallels = function(x) {
+ if (!arguments.length) return parallels;
+ parallels = [+x[0], +x[1]];
+ return reload();
+ };
+
+ albers.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return albers;
+ };
+
+ albers.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return albers;
+ };
+
+ return reload();
+};
+
+// A composite projection for the United States, 960x500. The set of standard
+// parallels for each region comes from USGS, which is published here:
+// http://egsc.usgs.gov/isb/pubs/MapProjections/projections.html#albers
+// TODO allow the composite projection to be rescaled?
+d3.geo.albersUsa = function() {
+ var lower48 = d3.geo.albers();
+
+ var alaska = d3.geo.albers()
+ .origin([-160, 60])
+ .parallels([55, 65]);
+
+ var hawaii = d3.geo.albers()
+ .origin([-160, 20])
+ .parallels([8, 18]);
+
+ var puertoRico = d3.geo.albers()
+ .origin([-60, 10])
+ .parallels([8, 18]);
+
+ function albersUsa(coordinates) {
+ var lon = coordinates[0],
+ lat = coordinates[1];
+ return (lat > 50 ? alaska
+ : lon < -140 ? hawaii
+ : lat < 21 ? puertoRico
+ : lower48)(coordinates);
+ }
+
+ albersUsa.scale = function(x) {
+ if (!arguments.length) return lower48.scale();
+ lower48.scale(x);
+ alaska.scale(x * .6);
+ hawaii.scale(x);
+ puertoRico.scale(x * 1.5);
+ return albersUsa.translate(lower48.translate());
+ };
+
+ albersUsa.translate = function(x) {
+ if (!arguments.length) return lower48.translate();
+ var dz = lower48.scale() / 1000,
+ dx = x[0],
+ dy = x[1];
+ lower48.translate(x);
+ alaska.translate([dx - 400 * dz, dy + 170 * dz]);
+ hawaii.translate([dx - 190 * dz, dy + 200 * dz]);
+ puertoRico.translate([dx + 580 * dz, dy + 430 * dz]);
+ return albersUsa;
+ };
+
+ return albersUsa.scale(lower48.scale());
+};
+d3.geo.bonne = function() {
+ var scale = 200,
+ translate = [480, 250],
+ x0, // origin longitude in radians
+ y0, // origin latitude in radians
+ y1, // parallel latitude in radians
+ c1; // cot(y1)
+
+ function bonne(coordinates) {
+ var x = coordinates[0] * d3_geo_radians - x0,
+ y = coordinates[1] * d3_geo_radians - y0;
+ if (y1) {
+ var p = c1 + y1 - y, E = x * Math.cos(y) / p;
+ x = p * Math.sin(E);
+ y = p * Math.cos(E) - c1;
+ } else {
+ x *= Math.cos(y);
+ y *= -1;
+ }
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ bonne.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ if (y1) {
+ var c = c1 + y, p = Math.sqrt(x * x + c * c);
+ y = c1 + y1 - p;
+ x = x0 + p * Math.atan2(x, c) / Math.cos(y);
+ } else {
+ y *= -1;
+ x /= Math.cos(y);
+ }
+ return [
+ x / d3_geo_radians,
+ y / d3_geo_radians
+ ];
+ };
+
+ // 90° for Werner, 0° for Sinusoidal
+ bonne.parallel = function(x) {
+ if (!arguments.length) return y1 / d3_geo_radians;
+ c1 = 1 / Math.tan(y1 = x * d3_geo_radians);
+ return bonne;
+ };
+
+ bonne.origin = function(x) {
+ if (!arguments.length) return [x0 / d3_geo_radians, y0 / d3_geo_radians];
+ x0 = x[0] * d3_geo_radians;
+ y0 = x[1] * d3_geo_radians;
+ return bonne;
+ };
+
+ bonne.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return bonne;
+ };
+
+ bonne.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return bonne;
+ };
+
+ return bonne.origin([0, 0]).parallel(45);
+};
+d3.geo.equirectangular = function() {
+ var scale = 500,
+ translate = [480, 250];
+
+ function equirectangular(coordinates) {
+ var x = coordinates[0] / 360,
+ y = -coordinates[1] / 360;
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ equirectangular.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ return [
+ 360 * x,
+ -360 * y
+ ];
+ };
+
+ equirectangular.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return equirectangular;
+ };
+
+ equirectangular.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return equirectangular;
+ };
+
+ return equirectangular;
+};
+d3.geo.mercator = function() {
+ var scale = 500,
+ translate = [480, 250];
+
+ function mercator(coordinates) {
+ var x = coordinates[0] / 360,
+ y = -(Math.log(Math.tan(Math.PI / 4 + coordinates[1] * d3_geo_radians / 2)) / d3_geo_radians) / 360;
+ return [
+ scale * x + translate[0],
+ scale * Math.max(-.5, Math.min(.5, y)) + translate[1]
+ ];
+ }
+
+ mercator.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ return [
+ 360 * x,
+ 2 * Math.atan(Math.exp(-360 * y * d3_geo_radians)) / d3_geo_radians - 90
+ ];
+ };
+
+ mercator.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return mercator;
+ };
+
+ mercator.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return mercator;
+ };
+
+ return mercator;
+};
+function d3_geo_type(types, defaultValue) {
+ return function(object) {
+ return object && object.type in types ? types[object.type](object) : defaultValue;
+ };
+}
+/**
+ * Returns a function that, given a GeoJSON object (e.g., a feature), returns
+ * the corresponding SVG path. The function can be customized by overriding the
+ * projection. Point features are mapped to circles with a default radius of
+ * 4.5px; the radius can be specified either as a constant or a function that
+ * is evaluated per object.
+ */
+d3.geo.path = function() {
+ var pointRadius = 4.5,
+ pointCircle = d3_path_circle(pointRadius),
+ projection = d3.geo.albersUsa();
+
+ function path(d, i) {
+ if (typeof pointRadius === "function") {
+ pointCircle = d3_path_circle(pointRadius.apply(this, arguments));
+ }
+ return pathType(d) || null;
+ }
+
+ function project(coordinates) {
+ return projection(coordinates).join(",");
+ }
+
+ var pathType = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var path = [],
+ features = o.features,
+ i = -1, // features.index
+ n = features.length;
+ while (++i < n) path.push(pathType(features[i].geometry));
+ return path.join("");
+ },
+
+ Feature: function(o) {
+ return pathType(o.geometry);
+ },
+
+ Point: function(o) {
+ return "M" + project(o.coordinates) + pointCircle;
+ },
+
+ MultiPoint: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) path.push("M", project(coordinates[i]), pointCircle);
+ return path.join("");
+ },
+
+ LineString: function(o) {
+ var path = ["M"],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) path.push(project(coordinates[i]), "L");
+ path.pop();
+ return path.join("");
+ },
+
+ MultiLineString: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates.index
+ m; // subcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ m = subcoordinates.length;
+ path.push("M");
+ while (++j < m) path.push(project(subcoordinates[j]), "L");
+ path.pop();
+ }
+ return path.join("");
+ },
+
+ Polygon: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates.index
+ m; // subcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ if ((m = subcoordinates.length - 1) > 0) {
+ path.push("M");
+ while (++j < m) path.push(project(subcoordinates[j]), "L");
+ path[path.length - 1] = "Z";
+ }
+ }
+ return path.join("");
+ },
+
+ MultiPolygon: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates index
+ m, // subcoordinates.length
+ subsubcoordinates, // subcoordinates[j]
+ k, // subsubcoordinates index
+ p; // subsubcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ m = subcoordinates.length;
+ while (++j < m) {
+ subsubcoordinates = subcoordinates[j];
+ k = -1;
+ if ((p = subsubcoordinates.length - 1) > 0) {
+ path.push("M");
+ while (++k < p) path.push(project(subsubcoordinates[k]), "L");
+ path[path.length - 1] = "Z";
+ }
+ }
+ }
+ return path.join("");
+ },
+
+ GeometryCollection: function(o) {
+ var path = [],
+ geometries = o.geometries,
+ i = -1, // geometries index
+ n = geometries.length;
+ while (++i < n) path.push(pathType(geometries[i]));
+ return path.join("");
+ }
+
+ });
+
+ var areaType = path.area = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var area = 0,
+ features = o.features,
+ i = -1, // features.index
+ n = features.length;
+ while (++i < n) area += areaType(features[i]);
+ return area;
+ },
+
+ Feature: function(o) {
+ return areaType(o.geometry);
+ },
+
+ Polygon: function(o) {
+ return polygonArea(o.coordinates);
+ },
+
+ MultiPolygon: function(o) {
+ var sum = 0,
+ coordinates = o.coordinates,
+ i = -1, // coordinates index
+ n = coordinates.length;
+ while (++i < n) sum += polygonArea(coordinates[i]);
+ return sum;
+ },
+
+ GeometryCollection: function(o) {
+ var sum = 0,
+ geometries = o.geometries,
+ i = -1, // geometries index
+ n = geometries.length;
+ while (++i < n) sum += areaType(geometries[i]);
+ return sum;
+ }
+
+ }, 0);
+
+ function polygonArea(coordinates) {
+ var sum = area(coordinates[0]), // exterior ring
+ i = 0, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) sum -= area(coordinates[i]); // holes
+ return sum;
+ }
+
+ function polygonCentroid(coordinates) {
+ var polygon = d3.geom.polygon(coordinates[0].map(projection)), // exterior ring
+ area = polygon.area(),
+ centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1),
+ x = centroid[0],
+ y = centroid[1],
+ z = area,
+ i = 0, // coordinates index
+ n = coordinates.length;
+ while (++i < n) {
+ polygon = d3.geom.polygon(coordinates[i].map(projection)); // holes
+ area = polygon.area();
+ centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1);
+ x -= centroid[0];
+ y -= centroid[1];
+ z -= area;
+ }
+ return [x, y, 6 * z]; // weighted centroid
+ }
+
+ var centroidType = path.centroid = d3_geo_type({
+
+ // TODO FeatureCollection
+ // TODO Point
+ // TODO MultiPoint
+ // TODO LineString
+ // TODO MultiLineString
+ // TODO GeometryCollection
+
+ Feature: function(o) {
+ return centroidType(o.geometry);
+ },
+
+ Polygon: function(o) {
+ var centroid = polygonCentroid(o.coordinates);
+ return [centroid[0] / centroid[2], centroid[1] / centroid[2]];
+ },
+
+ MultiPolygon: function(o) {
+ var area = 0,
+ coordinates = o.coordinates,
+ centroid,
+ x = 0,
+ y = 0,
+ z = 0,
+ i = -1, // coordinates index
+ n = coordinates.length;
+ while (++i < n) {
+ centroid = polygonCentroid(coordinates[i]);
+ x += centroid[0];
+ y += centroid[1];
+ z += centroid[2];
+ }
+ return [x / z, y / z];
+ }
+
+ });
+
+ function area(coordinates) {
+ return Math.abs(d3.geom.polygon(coordinates.map(projection)).area());
+ }
+
+ path.projection = function(x) {
+ projection = x;
+ return path;
+ };
+
+ path.pointRadius = function(x) {
+ if (typeof x === "function") pointRadius = x;
+ else {
+ pointRadius = +x;
+ pointCircle = d3_path_circle(pointRadius);
+ }
+ return path;
+ };
+
+ return path;
+};
+
+function d3_path_circle(radius) {
+ return "m0," + radius
+ + "a" + radius + "," + radius + " 0 1,1 0," + (-2 * radius)
+ + "a" + radius + "," + radius + " 0 1,1 0," + (+2 * radius)
+ + "z";
+}
+/**
+ * Given a GeoJSON object, returns the corresponding bounding box. The bounding
+ * box is represented by a two-dimensional array: [[left, bottom], [right,
+ * top]], where left is the minimum longitude, bottom is the minimum latitude,
+ * right is maximum longitude, and top is the maximum latitude.
+ */
+d3.geo.bounds = function(feature) {
+ var left = Infinity,
+ bottom = Infinity,
+ right = -Infinity,
+ top = -Infinity;
+ d3_geo_bounds(feature, function(x, y) {
+ if (x < left) left = x;
+ if (x > right) right = x;
+ if (y < bottom) bottom = y;
+ if (y > top) top = y;
+ });
+ return [[left, bottom], [right, top]];
+};
+
+function d3_geo_bounds(o, f) {
+ if (o.type in d3_geo_boundsTypes) d3_geo_boundsTypes[o.type](o, f);
+}
+
+var d3_geo_boundsTypes = {
+ Feature: d3_geo_boundsFeature,
+ FeatureCollection: d3_geo_boundsFeatureCollection,
+ GeometryCollection: d3_geo_boundsGeometryCollection,
+ LineString: d3_geo_boundsLineString,
+ MultiLineString: d3_geo_boundsMultiLineString,
+ MultiPoint: d3_geo_boundsLineString,
+ MultiPolygon: d3_geo_boundsMultiPolygon,
+ Point: d3_geo_boundsPoint,
+ Polygon: d3_geo_boundsPolygon
+};
+
+function d3_geo_boundsFeature(o, f) {
+ d3_geo_bounds(o.geometry, f);
+}
+
+function d3_geo_boundsFeatureCollection(o, f) {
+ for (var a = o.features, i = 0, n = a.length; i < n; i++) {
+ d3_geo_bounds(a[i].geometry, f);
+ }
+}
+
+function d3_geo_boundsGeometryCollection(o, f) {
+ for (var a = o.geometries, i = 0, n = a.length; i < n; i++) {
+ d3_geo_bounds(a[i], f);
+ }
+}
+
+function d3_geo_boundsLineString(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ f.apply(null, a[i]);
+ }
+}
+
+function d3_geo_boundsMultiLineString(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ for (var b = a[i], j = 0, m = b.length; j < m; j++) {
+ f.apply(null, b[j]);
+ }
+ }
+}
+
+function d3_geo_boundsMultiPolygon(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ for (var b = a[i][0], j = 0, m = b.length; j < m; j++) {
+ f.apply(null, b[j]);
+ }
+ }
+}
+
+function d3_geo_boundsPoint(o, f) {
+ f.apply(null, o.coordinates);
+}
+
+function d3_geo_boundsPolygon(o, f) {
+ for (var a = o.coordinates[0], i = 0, n = a.length; i < n; i++) {
+ f.apply(null, a[i]);
+ }
+}
+// TODO breakAtDateLine?
+
+d3.geo.circle = function() {
+ var origin = [0, 0],
+ degrees = 90 - 1e-2,
+ radians = degrees * d3_geo_radians,
+ arc = d3.geo.greatArc().target(Object);
+
+ function circle() {
+ // TODO render a circle as a Polygon
+ }
+
+ function visible(point) {
+ return arc.distance(point) < radians;
+ }
+
+ circle.clip = function(d) {
+ arc.source(typeof origin === "function" ? origin.apply(this, arguments) : origin);
+ return clipType(d);
+ };
+
+ var clipType = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var features = o.features.map(clipType).filter(Object);
+ return features && (o = Object.create(o), o.features = features, o);
+ },
+
+ Feature: function(o) {
+ var geometry = clipType(o.geometry);
+ return geometry && (o = Object.create(o), o.geometry = geometry, o);
+ },
+
+ Point: function(o) {
+ return visible(o.coordinates) && o;
+ },
+
+ MultiPoint: function(o) {
+ var coordinates = o.coordinates.filter(visible);
+ return coordinates.length && {
+ type: o.type,
+ coordinates: coordinates
+ };
+ },
+
+ LineString: function(o) {
+ var coordinates = clip(o.coordinates);
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ MultiLineString: function(o) {
+ var coordinates = o.coordinates.map(clip).filter(function(d) { return d.length; });
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ Polygon: function(o) {
+ var coordinates = o.coordinates.map(clip);
+ return coordinates[0].length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ MultiPolygon: function(o) {
+ var coordinates = o.coordinates.map(function(d) { return d.map(clip); }).filter(function(d) { return d[0].length; });
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ GeometryCollection: function(o) {
+ var geometries = o.geometries.map(clipType).filter(Object);
+ return geometries.length && (o = Object.create(o), o.geometries = geometries, o);
+ }
+
+ });
+
+ function clip(coordinates) {
+ var i = -1,
+ n = coordinates.length,
+ clipped = [],
+ p0,
+ p1,
+ p2,
+ d0,
+ d1;
+
+ while (++i < n) {
+ d1 = arc.distance(p2 = coordinates[i]);
+ if (d1 < radians) {
+ if (p1) clipped.push(d3_geo_greatArcInterpolate(p1, p2)((d0 - radians) / (d0 - d1)));
+ clipped.push(p2);
+ p0 = p1 = null;
+ } else {
+ p1 = p2;
+ if (!p0 && clipped.length) {
+ clipped.push(d3_geo_greatArcInterpolate(clipped[clipped.length - 1], p1)((radians - d0) / (d1 - d0)));
+ p0 = p1;
+ }
+ }
+ d0 = d1;
+ }
+
+ if (p1 && clipped.length) {
+ d1 = arc.distance(p2 = clipped[0]);
+ clipped.push(d3_geo_greatArcInterpolate(p1, p2)((d0 - radians) / (d0 - d1)));
+ }
+
+ return resample(clipped);
+ }
+
+ // Resample coordinates, creating great arcs between each.
+ function resample(coordinates) {
+ var i = 0,
+ n = coordinates.length,
+ j,
+ m,
+ resampled = n ? [coordinates[0]] : coordinates,
+ resamples,
+ origin = arc.source();
+
+ while (++i < n) {
+ resamples = arc.source(coordinates[i - 1])(coordinates[i]).coordinates;
+ for (j = 0, m = resamples.length; ++j < m;) resampled.push(resamples[j]);
+ }
+
+ arc.source(origin);
+ return resampled;
+ }
+
+ circle.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ return circle;
+ };
+
+ circle.angle = function(x) {
+ if (!arguments.length) return degrees;
+ radians = (degrees = +x) * d3_geo_radians;
+ return circle;
+ };
+
+ // Precision is specified in degrees.
+ circle.precision = function(x) {
+ if (!arguments.length) return arc.precision();
+ arc.precision(x);
+ return circle;
+ };
+
+ return circle;
+}
+d3.geo.greatArc = function() {
+ var source = d3_geo_greatArcSource,
+ target = d3_geo_greatArcTarget,
+ precision = 6 * d3_geo_radians;
+
+ function greatArc() {
+ var a = typeof source === "function" ? source.apply(this, arguments) : source,
+ b = typeof target === "function" ? target.apply(this, arguments) : target,
+ i = d3_geo_greatArcInterpolate(a, b),
+ dt = precision / i.d,
+ t = 0,
+ coordinates = [a];
+ while ((t += dt) < 1) coordinates.push(i(t));
+ coordinates.push(b);
+ return {
+ type: "LineString",
+ coordinates: coordinates
+ };
+ }
+
+ // Length returned in radians; multiply by radius for distance.
+ greatArc.distance = function() {
+ var a = typeof source === "function" ? source.apply(this, arguments) : source,
+ b = typeof target === "function" ? target.apply(this, arguments) : target;
+ return d3_geo_greatArcInterpolate(a, b).d;
+ };
+
+ greatArc.source = function(x) {
+ if (!arguments.length) return source;
+ source = x;
+ return greatArc;
+ };
+
+ greatArc.target = function(x) {
+ if (!arguments.length) return target;
+ target = x;
+ return greatArc;
+ };
+
+ // Precision is specified in degrees.
+ greatArc.precision = function(x) {
+ if (!arguments.length) return precision / d3_geo_radians;
+ precision = x * d3_geo_radians;
+ return greatArc;
+ };
+
+ return greatArc;
+};
+
+function d3_geo_greatArcSource(d) {
+ return d.source;
+}
+
+function d3_geo_greatArcTarget(d) {
+ return d.target;
+}
+
+function d3_geo_greatArcInterpolate(a, b) {
+ var x0 = a[0] * d3_geo_radians, cx0 = Math.cos(x0), sx0 = Math.sin(x0),
+ y0 = a[1] * d3_geo_radians, cy0 = Math.cos(y0), sy0 = Math.sin(y0),
+ x1 = b[0] * d3_geo_radians, cx1 = Math.cos(x1), sx1 = Math.sin(x1),
+ y1 = b[1] * d3_geo_radians, cy1 = Math.cos(y1), sy1 = Math.sin(y1),
+ d = interpolate.d = Math.acos(Math.max(-1, Math.min(1, sy0 * sy1 + cy0 * cy1 * Math.cos(x1 - x0)))),
+ sd = Math.sin(d);
+
+ // From http://williams.best.vwh.net/avform.htm#Intermediate
+ function interpolate(t) {
+ var A = Math.sin(d - (t *= d)) / sd,
+ B = Math.sin(t) / sd,
+ x = A * cy0 * cx0 + B * cy1 * cx1,
+ y = A * cy0 * sx0 + B * cy1 * sx1,
+ z = A * sy0 + B * sy1;
+ return [
+ Math.atan2(y, x) / d3_geo_radians,
+ Math.atan2(z, Math.sqrt(x * x + y * y)) / d3_geo_radians
+ ];
+ }
+
+ return interpolate;
+}
+d3.geo.greatCircle = d3.geo.circle;
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js
new file mode 100644
index 0000000..d860c2b
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js
@@ -0,0 +1,835 @@
+(function(){d3.geom = {};
+/**
+ * Computes a contour for a given input grid function using the <a
+ * href="http://en.wikipedia.org/wiki/Marching_squares">marching
+ * squares</a> algorithm. Returns the contour polygon as an array of points.
+ *
+ * @param grid a two-input function(x, y) that returns true for values
+ * inside the contour and false for values outside the contour.
+ * @param start an optional starting point [x, y] on the grid.
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.contour = function(grid, start) {
+ var s = start || d3_geom_contourStart(grid), // starting point
+ c = [], // contour polygon
+ x = s[0], // current x position
+ y = s[1], // current y position
+ dx = 0, // next x direction
+ dy = 0, // next y direction
+ pdx = NaN, // previous x direction
+ pdy = NaN, // previous y direction
+ i = 0;
+
+ do {
+ // determine marching squares index
+ i = 0;
+ if (grid(x-1, y-1)) i += 1;
+ if (grid(x, y-1)) i += 2;
+ if (grid(x-1, y )) i += 4;
+ if (grid(x, y )) i += 8;
+
+ // determine next direction
+ if (i === 6) {
+ dx = pdy === -1 ? -1 : 1;
+ dy = 0;
+ } else if (i === 9) {
+ dx = 0;
+ dy = pdx === 1 ? -1 : 1;
+ } else {
+ dx = d3_geom_contourDx[i];
+ dy = d3_geom_contourDy[i];
+ }
+
+ // update contour polygon
+ if (dx != pdx && dy != pdy) {
+ c.push([x, y]);
+ pdx = dx;
+ pdy = dy;
+ }
+
+ x += dx;
+ y += dy;
+ } while (s[0] != x || s[1] != y);
+
+ return c;
+};
+
+// lookup tables for marching directions
+var d3_geom_contourDx = [1, 0, 1, 1,-1, 0,-1, 1,0, 0,0,0,-1, 0,-1,NaN],
+ d3_geom_contourDy = [0,-1, 0, 0, 0,-1, 0, 0,1,-1,1,1, 0,-1, 0,NaN];
+
+function d3_geom_contourStart(grid) {
+ var x = 0,
+ y = 0;
+
+ // search for a starting point; begin at origin
+ // and proceed along outward-expanding diagonals
+ while (true) {
+ if (grid(x,y)) {
+ return [x,y];
+ }
+ if (x === 0) {
+ x = y + 1;
+ y = 0;
+ } else {
+ x = x - 1;
+ y = y + 1;
+ }
+ }
+}
+/**
+ * Computes the 2D convex hull of a set of points using Graham's scanning
+ * algorithm. The algorithm has been implemented as described in Cormen,
+ * Leiserson, and Rivest's Introduction to Algorithms. The running time of
+ * this algorithm is O(n log n), where n is the number of input points.
+ *
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.hull = function(vertices) {
+ if (vertices.length < 3) return [];
+
+ var len = vertices.length,
+ plen = len - 1,
+ points = [],
+ stack = [],
+ i, j, h = 0, x1, y1, x2, y2, u, v, a, sp;
+
+ // find the starting ref point: leftmost point with the minimum y coord
+ for (i=1; i<len; ++i) {
+ if (vertices[i][1] < vertices[h][1]) {
+ h = i;
+ } else if (vertices[i][1] == vertices[h][1]) {
+ h = (vertices[i][0] < vertices[h][0] ? i : h);
+ }
+ }
+
+ // calculate polar angles from ref point and sort
+ for (i=0; i<len; ++i) {
+ if (i === h) continue;
+ y1 = vertices[i][1] - vertices[h][1];
+ x1 = vertices[i][0] - vertices[h][0];
+ points.push({angle: Math.atan2(y1, x1), index: i});
+ }
+ points.sort(function(a, b) { return a.angle - b.angle; });
+
+ // toss out duplicate angles
+ a = points[0].angle;
+ v = points[0].index;
+ u = 0;
+ for (i=1; i<plen; ++i) {
+ j = points[i].index;
+ if (a == points[i].angle) {
+ // keep angle for point most distant from the reference
+ x1 = vertices[v][0] - vertices[h][0];
+ y1 = vertices[v][1] - vertices[h][1];
+ x2 = vertices[j][0] - vertices[h][0];
+ y2 = vertices[j][1] - vertices[h][1];
+ if ((x1*x1 + y1*y1) >= (x2*x2 + y2*y2)) {
+ points[i].index = -1;
+ } else {
+ points[u].index = -1;
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+ } else {
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+ }
+
+ // initialize the stack
+ stack.push(h);
+ for (i=0, j=0; i<2; ++j) {
+ if (points[j].index !== -1) {
+ stack.push(points[j].index);
+ i++;
+ }
+ }
+ sp = stack.length;
+
+ // do graham's scan
+ for (; j<plen; ++j) {
+ if (points[j].index === -1) continue; // skip tossed out points
+ while (!d3_geom_hullCCW(stack[sp-2], stack[sp-1], points[j].index, vertices)) {
+ --sp;
+ }
+ stack[sp++] = points[j].index;
+ }
+
+ // construct the hull
+ var poly = [];
+ for (i=0; i<sp; ++i) {
+ poly.push(vertices[stack[i]]);
+ }
+ return poly;
+}
+
+// are three points in counter-clockwise order?
+function d3_geom_hullCCW(i1, i2, i3, v) {
+ var t, a, b, c, d, e, f;
+ t = v[i1]; a = t[0]; b = t[1];
+ t = v[i2]; c = t[0]; d = t[1];
+ t = v[i3]; e = t[0]; f = t[1];
+ return ((f-b)*(c-a) - (d-b)*(e-a)) > 0;
+}
+// Note: requires coordinates to be counterclockwise and convex!
+d3.geom.polygon = function(coordinates) {
+
+ coordinates.area = function() {
+ var i = 0,
+ n = coordinates.length,
+ a = coordinates[n - 1][0] * coordinates[0][1],
+ b = coordinates[n - 1][1] * coordinates[0][0];
+ while (++i < n) {
+ a += coordinates[i - 1][0] * coordinates[i][1];
+ b += coordinates[i - 1][1] * coordinates[i][0];
+ }
+ return (b - a) * .5;
+ };
+
+ coordinates.centroid = function(k) {
+ var i = -1,
+ n = coordinates.length - 1,
+ x = 0,
+ y = 0,
+ a,
+ b,
+ c;
+ if (!arguments.length) k = -1 / (6 * coordinates.area());
+ while (++i < n) {
+ a = coordinates[i];
+ b = coordinates[i + 1];
+ c = a[0] * b[1] - b[0] * a[1];
+ x += (a[0] + b[0]) * c;
+ y += (a[1] + b[1]) * c;
+ }
+ return [x * k, y * k];
+ };
+
+ // The Sutherland-Hodgman clipping algorithm.
+ coordinates.clip = function(subject) {
+ var input,
+ i = -1,
+ n = coordinates.length,
+ j,
+ m,
+ a = coordinates[n - 1],
+ b,
+ c,
+ d;
+ while (++i < n) {
+ input = subject.slice();
+ subject.length = 0;
+ b = coordinates[i];
+ c = input[(m = input.length) - 1];
+ j = -1;
+ while (++j < m) {
+ d = input[j];
+ if (d3_geom_polygonInside(d, a, b)) {
+ if (!d3_geom_polygonInside(c, a, b)) {
+ subject.push(d3_geom_polygonIntersect(c, d, a, b));
+ }
+ subject.push(d);
+ } else if (d3_geom_polygonInside(c, a, b)) {
+ subject.push(d3_geom_polygonIntersect(c, d, a, b));
+ }
+ c = d;
+ }
+ a = b;
+ }
+ return subject;
+ };
+
+ return coordinates;
+};
+
+function d3_geom_polygonInside(p, a, b) {
+ return (b[0] - a[0]) * (p[1] - a[1]) < (b[1] - a[1]) * (p[0] - a[0]);
+}
+
+// Intersect two infinite lines cd and ab.
+function d3_geom_polygonIntersect(c, d, a, b) {
+ var x1 = c[0], x2 = d[0], x3 = a[0], x4 = b[0],
+ y1 = c[1], y2 = d[1], y3 = a[1], y4 = b[1],
+ x13 = x1 - x3,
+ x21 = x2 - x1,
+ x43 = x4 - x3,
+ y13 = y1 - y3,
+ y21 = y2 - y1,
+ y43 = y4 - y3,
+ ua = (x43 * y13 - y43 * x13) / (y43 * x21 - x43 * y21);
+ return [x1 + ua * x21, y1 + ua * y21];
+}
+// Adapted from Nicolas Garcia Belmonte's JIT implementation:
+// http://blog.thejit.org/2010/02/12/voronoi-tessellation/
+// http://blog.thejit.org/assets/voronoijs/voronoi.js
+// See lib/jit/LICENSE for details.
+
+// Notes:
+//
+// This implementation does not clip the returned polygons, so if you want to
+// clip them to a particular shape you will need to do that either in SVG or by
+// post-processing with d3.geom.polygon's clip method.
+//
+// If any vertices are coincident or have NaN positions, the behavior of this
+// method is undefined. Most likely invalid polygons will be returned. You
+// should filter invalid points, and consolidate coincident points, before
+// computing the tessellation.
+
+/**
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygons [[[x1, y1], [x2, y2], …], …]
+ */
+d3.geom.voronoi = function(vertices) {
+ var polygons = vertices.map(function() { return []; });
+
+ d3_voronoi_tessellate(vertices, function(e) {
+ var s1,
+ s2,
+ x1,
+ x2,
+ y1,
+ y2;
+ if (e.a === 1 && e.b >= 0) {
+ s1 = e.ep.r;
+ s2 = e.ep.l;
+ } else {
+ s1 = e.ep.l;
+ s2 = e.ep.r;
+ }
+ if (e.a === 1) {
+ y1 = s1 ? s1.y : -1e6;
+ x1 = e.c - e.b * y1;
+ y2 = s2 ? s2.y : 1e6;
+ x2 = e.c - e.b * y2;
+ } else {
+ x1 = s1 ? s1.x : -1e6;
+ y1 = e.c - e.a * x1;
+ x2 = s2 ? s2.x : 1e6;
+ y2 = e.c - e.a * x2;
+ }
+ var v1 = [x1, y1],
+ v2 = [x2, y2];
+ polygons[e.region.l.index].push(v1, v2);
+ polygons[e.region.r.index].push(v1, v2);
+ });
+
+ // Reconnect the polygon segments into counterclockwise loops.
+ return polygons.map(function(polygon, i) {
+ var cx = vertices[i][0],
+ cy = vertices[i][1];
+ polygon.forEach(function(v) {
+ v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+ });
+ return polygon.sort(function(a, b) {
+ return a.angle - b.angle;
+ }).filter(function(d, i) {
+ return !i || (d.angle - polygon[i - 1].angle > 1e-10);
+ });
+ });
+};
+
+var d3_voronoi_opposite = {"l": "r", "r": "l"};
+
+function d3_voronoi_tessellate(vertices, callback) {
+
+ var Sites = {
+ list: vertices
+ .map(function(v, i) {
+ return {
+ index: i,
+ x: v[0],
+ y: v[1]
+ };
+ })
+ .sort(function(a, b) {
+ return a.y < b.y ? -1
+ : a.y > b.y ? 1
+ : a.x < b.x ? -1
+ : a.x > b.x ? 1
+ : 0;
+ }),
+ bottomSite: null
+ };
+
+ var EdgeList = {
+ list: [],
+ leftEnd: null,
+ rightEnd: null,
+
+ init: function() {
+ EdgeList.leftEnd = EdgeList.createHalfEdge(null, "l");
+ EdgeList.rightEnd = EdgeList.createHalfEdge(null, "l");
+ EdgeList.leftEnd.r = EdgeList.rightEnd;
+ EdgeList.rightEnd.l = EdgeList.leftEnd;
+ EdgeList.list.unshift(EdgeList.leftEnd, EdgeList.rightEnd);
+ },
+
+ createHalfEdge: function(edge, side) {
+ return {
+ edge: edge,
+ side: side,
+ vertex: null,
+ "l": null,
+ "r": null
+ };
+ },
+
+ insert: function(lb, he) {
+ he.l = lb;
+ he.r = lb.r;
+ lb.r.l = he;
+ lb.r = he;
+ },
+
+ leftBound: function(p) {
+ var he = EdgeList.leftEnd;
+ do {
+ he = he.r;
+ } while (he != EdgeList.rightEnd && Geom.rightOf(he, p));
+ he = he.l;
+ return he;
+ },
+
+ del: function(he) {
+ he.l.r = he.r;
+ he.r.l = he.l;
+ he.edge = null;
+ },
+
+ right: function(he) {
+ return he.r;
+ },
+
+ left: function(he) {
+ return he.l;
+ },
+
+ leftRegion: function(he) {
+ return he.edge == null
+ ? Sites.bottomSite
+ : he.edge.region[he.side];
+ },
+
+ rightRegion: function(he) {
+ return he.edge == null
+ ? Sites.bottomSite
+ : he.edge.region[d3_voronoi_opposite[he.side]];
+ }
+ };
+
+ var Geom = {
+
+ bisect: function(s1, s2) {
+ var newEdge = {
+ region: {"l": s1, "r": s2},
+ ep: {"l": null, "r": null}
+ };
+
+ var dx = s2.x - s1.x,
+ dy = s2.y - s1.y,
+ adx = dx > 0 ? dx : -dx,
+ ady = dy > 0 ? dy : -dy;
+
+ newEdge.c = s1.x * dx + s1.y * dy
+ + (dx * dx + dy * dy) * .5;
+
+ if (adx > ady) {
+ newEdge.a = 1;
+ newEdge.b = dy / dx;
+ newEdge.c /= dx;
+ } else {
+ newEdge.b = 1;
+ newEdge.a = dx / dy;
+ newEdge.c /= dy;
+ }
+
+ return newEdge;
+ },
+
+ intersect: function(el1, el2) {
+ var e1 = el1.edge,
+ e2 = el2.edge;
+ if (!e1 || !e2 || (e1.region.r == e2.region.r)) {
+ return null;
+ }
+ var d = (e1.a * e2.b) - (e1.b * e2.a);
+ if (Math.abs(d) < 1e-10) {
+ return null;
+ }
+ var xint = (e1.c * e2.b - e2.c * e1.b) / d,
+ yint = (e2.c * e1.a - e1.c * e2.a) / d,
+ e1r = e1.region.r,
+ e2r = e2.region.r,
+ el,
+ e;
+ if ((e1r.y < e2r.y) ||
+ (e1r.y == e2r.y && e1r.x < e2r.x)) {
+ el = el1;
+ e = e1;
+ } else {
+ el = el2;
+ e = e2;
+ }
+ var rightOfSite = (xint >= e.region.r.x);
+ if ((rightOfSite && (el.side === "l")) ||
+ (!rightOfSite && (el.side === "r"))) {
+ return null;
+ }
+ return {
+ x: xint,
+ y: yint
+ };
+ },
+
+ rightOf: function(he, p) {
+ var e = he.edge,
+ topsite = e.region.r,
+ rightOfSite = (p.x > topsite.x);
+
+ if (rightOfSite && (he.side === "l")) {
+ return 1;
+ }
+ if (!rightOfSite && (he.side === "r")) {
+ return 0;
+ }
+ if (e.a === 1) {
+ var dyp = p.y - topsite.y,
+ dxp = p.x - topsite.x,
+ fast = 0,
+ above = 0;
+
+ if ((!rightOfSite && (e.b < 0)) ||
+ (rightOfSite && (e.b >= 0))) {
+ above = fast = (dyp >= e.b * dxp);
+ } else {
+ above = ((p.x + p.y * e.b) > e.c);
+ if (e.b < 0) {
+ above = !above;
+ }
+ if (!above) {
+ fast = 1;
+ }
+ }
+ if (!fast) {
+ var dxs = topsite.x - e.region.l.x;
+ above = (e.b * (dxp * dxp - dyp * dyp)) <
+ (dxs * dyp * (1 + 2 * dxp / dxs + e.b * e.b));
+
+ if (e.b < 0) {
+ above = !above;
+ }
+ }
+ } else /* e.b == 1 */ {
+ var yl = e.c - e.a * p.x,
+ t1 = p.y - yl,
+ t2 = p.x - topsite.x,
+ t3 = yl - topsite.y;
+
+ above = (t1 * t1) > (t2 * t2 + t3 * t3);
+ }
+ return he.side === "l" ? above : !above;
+ },
+
+ endPoint: function(edge, side, site) {
+ edge.ep[side] = site;
+ if (!edge.ep[d3_voronoi_opposite[side]]) return;
+ callback(edge);
+ },
+
+ distance: function(s, t) {
+ var dx = s.x - t.x,
+ dy = s.y - t.y;
+ return Math.sqrt(dx * dx + dy * dy);
+ }
+ };
+
+ var EventQueue = {
+ list: [],
+
+ insert: function(he, site, offset) {
+ he.vertex = site;
+ he.ystar = site.y + offset;
+ for (var i=0, list=EventQueue.list, l=list.length; i<l; i++) {
+ var next = list[i];
+ if (he.ystar > next.ystar ||
+ (he.ystar == next.ystar &&
+ site.x > next.vertex.x)) {
+ continue;
+ } else {
+ break;
+ }
+ }
+ list.splice(i, 0, he);
+ },
+
+ del: function(he) {
+ for (var i=0, ls=EventQueue.list, l=ls.length; i<l && (ls[i] != he); ++i) {}
+ ls.splice(i, 1);
+ },
+
+ empty: function() { return EventQueue.list.length === 0; },
+
+ nextEvent: function(he) {
+ for (var i=0, ls=EventQueue.list, l=ls.length; i<l; ++i) {
+ if (ls[i] == he) return ls[i+1];
+ }
+ return null;
+ },
+
+ min: function() {
+ var elem = EventQueue.list[0];
+ return {
+ x: elem.vertex.x,
+ y: elem.ystar
+ };
+ },
+
+ extractMin: function() {
+ return EventQueue.list.shift();
+ }
+ };
+
+ EdgeList.init();
+ Sites.bottomSite = Sites.list.shift();
+
+ var newSite = Sites.list.shift(), newIntStar;
+ var lbnd, rbnd, llbnd, rrbnd, bisector;
+ var bot, top, temp, p, v;
+ var e, pm;
+
+ while (true) {
+ if (!EventQueue.empty()) {
+ newIntStar = EventQueue.min();
+ }
+ if (newSite && (EventQueue.empty()
+ || newSite.y < newIntStar.y
+ || (newSite.y == newIntStar.y
+ && newSite.x < newIntStar.x))) { //new site is smallest
+ lbnd = EdgeList.leftBound(newSite);
+ rbnd = EdgeList.right(lbnd);
+ bot = EdgeList.rightRegion(lbnd);
+ e = Geom.bisect(bot, newSite);
+ bisector = EdgeList.createHalfEdge(e, "l");
+ EdgeList.insert(lbnd, bisector);
+ p = Geom.intersect(lbnd, bisector);
+ if (p) {
+ EventQueue.del(lbnd);
+ EventQueue.insert(lbnd, p, Geom.distance(p, newSite));
+ }
+ lbnd = bisector;
+ bisector = EdgeList.createHalfEdge(e, "r");
+ EdgeList.insert(lbnd, bisector);
+ p = Geom.intersect(bisector, rbnd);
+ if (p) {
+ EventQueue.insert(bisector, p, Geom.distance(p, newSite));
+ }
+ newSite = Sites.list.shift();
+ } else if (!EventQueue.empty()) { //intersection is smallest
+ lbnd = EventQueue.extractMin();
+ llbnd = EdgeList.left(lbnd);
+ rbnd = EdgeList.right(lbnd);
+ rrbnd = EdgeList.right(rbnd);
+ bot = EdgeList.leftRegion(lbnd);
+ top = EdgeList.rightRegion(rbnd);
+ v = lbnd.vertex;
+ Geom.endPoint(lbnd.edge, lbnd.side, v);
+ Geom.endPoint(rbnd.edge, rbnd.side, v);
+ EdgeList.del(lbnd);
+ EventQueue.del(rbnd);
+ EdgeList.del(rbnd);
+ pm = "l";
+ if (bot.y > top.y) {
+ temp = bot;
+ bot = top;
+ top = temp;
+ pm = "r";
+ }
+ e = Geom.bisect(bot, top);
+ bisector = EdgeList.createHalfEdge(e, pm);
+ EdgeList.insert(llbnd, bisector);
+ Geom.endPoint(e, d3_voronoi_opposite[pm], v);
+ p = Geom.intersect(llbnd, bisector);
+ if (p) {
+ EventQueue.del(llbnd);
+ EventQueue.insert(llbnd, p, Geom.distance(p, bot));
+ }
+ p = Geom.intersect(bisector, rrbnd);
+ if (p) {
+ EventQueue.insert(bisector, p, Geom.distance(p, bot));
+ }
+ } else {
+ break;
+ }
+ }//end while
+
+ for (lbnd = EdgeList.right(EdgeList.leftEnd);
+ lbnd != EdgeList.rightEnd;
+ lbnd = EdgeList.right(lbnd)) {
+ callback(lbnd.edge);
+ }
+}
+/**
+* @param vertices [[x1, y1], [x2, y2], …]
+* @returns triangles [[[x1, y1], [x2, y2], [x3, y3]], …]
+ */
+d3.geom.delaunay = function(vertices) {
+ var edges = vertices.map(function() { return []; }),
+ triangles = [];
+
+ // Use the Voronoi tessellation to determine Delaunay edges.
+ d3_voronoi_tessellate(vertices, function(e) {
+ edges[e.region.l.index].push(vertices[e.region.r.index]);
+ });
+
+ // Reconnect the edges into counterclockwise triangles.
+ edges.forEach(function(edge, i) {
+ var v = vertices[i],
+ cx = v[0],
+ cy = v[1];
+ edge.forEach(function(v) {
+ v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+ });
+ edge.sort(function(a, b) {
+ return a.angle - b.angle;
+ });
+ for (var j = 0, m = edge.length - 1; j < m; j++) {
+ triangles.push([v, edge[j], edge[j + 1]]);
+ }
+ });
+
+ return triangles;
+};
+// Constructs a new quadtree for the specified array of points. A quadtree is a
+// two-dimensional recursive spatial subdivision. This implementation uses
+// square partitions, dividing each square into four equally-sized squares. Each
+// point exists in a unique node; if multiple points are in the same position,
+// some points may be stored on internal nodes rather than leaf nodes. Quadtrees
+// can be used to accelerate various spatial operations, such as the Barnes-Hut
+// approximation for computing n-body forces, or collision detection.
+d3.geom.quadtree = function(points, x1, y1, x2, y2) {
+ var p,
+ i = -1,
+ n = points.length;
+
+ // Type conversion for deprecated API.
+ if (n && isNaN(points[0].x)) points = points.map(d3_geom_quadtreePoint);
+
+ // Allow bounds to be specified explicitly.
+ if (arguments.length < 5) {
+ if (arguments.length === 3) {
+ y2 = x2 = y1;
+ y1 = x1;
+ } else {
+ x1 = y1 = Infinity;
+ x2 = y2 = -Infinity;
+
+ // Compute bounds.
+ while (++i < n) {
+ p = points[i];
+ if (p.x < x1) x1 = p.x;
+ if (p.y < y1) y1 = p.y;
+ if (p.x > x2) x2 = p.x;
+ if (p.y > y2) y2 = p.y;
+ }
+
+ // Squarify the bounds.
+ var dx = x2 - x1,
+ dy = y2 - y1;
+ if (dx > dy) y2 = y1 + dx;
+ else x2 = x1 + dy;
+ }
+ }
+
+ // Recursively inserts the specified point p at the node n or one of its
+ // descendants. The bounds are defined by [x1, x2] and [y1, y2].
+ function insert(n, p, x1, y1, x2, y2) {
+ if (isNaN(p.x) || isNaN(p.y)) return; // ignore invalid points
+ if (n.leaf) {
+ var v = n.point;
+ if (v) {
+ // If the point at this leaf node is at the same position as the new
+ // point we are adding, we leave the point associated with the
+ // internal node while adding the new point to a child node. This
+ // avoids infinite recursion.
+ if ((Math.abs(v.x - p.x) + Math.abs(v.y - p.y)) < .01) {
+ insertChild(n, p, x1, y1, x2, y2);
+ } else {
+ n.point = null;
+ insertChild(n, v, x1, y1, x2, y2);
+ insertChild(n, p, x1, y1, x2, y2);
+ }
+ } else {
+ n.point = p;
+ }
+ } else {
+ insertChild(n, p, x1, y1, x2, y2);
+ }
+ }
+
+ // Recursively inserts the specified point p into a descendant of node n. The
+ // bounds are defined by [x1, x2] and [y1, y2].
+ function insertChild(n, p, x1, y1, x2, y2) {
+ // Compute the split point, and the quadrant in which to insert p.
+ var sx = (x1 + x2) * .5,
+ sy = (y1 + y2) * .5,
+ right = p.x >= sx,
+ bottom = p.y >= sy,
+ i = (bottom << 1) + right;
+
+ // Recursively insert into the child node.
+ n.leaf = false;
+ n = n.nodes[i] || (n.nodes[i] = d3_geom_quadtreeNode());
+
+ // Update the bounds as we recurse.
+ if (right) x1 = sx; else x2 = sx;
+ if (bottom) y1 = sy; else y2 = sy;
+ insert(n, p, x1, y1, x2, y2);
+ }
+
+ // Create the root node.
+ var root = d3_geom_quadtreeNode();
+
+ root.add = function(p) {
+ insert(root, p, x1, y1, x2, y2);
+ };
+
+ root.visit = function(f) {
+ d3_geom_quadtreeVisit(f, root, x1, y1, x2, y2);
+ };
+
+ // Insert all points.
+ points.forEach(root.add);
+ return root;
+};
+
+function d3_geom_quadtreeNode() {
+ return {
+ leaf: true,
+ nodes: [],
+ point: null
+ };
+}
+
+function d3_geom_quadtreeVisit(f, node, x1, y1, x2, y2) {
+ if (!f(node, x1, y1, x2, y2)) {
+ var sx = (x1 + x2) * .5,
+ sy = (y1 + y2) * .5,
+ children = node.nodes;
+ if (children[0]) d3_geom_quadtreeVisit(f, children[0], x1, y1, sx, sy);
+ if (children[1]) d3_geom_quadtreeVisit(f, children[1], sx, y1, x2, sy);
+ if (children[2]) d3_geom_quadtreeVisit(f, children[2], x1, sy, sx, y2);
+ if (children[3]) d3_geom_quadtreeVisit(f, children[3], sx, sy, x2, y2);
+ }
+}
+
+function d3_geom_quadtreePoint(p) {
+ return {
+ x: p[0],
+ y: p[1]
+ };
+}
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
index bfbc7ee..77ee372 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
@@ -1,22 +1,26 @@
-(function(){d3 = {version: "1.29.1"}; // semver
-if (!Date.now) Date.now = function() {
+(function(){if (!Date.now) Date.now = function() {
return +new Date;
};
-if (!Object.create) Object.create = function(o) {
- /** @constructor */ function f() {}
- f.prototype = o;
- return new f;
-};
+try {
+ document.createElement("div").style.setProperty("opacity", 0, "");
+} catch (error) {
+ var d3_style_prototype = CSSStyleDeclaration.prototype,
+ d3_style_setProperty = d3_style_prototype.setProperty;
+ d3_style_prototype.setProperty = function(name, value, priority) {
+ d3_style_setProperty.call(this, name, value + "", priority);
+ };
+}
+d3 = {version: "2.7.1"}; // semver
var d3_array = d3_arraySlice; // conversion for NodeLists
-function d3_arrayCopy(psuedoarray) {
- var i = -1, n = psuedoarray.length, array = [];
- while (++i < n) array.push(psuedoarray[i]);
+function d3_arrayCopy(pseudoarray) {
+ var i = -1, n = pseudoarray.length, array = [];
+ while (++i < n) array.push(pseudoarray[i]);
return array;
}
-function d3_arraySlice(psuedoarray) {
- return Array.prototype.slice.call(psuedoarray);
+function d3_arraySlice(pseudoarray) {
+ return Array.prototype.slice.call(pseudoarray);
}
try {
@@ -24,21 +28,63 @@ try {
} catch(e) {
d3_array = d3_arrayCopy;
}
+
+var d3_arraySubclass = [].__proto__?
+
+// Until ECMAScript supports array subclassing, prototype injection works well.
+function(array, prototype) {
+ array.__proto__ = prototype;
+}:
+
+// And if your browser doesn't support __proto__, we'll use direct extension.
+function(array, prototype) {
+ for (var property in prototype) array[property] = prototype[property];
+};
+function d3_this() {
+ return this;
+}
d3.functor = function(v) {
return typeof v === "function" ? v : function() { return v; };
};
-// A getter-setter method that preserves the appropriate `this` context.
-d3.rebind = function(object, method) {
+// Copies a variable number of methods from source to target.
+d3.rebind = function(target, source) {
+ var i = 1, n = arguments.length, method;
+ while (++i < n) target[method = arguments[i]] = d3_rebind(target, source, source[method]);
+ return target;
+};
+
+// Method is assumed to be a standard D3 getter-setter:
+// If passed with no arguments, gets the value.
+// If passed with arguments, sets the value and returns the target.
+function d3_rebind(target, source, method) {
return function() {
- var x = method.apply(object, arguments);
- return arguments.length ? object : x;
+ var value = method.apply(source, arguments);
+ return arguments.length ? target : value;
};
-};
+}
d3.ascending = function(a, b) {
- return a < b ? -1 : a > b ? 1 : 0;
+ return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
};
d3.descending = function(a, b) {
- return b < a ? -1 : b > a ? 1 : 0;
+ return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
+};
+d3.mean = function(array, f) {
+ var n = array.length,
+ a,
+ m = 0,
+ i = -1,
+ j = 0;
+ if (arguments.length === 1) {
+ while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+ } else {
+ while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+ }
+ return j ? m : undefined;
+};
+d3.median = function(array, f) {
+ if (arguments.length > 1) array = array.map(f);
+ array = array.filter(d3_number);
+ return array.length ? d3.quantile(array.sort(d3.ascending), .5) : undefined;
};
d3.min = function(array, f) {
var i = -1,
@@ -68,6 +114,45 @@ d3.max = function(array, f) {
}
return a;
};
+d3.extent = function(array, f) {
+ var i = -1,
+ n = array.length,
+ a,
+ b,
+ c;
+ if (arguments.length === 1) {
+ while (++i < n && ((a = c = array[i]) == null || a != a)) a = c = undefined;
+ while (++i < n) if ((b = array[i]) != null) {
+ if (a > b) a = b;
+ if (c < b) c = b;
+ }
+ } else {
+ while (++i < n && ((a = c = f.call(array, array[i], i)) == null || a != a)) a = undefined;
+ while (++i < n) if ((b = f.call(array, array[i], i)) != null) {
+ if (a > b) a = b;
+ if (c < b) c = b;
+ }
+ }
+ return [a, c];
+};
+d3.random = {
+ normal: function(mean, deviation) {
+ if (arguments.length < 2) deviation = 1;
+ if (arguments.length < 1) mean = 0;
+ return function() {
+ var x, y, r;
+ do {
+ x = Math.random() * 2 - 1;
+ y = Math.random() * 2 - 1;
+ r = x * x + y * y;
+ } while (!r || r > 1);
+ return mean + deviation * x * Math.sqrt(-2 * Math.log(r) / r);
+ };
+ }
+};
+function d3_number(x) {
+ return x != null && !isNaN(x);
+}
d3.sum = function(array, f) {
var s = 0,
n = array.length,
@@ -90,6 +175,9 @@ d3.quantile = function(values, p) {
e = H - h;
return e ? v + e * (values[h] - v) : v;
};
+d3.transpose = function(matrix) {
+ return d3.zip.apply(d3, matrix);
+};
d3.zip = function() {
if (!(n = arguments.length)) return [];
for (var i = -1, m = d3.min(arguments, d3_zipLength), zips = new Array(m); ++i < m;) {
@@ -303,27 +391,19 @@ function d3_splitter(d) {
function d3_collapse(s) {
return s.replace(/(^\s+)|(\s+$)/g, "").replace(/\s+/g, " ");
}
-//
-// Note: assigning to the arguments array simultaneously changes the value of
-// the corresponding argument!
-//
-// TODO The `this` argument probably shouldn't be the first argument to the
-// callback, anyway, since it's redundant. However, that will require a major
-// version bump due to backwards compatibility, so I'm not changing it right
-// away.
-//
-function d3_call(callback) {
- callback.apply(this, (arguments[0] = this, arguments));
- return this;
-}
/**
* @param {number} start
* @param {number=} stop
* @param {number=} step
*/
d3.range = function(start, stop, step) {
- if (arguments.length === 1) { stop = start; start = 0; }
- if (step == null) step = 1;
+ if (arguments.length < 3) {
+ step = 1;
+ if (arguments.length < 2) {
+ stop = start;
+ start = 0;
+ }
+ }
if ((stop - start) / step == Infinity) throw new Error("infinite range");
var range = [],
i = -1,
@@ -336,7 +416,7 @@ d3.requote = function(s) {
return s.replace(d3_requote_re, "\\$&");
};
-var d3_requote_re = /[\\\^\$\*\+\?\[\]\(\)\.\{\}]/g;
+var d3_requote_re = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
d3.round = function(x, n) {
return n
? Math.round(x * Math.pow(10, n)) * Math.pow(10, -n)
@@ -344,9 +424,10 @@ d3.round = function(x, n) {
};
d3.xhr = function(url, mime, callback) {
var req = new XMLHttpRequest;
- if (arguments.length < 3) callback = mime;
+ if (arguments.length < 3) callback = mime, mime = null;
else if (mime && req.overrideMimeType) req.overrideMimeType(mime);
req.open("GET", url, true);
+ if (mime) req.setRequestHeader("Accept", mime);
req.onreadystatechange = function() {
if (req.readyState === 4) callback(req.status < 300 ? req : null);
};
@@ -387,66 +468,79 @@ d3.xml = function(url, mime, callback) {
}
d3.xhr(url, mime, ready);
};
-d3.ns = {
-
- prefix: {
- svg: "http://www.w3.org/2000/svg",
- xhtml: "http://www.w3.org/1999/xhtml",
- xlink: "http://www.w3.org/1999/xlink",
- xml: "http://www.w3.org/XML/1998/namespace",
- xmlns: "http://www.w3.org/2000/xmlns/"
- },
+var d3_nsPrefix = {
+ svg: "http://www.w3.org/2000/svg",
+ xhtml: "http://www.w3.org/1999/xhtml",
+ xlink: "http://www.w3.org/1999/xlink",
+ xml: "http://www.w3.org/XML/1998/namespace",
+ xmlns: "http://www.w3.org/2000/xmlns/"
+};
+d3.ns = {
+ prefix: d3_nsPrefix,
qualify: function(name) {
var i = name.indexOf(":");
- return i < 0 ? name : {
- space: d3.ns.prefix[name.substring(0, i)],
- local: name.substring(i + 1)
- };
+ return i < 0 ? (name in d3_nsPrefix
+ ? {space: d3_nsPrefix[name], local: name} : name)
+ : {space: d3_nsPrefix[name.substring(0, i)], local: name.substring(i + 1)};
}
-
};
-/** @param {...string} types */
-d3.dispatch = function(types) {
- var dispatch = {},
- type;
- for (var i = 0, n = arguments.length; i < n; i++) {
- type = arguments[i];
- dispatch[type] = d3_dispatch(type);
- }
+d3.dispatch = function() {
+ var dispatch = new d3_dispatch(),
+ i = -1,
+ n = arguments.length;
+ while (++i < n) dispatch[arguments[i]] = d3_dispatch_event();
return dispatch;
};
-function d3_dispatch(type) {
- var dispatch = {},
- listeners = [];
+function d3_dispatch() {}
- dispatch.add = function(listener) {
- for (var i = 0; i < listeners.length; i++) {
- if (listeners[i].listener == listener) return dispatch; // already registered
- }
- listeners.push({listener: listener, on: true});
- return dispatch;
- };
+d3_dispatch.prototype.on = function(type, listener) {
+ var i = type.indexOf("."),
+ name = "";
- dispatch.remove = function(listener) {
- for (var i = 0; i < listeners.length; i++) {
- var l = listeners[i];
- if (l.listener == listener) {
- l.on = false;
- listeners = listeners.slice(0, i).concat(listeners.slice(i + 1));
- break;
- }
+ // Extract optional namespace, e.g., "click.foo"
+ if (i > 0) {
+ name = type.substring(i + 1);
+ type = type.substring(0, i);
+ }
+
+ return arguments.length < 2
+ ? this[type].on(name)
+ : (this[type].on(name, listener), this);
+};
+
+function d3_dispatch_event() {
+ var listeners = [],
+ listenerByName = {};
+
+ function dispatch() {
+ var z = listeners, // defensive reference
+ i = -1,
+ n = z.length,
+ l;
+ while (++i < n) if (l = z[i].on) l.apply(this, arguments);
+ }
+
+ dispatch.on = function(name, listener) {
+ var l, i;
+
+ // return the current listener, if any
+ if (arguments.length < 2) return (l = listenerByName[name]) && l.on;
+
+ // remove the old listener, if any (with copy-on-write)
+ if (l = listenerByName[name]) {
+ l.on = null;
+ listeners = listeners.slice(0, i = listeners.indexOf(l)).concat(listeners.slice(i + 1));
+ delete listenerByName[name];
}
- return dispatch;
- };
- dispatch.dispatch = function() {
- var ls = listeners; // defensive reference
- for (var i = 0, n = ls.length; i < n; i++) {
- var l = ls[i];
- if (l.on) l.listener.apply(this, arguments);
+ // add the new listener, if any
+ if (listener) {
+ listeners.push(listenerByName[name] = {on: listener});
}
+
+ return dispatch;
};
return dispatch;
@@ -461,10 +555,11 @@ d3.format = function(specifier) {
comma = match[7],
precision = match[8],
type = match[9],
- percentage = false,
+ scale = 1,
+ suffix = "",
integer = false;
- if (precision) precision = precision.substring(1);
+ if (precision) precision = +precision.substring(1);
if (zfill) {
fill = "0"; // TODO align = "=";
@@ -473,22 +568,36 @@ d3.format = function(specifier) {
switch (type) {
case "n": comma = true; type = "g"; break;
- case "%": percentage = true; type = "f"; break;
- case "p": percentage = true; type = "r"; break;
- case "d": integer = true; precision = "0"; break;
+ case "%": scale = 100; suffix = "%"; type = "f"; break;
+ case "p": scale = 100; suffix = "%"; type = "r"; break;
+ case "d": integer = true; precision = 0; break;
+ case "s": scale = -1; type = "r"; break;
}
+ // If no precision is specified for r, fallback to general notation.
+ if (type == "r" && !precision) type = "g";
+
type = d3_format_types[type] || d3_format_typeDefault;
return function(value) {
- var number = percentage ? value * 100 : +value,
- negative = (number < 0) && (number = -number) ? "\u2212" : sign;
// Return the empty string for floats formatted as ints.
- if (integer && (number % 1)) return "";
+ if (integer && (value % 1)) return "";
+
+ // Convert negative to positive, and record the sign prefix.
+ var negative = (value < 0) && (value = -value) ? "\u2212" : sign;
- // Convert the input value to the desired precision.
- value = type(number, precision);
+ // Apply the scale, computing it from the value's exponent for si format.
+ if (scale < 0) {
+ var prefix = d3.formatPrefix(value, precision);
+ value *= prefix.scale;
+ suffix = prefix.symbol;
+ } else {
+ value *= scale;
+ }
+
+ // Convert to the desired precision.
+ value = type(value, precision);
// If the fill character is 0, the sign and group is applied after the fill.
if (zfill) {
@@ -505,9 +614,8 @@ d3.format = function(specifier) {
var length = value.length;
if (length < width) value = new Array(width - length + 1).join(fill) + value;
}
- if (percentage) value += "%";
- return value;
+ return value + suffix;
};
};
@@ -518,12 +626,13 @@ var d3_format_types = {
g: function(x, p) { return x.toPrecision(p); },
e: function(x, p) { return x.toExponential(p); },
f: function(x, p) { return x.toFixed(p); },
- r: function(x, p) {
- var n = 1 + Math.floor(1e-15 + Math.log(x) / Math.LN10);
- return d3.round(x, p - n).toFixed(Math.max(0, p - n));
- }
+ r: function(x, p) { return d3.round(x, p = d3_format_precision(x, p)).toFixed(Math.max(0, Math.min(20, p))); }
};
+function d3_format_precision(x, p) {
+ return p - (x ? 1 + Math.floor(Math.log(x + Math.pow(10, 1 + Math.floor(Math.log(x) / Math.LN10) - p)) / Math.LN10) : 1);
+}
+
function d3_format_typeDefault(x) {
return x + "";
}
@@ -536,6 +645,26 @@ function d3_format_group(value) {
while (i > 0) t.push(value.substring(i -= 3, i + 3));
return t.reverse().join(",") + f;
}
+var d3_formatPrefixes = ["y","z","a","f","p","n","μ","m","","k","M","G","T","P","E","Z","Y"].map(d3_formatPrefix);
+
+d3.formatPrefix = function(value, precision) {
+ var i = 0;
+ if (value) {
+ if (value < 0) value *= -1;
+ if (precision) value = d3.round(value, d3_format_precision(value, precision));
+ i = 1 + Math.floor(1e-12 + Math.log(value) / Math.LN10);
+ i = Math.max(-24, Math.min(24, Math.floor((i <= 0 ? i + 1 : i - 1) / 3) * 3));
+ }
+ return d3_formatPrefixes[8 + i / 3];
+};
+
+function d3_formatPrefix(d, i) {
+ return {
+ scale: Math.pow(10, (8 - i) * 3),
+ symbol: d
+ };
+}
+
/*
* TERMS OF USE - EASING EQUATIONS
*
@@ -598,9 +727,15 @@ d3.ease = function(name) {
var i = name.indexOf("-"),
t = i >= 0 ? name.substring(0, i) : name,
m = i >= 0 ? name.substring(i + 1) : "in";
- return d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1)));
+ return d3_ease_clamp(d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1))));
};
+function d3_ease_clamp(f) {
+ return function(t) {
+ return t <= 0 ? 0 : t >= 1 ? 1 : f(t);
+ };
+}
+
function d3_ease_reverse(f) {
return function(t) {
return 1 - f(1 - t);
@@ -628,7 +763,7 @@ function d3_ease_sin(t) {
}
function d3_ease_exp(t) {
- return t ? Math.pow(2, 10 * (t - 1)) - 1e-3 : 0;
+ return Math.pow(2, 10 * (t - 1));
}
function d3_ease_circle(t) {
@@ -659,6 +794,11 @@ function d3_ease_bounce(t) {
: 7.5625 * (t -= 2.625 / 2.75) * t + .984375;
}
d3.event = null;
+
+function d3_eventCancel() {
+ d3.event.stopPropagation();
+ d3.event.preventDefault();
+}
d3.interpolate = function(a, b) {
var i = d3.interpolators.length, f;
while (--i >= 0 && !(f = d3.interpolators[i](a, b)));
@@ -753,6 +893,10 @@ d3.interpolateString = function(a, b) {
};
};
+d3.interpolateTransform = function(a, b) {
+ return d3.interpolateString(d3.transform(a) + "", d3.transform(b) + "");
+};
+
d3.interpolateRgb = function(a, b) {
a = d3.rgb(a);
b = d3.rgb(b);
@@ -763,10 +907,10 @@ d3.interpolateRgb = function(a, b) {
bg = b.g - ag,
bb = b.b - ab;
return function(t) {
- return "rgb(" + Math.round(ar + br * t)
- + "," + Math.round(ag + bg * t)
- + "," + Math.round(ab + bb * t)
- + ")";
+ return "#"
+ + d3_rgb_hex(Math.round(ar + br * t))
+ + d3_rgb_hex(Math.round(ag + bg * t))
+ + d3_rgb_hex(Math.round(ab + bb * t));
};
};
@@ -823,34 +967,34 @@ d3.interpolateObject = function(a, b) {
};
}
-var d3_interpolate_number = /[-+]?(?:\d+\.\d+|\d+\.|\.\d+|\d+)(?:[eE][-]?\d+)?/g,
- d3_interpolate_rgb = {background: 1, fill: 1, stroke: 1};
+var d3_interpolate_number = /[-+]?(?:\d*\.?\d+)(?:[eE][-+]?\d+)?/g;
function d3_interpolateByName(n) {
- return n in d3_interpolate_rgb || /\bcolor\b/.test(n)
- ? d3.interpolateRgb
+ return n == "transform"
+ ? d3.interpolateTransform
: d3.interpolate;
}
d3.interpolators = [
d3.interpolateObject,
function(a, b) { return (b instanceof Array) && d3.interpolateArray(a, b); },
- function(a, b) { return (typeof b === "string") && d3.interpolateString(String(a), b); },
- function(a, b) { return (b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b)) && d3.interpolateRgb(String(a), b); },
- function(a, b) { return (typeof b === "number") && d3.interpolateNumber(+a, b); }
+ function(a, b) { return (typeof a === "string" || typeof b === "string") && d3.interpolateString(a + "", b + ""); },
+ function(a, b) { return (typeof b === "string" ? b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Rgb || b instanceof d3_Hsl) && d3.interpolateRgb(a, b); },
+ function(a, b) { return !isNaN(a = +a) && !isNaN(b = +b) && d3.interpolateNumber(a, b); }
];
function d3_uninterpolateNumber(a, b) {
- b = 1 / (b - (a = +a));
+ b = b - (a = +a) ? 1 / (b - a) : 0;
return function(x) { return (x - a) * b; };
}
function d3_uninterpolateClamp(a, b) {
- b = 1 / (b - (a = +a));
+ b = b - (a = +a) ? 1 / (b - a) : 0;
return function(x) { return Math.max(0, Math.min(1, (x - a) * b)); };
}
d3.rgb = function(r, g, b) {
return arguments.length === 1
- ? d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb)
+ ? (r instanceof d3_Rgb ? d3_rgb(r.r, r.g, r.b)
+ : d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb))
: d3_rgb(~~r, ~~g, ~~b);
};
@@ -875,17 +1019,17 @@ d3_Rgb.prototype.brighter = function(k) {
if (g && g < i) g = i;
if (b && b < i) b = i;
return d3_rgb(
- Math.min(255, Math.floor(r / k)),
- Math.min(255, Math.floor(g / k)),
- Math.min(255, Math.floor(b / k)));
+ Math.min(255, Math.floor(r / k)),
+ Math.min(255, Math.floor(g / k)),
+ Math.min(255, Math.floor(b / k)));
};
d3_Rgb.prototype.darker = function(k) {
k = Math.pow(0.7, arguments.length ? k : 1);
return d3_rgb(
- Math.max(0, Math.floor(k * this.r)),
- Math.max(0, Math.floor(k * this.g)),
- Math.max(0, Math.floor(k * this.b)));
+ Math.floor(k * this.r),
+ Math.floor(k * this.g),
+ Math.floor(k * this.b));
};
d3_Rgb.prototype.hsl = function() {
@@ -897,7 +1041,9 @@ d3_Rgb.prototype.toString = function() {
};
function d3_rgb_hex(v) {
- return v < 0x10 ? "0" + v.toString(16) : v.toString(16);
+ return v < 0x10
+ ? "0" + Math.max(0, v).toString(16)
+ : Math.min(255, v).toString(16);
}
function d3_rgb_parse(format, rgb, hsl) {
@@ -1134,7 +1280,8 @@ for (var d3_rgb_name in d3_rgb_names) {
}
d3.hsl = function(h, s, l) {
return arguments.length === 1
- ? d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl)
+ ? (h instanceof d3_Hsl ? d3_hsl(h.h, h.s, h.l)
+ : d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl))
: d3_hsl(+h, +s, +l);
};
@@ -1163,7 +1310,7 @@ d3_Hsl.prototype.rgb = function() {
};
d3_Hsl.prototype.toString = function() {
- return "hsl(" + this.h + "," + this.s * 100 + "%," + this.l * 100 + "%)";
+ return this.rgb().toString();
};
function d3_hsl_rgb(h, s, l) {
@@ -1194,906 +1341,859 @@ function d3_hsl_rgb(h, s, l) {
return d3_rgb(vv(h + 120), vv(h), vv(h - 120));
}
+function d3_selection(groups) {
+ d3_arraySubclass(groups, d3_selectionPrototype);
+ return groups;
+}
+
var d3_select = function(s, n) { return n.querySelector(s); },
- d3_selectAll = function(s, n) { return d3_array(n.querySelectorAll(s)); };
+ d3_selectAll = function(s, n) { return n.querySelectorAll(s); },
+ d3_selectRoot = document.documentElement,
+ d3_selectMatcher = d3_selectRoot.matchesSelector || d3_selectRoot.webkitMatchesSelector || d3_selectRoot.mozMatchesSelector || d3_selectRoot.msMatchesSelector || d3_selectRoot.oMatchesSelector,
+ d3_selectMatches = function(n, s) { return d3_selectMatcher.call(n, s); };
-// Use Sizzle, if available.
+// Prefer Sizzle, if available.
if (typeof Sizzle === "function") {
d3_select = function(s, n) { return Sizzle(s, n)[0]; };
d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
+ d3_selectMatches = Sizzle.matchesSelector;
}
-var d3_root = d3_selection([[document]]);
-d3_root[0].parentNode = document.documentElement;
-
-// TODO fast singleton implementation!
-d3.select = function(selector) {
- return typeof selector === "string"
- ? d3_root.select(selector)
- : d3_selection([[selector]]); // assume node
-};
+var d3_selectionPrototype = [];
-d3.selectAll = function(selector) {
- return typeof selector === "string"
- ? d3_root.selectAll(selector)
- : d3_selection([d3_array(selector)]); // assume node[]
+d3.selection = function() {
+ return d3_selectionRoot;
};
-function d3_selection(groups) {
-
- function select(select) {
- var subgroups = [],
- subgroup,
- subnode,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroup.push(subnode = select(node));
- if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
- } else {
- subgroup.push(null);
- }
- }
- }
- return d3_selection(subgroups);
- }
-
- function selectAll(selectAll) {
- var subgroups = [],
- subgroup,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroups.push(subgroup = selectAll(node));
- subgroup.parentNode = node;
- }
- }
- }
- return d3_selection(subgroups);
- }
-
- // TODO select(function)?
- groups.select = function(selector) {
- return select(function(node) {
- return d3_select(selector, node);
- });
- };
-
- // TODO selectAll(function)?
- groups.selectAll = function(selector) {
- return selectAll(function(node) {
- return d3_selectAll(selector, node);
- });
- };
-
- // TODO preserve null elements to maintain index?
- groups.filter = function(filter) {
- var subgroups = [],
- subgroup,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if ((node = group[i]) && filter.call(node, node.__data__, i)) {
- subgroup.push(node);
- }
- }
- }
- return d3_selection(subgroups);
- };
-
- groups.map = function(map) {
- var group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) node.__data__ = map.call(node, node.__data__, i);
- }
- }
- return groups;
- };
-
- // TODO data(null) for clearing data?
- groups.data = function(data, join) {
- var enter = [],
- update = [],
- exit = [];
-
- function bind(group, groupData) {
- var i = 0,
- n = group.length,
- m = groupData.length,
- n0 = Math.min(n, m),
- n1 = Math.max(n, m),
- updateNodes = [],
- enterNodes = [],
- exitNodes = [],
- node,
- nodeData;
-
- if (join) {
- var nodeByKey = {},
- keys = [],
- key,
- j = groupData.length;
-
- for (i = 0; i < n; i++) {
- key = join.call(node = group[i], node.__data__, i);
- if (key in nodeByKey) {
- exitNodes[j++] = node; // duplicate key
- } else {
- nodeByKey[key] = node;
- }
- keys.push(key);
- }
-
- for (i = 0; i < m; i++) {
- node = nodeByKey[key = join.call(groupData, nodeData = groupData[i], i)];
- if (node) {
- node.__data__ = nodeData;
- updateNodes[i] = node;
- enterNodes[i] = exitNodes[i] = null;
- } else {
- enterNodes[i] = d3_selection_enterNode(nodeData);
- updateNodes[i] = exitNodes[i] = null;
- }
- delete nodeByKey[key];
- }
-
- for (i = 0; i < n; i++) {
- if (keys[i] in nodeByKey) {
- exitNodes[i] = group[i];
- }
- }
+d3.selection.prototype = d3_selectionPrototype;
+d3_selectionPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ group,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selector(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = (group = this[j]).parentNode;
+ for (var i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroup.push(subnode = selector.call(node, node.__data__, i));
+ if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
} else {
- for (; i < n0; i++) {
- node = group[i];
- nodeData = groupData[i];
- if (node) {
- node.__data__ = nodeData;
- updateNodes[i] = node;
- enterNodes[i] = exitNodes[i] = null;
- } else {
- enterNodes[i] = d3_selection_enterNode(nodeData);
- updateNodes[i] = exitNodes[i] = null;
- }
- }
- for (; i < m; i++) {
- enterNodes[i] = d3_selection_enterNode(groupData[i]);
- updateNodes[i] = exitNodes[i] = null;
- }
- for (; i < n1; i++) {
- exitNodes[i] = group[i];
- enterNodes[i] = updateNodes[i] = null;
- }
- }
-
- enterNodes.parentNode
- = updateNodes.parentNode
- = exitNodes.parentNode
- = group.parentNode;
-
- enter.push(enterNodes);
- update.push(updateNodes);
- exit.push(exitNodes);
- }
-
- var i = -1,
- n = groups.length,
- group;
- if (typeof data === "function") {
- while (++i < n) {
- bind(group = groups[i], data.call(group, group.parentNode.__data__, i));
- }
- } else {
- while (++i < n) {
- bind(group = groups[i], data);
+ subgroup.push(null);
}
}
+ }
- var selection = d3_selection(update);
- selection.enter = function() {
- return d3_selectionEnter(enter);
- };
- selection.exit = function() {
- return d3_selection(exit);
- };
- return selection;
- };
+ return d3_selection(subgroups);
+};
- // TODO mask forEach? or rename for eachData?
- // TODO offer the same semantics for map, reduce, etc.?
- groups.each = function(callback) {
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- var node = group[i];
- if (node) callback.call(node, node.__data__, i);
- }
- }
- return groups;
+function d3_selection_selector(selector) {
+ return function() {
+ return d3_select(selector, this);
};
-
- function first(callback) {
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- var node = group[i];
- if (node) return callback.call(node, node.__data__, i);
+}
+d3_selectionPrototype.selectAll = function(selector) {
+ var subgroups = [],
+ subgroup,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selectorAll(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroups.push(subgroup = d3_array(selector.call(node, node.__data__, i)));
+ subgroup.parentNode = node;
}
}
- return null;
}
- groups.empty = function() {
- return !first(function() { return true; });
- };
+ return d3_selection(subgroups);
+};
- groups.node = function() {
- return first(function() { return this; });
+function d3_selection_selectorAll(selector) {
+ return function() {
+ return d3_selectAll(selector, this);
};
+}
+d3_selectionPrototype.attr = function(name, value) {
+ name = d3.ns.qualify(name);
+
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) {
+ var node = this.node();
+ return name.local
+ ? node.getAttributeNS(name.space, name.local)
+ : node.getAttribute(name);
+ }
- groups.attr = function(name, value) {
- name = d3.ns.qualify(name);
-
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(name.local
- ? function() { return this.getAttributeNS(name.space, name.local); }
- : function() { return this.getAttribute(name); });
- }
-
- /** @this {Element} */
- function attrNull() {
- this.removeAttribute(name);
- }
+ function attrNull() {
+ this.removeAttribute(name);
+ }
- /** @this {Element} */
- function attrNullNS() {
- this.removeAttributeNS(name.space, name.local);
- }
+ function attrNullNS() {
+ this.removeAttributeNS(name.space, name.local);
+ }
- /** @this {Element} */
- function attrConstant() {
- this.setAttribute(name, value);
- }
+ function attrConstant() {
+ this.setAttribute(name, value);
+ }
- /** @this {Element} */
- function attrConstantNS() {
- this.setAttributeNS(name.space, name.local, value);
- }
+ function attrConstantNS() {
+ this.setAttributeNS(name.space, name.local, value);
+ }
- /** @this {Element} */
- function attrFunction() {
- var x = value.apply(this, arguments);
- if (x == null) this.removeAttribute(name);
- else this.setAttribute(name, x);
- }
+ function attrFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.removeAttribute(name);
+ else this.setAttribute(name, x);
+ }
- /** @this {Element} */
- function attrFunctionNS() {
- var x = value.apply(this, arguments);
- if (x == null) this.removeAttributeNS(name.space, name.local);
- else this.setAttributeNS(name.space, name.local, x);
- }
+ function attrFunctionNS() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.removeAttributeNS(name.space, name.local);
+ else this.setAttributeNS(name.space, name.local, x);
+ }
- return groups.each(value == null
- ? (name.local ? attrNullNS : attrNull) : (typeof value === "function"
- ? (name.local ? attrFunctionNS : attrFunction)
- : (name.local ? attrConstantNS : attrConstant)));
- };
+ return this.each(value == null
+ ? (name.local ? attrNullNS : attrNull) : (typeof value === "function"
+ ? (name.local ? attrFunctionNS : attrFunction)
+ : (name.local ? attrConstantNS : attrConstant)));
+};
+d3_selectionPrototype.classed = function(name, value) {
+ var names = name.split(d3_selection_classedWhitespace),
+ n = names.length,
+ i = -1;
+ if (arguments.length > 1) {
+ while (++i < n) d3_selection_classed.call(this, names[i], value);
+ return this;
+ } else {
+ while (++i < n) if (!d3_selection_classed.call(this, names[i])) return false;
+ return true;
+ }
+};
- groups.classed = function(name, value) {
- var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
+var d3_selection_classedWhitespace = /\s+/g;
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- if (c = this.classList) return c.contains(name);
- var c = this.className;
- re.lastIndex = 0;
- return re.test(c.baseVal != null ? c.baseVal : c);
- });
- }
+function d3_selection_classed(name, value) {
+ var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
- /** @this {Element} */
- function classedAdd() {
- if (c = this.classList) return c.add(name);
- var c = this.className,
- cb = c.baseVal != null,
- cv = cb ? c.baseVal : c;
- re.lastIndex = 0;
- if (!re.test(cv)) {
- cv = d3_collapse(cv + " " + name);
- if (cb) c.baseVal = cv;
- else this.className = cv;
- }
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) {
+ var node = this.node();
+ if (c = node.classList) return c.contains(name);
+ var c = node.className;
+ re.lastIndex = 0;
+ return re.test(c.baseVal != null ? c.baseVal : c);
+ }
- /** @this {Element} */
- function classedRemove() {
- if (c = this.classList) return c.remove(name);
- var c = this.className,
- cb = c.baseVal != null,
- cv = cb ? c.baseVal : c;
- cv = d3_collapse(cv.replace(re, " "));
+ function classedAdd() {
+ if (c = this.classList) return c.add(name);
+ var c = this.className,
+ cb = c.baseVal != null,
+ cv = cb ? c.baseVal : c;
+ re.lastIndex = 0;
+ if (!re.test(cv)) {
+ cv = d3_collapse(cv + " " + name);
if (cb) c.baseVal = cv;
else this.className = cv;
}
+ }
- /** @this {Element} */
- function classedFunction() {
- (value.apply(this, arguments)
- ? classedAdd
- : classedRemove).call(this);
- }
+ function classedRemove() {
+ if (c = this.classList) return c.remove(name);
+ var c = this.className,
+ cb = c.baseVal != null,
+ cv = cb ? c.baseVal : c;
+ cv = d3_collapse(cv.replace(re, " "));
+ if (cb) c.baseVal = cv;
+ else this.className = cv;
+ }
- return groups.each(typeof value === "function"
- ? classedFunction : value
+ function classedFunction() {
+ (value.apply(this, arguments)
? classedAdd
- : classedRemove);
- };
-
- groups.style = function(name, value, priority) {
- if (arguments.length < 3) priority = "";
+ : classedRemove).call(this);
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- return window.getComputedStyle(this, null).getPropertyValue(name);
- });
- }
+ return this.each(typeof value === "function"
+ ? classedFunction : value
+ ? classedAdd
+ : classedRemove);
+}
+d3_selectionPrototype.style = function(name, value, priority) {
+ if (arguments.length < 3) priority = "";
- /** @this {Element} */
- function styleNull() {
- this.style.removeProperty(name);
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) return window
+ .getComputedStyle(this.node(), null)
+ .getPropertyValue(name);
- /** @this {Element} */
- function styleConstant() {
- this.style.setProperty(name, value, priority);
- }
+ function styleNull() {
+ this.style.removeProperty(name);
+ }
- /** @this {Element} */
- function styleFunction() {
- var x = value.apply(this, arguments);
- if (x == null) this.style.removeProperty(name);
- else this.style.setProperty(name, x, priority);
- }
+ function styleConstant() {
+ this.style.setProperty(name, value, priority);
+ }
- return groups.each(value == null
- ? styleNull : (typeof value === "function"
- ? styleFunction : styleConstant));
- };
+ function styleFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.style.removeProperty(name);
+ else this.style.setProperty(name, x, priority);
+ }
- groups.property = function(name, value) {
- name = d3.ns.qualify(name);
+ return this.each(value == null
+ ? styleNull : (typeof value === "function"
+ ? styleFunction : styleConstant));
+};
+d3_selectionPrototype.property = function(name, value) {
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- return this[name];
- });
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) return this.node()[name];
- /** @this {Element} */
- function propertyNull() {
- delete this[name];
- }
+ function propertyNull() {
+ delete this[name];
+ }
- /** @this {Element} */
- function propertyConstant() {
- this[name] = value;
- }
+ function propertyConstant() {
+ this[name] = value;
+ }
- /** @this {Element} */
- function propertyFunction() {
- var x = value.apply(this, arguments);
- if (x == null) delete this[name];
- else this[name] = x;
- }
+ function propertyFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) delete this[name];
+ else this[name] = x;
+ }
- return groups.each(value == null
- ? propertyNull : (typeof value === "function"
- ? propertyFunction : propertyConstant));
- };
+ return this.each(value == null
+ ? propertyNull : (typeof value === "function"
+ ? propertyFunction : propertyConstant));
+};
+d3_selectionPrototype.text = function(value) {
+ return arguments.length < 1
+ ? this.node().textContent : this.each(typeof value === "function"
+ ? function() { var v = value.apply(this, arguments); this.textContent = v == null ? "" : v; } : value == null
+ ? function() { this.textContent = ""; }
+ : function() { this.textContent = value; });
+};
+d3_selectionPrototype.html = function(value) {
+ return arguments.length < 1
+ ? this.node().innerHTML : this.each(typeof value === "function"
+ ? function() { var v = value.apply(this, arguments); this.innerHTML = v == null ? "" : v; } : value == null
+ ? function() { this.innerHTML = ""; }
+ : function() { this.innerHTML = value; });
+};
+// TODO append(node)?
+// TODO append(function)?
+d3_selectionPrototype.append = function(name) {
+ name = d3.ns.qualify(name);
- groups.text = function(value) {
+ function append() {
+ return this.appendChild(document.createElementNS(this.namespaceURI, name));
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 1) {
- return first(function() {
- return this.textContent;
- });
- }
+ function appendNS() {
+ return this.appendChild(document.createElementNS(name.space, name.local));
+ }
- /** @this {Element} */
- function textConstant() {
- this.textContent = value;
- }
+ return this.select(name.local ? appendNS : append);
+};
+// TODO insert(node, function)?
+// TODO insert(function, string)?
+// TODO insert(function, function)?
+d3_selectionPrototype.insert = function(name, before) {
+ name = d3.ns.qualify(name);
+
+ function insert() {
+ return this.insertBefore(
+ document.createElementNS(this.namespaceURI, name),
+ d3_select(before, this));
+ }
- /** @this {Element} */
- function textFunction() {
- this.textContent = value.apply(this, arguments);
- }
+ function insertNS() {
+ return this.insertBefore(
+ document.createElementNS(name.space, name.local),
+ d3_select(before, this));
+ }
- return groups.each(typeof value === "function"
- ? textFunction : textConstant);
- };
+ return this.select(name.local ? insertNS : insert);
+};
+// TODO remove(selector)?
+// TODO remove(node)?
+// TODO remove(function)?
+d3_selectionPrototype.remove = function() {
+ return this.each(function() {
+ var parent = this.parentNode;
+ if (parent) parent.removeChild(this);
+ });
+};
+// TODO data(null) for clearing data?
+d3_selectionPrototype.data = function(data, join) {
+ var enter = [],
+ update = [],
+ exit = [];
+
+ function bind(group, groupData) {
+ var i,
+ n = group.length,
+ m = groupData.length,
+ n0 = Math.min(n, m),
+ n1 = Math.max(n, m),
+ updateNodes = [],
+ enterNodes = [],
+ exitNodes = [],
+ node,
+ nodeData;
+
+ if (join) {
+ var nodeByKey = {},
+ keys = [],
+ key,
+ j = groupData.length;
+
+ for (i = -1; ++i < n;) {
+ key = join.call(node = group[i], node.__data__, i);
+ if (key in nodeByKey) {
+ exitNodes[j++] = node; // duplicate key
+ } else {
+ nodeByKey[key] = node;
+ }
+ keys.push(key);
+ }
- groups.html = function(value) {
+ for (i = -1; ++i < m;) {
+ node = nodeByKey[key = join.call(groupData, nodeData = groupData[i], i)];
+ if (node) {
+ node.__data__ = nodeData;
+ updateNodes[i] = node;
+ enterNodes[i] = exitNodes[i] = null;
+ } else {
+ enterNodes[i] = d3_selection_dataNode(nodeData);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ delete nodeByKey[key];
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 1) {
- return first(function() {
- return this.innerHTML;
- });
- }
-
- /** @this {Element} */
- function htmlConstant() {
- this.innerHTML = value;
+ for (i = -1; ++i < n;) {
+ if (keys[i] in nodeByKey) {
+ exitNodes[i] = group[i];
+ }
+ }
+ } else {
+ for (i = -1; ++i < n0;) {
+ node = group[i];
+ nodeData = groupData[i];
+ if (node) {
+ node.__data__ = nodeData;
+ updateNodes[i] = node;
+ enterNodes[i] = exitNodes[i] = null;
+ } else {
+ enterNodes[i] = d3_selection_dataNode(nodeData);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ }
+ for (; i < m; ++i) {
+ enterNodes[i] = d3_selection_dataNode(groupData[i]);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ for (; i < n1; ++i) {
+ exitNodes[i] = group[i];
+ enterNodes[i] = updateNodes[i] = null;
+ }
}
- /** @this {Element} */
- function htmlFunction() {
- this.innerHTML = value.apply(this, arguments);
- }
+ enterNodes.update
+ = updateNodes;
- return groups.each(typeof value === "function"
- ? htmlFunction : htmlConstant);
- };
+ enterNodes.parentNode
+ = updateNodes.parentNode
+ = exitNodes.parentNode
+ = group.parentNode;
- // TODO append(node)?
- // TODO append(function)?
- groups.append = function(name) {
- name = d3.ns.qualify(name);
+ enter.push(enterNodes);
+ update.push(updateNodes);
+ exit.push(exitNodes);
+ }
- function append(node) {
- return node.appendChild(document.createElement(name));
+ var i = -1,
+ n = this.length,
+ group;
+ if (typeof data === "function") {
+ while (++i < n) {
+ bind(group = this[i], data.call(group, group.parentNode.__data__, i));
}
-
- function appendNS(node) {
- return node.appendChild(document.createElementNS(name.space, name.local));
+ } else {
+ while (++i < n) {
+ bind(group = this[i], data);
}
+ }
- return select(name.local ? appendNS : append);
- };
-
- // TODO insert(node, function)?
- // TODO insert(function, string)?
- // TODO insert(function, function)?
- groups.insert = function(name, before) {
- name = d3.ns.qualify(name);
+ var selection = d3_selection(update);
+ selection.enter = function() { return d3_selection_enter(enter); };
+ selection.exit = function() { return d3_selection(exit); };
+ return selection;
+};
- function insert(node) {
- return node.insertBefore(
- document.createElement(name),
- d3_select(before, node));
+function d3_selection_dataNode(data) {
+ return {__data__: data};
+}
+d3_selectionPrototype.filter = function(filter) {
+ var subgroups = [],
+ subgroup,
+ group,
+ node;
+
+ if (typeof filter !== "function") filter = d3_selection_filter(filter);
+
+ for (var j = 0, m = this.length; j < m; j++) {
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = (group = this[j]).parentNode;
+ for (var i = 0, n = group.length; i < n; i++) {
+ if ((node = group[i]) && filter.call(node, node.__data__, i)) {
+ subgroup.push(node);
+ }
}
+ }
- function insertNS(node) {
- return node.insertBefore(
- document.createElementNS(name.space, name.local),
- d3_select(before, node));
- }
+ return d3_selection(subgroups);
+};
- return select(name.local ? insertNS : insert);
+function d3_selection_filter(selector) {
+ return function() {
+ return d3_selectMatches(this, selector);
};
+}
+d3_selectionPrototype.map = function(map) {
+ return this.each(function() {
+ this.__data__ = map.apply(this, arguments);
+ });
+};
+d3_selectionPrototype.order = function() {
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = group.length - 1, next = group[i], node; --i >= 0;) {
+ if (node = group[i]) {
+ if (next) next.parentNode.insertBefore(node, next);
+ next = node;
+ }
+ }
+ }
+ return this;
+};
+d3_selectionPrototype.sort = function(comparator) {
+ comparator = d3_selection_sortComparator.apply(this, arguments);
+ for (var j = -1, m = this.length; ++j < m;) this[j].sort(comparator);
+ return this.order();
+};
- // TODO remove(selector)?
- // TODO remove(node)?
- // TODO remove(function)?
- groups.remove = function() {
- return groups.each(function() {
- var parent = this.parentNode;
- if (parent) parent.removeChild(this);
- });
+function d3_selection_sortComparator(comparator) {
+ if (!arguments.length) comparator = d3.ascending;
+ return function(a, b) {
+ return comparator(a && a.__data__, b && b.__data__);
};
-
- groups.sort = function(comparator) {
- comparator = d3_selection_comparator.apply(this, arguments);
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- group.sort(comparator);
- for (var i = 1, n = group.length, prev = group[0]; i < n; i++) {
- var node = group[i];
- if (node) {
- if (prev) prev.parentNode.insertBefore(node, prev.nextSibling);
- prev = node;
- }
+}
+// type can be namespaced, e.g., "click.foo"
+// listener can be null for removal
+d3_selectionPrototype.on = function(type, listener, capture) {
+ if (arguments.length < 3) capture = false;
+
+ // parse the type specifier
+ var name = "__on" + type, i = type.indexOf(".");
+ if (i > 0) type = type.substring(0, i);
+
+ // if called with only one argument, return the current listener
+ if (arguments.length < 2) return (i = this.node()[name]) && i._;
+
+ // remove the old event listener, and add the new event listener
+ return this.each(function(d, i) {
+ var node = this;
+
+ if (node[name]) node.removeEventListener(type, node[name], capture);
+ if (listener) node.addEventListener(type, node[name] = l, capture);
+
+ // wrapped event listener that preserves i
+ function l(e) {
+ var o = d3.event; // Events can be reentrant (e.g., focus).
+ d3.event = e;
+ try {
+ listener.call(node, node.__data__, i);
+ } finally {
+ d3.event = o;
}
}
- return groups;
- };
-
- // type can be namespaced, e.g., "click.foo"
- // listener can be null for removal
- groups.on = function(type, listener, capture) {
- if (arguments.length < 3) capture = false;
-
- // parse the type specifier
- var i = type.indexOf("."),
- typo = i === -1 ? type : type.substring(0, i),
- name = "__on" + type;
- // remove the old event listener, and add the new event listener
- return groups.each(function(d, i) {
- if (this[name]) this.removeEventListener(typo, this[name], capture);
- if (listener) this.addEventListener(typo, this[name] = l, capture);
-
- // wrapped event listener that preserves i
- var node = this;
- function l(e) {
- var o = d3.event; // Events can be reentrant (e.g., focus).
- d3.event = e;
- try {
- listener.call(this, node.__data__, i);
- } finally {
- d3.event = o;
- }
- }
- });
- };
+ // stash the unwrapped listener for retrieval
+ l._ = listener;
+ });
+};
+d3_selectionPrototype.each = function(callback) {
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ var node = group[i];
+ if (node) callback.call(node, node.__data__, i, j);
+ }
+ }
+ return this;
+};
+//
+// Note: assigning to the arguments array simultaneously changes the value of
+// the corresponding argument!
+//
+// TODO The `this` argument probably shouldn't be the first argument to the
+// callback, anyway, since it's redundant. However, that will require a major
+// version bump due to backwards compatibility, so I'm not changing it right
+// away.
+//
+d3_selectionPrototype.call = function(callback) {
+ callback.apply(this, (arguments[0] = this, arguments));
+ return this;
+};
+d3_selectionPrototype.empty = function() {
+ return !this.node();
+};
+d3_selectionPrototype.node = function(callback) {
+ for (var j = 0, m = this.length; j < m; j++) {
+ for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+ var node = group[i];
+ if (node) return node;
+ }
+ }
+ return null;
+};
+d3_selectionPrototype.transition = function() {
+ var subgroups = [],
+ subgroup,
+ node;
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ subgroup.push((node = group[i]) ? {node: node, delay: 0, duration: 250} : null);
+ }
+ }
- // TODO slice?
+ return d3_transition(subgroups, d3_transitionInheritId || ++d3_transitionId, Date.now());
+};
+var d3_selectionRoot = d3_selection([[document]]);
- groups.transition = function() {
- return d3_transition(groups);
- };
+d3_selectionRoot[0].parentNode = d3_selectRoot;
- groups.call = d3_call;
+// TODO fast singleton implementation!
+// TODO select(function)
+d3.select = function(selector) {
+ return typeof selector === "string"
+ ? d3_selectionRoot.select(selector)
+ : d3_selection([[selector]]); // assume node
+};
- return groups;
+// TODO selectAll(function)
+d3.selectAll = function(selector) {
+ return typeof selector === "string"
+ ? d3_selectionRoot.selectAll(selector)
+ : d3_selection([d3_array(selector)]); // assume node[]
+};
+function d3_selection_enter(selection) {
+ d3_arraySubclass(selection, d3_selection_enterPrototype);
+ return selection;
}
-function d3_selectionEnter(groups) {
-
- function select(select) {
- var subgroups = [],
- subgroup,
- subnode,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroup.push(subnode = select(group.parentNode));
- subnode.__data__ = node.__data__;
- } else {
- subgroup.push(null);
- }
+var d3_selection_enterPrototype = [];
+
+d3_selection_enterPrototype.append = d3_selectionPrototype.append;
+d3_selection_enterPrototype.insert = d3_selectionPrototype.insert;
+d3_selection_enterPrototype.empty = d3_selectionPrototype.empty;
+d3_selection_enterPrototype.node = d3_selectionPrototype.node;
+d3_selection_enterPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ upgroup,
+ group,
+ node;
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ upgroup = (group = this[j]).update;
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = group.parentNode;
+ for (var i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroup.push(upgroup[i] = subnode = selector.call(group.parentNode, node.__data__, i));
+ subnode.__data__ = node.__data__;
+ } else {
+ subgroup.push(null);
}
}
- return d3_selection(subgroups);
}
- // TODO append(node)?
- // TODO append(function)?
- groups.append = function(name) {
- name = d3.ns.qualify(name);
-
- function append(node) {
- return node.appendChild(document.createElement(name));
- }
-
- function appendNS(node) {
- return node.appendChild(document.createElementNS(name.space, name.local));
- }
-
- return select(name.local ? appendNS : append);
- };
+ return d3_selection(subgroups);
+};
+function d3_transition(groups, id, time) {
+ d3_arraySubclass(groups, d3_transitionPrototype);
- // TODO insert(node, function)?
- // TODO insert(function, string)?
- // TODO insert(function, function)?
- groups.insert = function(name, before) {
- name = d3.ns.qualify(name);
+ var tweens = {},
+ event = d3.dispatch("start", "end"),
+ ease = d3_transitionEase;
- function insert(node) {
- return node.insertBefore(
- document.createElement(name),
- d3_select(before, node));
- }
+ groups.id = id;
- function insertNS(node) {
- return node.insertBefore(
- document.createElementNS(name.space, name.local),
- d3_select(before, node));
- }
+ groups.time = time;
- return select(name.local ? insertNS : insert);
+ groups.tween = function(name, tween) {
+ if (arguments.length < 2) return tweens[name];
+ if (tween == null) delete tweens[name];
+ else tweens[name] = tween;
+ return groups;
};
- return groups;
-}
+ groups.ease = function(value) {
+ if (!arguments.length) return ease;
+ ease = typeof value === "function" ? value : d3.ease.apply(d3, arguments);
+ return groups;
+ };
-function d3_selection_comparator(comparator) {
- if (!arguments.length) comparator = d3.ascending;
- return function(a, b) {
- return comparator(a && a.__data__, b && b.__data__);
+ groups.each = function(type, listener) {
+ if (arguments.length < 2) return d3_transition_each.call(groups, type);
+ event.on(type, listener);
+ return groups;
};
-}
-function d3_selection_enterNode(data) {
- return {__data__: data};
-}
-d3.transition = d3_root.transition;
+ d3.timer(function(elapsed) {
+ groups.each(function(d, i, j) {
+ var tweened = [],
+ node = this,
+ delay = groups[j][i].delay,
+ duration = groups[j][i].duration,
+ lock = node.__transition__ || (node.__transition__ = {active: 0, count: 0});
-var d3_transitionId = 0,
- d3_transitionInheritId = 0;
+ ++lock.count;
-function d3_transition(groups) {
- var transition = {},
- transitionId = d3_transitionInheritId || ++d3_transitionId,
- tweens = {},
- interpolators = [],
- remove = false,
- event = d3.dispatch("start", "end"),
- stage = [],
- delay = [],
- duration = [],
- durationMax,
- ease = d3.ease("cubic-in-out");
-
- //
- // Be careful with concurrent transitions!
- //
- // Say transition A causes an exit. Before A finishes, a transition B is
- // created, and believes it only needs to do an update, because the elements
- // haven't been removed yet (which happens at the very end of the exit
- // transition).
- //
- // Even worse, what if either transition A or B has a staggered delay? Then,
- // some elements may be removed, while others remain. Transition B does not
- // know to enter the elements because they were still present at the time
- // the transition B was created (but not yet started).
- //
- // To prevent such confusion, we only trigger end events for transitions if
- // the transition ending is the only one scheduled for the given element.
- // Similarly, we only allow one transition to be active for any given
- // element, so that concurrent transitions do not overwrite each other's
- // properties.
- //
- // TODO Support transition namespaces, so that transitions can proceed
- // concurrently on the same element if needed. Hopefully, this is rare!
- //
-
- groups.each(function() {
- (this.__transition__ || (this.__transition__ = {})).owner = transitionId;
- });
+ delay <= elapsed ? start(elapsed) : d3.timer(start, delay, time);
- function step(elapsed) {
- var clear = true,
- k = -1;
- groups.each(function() {
- if (stage[++k] === 2) return; // ended
- var t = (elapsed - delay[k]) / duration[k],
- tx = this.__transition__,
- te, // ease(t)
- tk, // tween key
- ik = interpolators[k];
-
- // Check if the (un-eased) time is outside the range [0,1].
- if (t < 1) {
- clear = false;
- if (t < 0) return;
- } else {
- t = 1;
- }
+ function start(elapsed) {
+ if (lock.active > id) return stop();
+ lock.active = id;
- // Determine the stage of this transition.
- // 0 - Not yet started.
- // 1 - In progress.
- // 2 - Ended.
- if (stage[k]) {
- if (!tx || tx.active !== transitionId) {
- stage[k] = 2;
- return;
- }
- } else if (!tx || tx.active > transitionId) {
- stage[k] = 2;
- return;
- } else {
- stage[k] = 1;
- event.start.dispatch.apply(this, arguments);
- ik = interpolators[k] = {};
- tx.active = transitionId;
- for (tk in tweens) {
- if (te = tweens[tk].apply(this, arguments)) {
- ik[tk] = te;
+ for (var tween in tweens) {
+ if (tween = tweens[tween].call(node, d, i)) {
+ tweened.push(tween);
}
}
+
+ event.start.call(node, d, i);
+ if (!tick(elapsed)) d3.timer(tick, 0, time);
+ return 1;
}
- // Apply the interpolators!
- te = ease(t);
- for (tk in ik) ik[tk].call(this, te);
-
- // Handle ending transitions.
- if (t === 1) {
- stage[k] = 2;
- if (tx.active === transitionId) {
- var owner = tx.owner;
- if (owner === transitionId) {
- delete this.__transition__;
- if (remove && this.parentNode) this.parentNode.removeChild(this);
- }
- d3_transitionInheritId = transitionId;
- event.end.dispatch.apply(this, arguments);
+ function tick(elapsed) {
+ if (lock.active !== id) return stop();
+
+ var t = (elapsed - delay) / duration,
+ e = ease(t),
+ n = tweened.length;
+
+ while (n > 0) {
+ tweened[--n].call(node, e);
+ }
+
+ if (t >= 1) {
+ stop();
+ d3_transitionInheritId = id;
+ event.end.call(node, d, i);
d3_transitionInheritId = 0;
- tx.owner = owner;
+ return 1;
}
}
- });
- return clear;
- }
- transition.delay = function(value) {
- var delayMin = Infinity,
- k = -1;
- if (typeof value === "function") {
- groups.each(function(d, i) {
- var x = delay[++k] = +value.apply(this, arguments);
- if (x < delayMin) delayMin = x;
- });
- } else {
- delayMin = +value;
- groups.each(function(d, i) {
- delay[++k] = delayMin;
- });
- }
- d3_timer(step, delayMin);
- return transition;
- };
-
- transition.duration = function(value) {
- var k = -1;
- if (typeof value === "function") {
- durationMax = 0;
- groups.each(function(d, i) {
- var x = duration[++k] = +value.apply(this, arguments);
- if (x > durationMax) durationMax = x;
- });
- } else {
- durationMax = +value;
- groups.each(function(d, i) {
- duration[++k] = durationMax;
- });
- }
- return transition;
- };
+ function stop() {
+ if (!--lock.count) delete node.__transition__;
+ return 1;
+ }
+ });
+ return 1;
+ }, 0, time);
- transition.ease = function(value) {
- ease = typeof value === "function" ? value : d3.ease.apply(d3, arguments);
- return transition;
- };
+ return groups;
+}
- transition.attrTween = function(name, tween) {
+var d3_transitionRemove = {};
- /** @this {Element} */
- function attrTween(d, i) {
- var f = tween.call(this, d, i, this.getAttribute(name));
- return f && function(t) {
- this.setAttribute(name, f(t));
- };
- }
+function d3_transitionNull(d, i, a) {
+ return a != "" && d3_transitionRemove;
+}
- /** @this {Element} */
- function attrTweenNS(d, i) {
- var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
- return f && function(t) {
- this.setAttributeNS(name.space, name.local, f(t));
- };
- }
+function d3_transitionTween(name, b) {
+ var interpolate = d3_interpolateByName(name);
- tweens["attr." + name] = name.local ? attrTweenNS : attrTween;
- return transition;
- };
+ function transitionFunction(d, i, a) {
+ var v = b.call(this, d, i);
+ return v == null
+ ? a != "" && d3_transitionRemove
+ : a != v && interpolate(a, v);
+ }
- transition.attr = function(name, value) {
- return transition.attrTween(name, d3_transitionTween(value));
- };
+ function transitionString(d, i, a) {
+ return a != b && interpolate(a, b);
+ }
- transition.styleTween = function(name, tween, priority) {
- if (arguments.length < 3) priority = null;
+ return typeof b === "function" ? transitionFunction
+ : b == null ? d3_transitionNull
+ : (b += "", transitionString);
+}
- /** @this {Element} */
- function styleTween(d, i) {
- var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
- return f && function(t) {
- this.style.setProperty(name, f(t), priority);
- };
- }
+var d3_transitionPrototype = [],
+ d3_transitionId = 0,
+ d3_transitionInheritId = 0,
+ d3_transitionEase = d3.ease("cubic-in-out");
- tweens["style." + name] = styleTween;
- return transition;
- };
+d3_transitionPrototype.call = d3_selectionPrototype.call;
- transition.style = function(name, value, priority) {
- if (arguments.length < 3) priority = null;
- return transition.styleTween(name, d3_transitionTween(value), priority);
- };
+d3.transition = function() {
+ return d3_selectionRoot.transition();
+};
- transition.text = function(value) {
- tweens.text = function(d, i) {
- this.textContent = typeof value === "function"
- ? value.call(this, d, i)
- : value;
- };
- return transition;
- };
+d3.transition.prototype = d3_transitionPrototype;
+d3_transitionPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selector(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if ((node = group[i]) && (subnode = selector.call(node.node, node.node.__data__, i))) {
+ if ("__data__" in node.node) subnode.__data__ = node.node.__data__;
+ subgroup.push({node: subnode, delay: node.delay, duration: node.duration});
+ } else {
+ subgroup.push(null);
+ }
+ }
+ }
- transition.select = function(query) {
- var k, t = d3_transition(groups.select(query)).ease(ease);
- k = -1; t.delay(function(d, i) { return delay[++k]; });
- k = -1; t.duration(function(d, i) { return duration[++k]; });
- return t;
- };
+ return d3_transition(subgroups, this.id, this.time).ease(this.ease());
+};
+d3_transitionPrototype.selectAll = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnodes,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selectorAll(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subnodes = selector.call(node.node, node.node.__data__, i);
+ subgroups.push(subgroup = []);
+ for (var k = -1, o = subnodes.length; ++k < o;) {
+ subgroup.push({node: subnodes[k], delay: node.delay, duration: node.duration});
+ }
+ }
+ }
+ }
- transition.selectAll = function(query) {
- var k, t = d3_transition(groups.selectAll(query)).ease(ease);
- k = -1; t.delay(function(d, i) { return delay[i ? k : ++k]; })
- k = -1; t.duration(function(d, i) { return duration[i ? k : ++k]; });
- return t;
- };
+ return d3_transition(subgroups, this.id, this.time).ease(this.ease());
+};
+d3_transitionPrototype.attr = function(name, value) {
+ return this.attrTween(name, d3_transitionTween(name, value));
+};
- transition.remove = function() {
- remove = true;
- return transition;
- };
+d3_transitionPrototype.attrTween = function(nameNS, tween) {
+ var name = d3.ns.qualify(nameNS);
- transition.each = function(type, listener) {
- event[type].add(listener);
- return transition;
- };
+ function attrTween(d, i) {
+ var f = tween.call(this, d, i, this.getAttribute(name));
+ return f === d3_transitionRemove
+ ? (this.removeAttribute(name), null)
+ : f && function(t) { this.setAttribute(name, f(t)); };
+ }
- transition.call = d3_call;
+ function attrTweenNS(d, i) {
+ var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
+ return f === d3_transitionRemove
+ ? (this.removeAttributeNS(name.space, name.local), null)
+ : f && function(t) { this.setAttributeNS(name.space, name.local, f(t)); };
+ }
- return transition.delay(0).duration(250);
-}
+ return this.tween("attr." + nameNS, name.local ? attrTweenNS : attrTween);
+};
+d3_transitionPrototype.style = function(name, value, priority) {
+ if (arguments.length < 3) priority = "";
+ return this.styleTween(name, d3_transitionTween(name, value), priority);
+};
-function d3_transitionTween(b) {
- return typeof b === "function"
- ? function(d, i, a) { var v = b.call(this, d, i) + ""; return a != v && d3.interpolate(a, v); }
- : (b = b + "", function(d, i, a) { return a != b && d3.interpolate(a, b); });
+d3_transitionPrototype.styleTween = function(name, tween, priority) {
+ if (arguments.length < 3) priority = "";
+ return this.tween("style." + name, function(d, i) {
+ var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
+ return f === d3_transitionRemove
+ ? (this.style.removeProperty(name), null)
+ : f && function(t) { this.style.setProperty(name, f(t), priority); };
+ });
+};
+d3_transitionPrototype.text = function(value) {
+ return this.tween("text", function(d, i) {
+ this.textContent = typeof value === "function"
+ ? value.call(this, d, i)
+ : value;
+ });
+};
+d3_transitionPrototype.remove = function() {
+ return this.each("end", function() {
+ var p;
+ if (!this.__transition__ && (p = this.parentNode)) p.removeChild(this);
+ });
+};
+d3_transitionPrototype.delay = function(value) {
+ var groups = this;
+ return groups.each(typeof value === "function"
+ ? function(d, i, j) { groups[j][i].delay = +value.apply(this, arguments); }
+ : (value = +value, function(d, i, j) { groups[j][i].delay = value; }));
+};
+d3_transitionPrototype.duration = function(value) {
+ var groups = this;
+ return groups.each(typeof value === "function"
+ ? function(d, i, j) { groups[j][i].duration = +value.apply(this, arguments); }
+ : (value = +value, function(d, i, j) { groups[j][i].duration = value; }));
+};
+function d3_transition_each(callback) {
+ for (var j = 0, m = this.length; j < m; j++) {
+ for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+ var node = group[i];
+ if (node) callback.call(node = node.node, node.__data__, i, j);
+ }
+ }
+ return this;
}
+d3_transitionPrototype.transition = function() {
+ return this.select(d3_this);
+};
var d3_timer_queue = null,
d3_timer_interval, // is an interval (or frame) active?
d3_timer_timeout; // is a timeout active?
// The timer will continue to fire until callback returns true.
-d3.timer = function(callback) {
- d3_timer(callback, 0);
-};
-
-function d3_timer(callback, delay) {
- var now = Date.now(),
- found = false,
+d3.timer = function(callback, delay, then) {
+ var found = false,
t0,
t1 = d3_timer_queue;
- if (!isFinite(delay)) return;
+ if (arguments.length < 3) {
+ if (arguments.length < 2) delay = 0;
+ else if (!isFinite(delay)) return;
+ then = Date.now();
+ }
// See if the callback's already in the queue.
while (t1) {
if (t1.callback === callback) {
- t1.then = now;
+ t1.then = then;
t1.delay = delay;
found = true;
break;
@@ -2105,7 +2205,7 @@ function d3_timer(callback, delay) {
// Otherwise, add the callback to the queue.
if (!found) d3_timer_queue = {
callback: callback,
- then: now,
+ then: then,
delay: delay,
next: d3_timer_queue
};
@@ -2125,7 +2225,7 @@ function d3_timer_step() {
while (t1) {
elapsed = now - t1.then;
- if (elapsed > t1.delay) t1.flush = t1.callback(elapsed);
+ if (elapsed >= t1.delay) t1.flush = t1.callback(elapsed);
t1 = t1.next;
}
@@ -2178,6 +2278,66 @@ var d3_timer_frame = window.requestAnimationFrame
|| window.oRequestAnimationFrame
|| window.msRequestAnimationFrame
|| function(callback) { setTimeout(callback, 17); };
+d3.transform = function(string) {
+ var g = document.createElementNS(d3.ns.prefix.svg, "g"),
+ identity = {a: 1, b: 0, c: 0, d: 1, e: 0, f: 0};
+ return (d3.transform = function(string) {
+ g.setAttribute("transform", string);
+ var t = g.transform.baseVal.consolidate();
+ return new d3_transform(t ? t.matrix : identity);
+ })(string);
+};
+
+// Compute x-scale and normalize the first row.
+// Compute shear and make second row orthogonal to first.
+// Compute y-scale and normalize the second row.
+// Finally, compute the rotation.
+function d3_transform(m) {
+ var r0 = [m.a, m.b],
+ r1 = [m.c, m.d],
+ kx = d3_transformNormalize(r0),
+ kz = d3_transformDot(r0, r1),
+ ky = d3_transformNormalize(d3_transformCombine(r1, r0, -kz)) || 0;
+ if (r0[0] * r1[1] < r1[0] * r0[1]) {
+ r0[0] *= -1;
+ r0[1] *= -1;
+ kx *= -1;
+ kz *= -1;
+ }
+ this.rotate = (kx ? Math.atan2(r0[1], r0[0]) : Math.atan2(-r1[0], r1[1])) * d3_transformDegrees;
+ this.translate = [m.e, m.f];
+ this.scale = [kx, ky];
+ this.skew = ky ? Math.atan2(kz, ky) * d3_transformDegrees : 0;
+};
+
+d3_transform.prototype.toString = function() {
+ return "translate(" + this.translate
+ + ")rotate(" + this.rotate
+ + ")skewX(" + this.skew
+ + ")scale(" + this.scale
+ + ")";
+};
+
+function d3_transformDot(a, b) {
+ return a[0] * b[0] + a[1] * b[1];
+}
+
+function d3_transformNormalize(a) {
+ var k = Math.sqrt(d3_transformDot(a, a));
+ if (k) {
+ a[0] /= k;
+ a[1] /= k;
+ }
+ return k;
+}
+
+function d3_transformCombine(a, b, k) {
+ a[0] += k * b[0];
+ a[1] += k * b[1];
+ return a;
+}
+
+var d3_transformDegrees = 180 / Math.PI;
function d3_noop() {}
d3.scale = {};
@@ -2185,6 +2345,10 @@ function d3_scaleExtent(domain) {
var start = domain[0], stop = domain[domain.length - 1];
return start < stop ? [start, stop] : [stop, start];
}
+
+function d3_scaleRange(scale) {
+ return scale.rangeExtent ? scale.rangeExtent() : d3_scaleExtent(scale.range());
+}
function d3_scale_nice(domain, nice) {
var i0 = 0,
i1 = domain.length - 1,
@@ -2197,9 +2361,12 @@ function d3_scale_nice(domain, nice) {
dx = x0; x0 = x1; x1 = dx;
}
- nice = nice(x1 - x0);
- domain[i0] = nice.floor(x0);
- domain[i1] = nice.ceil(x1);
+ if (dx = x1 - x0) {
+ nice = nice(dx);
+ domain[i0] = nice.floor(x0);
+ domain[i1] = nice.ceil(x1);
+ }
+
return domain;
}
@@ -2207,11 +2374,11 @@ function d3_scale_niceDefault() {
return Math;
}
d3.scale.linear = function() {
- var domain = [0, 1],
- range = [0, 1],
- interpolate = d3.interpolate,
- clamp = false,
- output,
+ return d3_scale_linear([0, 1], [0, 1], d3.interpolate, false);
+};
+
+function d3_scale_linear(domain, range, interpolate, clamp) {
+ var output,
input;
function rescale() {
@@ -2272,15 +2439,15 @@ d3.scale.linear = function() {
return rescale();
};
+ scale.copy = function() {
+ return d3_scale_linear(domain, range, interpolate, clamp);
+ };
+
return rescale();
};
function d3_scale_linearRebind(scale, linear) {
- scale.range = d3.rebind(scale, linear.range);
- scale.rangeRound = d3.rebind(scale, linear.rangeRound);
- scale.interpolate = d3.rebind(scale, linear.interpolate);
- scale.clamp = d3.rebind(scale, linear.clamp);
- return scale;
+ return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
}
function d3_scale_linearNice(dx) {
@@ -2341,9 +2508,11 @@ function d3_scale_polylinear(domain, range, uninterpolate, interpolate) {
};
}
d3.scale.log = function() {
- var linear = d3.scale.linear(),
- log = d3_scale_log,
- pow = log.pow;
+ return d3_scale_log(d3.scale.linear(), d3_scale_logp);
+};
+
+function d3_scale_log(linear, log) {
+ var pow = log.pow;
function scale(x) {
return linear(log(x));
@@ -2355,7 +2524,7 @@ d3.scale.log = function() {
scale.domain = function(x) {
if (!arguments.length) return linear.domain().map(pow);
- log = x[0] < 0 ? d3_scale_logn : d3_scale_log;
+ log = x[0] < 0 ? d3_scale_logn : d3_scale_logp;
pow = log.pow;
linear.domain(x.map(log));
return scale;
@@ -2388,14 +2557,27 @@ d3.scale.log = function() {
return ticks;
};
- scale.tickFormat = function() {
- return d3_scale_logTickFormat;
+ scale.tickFormat = function(n, format) {
+ if (arguments.length < 2) format = d3_scale_logFormat;
+ if (arguments.length < 1) return format;
+ var k = n / scale.ticks().length,
+ f = log === d3_scale_logn ? (e = -1e-12, Math.floor) : (e = 1e-12, Math.ceil),
+ e;
+ return function(d) {
+ return d / pow(f(log(d) + e)) < k ? format(d) : "";
+ };
+ };
+
+ scale.copy = function() {
+ return d3_scale_log(linear.copy(), log);
};
return d3_scale_linearRebind(scale, linear);
};
-function d3_scale_log(x) {
+var d3_scale_logFormat = d3.format(".0e");
+
+function d3_scale_logp(x) {
return Math.log(x) / Math.LN10;
}
@@ -2403,22 +2585,20 @@ function d3_scale_logn(x) {
return -Math.log(-x) / Math.LN10;
}
-d3_scale_log.pow = function(x) {
+d3_scale_logp.pow = function(x) {
return Math.pow(10, x);
};
d3_scale_logn.pow = function(x) {
return -Math.pow(10, -x);
};
-
-function d3_scale_logTickFormat(d) {
- return d.toPrecision(1);
-}
d3.scale.pow = function() {
- var linear = d3.scale.linear(),
- exponent = 1,
- powp = Number,
- powb = powp;
+ return d3_scale_pow(d3.scale.linear(), 1);
+};
+
+function d3_scale_pow(linear, exponent) {
+ var powp = d3_scale_powPow(exponent),
+ powb = d3_scale_powPow(1 / exponent);
function scale(x) {
return linear(powp(x));
@@ -2430,8 +2610,6 @@ d3.scale.pow = function() {
scale.domain = function(x) {
if (!arguments.length) return linear.domain().map(powb);
- powp = d3_scale_powPow(exponent);
- powb = d3_scale_powPow(1 / exponent);
linear.domain(x.map(powp));
return scale;
};
@@ -2451,10 +2629,15 @@ d3.scale.pow = function() {
scale.exponent = function(x) {
if (!arguments.length) return exponent;
var domain = scale.domain();
- exponent = x;
+ powp = d3_scale_powPow(exponent = x);
+ powb = d3_scale_powPow(1 / exponent);
return scale.domain(domain);
};
+ scale.copy = function() {
+ return d3_scale_pow(linear.copy(), exponent);
+ };
+
return d3_scale_linearRebind(scale, linear);
};
@@ -2467,73 +2650,69 @@ d3.scale.sqrt = function() {
return d3.scale.pow().exponent(.5);
};
d3.scale.ordinal = function() {
- var domain = [],
- index = {},
- range = [],
- rangeBand = 0,
- rerange = d3_noop;
+ return d3_scale_ordinal([], {t: "range", x: []});
+};
+
+function d3_scale_ordinal(domain, ranger) {
+ var index,
+ range,
+ rangeBand;
function scale(x) {
- var i = x in index ? index[x] : (index[x] = domain.push(x) - 1);
- return range[i % range.length];
+ return range[((index[x] || (index[x] = domain.push(x))) - 1) % range.length];
+ }
+
+ function steps(start, step) {
+ return d3.range(domain.length).map(function(i) { return start + step * i; });
}
scale.domain = function(x) {
if (!arguments.length) return domain;
- domain = x;
+ domain = [];
index = {};
- var i = -1, j = -1, n = domain.length; while (++i < n) {
- x = domain[i];
- if (!(x in index)) index[x] = ++j;
- }
- rerange();
- return scale;
+ var i = -1, n = x.length, xi;
+ while (++i < n) if (!index[xi = x[i]]) index[xi] = domain.push(xi);
+ return scale[ranger.t](ranger.x, ranger.p);
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- rerange = d3_noop;
+ rangeBand = 0;
+ ranger = {t: "range", x: x};
return scale;
};
scale.rangePoints = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- step = (stop - start) / (domain.length - 1 + padding);
- range = domain.length == 1
- ? [(start + stop) / 2]
- : d3.range(start + step * padding / 2, stop + step / 2, step);
- rangeBand = 0;
- })();
+ var start = x[0],
+ stop = x[1],
+ step = (stop - start) / (domain.length - 1 + padding);
+ range = steps(domain.length < 2 ? (start + stop) / 2 : start + step * padding / 2, step);
+ rangeBand = 0;
+ ranger = {t: "rangePoints", x: x, p: padding};
return scale;
};
scale.rangeBands = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- step = (stop - start) / (domain.length + padding);
- range = d3.range(start + step * padding, stop, step);
- rangeBand = step * (1 - padding);
- })();
+ var start = x[0],
+ stop = x[1],
+ step = (stop - start) / (domain.length + padding);
+ range = steps(start + step * padding, step);
+ rangeBand = step * (1 - padding);
+ ranger = {t: "rangeBands", x: x, p: padding};
return scale;
};
scale.rangeRoundBands = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- diff = stop - start,
- step = Math.floor(diff / (domain.length + padding)),
- err = diff - (domain.length - padding) * step;
- range = d3.range(start + Math.round(err / 2), stop, step);
- rangeBand = Math.round(step * (1 - padding));
- })();
+ var start = x[0],
+ stop = x[1],
+ step = Math.floor((stop - start) / (domain.length + padding));
+ range = steps(start + Math.round((stop - start - (domain.length - padding) * step) / 2), step);
+ rangeBand = Math.round(step * (1 - padding));
+ ranger = {t: "rangeRoundBands", x: x, p: padding};
return scale;
};
@@ -2541,7 +2720,15 @@ d3.scale.ordinal = function() {
return rangeBand;
};
- return scale;
+ scale.rangeExtent = function() {
+ return ranger.t === "range" ? d3_scaleExtent(ranger.x) : ranger.x;
+ };
+
+ scale.copy = function() {
+ return d3_scale_ordinal(domain, ranger);
+ };
+
+ return scale.domain(domain);
};
/*
* This product includes color specifications and designs developed by Cynthia
@@ -2598,16 +2785,19 @@ var d3_category20c = [
"#636363", "#969696", "#bdbdbd", "#d9d9d9"
];
d3.scale.quantile = function() {
- var domain = [],
- range = [],
- thresholds = [];
+ return d3_scale_quantile([], []);
+};
+
+function d3_scale_quantile(domain, range) {
+ var thresholds;
function rescale() {
var k = 0,
n = domain.length,
q = range.length;
- thresholds.length = Math.max(0, q - 1);
+ thresholds = [];
while (++k < q) thresholds[k - 1] = d3.quantile(domain, k / q);
+ return scale;
}
function scale(x) {
@@ -2618,51 +2808,60 @@ d3.scale.quantile = function() {
scale.domain = function(x) {
if (!arguments.length) return domain;
domain = x.filter(function(d) { return !isNaN(d); }).sort(d3.ascending);
- rescale();
- return scale;
+ return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- rescale();
- return scale;
+ return rescale();
};
scale.quantiles = function() {
return thresholds;
};
- return scale;
+ scale.copy = function() {
+ return d3_scale_quantile(domain, range); // copy on write!
+ };
+
+ return rescale();
};
d3.scale.quantize = function() {
- var x0 = 0,
- x1 = 1,
- kx = 2,
- i = 1,
- range = [0, 1];
+ return d3_scale_quantize(0, 1, [0, 1]);
+};
+
+function d3_scale_quantize(x0, x1, range) {
+ var kx, i;
function scale(x) {
return range[Math.max(0, Math.min(i, Math.floor(kx * (x - x0))))];
}
- scale.domain = function(x) {
- if (!arguments.length) return [x0, x1];
- x0 = x[0];
- x1 = x[1];
+ function rescale() {
kx = range.length / (x1 - x0);
+ i = range.length - 1;
return scale;
+ }
+
+ scale.domain = function(x) {
+ if (!arguments.length) return [x0, x1];
+ x0 = +x[0];
+ x1 = +x[x.length - 1];
+ return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- kx = range.length / (x1 - x0);
- i = range.length - 1;
- return scale;
+ return rescale();
+ };
+
+ scale.copy = function() {
+ return d3_scale_quantize(x0, x1, range); // copy on write
};
- return scale;
+ return rescale();
};
d3.svg = {};
d3.svg.arc = function() {
@@ -2676,7 +2875,7 @@ d3.svg.arc = function() {
r1 = outerRadius.apply(this, arguments),
a0 = startAngle.apply(this, arguments) + d3_svg_arcOffset,
a1 = endAngle.apply(this, arguments) + d3_svg_arcOffset,
- da = a1 - a0,
+ da = (a1 < a0 && (da = a0, a0 = a1, a1 = da), a1 - a0),
df = da < Math.PI ? "0" : "1",
c0 = Math.cos(a0),
s0 = Math.sin(a0),
@@ -2688,8 +2887,8 @@ d3.svg.arc = function() {
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
+ "M0," + r0
- + "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
- + "A" + r0 + "," + r0 + " 0 1,1 0," + r0
+ + "A" + r0 + "," + r0 + " 0 1,0 0," + (-r0)
+ + "A" + r0 + "," + r0 + " 0 1,0 0," + r0
+ "Z"
: "M0," + r1
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
@@ -2855,33 +3054,30 @@ var d3_svg_lineInterpolators = {
// Linear interpolation; generates "L" commands.
function d3_svg_lineLinear(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("L", (p = points[i])[0], ",", p[1]);
return path.join("");
}
// Step interpolation; generates "H" and "V" commands.
function d3_svg_lineStepBefore(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("V", (p = points[i])[1], "H", p[0]);
return path.join("");
}
// Step interpolation; generates "H" and "V" commands.
function d3_svg_lineStepAfter(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("H", (p = points[i])[0], "V", p[1]);
return path.join("");
}
@@ -2979,15 +3175,14 @@ function d3_svg_lineCardinalTangents(points, tension) {
// B-spline interpolation; generates "C" commands.
function d3_svg_lineBasis(points) {
if (points.length < 3) return d3_svg_lineLinear(points);
- var path = [],
- i = 1,
+ var i = 1,
n = points.length,
pi = points[0],
x0 = pi[0],
y0 = pi[1],
px = [x0, x0, x0, (pi = points[1])[0]],
- py = [y0, y0, y0, pi[1]];
- path.push(x0, ",", y0);
+ py = [y0, y0, y0, pi[1]],
+ path = [x0, ",", y0];
d3_svg_lineBasisBezier(path, px, py);
while (++i < n) {
pi = points[i];
@@ -3206,16 +3401,17 @@ function d3_svg_area(projection) {
x1 = d3_svg_lineX,
y0 = 0,
y1 = d3_svg_lineY,
- interpolate = "linear",
- interpolator = d3_svg_lineInterpolators[interpolate],
+ interpolate,
+ i0,
+ i1,
tension = .7;
function area(d) {
if (d.length < 1) return null;
var points0 = d3_svg_linePoints(this, d, x0, y0),
points1 = d3_svg_linePoints(this, d, x0 === x1 ? d3_svg_areaX(points0) : x1, y0 === y1 ? d3_svg_areaY(points0) : y1);
- return "M" + interpolator(projection(points1), tension)
- + "L" + interpolator(projection(points0.reverse()), tension)
+ return "M" + i0(projection(points1), tension)
+ + "L" + i1(projection(points0.reverse()), tension)
+ "Z";
}
@@ -3257,7 +3453,8 @@ function d3_svg_area(projection) {
area.interpolate = function(x) {
if (!arguments.length) return interpolate;
- interpolator = d3_svg_lineInterpolators[interpolate = x];
+ i0 = d3_svg_lineInterpolators[interpolate = x];
+ i1 = i0.reverse || i0;
return area;
};
@@ -3267,9 +3464,12 @@ function d3_svg_area(projection) {
return area;
};
- return area;
+ return area.interpolate("linear");
}
+d3_svg_lineStepBefore.reverse = d3_svg_lineStepAfter;
+d3_svg_lineStepAfter.reverse = d3_svg_lineStepBefore;
+
d3.svg.area = function() {
return d3_svg_area(Object);
};
@@ -3308,10 +3508,10 @@ d3.svg.chord = function() {
var s = subgroup(this, source, d, i),
t = subgroup(this, target, d, i);
return "M" + s.p0
- + arc(s.r, s.p1) + (equals(s, t)
+ + arc(s.r, s.p1, s.a1 - s.a0) + (equals(s, t)
? curve(s.r, s.p1, s.r, s.p0)
: curve(s.r, s.p1, t.r, t.p0)
- + arc(t.r, t.p1)
+ + arc(t.r, t.p1, t.a1 - t.a0)
+ curve(t.r, t.p1, s.r, s.p0))
+ "Z";
}
@@ -3334,8 +3534,8 @@ d3.svg.chord = function() {
return a.a0 == b.a0 && a.a1 == b.a1;
}
- function arc(r, p) {
- return "A" + r + "," + r + " 0 0,1 " + p;
+ function arc(r, p, a) {
+ return "A" + r + "," + r + " 0 " + +(a > Math.PI) + ",1 " + p;
}
function curve(r0, p0, r1, p1) {
@@ -3465,7 +3665,7 @@ function d3_svg_mousePoint(container, e) {
var point = (container.ownerSVGElement || container).createSVGPoint();
if ((d3_mouse_bug44083 < 0) && (window.scrollX || window.scrollY)) {
var svg = d3.select(document.body)
- .append("svg:svg")
+ .append("svg")
.style("position", "absolute")
.style("top", 0)
.style("left", 0);
@@ -3483,8 +3683,9 @@ function d3_svg_mousePoint(container, e) {
point = point.matrixTransform(container.getScreenCTM().inverse());
return [point.x, point.y];
};
-d3.svg.touches = function(container) {
- var touches = d3.event.touches;
+d3.svg.touches = function(container, touches) {
+ if (arguments.length < 2) touches = d3.event.touches;
+
return touches ? d3_array(touches).map(function(touch) {
var point = d3_svg_mousePoint(container, touch);
point.identifier = touch.identifier;
@@ -3589,4 +3790,906 @@ d3.svg.symbolTypes = d3.keys(d3_svg_symbols);
var d3_svg_symbolSqrt3 = Math.sqrt(3),
d3_svg_symbolTan30 = Math.tan(30 * Math.PI / 180);
+d3.svg.axis = function() {
+ var scale = d3.scale.linear(),
+ orient = "bottom",
+ tickMajorSize = 6,
+ tickMinorSize = 6,
+ tickEndSize = 6,
+ tickPadding = 3,
+ tickArguments_ = [10],
+ tickFormat_,
+ tickSubdivide = 0;
+
+ function axis(selection) {
+ selection.each(function(d, i, j) {
+ var g = d3.select(this);
+
+ // If selection is a transition, create subtransitions.
+ var transition = selection.delay ? function(o) {
+ var id = d3_transitionInheritId;
+ try {
+ d3_transitionInheritId = selection.id;
+ return o.transition()
+ .delay(selection[j][i].delay)
+ .duration(selection[j][i].duration)
+ .ease(selection.ease());
+ } finally {
+ d3_transitionInheritId = id;
+ }
+ } : Object;
+
+ // Ticks, or domain values for ordinal scales.
+ var ticks = scale.ticks ? scale.ticks.apply(scale, tickArguments_) : scale.domain(),
+ tickFormat = tickFormat_ == null ? (scale.tickFormat ? scale.tickFormat.apply(scale, tickArguments_) : String) : tickFormat_;
+
+ // Minor ticks.
+ var subticks = d3_svg_axisSubdivide(scale, ticks, tickSubdivide),
+ subtick = g.selectAll(".minor").data(subticks, String),
+ subtickEnter = subtick.enter().insert("line", "g").attr("class", "tick minor").style("opacity", 1e-6),
+ subtickExit = transition(subtick.exit()).style("opacity", 1e-6).remove(),
+ subtickUpdate = transition(subtick).style("opacity", 1);
+
+ // Major ticks.
+ var tick = g.selectAll("g").data(ticks, String),
+ tickEnter = tick.enter().insert("g", "path").style("opacity", 1e-6),
+ tickExit = transition(tick.exit()).style("opacity", 1e-6).remove(),
+ tickUpdate = transition(tick).style("opacity", 1),
+ tickTransform;
+
+ // Domain.
+ var range = d3_scaleRange(scale),
+ path = g.selectAll(".domain").data([0]),
+ pathEnter = path.enter().append("path").attr("class", "domain"),
+ pathUpdate = transition(path);
+
+ // Stash a snapshot of the new scale, and retrieve the old snapshot.
+ var scale1 = scale.copy(),
+ scale0 = this.__chart__ || scale1;
+ this.__chart__ = scale1;
+
+ tickEnter.append("line").attr("class", "tick");
+ tickEnter.append("text");
+ tickUpdate.select("text").text(tickFormat);
+
+ switch (orient) {
+ case "bottom": {
+ tickTransform = d3_svg_axisX;
+ subtickUpdate.attr("x2", 0).attr("y2", tickMinorSize);
+ tickUpdate.select("line").attr("x2", 0).attr("y2", tickMajorSize);
+ tickUpdate.select("text").attr("x", 0).attr("y", Math.max(tickMajorSize, 0) + tickPadding).attr("dy", ".71em").attr("text-anchor", "middle");
+ pathUpdate.attr("d", "M" + range[0] + "," + tickEndSize + "V0H" + range[1] + "V" + tickEndSize);
+ break;
+ }
+ case "top": {
+ tickTransform = d3_svg_axisX;
+ subtickUpdate.attr("x2", 0).attr("y2", -tickMinorSize);
+ tickUpdate.select("line").attr("x2", 0).attr("y2", -tickMajorSize);
+ tickUpdate.select("text").attr("x", 0).attr("y", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("dy", "0em").attr("text-anchor", "middle");
+ pathUpdate.attr("d", "M" + range[0] + "," + -tickEndSize + "V0H" + range[1] + "V" + -tickEndSize);
+ break;
+ }
+ case "left": {
+ tickTransform = d3_svg_axisY;
+ subtickUpdate.attr("x2", -tickMinorSize).attr("y2", 0);
+ tickUpdate.select("line").attr("x2", -tickMajorSize).attr("y2", 0);
+ tickUpdate.select("text").attr("x", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "end");
+ pathUpdate.attr("d", "M" + -tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + -tickEndSize);
+ break;
+ }
+ case "right": {
+ tickTransform = d3_svg_axisY;
+ subtickUpdate.attr("x2", tickMinorSize).attr("y2", 0);
+ tickUpdate.select("line").attr("x2", tickMajorSize).attr("y2", 0);
+ tickUpdate.select("text").attr("x", Math.max(tickMajorSize, 0) + tickPadding).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "start");
+ pathUpdate.attr("d", "M" + tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + tickEndSize);
+ break;
+ }
+ }
+
+ // For quantitative scales:
+ // - enter new ticks from the old scale
+ // - exit old ticks to the new scale
+ if (scale.ticks) {
+ tickEnter.call(tickTransform, scale0);
+ tickUpdate.call(tickTransform, scale1);
+ tickExit.call(tickTransform, scale1);
+ subtickEnter.call(tickTransform, scale0);
+ subtickUpdate.call(tickTransform, scale1);
+ subtickExit.call(tickTransform, scale1);
+ }
+
+ // For ordinal scales:
+ // - any entering ticks are undefined in the old scale
+ // - any exiting ticks are undefined in the new scale
+ // Therefore, we only need to transition updating ticks.
+ else {
+ var dx = scale1.rangeBand() / 2, x = function(d) { return scale1(d) + dx; };
+ tickEnter.call(tickTransform, x);
+ tickUpdate.call(tickTransform, x);
+ }
+ });
+ }
+
+ axis.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = x;
+ return axis;
+ };
+
+ axis.orient = function(x) {
+ if (!arguments.length) return orient;
+ orient = x;
+ return axis;
+ };
+
+ axis.ticks = function() {
+ if (!arguments.length) return tickArguments_;
+ tickArguments_ = arguments;
+ return axis;
+ };
+
+ axis.tickFormat = function(x) {
+ if (!arguments.length) return tickFormat_;
+ tickFormat_ = x;
+ return axis;
+ };
+
+ axis.tickSize = function(x, y, z) {
+ if (!arguments.length) return tickMajorSize;
+ var n = arguments.length - 1;
+ tickMajorSize = +x;
+ tickMinorSize = n > 1 ? +y : tickMajorSize;
+ tickEndSize = n > 0 ? +arguments[n] : tickMajorSize;
+ return axis;
+ };
+
+ axis.tickPadding = function(x) {
+ if (!arguments.length) return tickPadding;
+ tickPadding = +x;
+ return axis;
+ };
+
+ axis.tickSubdivide = function(x) {
+ if (!arguments.length) return tickSubdivide;
+ tickSubdivide = +x;
+ return axis;
+ };
+
+ return axis;
+};
+
+function d3_svg_axisX(selection, x) {
+ selection.attr("transform", function(d) { return "translate(" + x(d) + ",0)"; });
+}
+
+function d3_svg_axisY(selection, y) {
+ selection.attr("transform", function(d) { return "translate(0," + y(d) + ")"; });
+}
+
+function d3_svg_axisSubdivide(scale, ticks, m) {
+ subticks = [];
+ if (m && ticks.length > 1) {
+ var extent = d3_scaleExtent(scale.domain()),
+ subticks,
+ i = -1,
+ n = ticks.length,
+ d = (ticks[1] - ticks[0]) / ++m,
+ j,
+ v;
+ while (++i < n) {
+ for (j = m; --j > 0;) {
+ if ((v = +ticks[i] - j * d) >= extent[0]) {
+ subticks.push(v);
+ }
+ }
+ }
+ for (--i, j = 0; ++j < m && (v = +ticks[i] + j * d) < extent[1];) {
+ subticks.push(v);
+ }
+ }
+ return subticks;
+}
+d3.svg.brush = function() {
+ var event = d3.dispatch("brushstart", "brush", "brushend"),
+ x, // x-scale, optional
+ y, // y-scale, optional
+ extent = [[0, 0], [0, 0]]; // [x0, y0], [x1, y1]
+
+ function brush(g) {
+ var resizes = x && y ? ["n", "e", "s", "w", "nw", "ne", "se", "sw"]
+ : x ? ["e", "w"]
+ : y ? ["n", "s"]
+ : [];
+
+ g.each(function() {
+ var g = d3.select(this).on("mousedown.brush", down),
+ bg = g.selectAll(".background").data([,]),
+ fg = g.selectAll(".extent").data([,]),
+ tz = g.selectAll(".resize").data(resizes, String),
+ e;
+
+ // An invisible, mouseable area for starting a new brush.
+ bg.enter().append("rect")
+ .attr("class", "background")
+ .style("visibility", "hidden")
+ .style("pointer-events", "all")
+ .style("cursor", "crosshair");
+
+ // The visible brush extent; style this as you like!
+ fg.enter().append("rect")
+ .attr("class", "extent")
+ .style("cursor", "move");
+
+ // More invisible rects for resizing the extent.
+ tz.enter().append("rect")
+ .attr("class", function(d) { return "resize " + d; })
+ .attr("width", 6)
+ .attr("height", 6)
+ .style("visibility", "hidden")
+ .style("pointer-events", brush.empty() ? "none" : "all")
+ .style("cursor", function(d) { return d3_svg_brushCursor[d]; });
+
+ // Remove any superfluous resizers.
+ tz.exit().remove();
+
+ // Initialize the background to fill the defined range.
+ // If the range isn't defined, you can post-process.
+ if (x) {
+ e = d3_scaleRange(x);
+ bg.attr("x", e[0]).attr("width", e[1] - e[0]);
+ d3_svg_brushRedrawX(g, extent);
+ }
+ if (y) {
+ e = d3_scaleRange(y);
+ bg.attr("y", e[0]).attr("height", e[1] - e[0]);
+ d3_svg_brushRedrawY(g, extent);
+ }
+ });
+ }
+
+ function down() {
+ var target = d3.select(d3.event.target);
+
+ // Store some global state for the duration of the brush gesture.
+ d3_svg_brush = brush;
+ d3_svg_brushTarget = this;
+ d3_svg_brushExtent = extent;
+ d3_svg_brushOffset = d3.svg.mouse(d3_svg_brushTarget);
+
+ // If the extent was clicked on, drag rather than brush;
+ // store the offset between the mouse and extent origin instead.
+ if (d3_svg_brushDrag = target.classed("extent")) {
+ d3_svg_brushOffset[0] = extent[0][0] - d3_svg_brushOffset[0];
+ d3_svg_brushOffset[1] = extent[0][1] - d3_svg_brushOffset[1];
+ }
+
+ // If a resizer was clicked on, record which side is to be resized.
+ // Also, set the offset to the opposite side.
+ else if (target.classed("resize")) {
+ d3_svg_brushResize = d3.event.target.__data__;
+ d3_svg_brushOffset[0] = extent[+/w$/.test(d3_svg_brushResize)][0];
+ d3_svg_brushOffset[1] = extent[+/^n/.test(d3_svg_brushResize)][1];
+ }
+
+ // If the ALT key is down when starting a brush, the center is at the mouse.
+ else if (d3.event.altKey) {
+ d3_svg_brushCenter = d3_svg_brushOffset.slice();
+ }
+
+ // Restrict which dimensions are resized.
+ d3_svg_brushX = !/^(n|s)$/.test(d3_svg_brushResize) && x;
+ d3_svg_brushY = !/^(e|w)$/.test(d3_svg_brushResize) && y;
+
+ // Notify listeners.
+ d3_svg_brushDispatch = dispatcher(this, arguments);
+ d3_svg_brushDispatch("brushstart");
+ d3_svg_brushMove();
+ d3_eventCancel();
+ }
+
+ function dispatcher(that, argumentz) {
+ return function(type) {
+ var e = d3.event;
+ try {
+ d3.event = {type: type, target: brush};
+ event[type].apply(that, argumentz);
+ } finally {
+ d3.event = e;
+ }
+ };
+ }
+
+ brush.x = function(z) {
+ if (!arguments.length) return x;
+ x = z;
+ return brush;
+ };
+
+ brush.y = function(z) {
+ if (!arguments.length) return y;
+ y = z;
+ return brush;
+ };
+
+ brush.extent = function(z) {
+ var x0, x1, y0, y1, t;
+
+ // Invert the pixel extent to data-space.
+ if (!arguments.length) {
+ if (x) {
+ x0 = extent[0][0], x1 = extent[1][0];
+ if (x.invert) x0 = x.invert(x0), x1 = x.invert(x1);
+ if (x1 < x0) t = x0, x0 = x1, x1 = t;
+ }
+ if (y) {
+ y0 = extent[0][1], y1 = extent[1][1];
+ if (y.invert) y0 = y.invert(y0), y1 = y.invert(y1);
+ if (y1 < y0) t = y0, y0 = y1, y1 = t;
+ }
+ return x && y ? [[x0, y0], [x1, y1]] : x ? [x0, x1] : y && [y0, y1];
+ }
+
+ // Scale the data-space extent to pixels.
+ if (x) {
+ x0 = z[0], x1 = z[1];
+ if (y) x0 = x0[0], x1 = x1[0];
+ if (x.invert) x0 = x(x0), x1 = x(x1);
+ if (x1 < x0) t = x0, x0 = x1, x1 = t;
+ extent[0][0] = x0, extent[1][0] = x1;
+ }
+ if (y) {
+ y0 = z[0], y1 = z[1];
+ if (x) y0 = y0[1], y1 = y1[1];
+ if (y.invert) y0 = y(y0), y1 = y(y1);
+ if (y1 < y0) t = y0, y0 = y1, y1 = t;
+ extent[0][1] = y0, extent[1][1] = y1;
+ }
+
+ return brush;
+ };
+
+ brush.clear = function() {
+ extent[0][0] =
+ extent[0][1] =
+ extent[1][0] =
+ extent[1][1] = 0;
+ return brush;
+ };
+
+ brush.empty = function() {
+ return (x && extent[0][0] === extent[1][0])
+ || (y && extent[0][1] === extent[1][1]);
+ };
+
+ d3.select(window)
+ .on("mousemove.brush", d3_svg_brushMove)
+ .on("mouseup.brush", d3_svg_brushUp)
+ .on("keydown.brush", d3_svg_brushKeydown)
+ .on("keyup.brush", d3_svg_brushKeyup);
+
+ return d3.rebind(brush, event, "on");
+};
+
+var d3_svg_brush,
+ d3_svg_brushDispatch,
+ d3_svg_brushTarget,
+ d3_svg_brushX,
+ d3_svg_brushY,
+ d3_svg_brushExtent,
+ d3_svg_brushDrag,
+ d3_svg_brushResize,
+ d3_svg_brushCenter,
+ d3_svg_brushOffset;
+
+function d3_svg_brushRedrawX(g, extent) {
+ g.select(".extent").attr("x", extent[0][0]);
+ g.selectAll(".n,.s,.w,.nw,.sw").attr("x", extent[0][0] - 2);
+ g.selectAll(".e,.ne,.se").attr("x", extent[1][0] - 3);
+ g.selectAll(".extent,.n,.s").attr("width", extent[1][0] - extent[0][0]);
+}
+
+function d3_svg_brushRedrawY(g, extent) {
+ g.select(".extent").attr("y", extent[0][1]);
+ g.selectAll(".n,.e,.w,.nw,.ne").attr("y", extent[0][1] - 3);
+ g.selectAll(".s,.se,.sw").attr("y", extent[1][1] - 4);
+ g.selectAll(".extent,.e,.w").attr("height", extent[1][1] - extent[0][1]);
+}
+
+function d3_svg_brushKeydown() {
+ if (d3.event.keyCode == 32 && d3_svg_brushTarget && !d3_svg_brushDrag) {
+ d3_svg_brushCenter = null;
+ d3_svg_brushOffset[0] -= d3_svg_brushExtent[1][0];
+ d3_svg_brushOffset[1] -= d3_svg_brushExtent[1][1];
+ d3_svg_brushDrag = 2;
+ d3_eventCancel();
+ }
+}
+
+function d3_svg_brushKeyup() {
+ if (d3.event.keyCode == 32 && d3_svg_brushDrag == 2) {
+ d3_svg_brushOffset[0] += d3_svg_brushExtent[1][0];
+ d3_svg_brushOffset[1] += d3_svg_brushExtent[1][1];
+ d3_svg_brushDrag = 0;
+ d3_eventCancel();
+ }
+}
+
+function d3_svg_brushMove() {
+ if (d3_svg_brushOffset) {
+ var mouse = d3.svg.mouse(d3_svg_brushTarget),
+ g = d3.select(d3_svg_brushTarget);
+
+ if (!d3_svg_brushDrag) {
+
+ // If needed, determine the center from the current extent.
+ if (d3.event.altKey) {
+ if (!d3_svg_brushCenter) {
+ d3_svg_brushCenter = [
+ (d3_svg_brushExtent[0][0] + d3_svg_brushExtent[1][0]) / 2,
+ (d3_svg_brushExtent[0][1] + d3_svg_brushExtent[1][1]) / 2
+ ];
+ }
+
+ // Update the offset, for when the ALT key is released.
+ d3_svg_brushOffset[0] = d3_svg_brushExtent[+(mouse[0] < d3_svg_brushCenter[0])][0];
+ d3_svg_brushOffset[1] = d3_svg_brushExtent[+(mouse[1] < d3_svg_brushCenter[1])][1];
+ }
+
+ // When the ALT key is released, we clear the center.
+ else d3_svg_brushCenter = null;
+ }
+
+ // Update the brush extent for each dimension.
+ if (d3_svg_brushX) {
+ d3_svg_brushMove1(mouse, d3_svg_brushX, 0);
+ d3_svg_brushRedrawX(g, d3_svg_brushExtent);
+ }
+ if (d3_svg_brushY) {
+ d3_svg_brushMove1(mouse, d3_svg_brushY, 1);
+ d3_svg_brushRedrawY(g, d3_svg_brushExtent);
+ }
+
+ // Notify listeners.
+ d3_svg_brushDispatch("brush");
+ }
+}
+
+function d3_svg_brushMove1(mouse, scale, i) {
+ var range = d3_scaleRange(scale),
+ r0 = range[0],
+ r1 = range[1],
+ offset = d3_svg_brushOffset[i],
+ size = d3_svg_brushExtent[1][i] - d3_svg_brushExtent[0][i],
+ min,
+ max;
+
+ // When dragging, reduce the range by the extent size and offset.
+ if (d3_svg_brushDrag) {
+ r0 -= offset;
+ r1 -= size + offset;
+ }
+
+ // Clamp the mouse so that the extent fits within the range extent.
+ min = Math.max(r0, Math.min(r1, mouse[i]));
+
+ // Compute the new extent bounds.
+ if (d3_svg_brushDrag) {
+ max = (min += offset) + size;
+ } else {
+
+ // If the ALT key is pressed, then preserve the center of the extent.
+ if (d3_svg_brushCenter) offset = Math.max(r0, Math.min(r1, 2 * d3_svg_brushCenter[i] - min));
+
+ // Compute the min and max of the offset and mouse.
+ if (offset < min) {
+ max = min;
+ min = offset;
+ } else {
+ max = offset;
+ }
+ }
+
+ // Update the stored bounds.
+ d3_svg_brushExtent[0][i] = min;
+ d3_svg_brushExtent[1][i] = max;
+}
+
+function d3_svg_brushUp() {
+ if (d3_svg_brushOffset) {
+ d3_svg_brushMove();
+ d3.select(d3_svg_brushTarget).selectAll(".resize").style("pointer-events", d3_svg_brush.empty() ? "none" : "all");
+ d3_svg_brushDispatch("brushend");
+ d3_svg_brush =
+ d3_svg_brushDispatch =
+ d3_svg_brushTarget =
+ d3_svg_brushX =
+ d3_svg_brushY =
+ d3_svg_brushExtent =
+ d3_svg_brushDrag =
+ d3_svg_brushResize =
+ d3_svg_brushCenter =
+ d3_svg_brushOffset = null;
+ d3_eventCancel();
+ }
+}
+
+var d3_svg_brushCursor = {
+ n: "ns-resize",
+ e: "ew-resize",
+ s: "ns-resize",
+ w: "ew-resize",
+ nw: "nwse-resize",
+ ne: "nesw-resize",
+ se: "nwse-resize",
+ sw: "nesw-resize"
+};
+d3.behavior = {};
+// TODO Track touch points by identifier.
+
+d3.behavior.drag = function() {
+ var event = d3.dispatch("drag", "dragstart", "dragend"),
+ origin = null;
+
+ function drag() {
+ this
+ .on("mousedown.drag", mousedown)
+ .on("touchstart.drag", mousedown);
+
+ d3.select(window)
+ .on("mousemove.drag", d3_behavior_dragMove)
+ .on("touchmove.drag", d3_behavior_dragMove)
+ .on("mouseup.drag", d3_behavior_dragUp, true)
+ .on("touchend.drag", d3_behavior_dragUp, true)
+ .on("click.drag", d3_behavior_dragClick, true);
+ }
+
+ // snapshot the local context for subsequent dispatch
+ function start() {
+ d3_behavior_dragEvent = event;
+ d3_behavior_dragEventTarget = d3.event.target;
+ d3_behavior_dragTarget = this;
+ d3_behavior_dragArguments = arguments;
+ d3_behavior_dragOrigin = d3_behavior_dragPoint();
+ if (origin) {
+ d3_behavior_dragOffset = origin.apply(d3_behavior_dragTarget, d3_behavior_dragArguments);
+ d3_behavior_dragOffset = [d3_behavior_dragOffset.x - d3_behavior_dragOrigin[0], d3_behavior_dragOffset.y - d3_behavior_dragOrigin[1]];
+ } else {
+ d3_behavior_dragOffset = [0, 0];
+ }
+ d3_behavior_dragMoved = 0;
+ }
+
+ function mousedown() {
+ start.apply(this, arguments);
+ d3_behavior_dragDispatch("dragstart");
+ }
+
+ drag.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ return drag;
+ };
+
+ return d3.rebind(drag, event, "on");
+};
+
+var d3_behavior_dragEvent,
+ d3_behavior_dragEventTarget,
+ d3_behavior_dragTarget,
+ d3_behavior_dragArguments,
+ d3_behavior_dragOffset,
+ d3_behavior_dragOrigin,
+ d3_behavior_dragMoved;
+
+function d3_behavior_dragDispatch(type) {
+ var p = d3_behavior_dragPoint(),
+ o = d3.event,
+ e = d3.event = {type: type};
+
+ if (p) {
+ e.x = p[0] + d3_behavior_dragOffset[0];
+ e.y = p[1] + d3_behavior_dragOffset[1];
+ e.dx = p[0] - d3_behavior_dragOrigin[0];
+ e.dy = p[1] - d3_behavior_dragOrigin[1];
+ d3_behavior_dragMoved |= e.dx | e.dy;
+ d3_behavior_dragOrigin = p;
+ }
+
+ try {
+ d3_behavior_dragEvent[type].apply(d3_behavior_dragTarget, d3_behavior_dragArguments);
+ } finally {
+ d3.event = o;
+ }
+
+ o.stopPropagation();
+ o.preventDefault();
+}
+
+function d3_behavior_dragPoint() {
+ var p = d3_behavior_dragTarget.parentNode,
+ t = d3.event.changedTouches;
+ return p && (t
+ ? d3.svg.touches(p, t)[0]
+ : d3.svg.mouse(p));
+}
+
+function d3_behavior_dragMove() {
+ if (!d3_behavior_dragTarget) return;
+ var parent = d3_behavior_dragTarget.parentNode;
+
+ // O NOES! The drag element was removed from the DOM.
+ if (!parent) return d3_behavior_dragUp();
+
+ d3_behavior_dragDispatch("drag");
+ d3_eventCancel();
+}
+
+function d3_behavior_dragUp() {
+ if (!d3_behavior_dragTarget) return;
+ d3_behavior_dragDispatch("dragend");
+
+ // If the node was moved, prevent the mouseup from propagating.
+ // Also prevent the subsequent click from propagating (e.g., for anchors).
+ if (d3_behavior_dragMoved) {
+ d3_eventCancel();
+ d3_behavior_dragMoved = d3.event.target === d3_behavior_dragEventTarget;
+ }
+
+ d3_behavior_dragEvent =
+ d3_behavior_dragEventTarget =
+ d3_behavior_dragTarget =
+ d3_behavior_dragArguments =
+ d3_behavior_dragOffset =
+ d3_behavior_dragOrigin = null;
+}
+
+function d3_behavior_dragClick() {
+ if (d3_behavior_dragMoved) {
+ d3_eventCancel();
+ d3_behavior_dragMoved = 0;
+ }
+}
+// TODO unbind zoom behavior?
+d3.behavior.zoom = function() {
+ var xyz = [0, 0, 0],
+ event = d3.dispatch("zoom"),
+ extent = d3_behavior_zoomInfiniteExtent;
+
+ function zoom() {
+ this
+ .on("mousedown.zoom", mousedown)
+ .on("mousewheel.zoom", mousewheel)
+ .on("DOMMouseScroll.zoom", mousewheel)
+ .on("dblclick.zoom", dblclick)
+ .on("touchstart.zoom", touchstart);
+
+ d3.select(window)
+ .on("mousemove.zoom", d3_behavior_zoomMousemove)
+ .on("mouseup.zoom", d3_behavior_zoomMouseup)
+ .on("touchmove.zoom", d3_behavior_zoomTouchmove)
+ .on("touchend.zoom", d3_behavior_zoomTouchup)
+ .on("click.zoom", d3_behavior_zoomClick, true);
+ }
+
+ // snapshot the local context for subsequent dispatch
+ function start() {
+ d3_behavior_zoomXyz = xyz;
+ d3_behavior_zoomExtent = extent;
+ d3_behavior_zoomDispatch = event.zoom;
+ d3_behavior_zoomEventTarget = d3.event.target;
+ d3_behavior_zoomTarget = this;
+ d3_behavior_zoomArguments = arguments;
+ }
+
+ function mousedown() {
+ start.apply(this, arguments);
+ d3_behavior_zoomPanning = d3_behavior_zoomLocation(d3.svg.mouse(d3_behavior_zoomTarget));
+ d3_behavior_zoomMoved = 0;
+ d3.event.preventDefault();
+ window.focus();
+ }
+
+ // store starting mouse location
+ function mousewheel() {
+ start.apply(this, arguments);
+ if (!d3_behavior_zoomZooming) d3_behavior_zoomZooming = d3_behavior_zoomLocation(d3.svg.mouse(d3_behavior_zoomTarget));
+ d3_behavior_zoomTo(d3_behavior_zoomDelta() + xyz[2], d3.svg.mouse(d3_behavior_zoomTarget), d3_behavior_zoomZooming);
+ }
+
+ function dblclick() {
+ start.apply(this, arguments);
+ var mouse = d3.svg.mouse(d3_behavior_zoomTarget);
+ d3_behavior_zoomTo(d3.event.shiftKey ? Math.ceil(xyz[2] - 1) : Math.floor(xyz[2] + 1), mouse, d3_behavior_zoomLocation(mouse));
+ }
+
+ // doubletap detection
+ function touchstart() {
+ start.apply(this, arguments);
+ var touches = d3_behavior_zoomTouchup(),
+ touch,
+ now = Date.now();
+ if ((touches.length === 1) && (now - d3_behavior_zoomLast < 300)) {
+ d3_behavior_zoomTo(1 + Math.floor(xyz[2]), touch = touches[0], d3_behavior_zoomLocations[touch.identifier]);
+ }
+ d3_behavior_zoomLast = now;
+ }
+
+ zoom.extent = function(x) {
+ if (!arguments.length) return extent;
+ extent = x == null ? d3_behavior_zoomInfiniteExtent : x;
+ return zoom;
+ };
+
+ return d3.rebind(zoom, event, "on");
+};
+
+var d3_behavior_zoomDiv,
+ d3_behavior_zoomPanning,
+ d3_behavior_zoomZooming,
+ d3_behavior_zoomLocations = {}, // identifier -> location
+ d3_behavior_zoomLast = 0,
+ d3_behavior_zoomXyz,
+ d3_behavior_zoomExtent,
+ d3_behavior_zoomDispatch,
+ d3_behavior_zoomEventTarget,
+ d3_behavior_zoomTarget,
+ d3_behavior_zoomArguments,
+ d3_behavior_zoomMoved;
+
+function d3_behavior_zoomLocation(point) {
+ return [
+ point[0] - d3_behavior_zoomXyz[0],
+ point[1] - d3_behavior_zoomXyz[1],
+ d3_behavior_zoomXyz[2]
+ ];
+}
+
+// detect the pixels that would be scrolled by this wheel event
+function d3_behavior_zoomDelta() {
+
+ // mousewheel events are totally broken!
+ // https://bugs.webkit.org/show_bug.cgi?id=40441
+ // not only that, but Chrome and Safari differ in re. to acceleration!
+ if (!d3_behavior_zoomDiv) {
+ d3_behavior_zoomDiv = d3.select("body").append("div")
+ .style("visibility", "hidden")
+ .style("top", 0)
+ .style("height", 0)
+ .style("width", 0)
+ .style("overflow-y", "scroll")
+ .append("div")
+ .style("height", "2000px")
+ .node().parentNode;
+ }
+
+ var e = d3.event, delta;
+ try {
+ d3_behavior_zoomDiv.scrollTop = 1000;
+ d3_behavior_zoomDiv.dispatchEvent(e);
+ delta = 1000 - d3_behavior_zoomDiv.scrollTop;
+ } catch (error) {
+ delta = e.wheelDelta || (-e.detail * 5);
+ }
+
+ return delta * .005;
+}
+
+// Note: Since we don't rotate, it's possible for the touches to become
+// slightly detached from their original positions. Thus, we recompute the
+// touch points on touchend as well as touchstart!
+function d3_behavior_zoomTouchup() {
+ var touches = d3.svg.touches(d3_behavior_zoomTarget),
+ i = -1,
+ n = touches.length,
+ touch;
+ while (++i < n) d3_behavior_zoomLocations[(touch = touches[i]).identifier] = d3_behavior_zoomLocation(touch);
+ return touches;
+}
+
+function d3_behavior_zoomTouchmove() {
+ var touches = d3.svg.touches(d3_behavior_zoomTarget);
+ switch (touches.length) {
+
+ // single-touch pan
+ case 1: {
+ var touch = touches[0];
+ d3_behavior_zoomTo(d3_behavior_zoomXyz[2], touch, d3_behavior_zoomLocations[touch.identifier]);
+ break;
+ }
+
+ // double-touch pan + zoom
+ case 2: {
+ var p0 = touches[0],
+ p1 = touches[1],
+ p2 = [(p0[0] + p1[0]) / 2, (p0[1] + p1[1]) / 2],
+ l0 = d3_behavior_zoomLocations[p0.identifier],
+ l1 = d3_behavior_zoomLocations[p1.identifier],
+ l2 = [(l0[0] + l1[0]) / 2, (l0[1] + l1[1]) / 2, l0[2]];
+ d3_behavior_zoomTo(Math.log(d3.event.scale) / Math.LN2 + l0[2], p2, l2);
+ break;
+ }
+ }
+}
+
+function d3_behavior_zoomMousemove() {
+ d3_behavior_zoomZooming = null;
+ if (d3_behavior_zoomPanning) {
+ d3_behavior_zoomMoved = 1;
+ d3_behavior_zoomTo(d3_behavior_zoomXyz[2], d3.svg.mouse(d3_behavior_zoomTarget), d3_behavior_zoomPanning);
+ }
+}
+
+function d3_behavior_zoomMouseup() {
+ if (d3_behavior_zoomPanning) {
+ if (d3_behavior_zoomMoved) {
+ d3_eventCancel();
+ d3_behavior_zoomMoved = d3_behavior_zoomEventTarget === d3.event.target;
+ }
+
+ d3_behavior_zoomXyz =
+ d3_behavior_zoomExtent =
+ d3_behavior_zoomDispatch =
+ d3_behavior_zoomEventTarget =
+ d3_behavior_zoomTarget =
+ d3_behavior_zoomArguments =
+ d3_behavior_zoomPanning = null;
+ }
+}
+
+function d3_behavior_zoomClick() {
+ if (d3_behavior_zoomMoved) {
+ d3_eventCancel();
+ d3_behavior_zoomMoved = 0;
+ }
+}
+
+function d3_behavior_zoomTo(z, x0, x1) {
+ z = d3_behavior_zoomExtentClamp(z, 2);
+ var j = Math.pow(2, d3_behavior_zoomXyz[2]),
+ k = Math.pow(2, z),
+ K = Math.pow(2, (d3_behavior_zoomXyz[2] = z) - x1[2]),
+ x_ = d3_behavior_zoomXyz[0],
+ y_ = d3_behavior_zoomXyz[1],
+ x = d3_behavior_zoomXyz[0] = d3_behavior_zoomExtentClamp((x0[0] - x1[0] * K), 0, k),
+ y = d3_behavior_zoomXyz[1] = d3_behavior_zoomExtentClamp((x0[1] - x1[1] * K), 1, k),
+ o = d3.event; // Events can be reentrant (e.g., focus).
+
+ d3.event = {
+ scale: k,
+ translate: [x, y],
+ transform: function(sx, sy) {
+ if (sx) transform(sx, x_, x);
+ if (sy) transform(sy, y_, y);
+ }
+ };
+
+ function transform(scale, a, b) {
+ scale.domain(scale.range().map(function(v) { return scale.invert(((v - b) * j) / k + a); }));
+ }
+
+ try {
+ d3_behavior_zoomDispatch.apply(d3_behavior_zoomTarget, d3_behavior_zoomArguments);
+ } finally {
+ d3.event = o;
+ }
+
+ o.preventDefault();
+}
+
+var d3_behavior_zoomInfiniteExtent = [
+ [-Infinity, Infinity],
+ [-Infinity, Infinity],
+ [-Infinity, Infinity]
+];
+
+function d3_behavior_zoomExtentClamp(x, i, k) {
+ var range = d3_behavior_zoomExtent[i],
+ r0 = range[0],
+ r1 = range[1];
+ return arguments.length === 3
+ ? Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
+ Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k
+ : Math.max(r0, Math.min(r1, x));
+}
})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
index 76ddee0..24bcc42 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
@@ -113,16 +113,19 @@ d3.layout.chord = function() {
k = (2 * Math.PI - padding * n) / k;
// Compute the start and end angle for each group and subgroup.
+ // Note: Opera has a bug reordering object literal properties!
x = 0, i = -1; while (++i < n) {
x0 = x, j = -1; while (++j < n) {
var di = groupIndex[i],
- dj = subgroupIndex[i][j],
- v = matrix[di][dj];
+ dj = subgroupIndex[di][j],
+ v = matrix[di][dj],
+ a0 = x,
+ a1 = x += v * k;
subgroups[di + "-" + dj] = {
index: di,
subindex: dj,
- startAngle: x,
- endAngle: x += v * k,
+ startAngle: a0,
+ endAngle: a1,
value: v
};
}
@@ -143,7 +146,7 @@ d3.layout.chord = function() {
if (source.value || target.value) {
chords.push(source.value < target.value
? {source: target, target: source}
- : {source: source, target: target})
+ : {source: source, target: target});
}
}
}
@@ -153,7 +156,9 @@ d3.layout.chord = function() {
function resort() {
chords.sort(function(a, b) {
- return sortChords(a.target.value, b.target.value);
+ return sortChords(
+ (a.source.value + a.target.value) / 2,
+ (b.source.value + b.target.value) / 2);
});
}
@@ -209,6 +214,7 @@ d3.layout.force = function() {
var force = {},
event = d3.dispatch("tick"),
size = [1, 1],
+ drag,
alpha,
friction = .9,
linkDistance = d3_layout_forceLinkDistance,
@@ -220,9 +226,10 @@ d3.layout.force = function() {
nodes = [],
links = [],
distances,
- strengths;
+ strengths,
+ charges;
- function repulse(node, kc) {
+ function repulse(node) {
return function(quad, x1, y1, x2, y2) {
if (quad.point !== node) {
var dx = quad.cx - node.x,
@@ -231,30 +238,32 @@ d3.layout.force = function() {
/* Barnes-Hut criterion. */
if ((x2 - x1) * dn < theta) {
- var k = kc * quad.count * dn * dn;
- node.x += dx * k;
- node.y += dy * k;
+ var k = quad.charge * dn * dn;
+ node.px -= dx * k;
+ node.py -= dy * k;
return true;
}
if (quad.point && isFinite(dn)) {
- var k = kc * dn * dn;
- node.x += dx * k;
- node.y += dy * k;
+ var k = quad.pointCharge * dn * dn;
+ node.px -= dx * k;
+ node.py -= dy * k;
}
}
+ return !quad.charge;
};
}
function tick() {
var n = nodes.length,
m = links.length,
- q = d3.geom.quadtree(nodes),
+ q,
i, // current index
o, // current object
s, // current source
t, // current target
l, // current distance
+ k, // current force
x, // x-distance
y; // y-distance
@@ -269,30 +278,32 @@ d3.layout.force = function() {
l = alpha * strengths[i] * ((l = Math.sqrt(l)) - distances[i]) / l;
x *= l;
y *= l;
- t.x -= x;
- t.y -= y;
- s.x += x;
- s.y += y;
+ t.x -= x * (k = s.weight / (t.weight + s.weight));
+ t.y -= y * k;
+ s.x += x * (k = 1 - k);
+ s.y += y * k;
}
}
// apply gravity forces
- var kg = alpha * gravity;
- x = size[0] / 2;
- y = size[1] / 2;
- i = -1; while (++i < n) {
- o = nodes[i];
- o.x += (x - o.x) * kg;
- o.y += (y - o.y) * kg;
+ if (k = alpha * gravity) {
+ x = size[0] / 2;
+ y = size[1] / 2;
+ i = -1; if (k) while (++i < n) {
+ o = nodes[i];
+ o.x += (x - o.x) * k;
+ o.y += (y - o.y) * k;
+ }
}
- // compute quadtree center of mass
- d3_layout_forceAccumulate(q);
-
- // apply charge forces
- var kc = alpha * charge;
- i = -1; while (++i < n) {
- q.visit(repulse(nodes[i], kc));
+ // compute quadtree center of mass and apply charge forces
+ if (charge) {
+ d3_layout_forceAccumulate(q = d3.geom.quadtree(nodes), alpha, charges);
+ i = -1; while (++i < n) {
+ if (!(o = nodes[i]).fixed) {
+ q.visit(repulse(o));
+ }
+ }
}
// position verlet integration
@@ -307,17 +318,12 @@ d3.layout.force = function() {
}
}
- event.tick.dispatch({type: "tick", alpha: alpha});
+ event.tick({type: "tick", alpha: alpha});
// simulated annealing, basically
return (alpha *= .99) < .005;
}
- force.on = function(type, listener) {
- event[type].add(listener);
- return force;
- };
-
force.nodes = function(x) {
if (!arguments.length) return nodes;
nodes = x;
@@ -359,7 +365,7 @@ d3.layout.force = function() {
force.charge = function(x) {
if (!arguments.length) return charge;
- charge = x;
+ charge = typeof x === "function" ? x : +x;
return force;
};
@@ -387,6 +393,7 @@ d3.layout.force = function() {
for (i = 0; i < n; ++i) {
(o = nodes[i]).index = i;
+ o.weight = 0;
}
distances = [];
@@ -397,6 +404,8 @@ d3.layout.force = function() {
if (typeof o.target == "number") o.target = nodes[o.target];
distances[i] = linkDistance.call(this, o, i);
strengths[i] = linkStrength.call(this, o, i);
+ ++o.source.weight;
+ ++o.target.weight;
}
for (i = 0; i < n; ++i) {
@@ -407,6 +416,17 @@ d3.layout.force = function() {
if (isNaN(o.py)) o.py = o.y;
}
+ charges = [];
+ if (typeof charge === "function") {
+ for (i = 0; i < n; ++i) {
+ charges[i] = +charge.call(this, nodes[i], i);
+ }
+ } else {
+ for (i = 0; i < n; ++i) {
+ charges[i] = charge;
+ }
+ }
+
// initialize node position based on first neighbor
function position(dimension, size) {
var neighbors = neighbor(i),
@@ -449,116 +469,52 @@ d3.layout.force = function() {
// use `node.call(force.drag)` to make nodes draggable
force.drag = function() {
-
- this
- .on("mouseover.force", d3_layout_forceDragOver)
- .on("mouseout.force", d3_layout_forceDragOut)
- .on("mousedown.force", dragdown)
- .on("touchstart.force", dragdown);
-
- d3.select(window)
- .on("mousemove.force", d3_layout_forceDragMove)
- .on("touchmove.force", d3_layout_forceDragMove)
- .on("mouseup.force", d3_layout_forceDragUp, true)
- .on("touchend.force", d3_layout_forceDragUp, true)
- .on("click.force", d3_layout_forceDragClick, true);
-
- return force;
+ if (!drag) drag = d3.behavior.drag()
+ .origin(Object)
+ .on("dragstart", dragstart)
+ .on("drag", d3_layout_forceDrag)
+ .on("dragend", d3_layout_forceDragEnd);
+
+ this.on("mouseover.force", d3_layout_forceDragOver)
+ .on("mouseout.force", d3_layout_forceDragOut)
+ .call(drag);
};
- function dragdown(d, i) {
- var m = d3_layout_forcePoint(this.parentNode);
- (d3_layout_forceDragNode = d).fixed = true;
- d3_layout_forceDragMoved = false;
- d3_layout_forceDragElement = this;
+ function dragstart(d) {
+ d3_layout_forceDragOver(d3_layout_forceDragNode = d);
d3_layout_forceDragForce = force;
- d3_layout_forceDragOffset = [m[0] - d.x, m[1] - d.y];
- d3_layout_forceCancel();
}
- return force;
+ return d3.rebind(force, event, "on");
};
var d3_layout_forceDragForce,
- d3_layout_forceDragNode,
- d3_layout_forceDragMoved,
- d3_layout_forceDragOffset,
- d3_layout_forceStopClick,
- d3_layout_forceDragElement;
+ d3_layout_forceDragNode;
function d3_layout_forceDragOver(d) {
- d.fixed = true;
+ d.fixed |= 2;
}
function d3_layout_forceDragOut(d) {
- if (d !== d3_layout_forceDragNode) {
- d.fixed = false;
- }
+ if (d !== d3_layout_forceDragNode) d.fixed &= 1;
}
-function d3_layout_forcePoint(container) {
- return d3.event.touches
- ? d3.svg.touches(container)[0]
- : d3.svg.mouse(container);
+function d3_layout_forceDragEnd() {
+ d3_layout_forceDrag();
+ d3_layout_forceDragNode.fixed &= 1;
+ d3_layout_forceDragForce = d3_layout_forceDragNode = null;
}
-function d3_layout_forceDragMove() {
- if (!d3_layout_forceDragNode) return;
- var parent = d3_layout_forceDragElement.parentNode;
-
- // O NOES! The drag element was removed from the DOM.
- if (!parent) {
- d3_layout_forceDragNode.fixed = false;
- d3_layout_forceDragOffset = d3_layout_forceDragNode = d3_layout_forceDragElement = null;
- return;
- }
-
- var m = d3_layout_forcePoint(parent);
- d3_layout_forceDragMoved = true;
- d3_layout_forceDragNode.px = m[0] - d3_layout_forceDragOffset[0];
- d3_layout_forceDragNode.py = m[1] - d3_layout_forceDragOffset[1];
- d3_layout_forceCancel();
+function d3_layout_forceDrag() {
+ d3_layout_forceDragNode.px = d3.event.x;
+ d3_layout_forceDragNode.py = d3.event.y;
d3_layout_forceDragForce.resume(); // restart annealing
}
-function d3_layout_forceDragUp() {
- if (!d3_layout_forceDragNode) return;
-
- // If the node was moved, prevent the mouseup from propagating.
- // Also prevent the subsequent click from propagating (e.g., for anchors).
- if (d3_layout_forceDragMoved) {
- d3_layout_forceStopClick = true;
- d3_layout_forceCancel();
- }
-
- // Don't trigger this for touchend.
- if (d3.event.type === "mouseup") {
- d3_layout_forceDragMove();
- }
-
- d3_layout_forceDragNode.fixed = false;
- d3_layout_forceDragForce =
- d3_layout_forceDragOffset =
- d3_layout_forceDragNode =
- d3_layout_forceDragElement = null;
-}
-
-function d3_layout_forceDragClick() {
- if (d3_layout_forceStopClick) {
- d3_layout_forceCancel();
- d3_layout_forceStopClick = false;
- }
-}
-
-function d3_layout_forceCancel() {
- d3.event.stopPropagation();
- d3.event.preventDefault();
-}
-
-function d3_layout_forceAccumulate(quad) {
+function d3_layout_forceAccumulate(quad, alpha, charges) {
var cx = 0,
cy = 0;
- quad.count = 0;
+ quad.charge = 0;
if (!quad.leaf) {
var nodes = quad.nodes,
n = nodes.length,
@@ -567,10 +523,10 @@ function d3_layout_forceAccumulate(quad) {
while (++i < n) {
c = nodes[i];
if (c == null) continue;
- d3_layout_forceAccumulate(c);
- quad.count += c.count;
- cx += c.count * c.cx;
- cy += c.count * c.cy;
+ d3_layout_forceAccumulate(c, alpha, charges);
+ quad.charge += c.charge;
+ cx += c.charge * c.cx;
+ cy += c.charge * c.cy;
}
}
if (quad.point) {
@@ -579,12 +535,13 @@ function d3_layout_forceAccumulate(quad) {
quad.point.x += Math.random() - .5;
quad.point.y += Math.random() - .5;
}
- quad.count++;
- cx += quad.point.x;
- cy += quad.point.y;
+ var k = alpha * charges[quad.point.index];
+ quad.charge += quad.pointCharge = k;
+ cx += k * quad.point.x;
+ cy += k * quad.point.y;
}
- quad.cx = cx / quad.count;
- quad.cy = cy / quad.count;
+ quad.cx = cx / quad.charge;
+ quad.cy = cy / quad.charge;
}
function d3_layout_forceLinkDistance(link) {
@@ -604,12 +561,12 @@ d3.layout.partition = function() {
node.y = node.depth * dy;
node.dx = dx;
node.dy = dy;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length,
+ n,
c,
d;
- dx /= node.value;
+ dx = node.value ? dx / node.value : 0;
while (++i < n) {
position(c = children[i], x, d = c.value * dx, dy);
x += d;
@@ -620,9 +577,9 @@ d3.layout.partition = function() {
function depth(node) {
var children = node.children,
d = 0;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length;
+ n;
while (++i < n) d = Math.max(d, depth(children[i]));
}
return 1 + d;
@@ -644,48 +601,44 @@ d3.layout.partition = function() {
};
d3.layout.pie = function() {
var value = Number,
- sort = null,
+ sort = d3_layout_pieSortByValue,
startAngle = 0,
endAngle = 2 * Math.PI;
function pie(data, i) {
+ // Compute the numeric values for each data element.
+ var values = data.map(function(d, i) { return +value.call(pie, d, i); });
+
// Compute the start angle.
var a = +(typeof startAngle === "function"
? startAngle.apply(this, arguments)
: startAngle);
- // Compute the angular range (end - start).
- var k = (typeof endAngle === "function"
+ // Compute the angular scale factor: from value to radians.
+ var k = ((typeof endAngle === "function"
? endAngle.apply(this, arguments)
- : endAngle) - startAngle;
+ : endAngle) - startAngle)
+ / d3.sum(values);
// Optionally sort the data.
var index = d3.range(data.length);
- if (sort != null) index.sort(function(i, j) {
- return sort(data[i], data[j]);
- });
-
- // Compute the numeric values for each data element.
- var values = data.map(value);
-
- // Convert k into a scale factor from value to angle, using the sum.
- k /= values.reduce(function(p, d) { return p + d; }, 0);
+ if (sort != null) index.sort(sort === d3_layout_pieSortByValue
+ ? function(i, j) { return values[j] - values[i]; }
+ : function(i, j) { return sort(data[i], data[j]); });
// Compute the arcs!
- var arcs = index.map(function(i) {
- return {
+ // They are stored in the original data's order.
+ var arcs = [];
+ index.forEach(function(i) {
+ arcs[i] = {
data: data[i],
value: d = values[i],
startAngle: a,
endAngle: a += d * k
};
});
-
- // Return the arcs in the original data's order.
- return data.map(function(d, i) {
- return arcs[index[i]];
- });
+ return arcs;
}
/**
@@ -737,6 +690,8 @@ d3.layout.pie = function() {
return pie;
};
+
+var d3_layout_pieSortByValue = {};
// data is two-dimensional array of x,y; we populate y0
d3.layout.stack = function() {
var values = Object,
@@ -1088,9 +1043,9 @@ d3.layout.hierarchy = function() {
node = d3_layout_hierarchyInline ? data : {data: data};
node.depth = depth;
nodes.push(node);
- if (childs) {
+ if (childs && (n = childs.length)) {
var i = -1,
- n = childs.length,
+ n,
c = node.children = [],
v = 0,
j = depth + 1;
@@ -1103,7 +1058,7 @@ d3.layout.hierarchy = function() {
if (sort) c.sort(sort);
if (value) node.value = v;
} else if (value) {
- node.value = value.call(hierarchy, data, depth);
+ node.value = +value.call(hierarchy, data, depth) || 0;
}
return node;
}
@@ -1112,13 +1067,13 @@ d3.layout.hierarchy = function() {
function revalue(node, depth) {
var children = node.children,
v = 0;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length,
+ n,
j = depth + 1;
while (++i < n) v += revalue(children[i], j);
} else if (value) {
- v = value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth);
+ v = +value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth) || 0;
}
if (value) node.value = v;
return v;
@@ -1159,10 +1114,10 @@ d3.layout.hierarchy = function() {
// A method assignment helper for hierarchy subclasses.
function d3_layout_hierarchyRebind(object, hierarchy) {
- object.sort = d3.rebind(object, hierarchy.sort);
- object.children = d3.rebind(object, hierarchy.children);
+ d3.rebind(object, hierarchy, "sort", "children", "value");
+
+ // Add an alias for links, for convenience.
object.links = d3_layout_hierarchyLinks;
- object.value = d3.rebind(object, hierarchy.value);
// If the new API is used, enabling inlining.
object.nodes = function(d) {
@@ -1362,7 +1317,7 @@ function d3_layout_packUnlink(node) {
function d3_layout_packTree(node) {
var children = node.children;
- if (children) {
+ if (children && children.length) {
children.forEach(d3_layout_packTree);
node.r = d3_layout_packCircle(children);
} else {
@@ -1382,19 +1337,22 @@ function d3_layout_packTransform(node, x, y, k) {
}
function d3_layout_packPlace(a, b, c) {
- var da = b.r + c.r,
- db = a.r + c.r,
+ var db = a.r + c.r,
dx = b.x - a.x,
- dy = b.y - a.y,
- dc = Math.sqrt(dx * dx + dy * dy),
- cos = (db * db + dc * dc - da * da) / (2 * db * dc),
- theta = Math.acos(cos),
- x = cos * db,
- h = Math.sin(theta) * db;
- dx /= dc;
- dy /= dc;
- c.x = a.x + x * dx + h * dy;
- c.y = a.y + x * dy - h * dx;
+ dy = b.y - a.y;
+ if (db && (dx || dy)) {
+ var da = b.r + c.r,
+ dc = Math.sqrt(dx * dx + dy * dy),
+ cos = Math.max(-1, Math.min(1, (db * db + dc * dc - da * da) / (2 * db * dc))),
+ theta = Math.acos(cos),
+ x = cos * (db /= dc),
+ y = Math.sin(theta) * db;
+ c.x = a.x + x * dx + y * dy;
+ c.y = a.y + x * dy - y * dx;
+ } else {
+ c.x = a.x + db;
+ c.y = a.y;
+ }
}
// Implements a hierarchical layout using the cluster (or dendogram) algorithm.
d3.layout.cluster = function() {
@@ -1412,9 +1370,10 @@ d3.layout.cluster = function() {
// First walk, computing the initial x & y values.
d3_layout_treeVisitAfter(root, function(node) {
- if (node.children) {
- node.x = d3_layout_clusterX(node.children);
- node.y = d3_layout_clusterY(node.children);
+ var children = node.children;
+ if (children && children.length) {
+ node.x = d3_layout_clusterX(children);
+ node.y = d3_layout_clusterY(children);
} else {
node.x = previousNode ? x += separation(node, previousNode) : 0;
node.y = 0;
@@ -1431,7 +1390,7 @@ d3.layout.cluster = function() {
// Second walk, normalizing x & y to the desired size.
d3_layout_treeVisitAfter(root, function(node) {
node.x = (node.x - x0) / (x1 - x0) * size[0];
- node.y = (1 - node.y / root.y) * size[1];
+ node.y = (1 - (root.y ? node.y / root.y : 1)) * size[1];
});
return nodes;
@@ -1466,12 +1425,12 @@ function d3_layout_clusterX(children) {
function d3_layout_clusterLeft(node) {
var children = node.children;
- return children ? d3_layout_clusterLeft(children[0]) : node;
+ return children && children.length ? d3_layout_clusterLeft(children[0]) : node;
}
function d3_layout_clusterRight(node) {
- var children = node.children;
- return children ? d3_layout_clusterRight(children[children.length - 1]) : node;
+ var children = node.children, n;
+ return children && (n = children.length) ? d3_layout_clusterRight(children[n - 1]) : node;
}
// Node-link tree diagram using the Reingold-Tilford "tidy" algorithm
d3.layout.tree = function() {
@@ -1486,8 +1445,8 @@ d3.layout.tree = function() {
function firstWalk(node, previousSibling) {
var children = node.children,
layout = node._tree;
- if (children && children.length) {
- var n = children.length,
+ if (children && (n = children.length)) {
+ var n,
firstChild = children[0],
previousChild,
ancestor = firstChild,
@@ -1517,9 +1476,9 @@ d3.layout.tree = function() {
function secondWalk(node, x) {
node.x = node._tree.prelim + x;
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length;
+ n;
x += node._tree.mod;
while (++i < n) {
secondWalk(children[i], x);
@@ -1624,18 +1583,21 @@ function d3_layout_treeSeparation(a, b) {
// }
function d3_layout_treeLeft(node) {
- return node.children ? node.children[0] : node._tree.thread;
+ var children = node.children;
+ return children && children.length ? children[0] : node._tree.thread;
}
function d3_layout_treeRight(node) {
- return node.children ? node.children[node.children.length - 1] : node._tree.thread;
+ var children = node.children,
+ n;
+ return children && (n = children.length) ? children[n - 1] : node._tree.thread;
}
function d3_layout_treeSearch(node, compare) {
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var child,
- n = children.length,
+ n,
i = -1;
while (++i < n) {
if (compare(child = d3_layout_treeSearch(children[i], compare), node) > 0) {
@@ -1661,11 +1623,11 @@ function d3_layout_treeDeepest(a, b) {
function d3_layout_treeVisitAfter(node, callback) {
function visit(node, previousSibling) {
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var child,
previousChild = null,
i = -1,
- n = children.length;
+ n;
while (++i < n) {
child = children[i];
visit(child, previousChild);
@@ -1733,57 +1695,61 @@ d3.layout.treemap = function() {
// Recursively arranges the specified node's children into squarified rows.
function squarify(node) {
- if (!node.children) return;
- var rect = pad(node),
- row = [],
- children = node.children.slice(), // copy-on-write
- child,
- best = Infinity, // the best row score so far
- score, // the current row score
- u = Math.min(rect.dx, rect.dy), // initial orientation
- n;
- scale(children, rect.dx * rect.dy / node.value);
- row.area = 0;
- while ((n = children.length) > 0) {
- row.push(child = children[n - 1]);
- row.area += child.area;
- if ((score = worst(row, u)) <= best) { // continue with this orientation
- children.pop();
- best = score;
- } else { // abort, and try a different orientation
- row.area -= row.pop().area;
- position(row, u, rect, false);
- u = Math.min(rect.dx, rect.dy);
+ var children = node.children;
+ if (children && children.length) {
+ var rect = pad(node),
+ row = [],
+ remaining = children.slice(), // copy-on-write
+ child,
+ best = Infinity, // the best row score so far
+ score, // the current row score
+ u = Math.min(rect.dx, rect.dy), // initial orientation
+ n;
+ scale(remaining, rect.dx * rect.dy / node.value);
+ row.area = 0;
+ while ((n = remaining.length) > 0) {
+ row.push(child = remaining[n - 1]);
+ row.area += child.area;
+ if ((score = worst(row, u)) <= best) { // continue with this orientation
+ remaining.pop();
+ best = score;
+ } else { // abort, and try a different orientation
+ row.area -= row.pop().area;
+ position(row, u, rect, false);
+ u = Math.min(rect.dx, rect.dy);
+ row.length = row.area = 0;
+ best = Infinity;
+ }
+ }
+ if (row.length) {
+ position(row, u, rect, true);
row.length = row.area = 0;
- best = Infinity;
}
+ children.forEach(squarify);
}
- if (row.length) {
- position(row, u, rect, true);
- row.length = row.area = 0;
- }
- node.children.forEach(squarify);
}
// Recursively resizes the specified node's children into existing rows.
// Preserves the existing layout!
function stickify(node) {
- if (!node.children) return;
- var rect = pad(node),
- children = node.children.slice(), // copy-on-write
- child,
- row = [];
- scale(children, rect.dx * rect.dy / node.value);
- row.area = 0;
- while (child = children.pop()) {
- row.push(child);
- row.area += child.area;
- if (child.z != null) {
- position(row, child.z ? rect.dx : rect.dy, rect, !children.length);
- row.length = row.area = 0;
+ var children = node.children;
+ if (children && children.length) {
+ var rect = pad(node),
+ remaining = children.slice(), // copy-on-write
+ child,
+ row = [];
+ scale(remaining, rect.dx * rect.dy / node.value);
+ row.area = 0;
+ while (child = remaining.pop()) {
+ row.push(child);
+ row.area += child.area;
+ if (child.z != null) {
+ position(row, child.z ? rect.dx : rect.dy, rect, !remaining.length);
+ row.length = row.area = 0;
+ }
}
+ children.forEach(stickify);
}
- node.children.forEach(stickify);
}
// Computes the score for the specified row, as the worst aspect ratio.
@@ -1815,7 +1781,7 @@ d3.layout.treemap = function() {
v = u ? round(row.area / u) : 0,
o;
if (u == rect.dx) { // horizontal subdivision
- if (flush || v > rect.dy) v = rect.dy; // over+underflow
+ if (flush || v > rect.dy) v = v ? rect.dy : 0; // over+underflow
while (++i < n) {
o = row[i];
o.x = x;
@@ -1828,7 +1794,7 @@ d3.layout.treemap = function() {
rect.y += v;
rect.dy -= v;
} else { // vertical subdivision
- if (flush || v > rect.dx) v = rect.dx; // over+underflow
+ if (flush || v > rect.dx) v = v ? rect.dx : 0; // over+underflow
while (++i < n) {
o = row[i];
o.x = x;
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
index 3a3409f..4c1cda4 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
@@ -78,6 +78,7 @@ var d3_time_formats = {
H: function(d) { return d3_time_zfill2(d.getHours()); },
I: function(d) { return d3_time_zfill2(d.getHours() % 12 || 12); },
j: d3_time_dayOfYear,
+ L: function(d) { return d3_time_zfill3(d.getMilliseconds()); },
m: function(d) { return d3_time_zfill2(d.getMonth() + 1); },
M: function(d) { return d3_time_zfill2(d.getMinutes()); },
p: function(d) { return d.getHours() >= 12 ? "PM" : "AM"; },
@@ -104,6 +105,7 @@ var d3_time_parsers = {
H: d3_time_parseHour24,
I: d3_time_parseHour12,
// j: function(d, s, i) { /*TODO day of year [001,366] */ return i; },
+ L: d3_time_parseMilliseconds,
m: d3_time_parseMonthNumber,
M: d3_time_parseMinutes,
p: d3_time_parseAmPm,
@@ -277,6 +279,12 @@ function d3_time_parseSeconds(date, string, i) {
return n ? (date.setSeconds(+n[0]), i += n[0].length) : -1;
}
+function d3_time_parseMilliseconds(date, string, i) {
+ d3_time_numberRe.lastIndex = 0;
+ var n = d3_time_numberRe.exec(string.substring(i, i + 3));
+ return n ? (date.setMilliseconds(+n[0]), i += n[0].length) : -1;
+}
+
// Note: we don't look at the next directive.
var d3_time_numberRe = /\s*\d+/;
@@ -294,18 +302,22 @@ function d3_time_year(d) {
return new d3_time(d.getFullYear(), 0, 1);
}
+function d3_time_daysElapsed(d0, d1) {
+ return ~~((d1 - d0) / 864e5 - (d1.getTimezoneOffset() - d0.getTimezoneOffset()) / 1440);
+}
+
function d3_time_dayOfYear(d) {
- return d3_time_zfill3(1 + ~~((d - d3_time_year(d)) / 864e5));
+ return d3_time_zfill3(1 + d3_time_daysElapsed(d3_time_year(d), d));
}
function d3_time_weekNumberSunday(d) {
var d0 = d3_time_year(d);
- return d3_time_zfill2(~~(((d - d0) / 864e5 + d0.getDay()) / 7));
+ return d3_time_zfill2(~~((d3_time_daysElapsed(d0, d) + d0.getDay()) / 7));
}
function d3_time_weekNumberMonday(d) {
var d0 = d3_time_year(d);
- return d3_time_zfill2(~~(((d - d0) / 864e5 + (d0.getDay() + 6) % 7) / 7));
+ return d3_time_zfill2(~~((d3_time_daysElapsed(d0, d) + (d0.getDay() + 6) % 7) / 7));
}
// TODO table of time zone offset names?
@@ -320,9 +332,14 @@ d3.time.format.utc = function(template) {
var local = d3.time.format(template);
function format(date) {
- var utc = new d3_time_format_utc();
- utc._ = date;
- return local(utc);
+ try {
+ d3_time = d3_time_format_utc;
+ var utc = new d3_time();
+ utc._ = date;
+ return local(utc);
+ } finally {
+ d3_time = Date;
+ }
}
format.parse = function(string) {
@@ -364,7 +381,19 @@ d3_time_format_utc.prototype = {
setMonth: function(x) { this._.setUTCMonth(x); },
setSeconds: function(x) { this._.setUTCSeconds(x); }
};
-d3.time.format.iso = d3.time.format.utc("%Y-%m-%dT%H:%M:%SZ");
+var d3_time_formatIso = d3.time.format.utc("%Y-%m-%dT%H:%M:%S.%LZ");
+
+d3.time.format.iso = Date.prototype.toISOString ? d3_time_formatIsoNative : d3_time_formatIso;
+
+function d3_time_formatIsoNative(date) {
+ return date.toISOString();
+}
+
+d3_time_formatIsoNative.parse = function(string) {
+ return new Date(string);
+};
+
+d3_time_formatIsoNative.toString = d3_time_formatIso.toString;
function d3_time_range(floor, step, number) {
return function(t0, t1, dt) {
var time = floor(t0), times = [];
@@ -502,8 +531,7 @@ d3.time.years.utc = d3_time_range(d3.time.year.utc, function(date) {
return date.getUTCFullYear();
});
// TODO nice
-function d3_time_scale(methods, format) {
- var linear = d3.scale.linear();
+function d3_time_scale(linear, methods, format) {
function scale(x) {
return linear(x);
@@ -537,13 +565,12 @@ function d3_time_scale(methods, format) {
return format;
};
- // TOOD expose d3_scale_linear_rebind?
- scale.range = d3.rebind(scale, linear.range);
- scale.rangeRound = d3.rebind(scale, linear.rangeRound);
- scale.interpolate = d3.rebind(scale, linear.interpolate);
- scale.clamp = d3.rebind(scale, linear.clamp);
+ scale.copy = function() {
+ return d3_time_scale(linear.copy(), methods, format);
+ };
- return scale;
+ // TOOD expose d3_scale_linear_rebind?
+ return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
}
// TODO expose d3_scaleExtent?
@@ -619,7 +646,7 @@ var d3_time_scaleLocalFormats = [
var d3_time_scaleLocalFormat = d3_time_scaleFormat(d3_time_scaleLocalFormats);
d3.time.scale = function() {
- return d3_time_scale(d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
+ return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
};
var d3_time_scaleUTCMethods = [
[d3.time.seconds.utc, 1],
@@ -655,6 +682,6 @@ var d3_time_scaleUTCFormats = [
var d3_time_scaleUTCFormat = d3_time_scaleFormat(d3_time_scaleUTCFormats);
d3.time.scale.utc = function() {
- return d3_time_scale(d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
+ return d3_time_scale(d3.scale.linear(), d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
};
})();
commit afb9bfa4c6252f71fcf99343d92c892724592d79
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jan 5 15:24:34 2012 -0500
fix the user prefs test page so the buttons are re-enabled after clicking them
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
index 3c1e768..42dfbbe 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
@@ -97,6 +97,8 @@ public class TestUserPreferencesView extends Table {
new MessageWindow(extendLocatorId("csv"), "Export To CSV", "<pre>" + csv.toString() + "</pre>")
.show();
+
+ refreshTableInfo();
}
});
}
@@ -110,6 +112,7 @@ public class TestUserPreferencesView extends Table {
public void refresh() {
super.refresh();
getListGrid().setRecords(transform(this.prefs.getConfiguration()));
+ refreshTableInfo();
}
private ListGridRecord[] transform(Configuration configuration) {
commit 08a2a27a85319bf47e512780f678e532229381c8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jan 5 12:37:07 2012 -0500
fix the log message - we want to see the resource Ids so we need to convert the array to a string
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
index e5df592..5b6b048 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
@@ -23,6 +23,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -1008,7 +1009,7 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
}
}
} catch (Throwable t) {
- log.warn("problem creating schedules for resourceIds [" + resourceIds + "]", t);
+ log.warn("problem creating schedules for resourceIds [" + Arrays.toString(resourceIds) + "]", t);
}
return;
commit cf293cb3baf9e3d3447c16db0c181735d12c12e9
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Jan 5 13:58:08 2012 +0100
[BZ 746113] - increasing the maximum wait time for the tomcat start/stop
scripts from 1s to 120s.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
index f1e78f4..e9002f8 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
@@ -403,7 +403,7 @@ public class TomcatServerOperationsDelegate {
private void initProcessExecution(ProcessExecution processExecution) {
processExecution.setCaptureOutput(true);
- processExecution.setWaitForCompletion(1000L); // 1 second // TODO: Should we wait longer than one second?
+ processExecution.setWaitForCompletion(120000L); // 120 seconds - that should be safe? // TODO: make this configurable
processExecution.setKillOnTimeout(false);
}
commit aa4ec7d05bb38856a664ba6996255780db44f3d2
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jan 4 21:56:48 2012 +0100
BZ 770967 - the port expression may now also have a ${} expression.
BZ 766284 - Detect managed AS7 in domain mode
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
index 78b1543..0e58078 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
@@ -158,7 +158,8 @@ public class AbstractBaseDiscovery {
if (portString!=null && !portString.isEmpty()) {
- hp.port = Integer.valueOf(portString);
+ String tmp = replaceDollarExpression(portString,commandLine);
+ hp.port = Integer.valueOf(tmp);
}
else
hp.port = 9990; // Fallback to default
@@ -197,15 +198,24 @@ public class AbstractBaseDiscovery {
* -D jboss.bind.address.management
* or
* -b management
- * to find the management port
+ * to find the management addresss
*/
String ret=null;
for (String line: commandLine) {
- if (line.contains("-bmanagement") || line.contains("jboss.bind.address.management")) {
- ret = line.substring(line.indexOf("=")+1);
- break;
+ if (expression.contains("address")) {
+ if (line.contains("-bmanagement") || line.contains("jboss.bind.address.management")) {
+ ret = line.substring(line.indexOf("=")+1);
+ break;
+ }
}
+ else if (expression.contains("port")) {
+ if (line.contains(expression)) {
+ ret = line.substring(line.indexOf("=")+1);
+ break;
+ }
+ }
+
}
if (ret==null)
ret = fallback;
@@ -269,12 +279,17 @@ public class AbstractBaseDiscovery {
if (hostXml==null)
throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
- // TODO make realm variable
String fileName = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@path");
String relDir = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@relative-to");
+ String dmode;
+ if (mode==AS7Mode.STANDALONE)
+ dmode="server";
+ else
+ dmode="domain";
+
String fullName ;
- if (relDir.equals("jboss.server.config.dir"))
+ if (relDir.equals("jboss." + dmode + ".config.dir"))
fullName = baseDir + File.separator + mode.getBaseDir() + File.separator + "configuration" + File.separator + fileName;
else
fullName = relDir + File.separator + fileName;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
index 3e90588..53afe21 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
@@ -35,6 +35,7 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ProcessScanResult;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.core.system.ProcessInfo;
import org.rhq.modules.plugins.jbossas7.json.Address;
@@ -49,7 +50,7 @@ import org.rhq.modules.plugins.jbossas7.json.ReadResource;
* @author Heiko W. Rupp
*/
@SuppressWarnings("unused")
-public class ManagedASDiscovery extends AbstractBaseDiscovery
+public class ManagedASDiscovery extends AbstractBaseDiscovery implements ResourceDiscoveryComponent
{
@@ -144,7 +145,7 @@ public class ManagedASDiscovery extends AbstractBaseDiscovery
Address theAddress = new Address("server-group", serverGroup);
Operation op = new ReadResource(theAddress);
ComplexResult res = (ComplexResult) dcConnection.execute(op, true);
- if (res.isSuccess()) {
+ if (res!=null && res.isSuccess()) {
if (res.getResult().containsKey("socket-binding-group")) {
String sbg = (String) res.getResult().get("socket-binding-group");
commit 51d8b4632a497bdbdfe2ae154aafbf2631411452
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jan 4 15:32:40 2012 +0100
Allow to submit a 'now' value - otherwise the 7days case will always be served from the 1h table as the Handler's now is some ms earlier than the utilities now.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java
index 0dfe0bb..f43820f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java
@@ -447,12 +447,12 @@ public class MeasurementDataManagerUtility {
return tables;
}
- /**
+ /**
* The raw tables starting at the specified index. Can be useful for getting the tables in a necessary time order (like
* oldest data first.
- *
- * @param startIndex >= 0. If >= TABLE_COUNT normalized via modulo.
- * @return Array of raw table names starting with the table with the specified index.
+ *
+ * @param startIndex >= 0. If >= TABLE_COUNT normalized via modulo.
+ * @return Array of raw table names starting with the table with the specified index.
*/
public static String[] getAllRawTables(int startIndex) {
String[] tables = new String[TABLE_COUNT];
@@ -465,9 +465,13 @@ public class MeasurementDataManagerUtility {
}
public static String[] getTables(long beginTime, long endTime) {
+ return getTables(beginTime, endTime, System.currentTimeMillis());
+ }
+
+ public static String[] getTables(long beginTime, long endTime, long now) {
List<String> tables = new ArrayList<String>();
- long now = System.currentTimeMillis();
+
if ((now - RAW_PURGE) < beginTime) {
int startIndex = getTableIndex(beginTime);
int endIndex = getTableIndex(endTime);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index a772ab4..71a6a45 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -407,14 +407,15 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+ long now = System.currentTimeMillis();
if (endTime==0)
- endTime = System.currentTimeMillis();
+ endTime = now;
if (startTime==0)
startTime = endTime - EIGHT_HOURS;
if (duration>0) // overrides start time
startTime = endTime - duration*1000L; // duration is in seconds
- if (startTime < System.currentTimeMillis()-7L*86400*1000)
+ if (startTime < now -7L*86400*1000)
throw new IllegalArgumentException("Start time is older than 7 days");
// Check if the schedule exists
@@ -425,6 +426,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
so.startTime = startTime;
so.endTime = endTime;
so.mediaType = mediaType;
+ so.now = now-1; // pass this so that the for the 7days case is still handled from raw tables.
return so;
@@ -484,12 +486,13 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
int scheduleId;
long startTime;
long endTime;
+ long now;
MediaType mediaType;
@Override
public void write(OutputStream outputStream) throws IOException, WebApplicationException {
- String[] tables = MeasurementDataManagerUtility.getTables(startTime,endTime);
+ String[] tables = MeasurementDataManagerUtility.getTables(startTime,endTime,now);
StringBuilder sb = new StringBuilder();
for (int i = 0 ; i < tables.length ; i ++) {
sb.append("SELECT time_stamp,value FROM ");
commit d757cd72c10213f8888699095f7e5a1932427970
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Jan 4 17:27:03 2012 -0500
[BZ 759481] fix the NPE that occurred when quick clicking between the template screens
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
index afb7b31..72563c2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
@@ -25,6 +25,7 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.tree.Tree;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
@@ -118,8 +119,7 @@ public abstract class ResourceTypeTreeNodeBuilder {
boolean isPlatform = (parentType.getCategory() == ResourceCategory.PLATFORM && isEmpty(parentType
.getParentResourceTypes()));
if (!isPlatform || !gotPlatform) {
- treeNodes
- .add(getTreeNodeInstance(composite, String.valueOf(parentType.getId())));
+ treeNodes.add(getTreeNodeInstance(composite, String.valueOf(parentType.getId())));
}
if (isPlatform) {
gotPlatform = true;
@@ -132,7 +132,11 @@ public abstract class ResourceTypeTreeNodeBuilder {
platformsGrid.setData(platformsRecords.toArray(new ListGridRecord[platformsRecords.size()]));
platformServicesGrid.setData(platformServicesRecords
.toArray(new ListGridRecord[platformServicesRecords.size()]));
- serversGrid.getTree().linkNodes(treeNodes.toArray(new TreeNode[treeNodes.size()]));
+ Tree tree = serversGrid.getTree();
+ if (tree != null) {
+ TreeNode[] treeNodeArray = treeNodes.toArray(new TreeNode[treeNodes.size()]);
+ tree.linkNodes(treeNodeArray);
+ }
}
@Override
commit 04000903b57864003ee41a86e013ddcc39ec4789
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Jan 4 14:22:00 2012 -0500
[Bug 751778 - Upgrade from rhq4.1.0 to rhq4.2.0 fails with error : relation "rhq_drift_def_template" does not exist]
Fix query syntax for Oracle compatibility
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
index 95d9ef7..386bd2a 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
@@ -74,7 +74,7 @@ public class DriftTemplateMapDatabaseUpgradeTask implements DatabaseUpgradeTask
+ " from RHQ_DRIFT_DEF_TEMPLATE dt" //
+ " join RHQ_RESOURCE_TYPE rt on dt.RESOURCE_TYPE_ID = rt.ID" //
+ " join RHQ_RESOURCE res on rt.ID = res.RESOURCE_TYPE_ID" //
- + " and dd.RESOURCE_ID = res.ID" //
+ + " where dd.RESOURCE_ID = res.ID" //
+ " )" //
+ " where dd.DRIFT_DEF_TEMPLATE_ID is null";
commit 0db0f28f90897d71b3c992d802e58dc091ff2b7e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Jan 4 10:31:51 2012 -0500
add jboss-sasl jar (as-7 plugin dep) to eclipse build path
diff --git a/.classpath b/.classpath
index 24fb54d..9eaf31b 100644
--- a/.classpath
+++ b/.classpath
@@ -124,6 +124,7 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.2.1.GA/resteasy-jaxrs-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jettison-provider/2.2.1.GA/resteasy-jettison-provider-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/2.2.1.GA/jaxrs-api-2.2.1.GA.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/itests/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/drift-mongodb/src/main/java"/>
commit 51fbaef6a41e324118e069b7b5b8915526c2dc34
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Jan 4 14:15:57 2012 +0100
Adding support for Ldap, Dir, Event and EventDir contexts in addition to
the normal JNDI contexts in our JNDI security wrappers. This should unbreak
the LDAP support in the RHQ server.
Fixed enterprise/server/itests tests.
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java
deleted file mode 100644
index df42afe..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-/**
- * This is the "meat" of the RHQ's secured JNDI access. This {@link Context} decorator
- * applied security checks in each method (lookups, (un)bindings, etc).
- * <p>
- * The security check consists of checking if the current callstack has the {@link AllowRhqServerInternalsAccessPermission}.
- * <p>
- * This decorator applies the security check on any JNDI name without a scheme and
- * on any name that has a scheme listed in the {@link #checkedSchemes} list supplied
- * in the constructor.
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingContextDecorator implements Context {
-
- private static final AllowRhqServerInternalsAccessPermission PERM = new AllowRhqServerInternalsAccessPermission();
- private Context original;
- private List<String> checkedSchemes;
-
- public AccessCheckingContextDecorator(Context original, String... checkedSchemes) {
- this.original = original;
- this.checkedSchemes = Arrays.asList(checkedSchemes);
- }
-
- private static void check() {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(PERM);
- }
-
- private void checkScheme(String scheme) {
- if (scheme == null || checkedSchemes.contains(scheme)) {
- check();
- }
- }
-
- private void check(String name) {
- checkScheme(getURLScheme(name));
- }
-
- private void check(Name name) {
- if (name.size() == 0) {
- check();
- } else {
- String first = name.get(0);
- checkScheme(getURLScheme(first));
- }
- }
-
- public Object lookup(Name name) throws NamingException {
- check(name);
- return original.lookup(name);
- }
-
- public Object lookup(String name) throws NamingException {
- check(name);
- return original.lookup(name);
- }
-
- public void bind(Name name, Object obj) throws NamingException {
- check(name);
- original.bind(name, obj);
- }
-
- public void bind(String name, Object obj) throws NamingException {
- check(name);
- original.bind(name, obj);
- }
-
- public void rebind(Name name, Object obj) throws NamingException {
- check(name);
- original.rebind(name, obj);
- }
-
- public void rebind(String name, Object obj) throws NamingException {
- check(name);
- original.rebind(name, obj);
- }
-
- public void unbind(Name name) throws NamingException {
- check(name);
- original.unbind(name);
- }
-
- public void unbind(String name) throws NamingException {
- check(name);
- original.unbind(name);
- }
-
- public void rename(Name oldName, Name newName) throws NamingException {
- check(oldName);
- check(newName);
- original.rename(oldName, newName);
- }
-
- public void rename(String oldName, String newName) throws NamingException {
- check(oldName);
- check(newName);
- original.rename(oldName, newName);
- }
-
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
- check(name);
- return original.list(name);
- }
-
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
- check(name);
- return original.list(name);
- }
-
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
- check(name);
- return original.listBindings(name);
- }
-
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
- check(name);
- return original.listBindings(name);
- }
-
- public void destroySubcontext(Name name) throws NamingException {
- check(name);
- original.destroySubcontext(name);
- }
-
- public void destroySubcontext(String name) throws NamingException {
- check(name);
- original.destroySubcontext(name);
- }
-
- public Context createSubcontext(Name name) throws NamingException {
- check(name);
- return original.createSubcontext(name);
- }
-
- public Context createSubcontext(String name) throws NamingException {
- check(name);
- return original.createSubcontext(name);
- }
-
- public Object lookupLink(Name name) throws NamingException {
- check(name);
- return original.lookupLink(name);
- }
-
- public Object lookupLink(String name) throws NamingException {
- check(name);
- return original.lookupLink(name);
- }
-
- public NameParser getNameParser(Name name) throws NamingException {
- check(name);
- return original.getNameParser(name);
- }
-
- public NameParser getNameParser(String name) throws NamingException {
- check(name);
- return original.getNameParser(name);
- }
-
- public Name composeName(Name name, Name prefix) throws NamingException {
- check(name);
- return original.composeName(name, prefix);
- }
-
- public String composeName(String name, String prefix) throws NamingException {
- check(name);
- return original.composeName(name, prefix);
- }
-
- public Object addToEnvironment(String propName, Object propVal) throws NamingException {
- check();
- return original.addToEnvironment(propName, propVal);
- }
-
- public Object removeFromEnvironment(String propName) throws NamingException {
- check();
- return original.removeFromEnvironment(propName);
- }
-
- public Hashtable<?, ?> getEnvironment() throws NamingException {
- check();
- return original.getEnvironment();
- }
-
- public void close() throws NamingException {
- check();
- original.close();
- }
-
- public String getNameInNamespace() throws NamingException {
- check();
- return original.getNameInNamespace();
- }
-
- //copied from InitialContext
- private static String getURLScheme(String str) {
- int colon_posn = str.indexOf(':');
- int slash_posn = str.indexOf('/');
-
- if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
- return str.substring(0, colon_posn);
- return null;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
index e529347..60e9bf6 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -27,6 +27,7 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
@@ -43,6 +44,18 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jnp.interfaces.NamingContextFactory;
+import org.rhq.jndi.context.AccessCheckingContextDecorator;
+import org.rhq.jndi.context.AccessCheckingDirContextDecorator;
+import org.rhq.jndi.context.AccessCheckingEventContextDecorator;
+import org.rhq.jndi.context.AccessCheckingEventDirContextDecorator;
+import org.rhq.jndi.context.AccessCheckingLdapContextDecorator;
+import org.rhq.jndi.context.ContextDecoratorPicker;
+import org.rhq.jndi.context.URLPreferringContextDecorator;
+import org.rhq.jndi.context.URLPreferringDirContextDecorator;
+import org.rhq.jndi.context.URLPreferringEventContextDecorator;
+import org.rhq.jndi.context.URLPreferringEventDirContextDecorator;
+import org.rhq.jndi.context.URLPreferringLdapContextDecorator;
+
/**
* This initial context factory builder is installed early on during the RHQ server startup
* and is later on used for obtaining the {@link Context}s for all JNDI lookups in the
@@ -67,7 +80,7 @@ import org.jnp.interfaces.NamingContextFactory;
*/
public class AccessCheckingInitialContextFactoryBuilder implements InitialContextFactoryBuilder {
private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
-
+
/**
* The list of JNDI name schemes that should be checked for security permissions
* (in addition to the names with no scheme).
@@ -79,14 +92,14 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
private static final Set<InetAddress> SERVER_BIND_IPS;
static {
SERVER_BIND_IPS = new HashSet<InetAddress>();
-
+
try {
String bindingAddressString = System.getProperty("jboss.bind.address");
InetAddress bindingAddress = InetAddress.getByName(bindingAddressString);
-
+
if (bindingAddress.isAnyLocalAddress()) {
Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
- while(ifaces.hasMoreElements()) {
+ while (ifaces.hasMoreElements()) {
NetworkInterface iface = ifaces.nextElement();
SERVER_BIND_IPS.addAll(Collections.list(iface.getInetAddresses()));
}
@@ -97,11 +110,12 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
LOG.error("Could not obtain the list of local IPs", e);
} catch (UnknownHostException e) {
LOG.error("Failed to get the binding address of the RHQ server.", e);
- }
+ }
}
-
- private static final int JNP_PORT = Integer.parseInt(System.getProperty("rhq.server.startup.namingservice.port", "2099"));
-
+
+ private static final int JNP_PORT = Integer.parseInt(System.getProperty("rhq.server.startup.namingservice.port",
+ "2099"));
+
/**
* This is the default initial context factory that is returned when no other is
* configured using the environment variables.
@@ -147,31 +161,72 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
});
}
- private static InitialContextFactory createSecureWrapper(InitialContextFactory factory, Hashtable<?, ?> environment) {
+ private static InitialContextFactory
+ createSecureWrapper(InitialContextFactory factory, Hashtable<?, ?> environment) {
String providerUrl = (String) environment.get(Context.PROVIDER_URL);
-
+
if (providerUrl == null) {
- return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ return getAccessCheckingFactory(factory);
} else {
try {
URI uri = new URI(providerUrl);
InetAddress providerHost = InetAddress.getByName(uri.getHost());
-
+
//check if we are accessing the RHQ server through some remoting
//interface.
- if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
- return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
+ return getAccessCheckingFactory(factory);
} else {
- return new URLPreferringInitialContextFactoryDecorator(factory);
+ return getURLPreferringFactory(factory);
}
} catch (URISyntaxException e) {
- return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ return getAccessCheckingFactory(factory);
} catch (UnknownHostException e) {
//let the factory deal with the unknown host...
//this most probably shouldn't be secured because localhost addresses
//should be resolvable.
- return new URLPreferringInitialContextFactoryDecorator(factory);
+ return getURLPreferringFactory(factory);
}
}
}
+
+ private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
+ return new DecoratingInitialContextFactory(original, Arrays.asList(
+ getURLPreferringDecoratorPicker(), getAccessCheckingDecoratorPicker()));
+ }
+
+ private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
+ return new DecoratingInitialContextFactory(original, Arrays.asList(
+ getURLPreferringDecoratorPicker()));
+ }
+
+ private static ContextDecoratorPicker getAccessCheckingDecoratorPicker() {
+ ContextDecoratorPicker ret = new ContextDecoratorPicker();
+
+ ret.setConstructorParameters(new Object[] { CHECKED_SCHEMES });
+ ret.setConstructorParameterTypes(new Class<?>[] { String[].class });
+
+ ret.getPossibleDecorators().add(AccessCheckingContextDecorator.class);
+ ret.getPossibleDecorators().add(AccessCheckingDirContextDecorator.class);
+ ret.getPossibleDecorators().add(AccessCheckingEventContextDecorator.class);
+ ret.getPossibleDecorators().add(AccessCheckingEventDirContextDecorator.class);
+ ret.getPossibleDecorators().add(AccessCheckingLdapContextDecorator.class);
+
+ return ret;
+ }
+
+ private static ContextDecoratorPicker getURLPreferringDecoratorPicker() {
+ ContextDecoratorPicker ret = new ContextDecoratorPicker();
+
+ ret.setConstructorParameters(null);
+ ret.setConstructorParameterTypes(null);
+
+ ret.getPossibleDecorators().add(URLPreferringContextDecorator.class);
+ ret.getPossibleDecorators().add(URLPreferringDirContextDecorator.class);
+ ret.getPossibleDecorators().add(URLPreferringEventContextDecorator.class);
+ ret.getPossibleDecorators().add(URLPreferringEventDirContextDecorator.class);
+ ret.getPossibleDecorators().add(URLPreferringLdapContextDecorator.class);
+
+ return ret;
+ }
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java
deleted file mode 100644
index b23935f..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-/**
- * A decorator of an {@link InitialContextFactory} that adds the security checking
- * machinery to the returned initial contexts.
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingInitialContextFactoryDecorator extends URLPreferringInitialContextFactoryDecorator {
-
- private final String[] checkedSchemes;
-
- /**
- * @param factory the factory to wrap
- * @param checkedSchemes the list of JNDI name schemes to check for permissions
- * @see AccessCheckingContextDecorator
- */
- public AccessCheckingInitialContextFactoryDecorator(InitialContextFactory factory, String... checkedSchemes) {
- super(factory);
- this.checkedSchemes = checkedSchemes;
- }
-
- /**
- * @param environment the environment variables for the return {@link Context} to use
- *
- * @return the initial context returned by the decorated factory wrapped in
- * {@link URLPreferringContext} and {@link AccessCheckingContextDecorator} in that
- * order.
- */
- @Override
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- return new AccessCheckingContextDecorator(super.getInitialContext(environment), checkedSchemes);
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
new file mode 100644
index 0000000..2414c98
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
@@ -0,0 +1,63 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+import org.rhq.jndi.context.ContextDecoratorPicker;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class DecoratingInitialContextFactory implements InitialContextFactory {
+
+ private List<ContextDecoratorPicker> pickers;
+ private InitialContextFactory factory;
+
+ public DecoratingInitialContextFactory(InitialContextFactory factory, List<ContextDecoratorPicker> decoratorPickers) {
+ this.factory = factory;
+ this.pickers = decoratorPickers;
+ }
+
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ Context ctx = factory.getInitialContext(environment);
+
+ try {
+ for(ContextDecoratorPicker picker : pickers) {
+ ctx = picker.wrapInAppropriateDecorator(ctx);
+ }
+ } catch (IllegalArgumentException e) {
+ NamingException ex = new NamingException();
+ ex.initCause(ex);
+
+ throw e;
+ }
+
+ return ctx;
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
deleted file mode 100644
index c6456a2..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.NamingManager;
-
-/**
- * This is a modification of the default {@link InitialContext} class that
- * ignores the initial context factory builder when constructing the default
- * context to use in lookups etc.
- * <p>
- * This is important because RHQ server has its own initial context factory
- * builder that creates factories that in turn create contexts. If the default
- * {@link InitialContext} implementation was used, we'd never be able to lookup
- * scheme-based names because the default implementation of the {@link InitialContext}
- * always uses the default context of the builder if one is installed no matter
- * the scheme in the name.
- * <p>
- * The {@link AccessCheckingInitialContextFactoryBuilder} wraps the context returned
- * by the factory in an instance of this class and thus is restoring the original
- * intended behavior of the {@link InitialContext}. It looks at the name being looked
- * up (bound or whatever) and prefers to use the URL context factories if the name
- * contains the scheme (as does the {@link InitialContext} if no builder is installed).
- * If the name doesn't contain a scheme, the provided default context factory is used to
- * look up the name.
- *
- * @author Lukas Krejci
- */
-public class URLPreferringContext extends InitialContext {
-
- public URLPreferringContext(InitialContextFactory defaultContextFactory) throws NamingException {
- super(true);
- this.defaultInitCtx = defaultContextFactory.getInitialContext(null);
- this.gotDefault = true;
- init(null);
- }
-
- public URLPreferringContext(Hashtable<?, ?> environment, InitialContextFactory defaultContextFactory) throws NamingException {
- super(true);
- this.defaultInitCtx = defaultContextFactory.getInitialContext(environment);
- this.gotDefault = true;
- init(environment);
- }
-
- @Override
- protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
- if (name.size() > 0) {
- String first = name.get(0);
- String scheme = getURLScheme(first);
- if (scheme != null) {
- Context ctx = NamingManager.getURLContext(scheme, myProps);
- if (ctx != null) {
- return ctx;
- }
- }
- }
- return getDefaultInitCtx();
- }
-
- @Override
- protected Context getURLOrDefaultInitCtx(String name) throws NamingException {
- String scheme = getURLScheme(name);
- if (scheme != null) {
- Context ctx = NamingManager.getURLContext(scheme, myProps);
- if (ctx != null) {
- return ctx;
- }
- }
- return getDefaultInitCtx();
- }
-
- //copied from InitialContext
- private static String getURLScheme(String str) {
- int colon_posn = str.indexOf(':');
- int slash_posn = str.indexOf('/');
-
- if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
- return str.substring(0, colon_posn);
- return null;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
deleted file mode 100644
index 609e98c..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-/**
- * A decorator of an {@link InitialContextFactory} that returns an {@link URLPreferringContext}
- * backed by the wrapped initial context factory.
- * <p>
- * This is to support contexts that don't need to be secured, yet we need to make sure to
- * re-enable lookup of scheme-based names.
- *
- * @author Lukas Krejci
- */
-public class URLPreferringInitialContextFactoryDecorator implements InitialContextFactory {
-
- private final InitialContextFactory factory;
-
- public URLPreferringInitialContextFactoryDecorator(InitialContextFactory factory) {
- this.factory = factory;
- }
-
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- return new URLPreferringContext(environment, getFactory());
- }
-
- protected InitialContextFactory getFactory() {
- return factory;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
new file mode 100644
index 0000000..6bfec7e
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
@@ -0,0 +1,254 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
+
+/**
+ * This is the "meat" of the RHQ's secured JNDI access. This {@link Context} decorator
+ * applied security checks in each method (lookups, (un)bindings, etc).
+ * <p>
+ * The security check consists of checking if the current callstack has the {@link AllowRhqServerInternalsAccessPermission}.
+ * <p>
+ * This decorator applies the security check on any JNDI name without a scheme and
+ * on any name that has a scheme listed in the {@link #checkedSchemes} list supplied
+ * in the constructor.
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingContextDecorator implements Context, ContextDecorator, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final AllowRhqServerInternalsAccessPermission PERM = new AllowRhqServerInternalsAccessPermission();
+ private Context original;
+ private List<String> checkedSchemes;
+
+ public AccessCheckingContextDecorator(String... checkedSchemes) {
+ this.checkedSchemes = Arrays.asList(checkedSchemes);
+ }
+
+ public AccessCheckingContextDecorator(Context original, String... checkedSchemes) {
+ this.original = original;
+ this.checkedSchemes = Arrays.asList(checkedSchemes);
+ }
+
+ public void init(Context ctx) {
+ this.original = ctx;
+ }
+
+ protected Context getOriginal() {
+ return original;
+ }
+
+ protected static void check() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) sm.checkPermission(PERM);
+ }
+
+ private void checkScheme(String scheme) {
+ if (scheme == null || checkedSchemes.contains(scheme)) {
+ check();
+ }
+ }
+
+ protected void check(String name) {
+ checkScheme(getURLScheme(name));
+ }
+
+ protected void check(Name name) {
+ if (name.size() == 0) {
+ check();
+ } else {
+ String first = name.get(0);
+ checkScheme(getURLScheme(first));
+ }
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ check(name);
+ return original.lookup(name);
+ }
+
+ public Object lookup(String name) throws NamingException {
+ check(name);
+ return original.lookup(name);
+ }
+
+ public void bind(Name name, Object obj) throws NamingException {
+ check(name);
+ original.bind(name, obj);
+ }
+
+ public void bind(String name, Object obj) throws NamingException {
+ check(name);
+ original.bind(name, obj);
+ }
+
+ public void rebind(Name name, Object obj) throws NamingException {
+ check(name);
+ original.rebind(name, obj);
+ }
+
+ public void rebind(String name, Object obj) throws NamingException {
+ check(name);
+ original.rebind(name, obj);
+ }
+
+ public void unbind(Name name) throws NamingException {
+ check(name);
+ original.unbind(name);
+ }
+
+ public void unbind(String name) throws NamingException {
+ check(name);
+ original.unbind(name);
+ }
+
+ public void rename(Name oldName, Name newName) throws NamingException {
+ check(oldName);
+ check(newName);
+ original.rename(oldName, newName);
+ }
+
+ public void rename(String oldName, String newName) throws NamingException {
+ check(oldName);
+ check(newName);
+ original.rename(oldName, newName);
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+ check(name);
+ return original.list(name);
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
+ check(name);
+ return original.list(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+ check(name);
+ return original.listBindings(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
+ check(name);
+ return original.listBindings(name);
+ }
+
+ public void destroySubcontext(Name name) throws NamingException {
+ check(name);
+ original.destroySubcontext(name);
+ }
+
+ public void destroySubcontext(String name) throws NamingException {
+ check(name);
+ original.destroySubcontext(name);
+ }
+
+ public Context createSubcontext(Name name) throws NamingException {
+ check(name);
+ return original.createSubcontext(name);
+ }
+
+ public Context createSubcontext(String name) throws NamingException {
+ check(name);
+ return original.createSubcontext(name);
+ }
+
+ public Object lookupLink(Name name) throws NamingException {
+ check(name);
+ return original.lookupLink(name);
+ }
+
+ public Object lookupLink(String name) throws NamingException {
+ check(name);
+ return original.lookupLink(name);
+ }
+
+ public NameParser getNameParser(Name name) throws NamingException {
+ check(name);
+ return original.getNameParser(name);
+ }
+
+ public NameParser getNameParser(String name) throws NamingException {
+ check(name);
+ return original.getNameParser(name);
+ }
+
+ public Name composeName(Name name, Name prefix) throws NamingException {
+ check(name);
+ return original.composeName(name, prefix);
+ }
+
+ public String composeName(String name, String prefix) throws NamingException {
+ check(name);
+ return original.composeName(name, prefix);
+ }
+
+ public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+ check();
+ return original.addToEnvironment(propName, propVal);
+ }
+
+ public Object removeFromEnvironment(String propName) throws NamingException {
+ check();
+ return original.removeFromEnvironment(propName);
+ }
+
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
+ check();
+ return original.getEnvironment();
+ }
+
+ public void close() throws NamingException {
+ check();
+ original.close();
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ check();
+ return original.getNameInNamespace();
+ }
+
+ //copied from InitialContext
+ private static String getURLScheme(String str) {
+ int colon_posn = str.indexOf(':');
+ int slash_posn = str.indexOf('/');
+
+ if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
+ return str.substring(0, colon_posn);
+ return null;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
new file mode 100644
index 0000000..1614180
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
@@ -0,0 +1,187 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+/**
+ * A decorator of {@link DirContext}.
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingDirContextDecorator extends AccessCheckingContextDecorator implements DirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingDirContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingDirContextDecorator(DirContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected DirContext getOriginal() {
+ return (DirContext) super.getOriginal();
+ }
+
+ public Attributes getAttributes(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name);
+ }
+
+ public Attributes getAttributes(String name) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name);
+ }
+
+ public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name, attrIds);
+ }
+
+ public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name, attrIds);
+ }
+
+ public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mods);
+ }
+
+ public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mods);
+ }
+
+ public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().bind(name, obj, attrs);
+ }
+
+ public void bind(String name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().bind(name, obj, attrs);
+ }
+
+ public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().rebind(name, obj, attrs);
+ }
+
+ public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().rebind(name, obj, attrs);
+ }
+
+ public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
+ check(name);
+ return getOriginal().createSubcontext(name, attrs);
+ }
+
+ public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
+ check(name);
+ return getOriginal().createSubcontext(name, attrs);
+ }
+
+ public DirContext getSchema(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public DirContext getSchema(String name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public DirContext getSchemaClassDefinition(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getSchemaClassDefinition(name);
+ }
+
+ public DirContext getSchemaClassDefinition(String name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
+ String[] attributesToReturn) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
+ throws NamingException {
+ check(name);
+ return getOriginal().search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filterExpr, filterArgs, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
+ SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filterExpr, filterArgs, cons);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
new file mode 100644
index 0000000..67a9527
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
@@ -0,0 +1,69 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingEventContextDecorator extends AccessCheckingContextDecorator implements EventContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingEventContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingEventContextDecorator(EventContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected EventContext getOriginal() {
+ return (EventContext) super.getOriginal();
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ check();
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ check();
+ return getOriginal().targetMustExist();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
new file mode 100644
index 0000000..ed7a848
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
@@ -0,0 +1,96 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.SearchControls;
+import javax.naming.event.EventDirContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingEventDirContextDecorator extends AccessCheckingDirContextDecorator implements
+ EventDirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingEventDirContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingEventDirContextDecorator(EventDirContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected EventDirContext getOriginal() {
+ return (EventDirContext) super.getOriginal();
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ check();
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ check();
+ return getOriginal().targetMustExist();
+ }
+
+ public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void
+ addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
+ NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
new file mode 100644
index 0000000..e361db8
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
@@ -0,0 +1,85 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.ExtendedRequest;
+import javax.naming.ldap.ExtendedResponse;
+import javax.naming.ldap.LdapContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingLdapContextDecorator extends AccessCheckingDirContextDecorator implements LdapContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingLdapContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingLdapContextDecorator(LdapContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected LdapContext getOriginal() {
+ return (LdapContext) super.getOriginal();
+ }
+
+ public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
+ check();
+ return getOriginal().extendedOperation(request);
+ }
+
+ public LdapContext newInstance(Control[] requestControls) throws NamingException {
+ check();
+ return getOriginal().newInstance(requestControls);
+ }
+
+ public void reconnect(Control[] connCtls) throws NamingException {
+ check();
+ getOriginal().reconnect(connCtls);
+ }
+
+ public Control[] getConnectControls() throws NamingException {
+ check();
+ return getOriginal().getConnectControls();
+ }
+
+ public void setRequestControls(Control[] requestControls) throws NamingException {
+ check();
+ getOriginal().setRequestControls(requestControls);
+ }
+
+ public Control[] getRequestControls() throws NamingException {
+ check();
+ return getOriginal().getRequestControls();
+ }
+
+ public Control[] getResponseControls() throws NamingException {
+ check();
+ return getOriginal().getResponseControls();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
new file mode 100644
index 0000000..5755ebd
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
@@ -0,0 +1,33 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public interface ContextDecorator extends Context {
+
+ void init(Context context) throws NamingException;
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
new file mode 100644
index 0000000..a088aa2
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
@@ -0,0 +1,162 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+/**
+ * @author Lukas Krejci
+ */
+public class ContextDecoratorPicker {
+
+ private Set<Class<? extends ContextDecorator>> possibleDecorators = new HashSet<Class<? extends ContextDecorator>>();
+ private Class<?>[] constructorParameterTypes;
+ private Object[] constructorParameters;
+
+ public ContextDecoratorPicker() {
+ }
+
+ public ContextDecoratorPicker(Collection<? extends Class<? extends ContextDecorator>> c) {
+ possibleDecorators.addAll(c);
+ }
+
+ public Set<Class<? extends ContextDecorator>> getPossibleDecorators() {
+ return possibleDecorators;
+ }
+
+ public Class<?>[] getConstructorParameterTypes() {
+ return constructorParameterTypes;
+ }
+
+ public void setConstructorParameterTypes(Class<?>[] constructorParameterTypes) {
+ this.constructorParameterTypes = constructorParameterTypes;
+ }
+
+ public Object[] getConstructorParameters() {
+ return constructorParameters;
+ }
+
+ public void setConstructorParameters(Object[] constructorParameters) {
+ this.constructorParameters = constructorParameters;
+ }
+
+ public Context wrapInAppropriateDecorator(Context context) throws NamingException {
+ Class<? extends ContextDecorator> cls = getMatchByInterfaces(context, possibleDecorators);
+
+ if (cls == null) {
+ throw new IllegalArgumentException("Could not find a matching context decorator for " + context.getClass() + " in " + this);
+ }
+
+ Constructor<? extends ContextDecorator> ctor = null;
+ try {
+ ctor = cls.getConstructor(constructorParameterTypes);
+ ContextDecorator ctx = ctor.newInstance(constructorParameters);
+
+ ctx.init(context);
+
+ return ctx;
+ } catch (SecurityException e) {
+ throw new IllegalStateException("Could not instantiate a class through reflection.", e);
+ } catch (NoSuchMethodException e) {
+ throw new IllegalArgumentException(
+ "Could not construct a context decorator - unable to find a constructor with parameters "
+ + (constructorParameterTypes == null ? "[no parameters]" : Arrays.asList(constructorParameterTypes)) + " on class " + cls.getName(), e);
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
+ } catch (InstantiationException e) {
+ throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
+ } catch (IllegalAccessException e) {
+ throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
+ } catch (InvocationTargetException e) {
+ throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
+ }
+ }
+
+ private static <T> Class<? extends T> getMatchByInterfaces(Object obj, Set<Class<? extends T>> classes) {
+ Set<Class<?>> ifaces = getAllImplementedInterfaces(obj.getClass());
+
+ Class<? extends T> match = null;
+ int maxMatchCnt = Integer.MIN_VALUE;
+
+ for(Class<? extends T> cls : classes) {
+ int cnt = getBestMatchByIfaces(cls, ifaces);
+ if (cnt > maxMatchCnt) {
+ maxMatchCnt = cnt;
+ match = cls;
+ }
+ }
+
+ return match;
+ }
+
+ private static int getBestMatchByIfaces(Class<?> cls, Set<Class<?>> ifaces) {
+ int ret = 0;
+
+ //count how many interfaces from the supplied array the class implements
+ for(Class<?> iface : ifaces) {
+ if (iface.isAssignableFrom(cls)) {
+ ++ret;
+ } else {
+ --ret;
+ }
+ }
+
+ //that's not all - to get the best possible match, we need to take into account
+ //the fact that the class might implement more than just the interfaces provided
+ Set<Class<?>> clsIfaces = getAllImplementedInterfaces(cls);
+
+ for(Class<?> clsIface : clsIfaces) {
+ if (!(ifaces.contains(clsIface))) {
+ --ret;
+ }
+ }
+
+ return ret;
+ }
+
+ private static Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
+ HashSet<Class<?>> ret = new HashSet<Class<?>>();
+ getAllImplementedInterfaces(cls, ret);
+
+ return ret;
+ }
+
+ private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
+ Class<?>[] ifaces = cls.getInterfaces();
+
+ for(Class<?> iface : Arrays.asList(ifaces)) {
+ output.add(iface);
+ getAllImplementedInterfaces(iface, output);
+ }
+
+ if (cls.getSuperclass() != null) {
+ getAllImplementedInterfaces(cls.getSuperclass(), output);
+ }
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
new file mode 100644
index 0000000..20077de
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
@@ -0,0 +1,212 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.io.Serializable;
+import java.util.Hashtable;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ * This is a wrapper class around another {@link Context} implementation that
+ * prefers to use an URL context for some operation if the JNDI name contains
+ * a scheme rather than the original. This is the behavior of {@link InitialContext}
+ * which we need to restore in the contexts created by the {@link AccessCheckingInitialContextFactoryBuilder}
+ * (which an {@link InitialContext} uses exclusively if the builder is set).
+ * <p>
+ * This is important because RHQ server has its own initial context factory
+ * builder that creates factories that in turn create contexts. If the default
+ * {@link InitialContext} implementation was used, we'd never be able to lookup
+ * scheme-based names because the default implementation of the {@link InitialContext}
+ * always uses the default context of the builder if one is installed no matter
+ * the scheme in the name.
+ * <p>
+ * The {@link AccessCheckingInitialContextFactoryBuilder} wraps the context returned
+ * by the factory in an instance of this class and thus is restoring the original
+ * intended behavior of the {@link InitialContext}. It looks at the name being looked
+ * up (bound or whatever) and prefers to use the URL context factories if the name
+ * contains the scheme (as does the {@link InitialContext} if no builder is installed).
+ * If the name doesn't contain a scheme, the provided default context factory is used to
+ * look up the name.
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecorator implements Context, ContextDecorator, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Context original;
+
+ public URLPreferringContextDecorator() {
+
+ }
+
+ public URLPreferringContextDecorator(Context ctx) {
+ original = ctx;
+ }
+
+ public void init(Context context) {
+ original = context;
+ }
+
+ protected Context getOriginal() throws NamingException {
+ return original;
+ }
+
+ protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
+ @SuppressWarnings("unchecked")
+ Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
+ return urlContext == null ? getOriginal() : urlContext;
+ }
+
+ protected Context getURLOrDefaultInitCtx(String name) throws NamingException {
+ @SuppressWarnings("unchecked")
+ Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
+ return urlContext == null ? getOriginal() : urlContext;
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookup(name);
+ }
+
+ public Object lookup(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookup(name);
+ }
+
+ public void bind(Name name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj);
+ }
+
+ public void bind(String name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj);
+ }
+
+ public void rebind(Name name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj);
+ }
+
+ public void rebind(String name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj);
+ }
+
+ public void unbind(Name name) throws NamingException {
+ getURLOrDefaultInitCtx(name).unbind(name);
+ }
+
+ public void unbind(String name) throws NamingException {
+ getURLOrDefaultInitCtx(name).unbind(name);
+ }
+
+ public void rename(Name oldName, Name newName) throws NamingException {
+ getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
+ }
+
+ public void rename(String oldName, String newName) throws NamingException {
+ getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).list(name);
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).list(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).listBindings(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).listBindings(name);
+ }
+
+ public void destroySubcontext(Name name) throws NamingException {
+ getURLOrDefaultInitCtx(name).destroySubcontext(name);
+ }
+
+ public void destroySubcontext(String name) throws NamingException {
+ getURLOrDefaultInitCtx(name).destroySubcontext(name);
+ }
+
+ public Context createSubcontext(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name);
+ }
+
+ public Context createSubcontext(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name);
+ }
+
+ public Object lookupLink(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookupLink(name);
+ }
+
+ public Object lookupLink(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookupLink(name);
+ }
+
+ public NameParser getNameParser(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getNameParser(name);
+ }
+
+ public NameParser getNameParser(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getNameParser(name);
+ }
+
+ public Name composeName(Name name, Name prefix) throws NamingException {
+ return getOriginal().composeName(name, prefix);
+ }
+
+ public String composeName(String name, String prefix) throws NamingException {
+ return getOriginal().composeName(name, prefix);
+ }
+
+ public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+ return getOriginal().addToEnvironment(propName, propVal);
+ }
+
+ public Object removeFromEnvironment(String propName) throws NamingException {
+ return getOriginal().removeFromEnvironment(propName);
+ }
+
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
+ return getOriginal().getEnvironment();
+ }
+
+ public void close() throws NamingException {
+ if (getOriginal() != null) {
+ getOriginal().close();
+ original = null;
+ }
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ return getOriginal().getNameInNamespace();
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
new file mode 100644
index 0000000..6e7debc
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
@@ -0,0 +1,76 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.spi.NamingManager;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecoratorHelper {
+
+ private URLPreferringContextDecoratorHelper() {
+
+ }
+
+ public static Context getURLContext(String name, Hashtable<Object, Object> env) throws NamingException {
+ String scheme = getURLScheme(name);
+ if (scheme != null) {
+ Context ctx = NamingManager.getURLContext(scheme, env);
+ if (ctx != null) {
+ return ctx;
+ }
+ }
+
+ return null;
+ }
+
+ public static Context getURLContext(Name name, Hashtable<Object, Object> env) throws NamingException {
+ if (name.size() > 0) {
+ String first = name.get(0);
+ String scheme = getURLScheme(first);
+ if (scheme != null) {
+ Context ctx = NamingManager.getURLContext(scheme, env);
+ if (ctx != null) {
+ return ctx;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ //copied from InitialContext
+ private static String getURLScheme(String str) {
+ int colon_posn = str.indexOf(':');
+ int slash_posn = str.indexOf('/');
+
+ if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
+ return str.substring(0, colon_posn);
+ return null;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
new file mode 100644
index 0000000..6a49942
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
@@ -0,0 +1,185 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+/**
+ * Akin to {@link URLPreferringContextDecorator} this class implements the similar logic
+ * for {@link DirContext}s.
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringDirContextDecorator extends URLPreferringContextDecorator implements DirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringDirContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringDirContextDecorator(DirContext ctx) {
+ super(ctx);
+ }
+
+ protected DirContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof DirContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of DirContext");
+ }
+ }
+
+ return (DirContext) ctx;
+ }
+
+ @Override
+ protected DirContext getURLOrDefaultInitCtx(Name name) throws NamingException {
+ Context ctx = super.getURLOrDefaultInitCtx(name);
+ return checkAndCast(ctx);
+ }
+
+ @Override
+ protected DirContext getURLOrDefaultInitCtx(String name) throws NamingException {
+ Context ctx = super.getURLOrDefaultInitCtx(name);
+ return checkAndCast(ctx);
+ }
+
+ public Attributes getAttributes(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name);
+ }
+
+ public Attributes getAttributes(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name);
+ }
+
+ public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
+ }
+
+ public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
+ }
+
+ public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
+ }
+
+ public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
+ }
+
+ public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
+ }
+
+ public void bind(String name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
+ }
+
+ public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
+ }
+
+ public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
+ }
+
+ public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
+ }
+
+ public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
+ }
+
+ public DirContext getSchema(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchema(name);
+ }
+
+ public DirContext getSchema(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchema(name);
+ }
+
+ public DirContext getSchemaClassDefinition(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
+ }
+
+ public DirContext getSchemaClassDefinition(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
+ String[] attributesToReturn) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
+ throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
+ SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
new file mode 100644
index 0000000..e3298a0
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
@@ -0,0 +1,81 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringEventContextDecorator extends URLPreferringContextDecorator implements EventContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringEventContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringEventContextDecorator(EventContext ctx) {
+ super(ctx);
+ }
+
+ protected EventContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof EventContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of EventContext");
+ }
+ }
+
+ return (EventContext) ctx;
+ }
+
+ @Override
+ protected EventContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return getOriginal().targetMustExist();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
new file mode 100644
index 0000000..4925297
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
@@ -0,0 +1,104 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.directory.SearchControls;
+import javax.naming.event.EventDirContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringEventDirContextDecorator extends URLPreferringDirContextDecorator implements EventDirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringEventDirContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringEventDirContextDecorator(EventDirContext ctx) {
+ super(ctx);
+ }
+
+ @Override
+ protected EventDirContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof EventDirContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of EventDirContext");
+ }
+ }
+
+ return (EventDirContext) ctx;
+ }
+
+ @Override
+ protected EventDirContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return getOriginal().targetMustExist();
+ }
+
+ public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void
+ addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
+ NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
new file mode 100644
index 0000000..c74df39
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
@@ -0,0 +1,94 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.ExtendedRequest;
+import javax.naming.ldap.ExtendedResponse;
+import javax.naming.ldap.LdapContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringLdapContextDecorator extends URLPreferringDirContextDecorator implements LdapContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringLdapContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringLdapContextDecorator(LdapContext original) {
+ super(original);
+ }
+
+ @Override
+ protected LdapContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof LdapContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException("Not an instance of LdapContext");
+ }
+ }
+
+ return (LdapContext) ctx;
+ }
+
+ @Override
+ protected LdapContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
+ return getOriginal().extendedOperation(request);
+ }
+
+ public LdapContext newInstance(Control[] requestControls) throws NamingException {
+ return new URLPreferringLdapContextDecorator(getOriginal().newInstance(requestControls));
+ }
+
+ public void reconnect(Control[] connCtls) throws NamingException {
+ getOriginal().reconnect(connCtls);
+ }
+
+ public Control[] getConnectControls() throws NamingException {
+ return getOriginal().getConnectControls();
+ }
+
+ public void setRequestControls(Control[] requestControls) throws NamingException {
+ getOriginal().setRequestControls(requestControls);
+ }
+
+ public Control[] getRequestControls() throws NamingException {
+ return getOriginal().getRequestControls();
+ }
+
+ public Control[] getResponseControls() throws NamingException {
+ return getOriginal().getResponseControls();
+ }
+
+}
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 8753e6f..6898621 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -56,6 +56,12 @@
<dependency>
<groupId>org.rhq</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
commit d1d18876b9f22a681e7243ef54aa649d066e8656
Author: Larry O'Leary <loleary(a)redhat.com>
Date: Tue Jan 3 16:37:31 2012 -0600
[Bug 769470] TomcatWarDiscoveryComponent excludes valid WAR deployments due to eager host name regular expression
Changed regular expression used to extract host name from context name to stop at first slash instead of last slash.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java
index f6fa791..7605749 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java
@@ -1,5 +1,5 @@
/** Jopr Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,7 @@ public class TomcatWarDiscoveryComponent extends MBeanResourceDiscoveryComponent
private static final List<String> EMS_ATTRIBUTE_DOC_BASE = Arrays.asList(new String[] { "docBase" });
private static final List<String> EMS_ATTRIBUTE_PATH = Arrays.asList(new String[] { "path" });
/** The name MBean attribute for each application is of the form "Tomcat WAR (//vHost/contextRoot)". */
- private static final Pattern PATTERN_NAME = Pattern.compile("//(.*)(/.*)");
+ private static final Pattern PATTERN_NAME = Pattern.compile("^//([^/]+)(.*)$");
private static final String RT_LOG_FILE_NAME_SUFFIX = "_rt.log";
private final Log log = LogFactory.getLog(this.getClass());
commit caff389ecc3e3f6c53e9880f840c1995241a92a4
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 3 15:19:18 2012 +0100
Some cleanup, return location for PUT metric, allow to expose raw metrics as xml too.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index 77e36a4..a772ab4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -123,30 +123,8 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
List<List<MeasurementDataNumericHighLowComposite>> listList = dataManager.findDataForResource(caller,
schedule.getResource().getId(), new int[]{definitionId}, startTime, endTime, dataPoints);
-/*
- long minTime=Long.MAX_VALUE;
- long maxTime=0;
-*/
-
if (!listList.isEmpty()) {
List<MeasurementDataNumericHighLowComposite> list = listList.get(0);
-/*
- for (MeasurementDataNumericHighLowComposite c : list) {
- long timestamp = c.getTimestamp();
- if (!Double.isNaN(c.getValue()) || !hideEmpty) {
- MetricAggregate.DataPoint dp = new MetricAggregate.DataPoint(timestamp,c.getValue(),c.getHighValue(),c.getLowValue());
- res.addDataPoint(dp);
- }
- if (timestamp <minTime)
- minTime= timestamp;
- if (timestamp >maxTime)
- maxTime= timestamp;
- }
- res.setNumDataPoints(list.size());
- }
- res.setMaxTimeStamp(maxTime);
- res.setMinTimeStamp(minTime);
-*/
fill(res, list,scheduleId,hideEmpty);
}
@@ -156,7 +134,6 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
cc.setPrivate(false);
cc.setNoCache(false);
-
Response.ResponseBuilder builder;
MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
@@ -224,6 +201,8 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@QueryParam("hideEmpty") boolean hideEmpty, @Context Request request,
@Context HttpHeaders headers) {
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+
if (startTime==0) {
endTime = System.currentTimeMillis();
startTime = endTime - EIGHT_HOURS;
@@ -259,7 +238,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
GenericEntity<List<MetricAggregate>> metAgg = new GenericEntity<List<MetricAggregate>>(resList) {};
- return Response.ok(metAgg).build();
+ return Response.ok(metAgg,mediaType).build();
}
@@ -275,8 +254,10 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
*/
public Response getSchedule(int scheduleId, Request request, HttpHeaders headers, UriInfo uriInfo) {
- MeasurementSchedule schedule=null;
- Response.ResponseBuilder builder=null;
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+
+ MeasurementSchedule schedule;
+ Response.ResponseBuilder builder;
// Create a cache control
CacheControl cc = new CacheControl();
@@ -351,9 +332,6 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
Link updateLink = new Link("edit",uri.toString());
metricSchedule.addLink(updateLink);
- // What media type does the user request?
- MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
-
if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
builder = Response.ok(renderTemplate("metricSchedule", metricSchedule), mediaType);
}
@@ -427,6 +405,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
Request request,
HttpHeaders headers) {
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
if (endTime==0)
endTime = System.currentTimeMillis();
@@ -441,10 +420,11 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
// Check if the schedule exists
obtainSchedule(scheduleId);
- RawNumericJsonStreamingOutput so = new RawNumericJsonStreamingOutput();
+ RawNumericStreamingOutput so = new RawNumericStreamingOutput();
so.scheduleId = scheduleId;
so.startTime = startTime;
so.endTime = endTime;
+ so.mediaType = mediaType;
return so;
@@ -456,8 +436,9 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("data/{scheduleId}/raw/{timeStamp}")
public Response putMetricValue(@PathParam("scheduleId") int scheduleId, @PathParam("timeStamp") long timestamp,
- NumericDataPoint point, @Context HttpHeaders headers) {
+ NumericDataPoint point, @Context HttpHeaders headers, UriInfo uriInfo) {
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
MeasurementSchedule schedule = obtainSchedule(scheduleId);
Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(1);
@@ -465,7 +446,13 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
dataManager.addNumericData(data);
- return Response.ok().build(); // TODO correct code?
+ UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
+ uriBuilder.path("/metric/data/{scheduleId}/raw");
+ uriBuilder.queryParam("startTime",timestamp);
+ uriBuilder.queryParam("endTime",timestamp);
+ URI uri = uriBuilder.build(scheduleId);
+
+ return Response.created(uri).type(mediaType).build();
}
@@ -475,6 +462,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response postMetricValues(Collection<NumericDataPoint> points, @Context HttpHeaders headers) {
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(points.size());
for (NumericDataPoint point : points) {
data.add(new MeasurementDataNumeric(point.getTimeStamp(), point.getScheduleId(),point.getValue()));
@@ -482,7 +470,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
dataManager.addNumericData(data);
- return Response.ok().build();
+ return Response.noContent().type(mediaType).build();
}
@@ -491,11 +479,12 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
* without creating tons of objects in the middle to have them marshalled
* by JAX-RS
*/
- private class RawNumericJsonStreamingOutput implements StreamingOutput {
+ private class RawNumericStreamingOutput implements StreamingOutput {
int scheduleId;
long startTime;
long endTime;
+ MediaType mediaType;
@Override
public void write(OutputStream outputStream) throws IOException, WebApplicationException {
@@ -528,22 +517,38 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
rs = ps.executeQuery();
PrintWriter pw = new PrintWriter(outputStream);
- pw.println("[");
- while (rs.next()) {
- pw.print("{");
- pw.print("\"scheduleId\":");
- pw.print(scheduleId);
- pw.print(", ");
- pw.print("\"timeStamp\":");
- pw.print(rs.getLong(1));
- pw.print(", ");
- pw.print("\"value\":");
- pw.print(rs.getLong(2));
- pw.print("}");
- if (!rs.isLast())
- pw.print(",\n");
+
+ if (mediaType.equals(MediaType.APPLICATION_JSON_TYPE)) {
+ pw.println("[");
+ while (rs.next()) {
+ pw.print("{");
+ pw.print("\"scheduleId\":");
+ pw.print(scheduleId);
+ pw.print(", ");
+ pw.print("\"timeStamp\":");
+ pw.print(rs.getLong(1));
+ pw.print(", ");
+ pw.print("\"value\":");
+ pw.print(rs.getDouble(2));
+ pw.print("}");
+ if (!rs.isLast())
+ pw.print(",\n");
+ }
+ pw.println("]");
+ }
+ else if (mediaType.equals(MediaType.APPLICATION_XML_TYPE)) {
+ pw.println("<collection>");
+ while(rs.next()) {
+ pw.print(" <numericDataPoint scheduleId=\"");
+ pw.print(scheduleId);
+ pw.print("\" timeStamp=\"");
+ pw.print(rs.getLong(1));
+ pw.print("\" value=\"");
+ pw.print(rs.getDouble(2));
+ pw.println("\"/>");
+ }
+ pw.println("</collection>");
}
- pw.println("]");
pw.flush();
pw.close();
} catch (SQLException e) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
index 2c75a55..6f76bce 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
@@ -119,7 +119,7 @@ public interface MetricHandlerLocal {
*/
@GET
@Path("data/{scheduleId}/raw")
- @Produces({MediaType.APPLICATION_JSON})
+ @Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
StreamingOutput getMetricDataRaw(@PathParam("scheduleId") int scheduleId,
@QueryParam("startTime") long startTime,
@QueryParam("endTime") long endTime,
@@ -133,15 +133,17 @@ public interface MetricHandlerLocal {
* @param timestamp Timestamp of the entry
* @param point Datapoint of class NumericDataPoint
* @param headers Injected HTTP headers
+ * @param uriInfo Injected info about the uri
* @return
*/
@PUT
@Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
@Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
@Path("data/{scheduleId}/raw/{timeStamp}")
- Response putMetricValue(@PathParam("scheduleId")int scheduleId,
- @PathParam("timeStamp")long timestamp, NumericDataPoint point,
- @Context HttpHeaders headers);
+ Response putMetricValue(@PathParam("scheduleId") int scheduleId,
+ @PathParam("timeStamp") long timestamp, NumericDataPoint point,
+ @Context HttpHeaders headers,
+ @Context UriInfo uriInfo);
/**
* Submit a series of (numerical) metric values to the server
commit 6945397a12e96fcaa7c92161e5f474abd98f7cad
Merge: 89027fe eb92c16
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 3 15:26:38 2012 +0100
Merge branch 'lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs'
commit eb92c16f4ac8151e1984406af677f950f9984af4
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 3 15:07:13 2012 +0100
updating the javadocs to correctly explain the purpose of the URLPreferringContext
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
index b291c3e..c6456a2 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
@@ -35,17 +35,18 @@ import javax.naming.spi.NamingManager;
* <p>
* This is important because RHQ server has its own initial context factory
* builder that creates factories that in turn create contexts. If the default
- * {@link InitialContext} implementation was used, we'd end up with a stack overflow
- * error caused by the callchain loop when the {@link InitialContext} would ask
- * the builder for a factory that would create another context that would ask the
- * builder for the factory, etc. ad infinitum.
+ * {@link InitialContext} implementation was used, we'd never be able to lookup
+ * scheme-based names because the default implementation of the {@link InitialContext}
+ * always uses the default context of the builder if one is installed no matter
+ * the scheme in the name.
* <p>
- * This class prevents that by acting exactly like the InitialContext would if
- * the initial context factory builder wasn't installed. This enables the callers
- * to still use the standard InitialContext when doing lookups etc. This standard
- * initial context will ask our initial context factory builder which will then
- * in chain create this {@link URLPreferringContext} that behaves like the original
- * InitialContext would if the builder wasn't there.
+ * The {@link AccessCheckingInitialContextFactoryBuilder} wraps the context returned
+ * by the factory in an instance of this class and thus is restoring the original
+ * intended behavior of the {@link InitialContext}. It looks at the name being looked
+ * up (bound or whatever) and prefers to use the URL context factories if the name
+ * contains the scheme (as does the {@link InitialContext} if no builder is installed).
+ * If the name doesn't contain a scheme, the provided default context factory is used to
+ * look up the name.
*
* @author Lukas Krejci
*/
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
index 6c311c7..609e98c 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
@@ -22,7 +22,6 @@ package org.rhq.jndi;
import java.util.Hashtable;
import javax.naming.Context;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
@@ -31,8 +30,7 @@ import javax.naming.spi.InitialContextFactory;
* backed by the wrapped initial context factory.
* <p>
* This is to support contexts that don't need to be secured, yet we need to make sure to
- * break the call-chain loop caused by the {@link InitialContext} asking the RHQ's {@link AccessCheckingInitialContextFactoryBuilder} for
- * default contexts.
+ * re-enable lookup of scheme-based names.
*
* @author Lukas Krejci
*/
commit 0dcc5c33c0cc9ca03a32bd17dd8e188ca27b243d
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 3 14:47:12 2012 +0100
Adding integration tests for the ability of serverside scripts to access remote JNDI servers (unlike the JNDI directory of the RHQ server itself).
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
new file mode 100644
index 0000000..1991e0e
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -0,0 +1,315 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>jndi-access-test-parent</artifactId>
+ <groupId>org.rhq</groupId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>jndi-access-test</artifactId>
+ <packaging>jar</packaging>
+
+ <name>JNDI access integration test</name>
+ <description>Tests for local and remote JNDI access from within serverside scripts.</description>
+
+ <properties>
+ <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
+ <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
+ <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
+ <jnp.port>54987</jnp.port>
+ <jnp.rmiPort>54988</jnp.rmiPort>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!--================ Test Deps ================ -->
+
+ <!-- Note, the test deps are intentionally placed above the other
+ scoped deps because of classpath reasons. Maven orders the [test] classpath
+ in the order listed in the pom. We specifically need the embeddable-ejb3
+ jar above the standard ejb3 jars because we need the embeddble packages loaded
+ when testing. -->
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-core-client-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-server-client-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>jndi-access-remote-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>${jboss-embeddable-ejb3.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- NOTE: The remaining test deps correspond to the classes contained
+ in hibernate-all.jar and thirdparty-all.jar. -->
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- needed by embedded ejb container -->
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- needed by embedded ejb container -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- 3rd Party Deps -->
+
+ <!-- required by RHQ server classes, as well as EJB3 Embedded -->
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1-jboss</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate-annotations</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate-entitymanager</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed
+ by the PoolClass annotation used on some of our SLSB's -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <!-- for the transaction interrupt EJB3 interceptor -->
+ <dependency>
+ <groupId>org.jboss.transaction</groupId>
+ <artifactId>jboss-jta</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz-oracle</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement
+ section. -->
+ <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
+ </dependency>
+
+ <!-- This is needed cglib which is in turn needed by hibernate -->
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.18</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- in order to get JMS to work properly in embedded
+ test container, extract jms-rs.rar classes -->
+ <execution>
+ <id>Extract JMS classes from RAR needed for JMS tests</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <unzip src="src/test/resources/jms-ra.rar"
+ dest="target">
+ <patternset>
+ <include name="jms-ra.jar" />
+ </patternset>
+ </unzip>
+ <unzip src="target/jms-ra.jar"
+ dest="target/test-classes">
+ <patternset>
+ <include name="org/**" />
+ </patternset>
+ </unzip>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Everything but the web service tests, this is the standard
+ test execution -->
+ <configuration>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
+ <systemPropertyVariables>
+ <embeddedDeployment>true</embeddedDeployment>
+ <deploymentDirectory>target/test-classes</deploymentDirectory>
+ <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
+ <clean.db>${clean.db}</clean.db>
+ <test.server.jar.path>${settings.localRepository}/org/rhq/jndi-access-remote-server/${project.version}/jndi-access-remote-server-${project.version}.jar</test.server.jar.path>
+ <jnp.port>${jnp.port}</jnp.port>
+ <jnp.rmiPort>${jnp.rmiPort}</jnp.rmiPort>
+ </systemPropertyVariables>
+ <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
+ <additionalClasspathElements>
+ <!-- The below is required for tests to run against
+ Oracle. -->
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
new file mode 100644
index 0000000..f20d4f1
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
@@ -0,0 +1,193 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.test;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.SerializablePermission;
+import java.security.PermissionCollection;
+import java.util.Collections;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import org.rhq.bindings.SandboxedScriptEngine;
+import org.rhq.bindings.ScriptEngineFactory;
+import org.rhq.bindings.StandardBindings;
+import org.rhq.bindings.StandardScriptPermissions;
+import org.rhq.bindings.util.PackageFinder;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.client.LocalClient;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
+import org.rhq.enterprise.server.util.LookupUtil;
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class JndiAccessTest extends AbstractEJB3Test {
+ private static final Log JNP_SERVER_LOG = LogFactory.getLog("Test JNP Server");
+
+ private Process testServerProcess;
+ private Thread testServerStdErrReader;
+ private Thread testServerStdOutReader;
+
+ @BeforeClass
+ @Parameters({"test.server.jar.path", "jnp.port", "jnp.rmiPort"})
+ public void startTestJnpServer(String testServerJar, int jnpPort, int rmiPort) throws Exception {
+ ProcessBuilder bld = new ProcessBuilder("java", "-Djnp.port=" + jnpPort, "-Djnp.rmiPort=" + rmiPort, "-jar", testServerJar);
+
+ testServerProcess = bld.start();
+
+ testServerStdErrReader = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getErrorStream()));
+ try {
+ String line;
+ while((line = rdr.readLine()) != null) {
+ JNP_SERVER_LOG.warn(line);
+ }
+ } catch (IOException e) {
+ JNP_SERVER_LOG.error("Reading test JNP server error output failed.", e);
+ } finally {
+ try {
+ rdr.close();
+ } catch (IOException e) {
+ JNP_SERVER_LOG.error("Failed to close the test server error stream.", e);
+ }
+ }
+ }
+ });
+ testServerStdErrReader.start();
+
+ testServerStdOutReader = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getInputStream()));
+ try {
+ String line;
+ while((line = rdr.readLine()) != null) {
+ JNP_SERVER_LOG.debug(line);
+ }
+ } catch (IOException e) {
+ JNP_SERVER_LOG.error("Reading test JNP server standard output failed.", e);
+ } finally {
+ try {
+ rdr.close();
+ } catch (IOException e) {
+ JNP_SERVER_LOG.error("Failed to close the test server standard output stream.", e);
+ }
+ }
+ }
+ });
+ testServerStdOutReader.start();
+
+ //give the JNP server some time to start up
+ Thread.sleep(5000);
+ }
+
+ @AfterClass
+ public void stopTestJnpServer() throws Exception {
+ testServerProcess.destroy();
+ testServerStdErrReader.join();
+ testServerStdOutReader.join();
+ }
+
+ @Parameters("jnp.port")
+ public void testRemoteConnectionWorkingFromJava(int jnpPort) throws Exception {
+ Properties env = new Properties();
+ env.put("java.naming.factory.initial", "org.jboss.naming.NamingContextFactory");
+ env.put("java.naming.provider.url", "jnp://localhost:" + jnpPort);
+ InitialContext ctx = new InitialContext(env);
+ Object kachny = ctx.lookup("kachny");
+
+ assert kachny != null;
+ }
+
+ public void testLocalJNDILookupFailsFromScripts() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
+ + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
+
+ Assert.fail("The script shouldn't have been able to use the EntityManager.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ @Parameters("jnp.port")
+ public void testRemoteJNDILookupWorksFromScripts(int jnpPort) throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "env = new java.util.Hashtable();"
+ + "env.put('java.naming.factory.initial', 'org.jboss.naming.NamingContextFactory');"
+ + "env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort + "');"
+ + "context = new javax.naming.InitialContext(env);\n"
+ + "kachny = context.lookup('kachny');\n"
+ + "assertNotNull(kachny);\n");
+ } catch (ScriptException e) {
+ Assert.fail("The script should have been able to access a remote JNDI server.", e);
+ }
+ }
+
+ private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
+ StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
+ ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
+
+ PermissionCollection perms = new StandardScriptPermissions();
+
+ return new SandboxedScriptEngine(engine, perms);
+ }
+
+ private static void checkIsDesiredSecurityException(ScriptException e) {
+ String message = e.getMessage();
+ String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
+
+ Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
+ }
+}
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties
new file mode 100644
index 0000000..1951b84
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties
@@ -0,0 +1,26 @@
+# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
+# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
+# WORK IN THIS MODULE.
+
+hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+#hibernate.connection.release_mode=after_statement
+#hibernate.transaction.flush_before_completion=false
+#hibernate.transaction.auto_close_session=false
+#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
+#hibernate.hbm2ddl.auto=create-drop
+#hibernate.hbm2ddl.auto=create
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+# Clustered cache with TreeCache
+#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
+#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
+#hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+hibernate.bytecode.use_reflection_optimizer=false
+# I don't think this is honored, but EJB3Deployer uses it
+hibernate.bytecode.provider=javassist
+hibernate.jdbc.use_streams_for_binary=true
+hibernate.show_sql=false
+hibernate.format_sql=true
+hibernate.default_batch_fetch_size=16
+hibernate.jdbc.batch_size=20
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/jms-ra.rar b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/jms-ra.rar
new file mode 100644
index 0000000..c4807c6
Binary files /dev/null and b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/jms-ra.rar differ
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml
new file mode 100644
index 0000000..ec09ed7
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 39945 2006-01-12 02:44:07Z bill $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="WARN"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Messagen -->
+ <!--
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ -->
+ <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="target/server-jar-test.log"/>
+ <param name="Threshold" value="WARN"/>
+ <param name="Append" value="false"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Messagen -->
+ <!--
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ -->
+ <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
+ </layout>
+ </appender>
+
+ <category name="Test JNP Server">
+ <priority value="DEBUG"/>
+ </category>
+
+ <!-- Hibernate logs WARNINGS frequent from this class, in test envs. -->
+ <category name="org.hibernate.hql.ast.QueryTranslatorImpl">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- hides the TIMER SERVICE IS NOT INSTALLED warning - we know embedded EJB3 container doesn't support timers -->
+ <category name="org.jboss.ejb3.timerservice.jboss.JBossTimerServiceFactory">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- hides the shutdown warnings - for some reason, the container spits out some warnings when shutting down -->
+ <category name="org.jboss.kernel.plugins.dependency.StartStopLifecycleAction">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Hibernate SQL logs -->
+ <!--
+ <category name="org.hibernate.SQL">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy
new file mode 100644
index 0000000..8860b47
--- /dev/null
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy
@@ -0,0 +1,10 @@
+// We need the SecurityManager installed to enable sandboxing of CLI scripts
+// but we don't define any other security measures on the RHQ server itself.
+//
+// Granting all permissions allows us to run the RHQ server as if no security
+// manager was in place (which is assumed by default by JBoss AS) but be able
+// to use it when we need it for our own purposes.
+
+grant {
+ permission java.security.AllPermission;
+};
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
new file mode 100644
index 0000000..6e9c673
--- /dev/null
+++ b/modules/integration-tests/jndi-access/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>rhq-integration-tests</artifactId>
+ <groupId>org.rhq</groupId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>jndi-access-test-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <name>JNDI access tests</name>
+ <description>Tests for the secured JNDI access tests</description>
+
+ <modules>
+ <module>remote-server</module>
+ <module>jndi-access-test</module>
+ </modules>
+</project>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
new file mode 100644
index 0000000..9046e6f
--- /dev/null
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -0,0 +1,72 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>jndi-access-test-parent</artifactId>
+ <groupId>org.rhq</groupId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>jndi-access-remote-server</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Test JNDI-enabled remote server</name>
+ <description>
+ A testing JNDI-enabled server to test the ability to connect to remote servers without security
+ checks from within the scripts running inside the RHQ server.
+ </description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>4.2.2.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.2.2.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals><goal>single</goal></goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.rhq.jndi.test.Server</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java b/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java
new file mode 100644
index 0000000..7bfb8e8
--- /dev/null
+++ b/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java
@@ -0,0 +1,79 @@
+package org.rhq.jndi.test;
+import java.util.Properties;
+
+import javax.naming.CompoundName;
+
+import org.jnp.server.Main;
+import org.jnp.server.NamingBeanImpl;
+
+import org.jboss.logging.Logger;
+
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class Server {
+ private static final Logger LOG = Logger.getLogger(Server.class);
+
+ private static Server INSTANCE;
+
+ private Main jnpServer;
+
+ public static void main(String[] args) throws Exception {
+ LOG.debug("System properties: " + System.getProperties());
+ Server.start();
+ }
+
+ private Server() {
+ jnpServer = new Main("org.rhq.jndi.access.test.server");
+ }
+
+ public static synchronized Server getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE = new Server();
+ }
+
+ return INSTANCE;
+ }
+
+ public static void start() throws Exception {
+ LOG.debug("Initializing the JNP server");
+
+ NamingBeanImpl nbi = new NamingBeanImpl();
+ getInstance().jnpServer.setNamingInfo(nbi);
+ nbi.start();
+
+ LOG.debug("Binding kachny");
+
+ nbi.getNamingInstance().bind(new CompoundName("kachny", new Properties()), "KACHNY!", String.class.getName());
+
+ LOG.debug("Starting the JNP server");
+
+ getInstance().jnpServer.start();
+ }
+
+ public static void stop() {
+ LOG.debug("Stopping the JNP server");
+ getInstance().jnpServer.stop();
+ }
+}
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties b/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties
new file mode 100644
index 0000000..a45f2ce
--- /dev/null
+++ b/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jboss.naming.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties b/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties
new file mode 100644
index 0000000..2d41f83
--- /dev/null
+++ b/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootCategory=TRACE, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 0290729..969b94a 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -62,6 +62,7 @@
<id>integration-tests</id>
<modules>
<module>apache-plugin-test</module>
+ <module>jndi-access</module>
<!--<module>mod_cluster-plugin-test</module>-->
</modules>
</profile>
commit 89027fe4e28299fbe408617ff830701c63ec00e5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 3 14:01:32 2012 +0100
BZ 771216 - return messages accompanying error codes with the return type the client has requested.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
index 58ccf30..fe23ad2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
@@ -18,12 +18,16 @@
*/
package org.rhq.enterprise.server.rest;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import org.rhq.enterprise.server.authz.PermissionException;
import org.rhq.enterprise.server.resource.ResourceNotFoundException;
+import org.rhq.enterprise.server.rest.domain.RHQErrorWrapper;
/**
* Map a NotFoundException to a HTTP response with respective error message
@@ -32,10 +36,14 @@ import org.rhq.enterprise.server.resource.ResourceNotFoundException;
@Provider
public class CustomExceptionMapper implements ExceptionMapper<Exception> {
+ @Context
+ HttpHeaders httpHeaders;
@Override
public Response toResponse(Exception e) {
+
+
Throwable cause = e.getCause();
Response.ResponseBuilder builder;
if (cause !=null) {
@@ -52,7 +60,8 @@ public class CustomExceptionMapper implements ExceptionMapper<Exception> {
status = Response.Status.SERVICE_UNAVAILABLE;
builder = Response.status(status);
- builder.entity(cause.getMessage());
+ String message = cause.getMessage();
+ wrapMessage(builder, message);
}
else {
if (e instanceof PermissionException) {
@@ -60,9 +69,30 @@ public class CustomExceptionMapper implements ExceptionMapper<Exception> {
} else {
builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
}
- if (e.getMessage()!=null)
- builder.entity(e.getMessage());
+ if (e.getMessage()!=null) {
+ wrapMessage(builder,e.getMessage());
+ }
}
return builder.build();
}
+
+ /**
+ * Wrap the passed message according to the mediaType from the HttpHeader
+ * @param builder
+ * @param message
+ */
+ private void wrapMessage(Response.ResponseBuilder builder, String message) {
+
+ MediaType mediaType = httpHeaders.getAcceptableMediaTypes().get(0);
+
+ if (mediaType.equals(MediaType.TEXT_PLAIN_TYPE)) {
+ builder.entity(message);
+ } else if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
+ builder.entity("<html><body><h1>Error</h1><h2>" + message + "</h2></body></html>");
+ } else {
+ RHQErrorWrapper error = new RHQErrorWrapper(message);
+ builder.entity(error);
+ }
+ builder.type(mediaType);
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java
new file mode 100644
index 0000000..f62b1bc
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java
@@ -0,0 +1,28 @@
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Wrapper for Exceptions
+ * @author Heiko W. Rupp
+ */
+@XmlRootElement
+public class RHQErrorWrapper {
+
+ private String message;
+
+ public RHQErrorWrapper(String message) {
+ this.message = message;
+ }
+
+ public RHQErrorWrapper() {
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
commit 3fea0b257d0598b7beeaa2bc3982b2d07def1887
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 2 22:05:49 2012 +0100
Mention RHQ samples project.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 76aa220..9e96d76 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -5,7 +5,9 @@
Join us in making it great by providing feedback and contributions of code and examples
that use the api.
-See also <a href="http://rhq-project.org/display/RHQ/Design-REST">the RHQ wiki</a> and
+See also <a href="http://rhq-project.org/display/RHQ/Design-REST">the RHQ wiki</a> on REST.
+Check out the <a href="https://github.com/rhq-project/samples/tree/master/rest-api">RHQ samples project</a>
+for samples in various programming languages and
<a href="https://github.com/pilhuhn/RHQpocket">RHQpocket</a> as an example of a
mobile client (Android) of the API.
<ul>
commit 09dee7d811bfed40ff6b4606242c4aa89f8225c6
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 2 13:08:00 2012 +0100
sort retrieved values by timestamp, as some clients don't cope well with out of order data.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index ba9785c..77e36a4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -510,6 +510,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
sb.append(" UNION ALL ");
}
+ sb.append(" ORDER BY time_stamp ASC");
commit 14fc3e1c71e67517449dcbe6543327cee9ffddcb
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Dec 31 15:21:30 2011 +0100
Rollback jackson to 1.7.4, as 1.9.3 has a bug (JACKSON-744)
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index f39c296..8220355 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -16,7 +16,7 @@
<properties>
<json.version>${project.json.version}</json.version>
- <jackson.version>1.9.3</jackson.version>
+ <jackson.version>1.7.4</jackson.version>
<jboss.sasl.version>1.0.0.Beta9</jboss.sasl.version>
</properties>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
index 11f823d..e895dd4 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
@@ -21,6 +21,7 @@ package org.rhq.modules.plugins.jbossas7;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -430,7 +431,8 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest
ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(definition,connection,null);
Configuration config = delegate.loadResourceConfiguration();
assert config!=null;
- assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5: " + config.getProperties().toString();
+ Collection<Property> properties = config.getProperties();
+ assert properties.size()==6 : "Got " + properties.size() + " props instead of 6: " + properties.toString();
PropertySimple simple = config.getSimple("check-interval");
assert simple !=null;
Integer integerValue = simple.getIntegerValue();
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
index 67f2243..2dcd49f 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
@@ -59,6 +59,7 @@ public class OperationJsonTest {
assert op!=null;
assert op.getOperation()!=null : "op.operation was null!";
assert op.getOperation().equals(operation.getOperation()) : "Operation is " + op.getOperation();
+ assert op.getName()!=null : "op.getName is null";
assert op.getName().equals("socket-binding") : "attribute name is " + op.getName() + " and not 'socket-binding'";
assert op.getValue().equals("jndi") : "attribute value is " + op.getValue();
assert op.getAddress().size()==2 : "Address did not contain 2 parts, but " + op.getAddress().size();
commit 685a93c8b98e796173e5830159b33aa8350676a0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Dec 30 17:02:00 2011 +0100
Support submission of (numerical) metrics into the server and retrieval of raw numeric values.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java
index d0d26ab..d22689f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java
@@ -82,6 +82,10 @@ public abstract class MeasurementData implements Serializable {
this.setName(request.getName());
}
+ protected MeasurementData(long timestamp, int scheduleId) {
+ this(new MeasurementDataPK(timestamp,scheduleId));
+ }
+
public int getScheduleId() {
return id.scheduleId;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java
index 4e82c43..d0bf41f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java
@@ -59,6 +59,11 @@ public class MeasurementDataNumeric extends MeasurementData implements Serializa
this.rawNumericType = request.getRawNumericType();
}
+ public MeasurementDataNumeric(long collectionTime, int scheduleId,Double value) {
+ super(collectionTime,scheduleId);
+ this.value = value;
+ }
+
@Deprecated
// Have to make this protected so that people only use the constructor taking a request (so the name can be set for live values)
public MeasurementDataNumeric(MeasurementDataPK md, Double value) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
index 7ffb8e1..7bb7c8f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.server.measurement;
import java.sql.Connection;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
@@ -176,9 +177,9 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
long start = System.currentTimeMillis();
// TODO GH: Deal with offset (this is only for situations where the clock doesn't match on the agent)
- /*
+ /*
* even if these methods check for null/empty collections, they cross the EJB boundary and so unnecessarily
- * start transactions. by checking the null/emptiness of a collection here, by only create transactions
+ * start transactions. by checking the null/emptiness of a collection here, by only create transactions
* when real work will be done;
*/
if (report.getNumericData() != null && !report.getNumericData().isEmpty()) {
@@ -799,6 +800,37 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
return values;
}
+ @Override
+ public List<MeasurementDataNumeric> findRawData(Subject subject, int scheduleId, long startTime, long endTime) {
+
+ List<MeasurementDataNumeric> result = new ArrayList<MeasurementDataNumeric>();
+ String table = MeasurementDataManagerUtility.getCurrentRawTable();
+ Connection connection = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ connection = rhqDs.getConnection();
+ ps = connection.prepareStatement( // TODO supply real impl that spans multiple tables
+ "SELECT time_stamp,value FROM " + table + " WHERE schedule_id= ? AND time_stamp BETWEEN ? AND ?");
+ ps.setLong(1,scheduleId);
+ ps.setLong(2,startTime);
+ ps.setLong(3,endTime);
+ rs = ps.executeQuery();
+
+ while (rs.next()) {
+ MeasurementDataNumeric point = new MeasurementDataNumeric(rs.getLong(1),scheduleId,rs.getDouble(2));
+ result.add(point);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace(); // TODO: Customise this generated block
+ } finally {
+ JDBCUtil.safeClose(connection, ps, rs);
+ }
+
+
+ return result;
+ }
+
private List<MeasurementDataRequest> createRequests(List<MeasurementDefinition> definitions) {
List<MeasurementDataRequest> requests = new ArrayList<MeasurementDataRequest>();
for (MeasurementDefinition definition : definitions) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
index e80f16a..4ea8302 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
@@ -189,4 +189,6 @@ public interface MeasurementDataManagerLocal {
List<List<MeasurementDataNumericHighLowComposite>> findDataForResource(Subject subject, int resourceId,
int[] definitionIds, long beginTime, long endTime, int numPoints);
+
+ List<MeasurementDataNumeric> findRawData(Subject subject, int scheduleId, long startTime, long endTime);
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index 99dd6fe..ba9785c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -18,18 +18,34 @@
*/
package org.rhq.enterprise.server.rest;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.URI;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
+import javax.sql.DataSource;
+import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.CacheControl;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.EntityTag;
@@ -38,6 +54,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
@@ -45,9 +62,13 @@ import org.jboss.cache.Fqn;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.DataType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.core.util.jdbc.JDBCUtil;
+import org.rhq.enterprise.server.RHQConstants;
+import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.rest.domain.Link;
import org.rhq.enterprise.server.rest.domain.MetricAggregate;
@@ -55,6 +76,7 @@ import org.rhq.enterprise.server.measurement.MeasurementAggregate;
import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal;
import org.rhq.enterprise.server.rest.domain.MetricSchedule;
+import org.rhq.enterprise.server.rest.domain.NumericDataPoint;
/**
* Deal with metrics
@@ -62,6 +84,7 @@ import org.rhq.enterprise.server.rest.domain.MetricSchedule;
*/
@Interceptors(SetCallerInterceptor.class)
@Stateless
+(a)javax.annotation.Resource(name = "RHQ_DS", mappedName = RHQConstants.DATASOURCE_JNDI_NAME)
public class MetricHandlerBean extends AbstractRestBean implements MetricHandlerLocal {
@EJB
@@ -71,6 +94,10 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@EJB
ResourceManagerLocal resMgr;
+ @javax.annotation.Resource(name = "RHQ_DS")
+ private DataSource rhqDs;
+
+
private static final long EIGHT_HOURS = 8 * 3600L * 1000L;
@Override
@@ -87,20 +114,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
startTime = endTime - EIGHT_HOURS;
}
-
- MeasurementSchedule schedule;
- schedule = getFromCache(scheduleId,MeasurementSchedule.class);
- if (schedule==null) {
- schedule = scheduleManager.getScheduleById(caller,scheduleId);
- if (schedule==null) {
- throw new StuffNotFoundException("Schedule with id " + scheduleId);
- }
- else
- putToCache(scheduleId,MeasurementSchedule.class,schedule);
- }
-
- if (schedule.getDefinition().getDataType()!= DataType.MEASUREMENT)
- throw new IllegalArgumentException("Schedule [" + scheduleId + "] is not a (numerical) metric");
+ MeasurementSchedule schedule = obtainSchedule(scheduleId);
MeasurementAggregate aggr = dataManager.getAggregate(caller, scheduleId, startTime, endTime);
MetricAggregate res = new MetricAggregate(scheduleId, aggr.getMin(),aggr.getAvg(),aggr.getMax());
@@ -156,6 +170,28 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
return builder.build();
}
+ /**
+ * Get the schedule for the passed schedule id
+ * @param scheduleId id to look up
+ * @return schedule
+ * @throws StuffNotFoundException if there is no schedule with the passed id
+ */
+ private MeasurementSchedule obtainSchedule(int scheduleId) {
+ MeasurementSchedule schedule;
+ schedule = getFromCache(scheduleId,MeasurementSchedule.class);
+ if (schedule==null) {
+ schedule = scheduleManager.getScheduleById(caller,scheduleId);
+ if (schedule==null) {
+ throw new StuffNotFoundException("Schedule with id " + scheduleId);
+ }
+ else
+ putToCache(scheduleId,MeasurementSchedule.class,schedule);
+ }
+
+ if (schedule.getDefinition().getDataType()!= DataType.MEASUREMENT)
+ throw new IllegalArgumentException("Schedule [" + scheduleId + "] is not a (numerical) metric");
+ return schedule;
+ }
private MetricAggregate fill(MetricAggregate res, List<MeasurementDataNumericHighLowComposite> list, int scheduleId,
boolean hideEmpty) {
long minTime=Long.MAX_VALUE;
@@ -180,7 +216,6 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
return res;
}
- @Override
@GET
@Path("data")
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_HTML})
@@ -382,4 +417,139 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
return Response.ok(ret,httpHeaders.getAcceptableMediaTypes().get(0)).build();
}
+
+ @GET
+ @Path("data/{scheduleId}/raw")
+ public StreamingOutput getMetricDataRaw(@PathParam("scheduleId") int scheduleId,
+ @QueryParam("startTime") long startTime,
+ @QueryParam("endTime") long endTime,
+ long duration,
+ Request request,
+ HttpHeaders headers) {
+
+
+ if (endTime==0)
+ endTime = System.currentTimeMillis();
+ if (startTime==0)
+ startTime = endTime - EIGHT_HOURS;
+ if (duration>0) // overrides start time
+ startTime = endTime - duration*1000L; // duration is in seconds
+
+ if (startTime < System.currentTimeMillis()-7L*86400*1000)
+ throw new IllegalArgumentException("Start time is older than 7 days");
+
+ // Check if the schedule exists
+ obtainSchedule(scheduleId);
+
+ RawNumericJsonStreamingOutput so = new RawNumericJsonStreamingOutput();
+ so.scheduleId = scheduleId;
+ so.startTime = startTime;
+ so.endTime = endTime;
+
+
+ return so;
+ }
+
+ @Override
+ @PUT
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Path("data/{scheduleId}/raw/{timeStamp}")
+ public Response putMetricValue(@PathParam("scheduleId") int scheduleId, @PathParam("timeStamp") long timestamp,
+ NumericDataPoint point, @Context HttpHeaders headers) {
+
+ MeasurementSchedule schedule = obtainSchedule(scheduleId);
+
+ Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(1);
+ data.add(new MeasurementDataNumeric(point.getTimeStamp(),scheduleId,point.getValue()));
+
+ dataManager.addNumericData(data);
+
+ return Response.ok().build(); // TODO correct code?
+ }
+
+
+ @Override
+ @POST
+ @Path("data/raw")
+ @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response postMetricValues(Collection<NumericDataPoint> points, @Context HttpHeaders headers) {
+
+ Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(points.size());
+ for (NumericDataPoint point : points) {
+ data.add(new MeasurementDataNumeric(point.getTimeStamp(), point.getScheduleId(),point.getValue()));
+ }
+
+ dataManager.addNumericData(data);
+
+ return Response.ok().build();
+
+ }
+
+ /**
+ * Write the numeric data points to the output stream in JSON encoding
+ * without creating tons of objects in the middle to have them marshalled
+ * by JAX-RS
+ */
+ private class RawNumericJsonStreamingOutput implements StreamingOutput {
+
+ int scheduleId;
+ long startTime;
+ long endTime;
+
+ @Override
+ public void write(OutputStream outputStream) throws IOException, WebApplicationException {
+
+ String[] tables = MeasurementDataManagerUtility.getTables(startTime,endTime);
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0 ; i < tables.length ; i ++) {
+ sb.append("SELECT time_stamp,value FROM ");
+ sb.append(tables[i]);
+ sb.append(" WHERE schedule_id = ? AND time_stamp BETWEEN ? AND ?");
+ if (i < tables.length-1)
+ sb.append(" UNION ALL ");
+ }
+
+
+
+
+ Connection connection = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ connection = rhqDs.getConnection();
+ ps = connection.prepareStatement( sb.toString() );
+ for (int i = 0; i < tables.length ; i++) {
+ ps.setInt(i * 3 + 1, scheduleId);
+ ps.setLong(i*3+2,startTime);
+ ps.setLong(i*3+3,endTime);
+ }
+ rs = ps.executeQuery();
+
+ PrintWriter pw = new PrintWriter(outputStream);
+ pw.println("[");
+ while (rs.next()) {
+ pw.print("{");
+ pw.print("\"scheduleId\":");
+ pw.print(scheduleId);
+ pw.print(", ");
+ pw.print("\"timeStamp\":");
+ pw.print(rs.getLong(1));
+ pw.print(", ");
+ pw.print("\"value\":");
+ pw.print(rs.getLong(2));
+ pw.print("}");
+ if (!rs.isLast())
+ pw.print(",\n");
+ }
+ pw.println("]");
+ pw.flush();
+ pw.close();
+ } catch (SQLException e) {
+ log.error(e);
+ } finally {
+ JDBCUtil.safeClose(connection, ps, rs);
+ }
+ }
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
index 6631ef4..2c75a55 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
@@ -18,12 +18,14 @@
*/
package org.rhq.enterprise.server.rest;
+import java.util.Collection;
import java.util.List;
import javax.ejb.Local;
import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
+import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -34,10 +36,12 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
import javax.ws.rs.core.UriInfo;
import org.rhq.enterprise.server.rest.domain.MetricAggregate;
import org.rhq.enterprise.server.rest.domain.MetricSchedule;
+import org.rhq.enterprise.server.rest.domain.NumericDataPoint;
/**
* Deal with metrics
@@ -76,16 +80,77 @@ public interface MetricHandlerLocal {
@Path("data/resource/{resourceId}")
List<MetricAggregate> getAggregatesForResource(@PathParam("resourceId") int resourceId);
+ /**
+ * Get information about the schedule
+ * @param scheduleId id of the schedule
+ * @param request Injected request
+ * @param headers Injected http headers
+ * @param uriInfo Injected Uri
+ * @return the schedule
+ */
@GET
@Path("/schedule/{id}")
@Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML,MediaType.TEXT_HTML})
Response getSchedule(@PathParam("id") int scheduleId, @Context Request request, @Context HttpHeaders headers,
@Context UriInfo uriInfo);
+ /**
+ * Update a schedule. Currently change of collection interval and enabled/disabled state are supported.
+ * @param scheduleId Id of the schedule to update
+ * @param in Modified schedule object
+ * @param headers Injected http headers
+ * @return Result of updating
+ */
@PUT
@Path("/schedule/{id}")
@Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
Response updateSchedule(@PathParam("id") int scheduleId, MetricSchedule in,@Context HttpHeaders headers);
+ /**
+ * Expose the raw metrics for the given schedule
+ * @param scheduleId Schedule id
+ * @param startTime Start time, if 0 and duration=, start time = 8h before endTime
+ * @param endTime End time. If 0, now is used
+ * @param duration Duration in seconds. If duration=0, startTime is used
+ * @param request Injected Request headers
+ * @param headers Injected HttpHeaders
+ * @return a JSON encoded stream of numerical values
+ */
+ @GET
+ @Path("data/{scheduleId}/raw")
+ @Produces({MediaType.APPLICATION_JSON})
+ StreamingOutput getMetricDataRaw(@PathParam("scheduleId") int scheduleId,
+ @QueryParam("startTime") long startTime,
+ @QueryParam("endTime") long endTime,
+ @QueryParam("duration") long duration,
+ @Context Request request,
+ @Context HttpHeaders headers);
+
+ /**
+ * Submit a single (numerical) metric value to the server.
+ * @param scheduleId Id of the schedule to submit to
+ * @param timestamp Timestamp of the entry
+ * @param point Datapoint of class NumericDataPoint
+ * @param headers Injected HTTP headers
+ * @return
+ */
+ @PUT
+ @Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ @Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ @Path("data/{scheduleId}/raw/{timeStamp}")
+ Response putMetricValue(@PathParam("scheduleId")int scheduleId,
+ @PathParam("timeStamp")long timestamp, NumericDataPoint point,
+ @Context HttpHeaders headers);
+
+ /**
+ * Submit a series of (numerical) metric values to the server
+ * @param points Collection of NumericDataPoint entries
+ * @param headers Injected HTTP headers
+ * @return
+ */
+ @POST
+ @Path("data/raw")
+ @Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ Response postMetricValues(Collection<NumericDataPoint> points, @Context HttpHeaders headers);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java
new file mode 100644
index 0000000..e1ef904
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java
@@ -0,0 +1,65 @@
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * One numerical data point of a schedule.
+ * This point does not contain the schedule id, as it is expected
+ * to be used to return lists of data points for a schedule.
+ *
+ * Xml names for the item and the attributes are shortened to
+ * conserve space when transferring to clients
+ *
+ * @author Heiko W. Rupp
+ */
+@XmlRootElement
+public class NumericDataPoint {
+
+ long timeStamp;
+ Double value;
+ private int scheduleId;
+
+ @SuppressWarnings("unused")
+ public NumericDataPoint() {
+ // Needed for JAXB
+ }
+
+ public NumericDataPoint(long timeStamp, Double value) {
+ this.timeStamp = timeStamp;
+ this.value = value;
+ }
+
+ public NumericDataPoint(long timeStamp, int scheduleId, Double value) {
+ this.timeStamp = timeStamp;
+ this.scheduleId = scheduleId;
+ this.value = value;
+ }
+
+ @XmlAttribute
+ public long getTimeStamp() {
+ return timeStamp;
+ }
+
+ @XmlAttribute
+ public Double getValue() {
+ return value;
+ }
+
+ @XmlAttribute
+ public int getScheduleId() {
+ return scheduleId;
+ }
+
+ public void setScheduleId(int scheduleId) {
+ this.scheduleId = scheduleId;
+ }
+
+ public void setTimeStamp(long timeStamp) {
+ this.timeStamp = timeStamp;
+ }
+
+ public void setValue(Double value) {
+ this.value = value;
+ }
+}
commit 14b81e5036bbbc47bb09fac2dc86b7166b1846fd
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sun Dec 25 11:42:47 2011 +0100
Initialize additionalProperties; give more debug output when assert fails.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
index 0517ee1..23df1a5 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
@@ -47,10 +47,12 @@ public class Operation {
this.operation = operation;
this.address = new Address(addressKey,addressValue);
this._address = address.path;
+ additionalProperties = new HashMap<String, Object>();
}
public Operation(String operation, Address address) {
this.operation = operation;
+ additionalProperties = new HashMap<String, Object>();
if (address!=null && address.path!=null) {
this.address = address;
this._address = address.path;
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
index ef58967..11f823d 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
@@ -430,7 +430,7 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest
ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(definition,connection,null);
Configuration config = delegate.loadResourceConfiguration();
assert config!=null;
- assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5";
+ assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5: " + config.getProperties().toString();
PropertySimple simple = config.getSimple("check-interval");
assert simple !=null;
Integer integerValue = simple.getIntegerValue();
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
index 354ab8d..67f2243 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
@@ -59,7 +59,7 @@ public class OperationJsonTest {
assert op!=null;
assert op.getOperation()!=null : "op.operation was null!";
assert op.getOperation().equals(operation.getOperation()) : "Operation is " + op.getOperation();
- assert op.getName().equals("socket-binding") : "attribute name is " + op.getName();
+ assert op.getName().equals("socket-binding") : "attribute name is " + op.getName() + " and not 'socket-binding'";
assert op.getValue().equals("jndi") : "attribute value is " + op.getValue();
assert op.getAddress().size()==2 : "Address did not contain 2 parts, but " + op.getAddress().size();
commit 894c2ec182b75d50ab0238a3a211966e517f939b
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Dec 22 17:57:02 2011 -0500
[BZ 767734] conditionally disabling remaining tags references from Bundles.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index 5ac460c..bbc4175 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -124,7 +124,11 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
+ deployment.getDestination().getName(), LinkManager.getBundleDestinationLink(version.getBundle().getId(),
deployment.getDestination().getId())));
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleDeployment_24.png"), deployment.getName()));
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
addMemberDeploymentsTable();
@@ -219,8 +223,8 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
// deployment represents content on the remote machines, showing purge only for live
// deployments makes sense).
if (deployment.isLive()) {
- IButton revertButton = new LocatableIButton(actionLayout.extendLocatorId("Revert"), MSG
- .view_bundle_revert());
+ IButton revertButton = new LocatableIButton(actionLayout.extendLocatorId("Revert"),
+ MSG.view_bundle_revert());
revertButton.setIcon("subsystems/bundle/BundleAction_Revert_16.png");
revertButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
public void onClick(com.smartgwt.client.widgets.events.ClickEvent event) {
@@ -252,8 +256,9 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
new Message(MSG.view_bundle_dest_purgeSuccessful(destinationName),
Message.Severity.Info));
// Bundle destination is purged, go back to bundle deployment view - it is not live anymore
- CoreGUI.goToView(LinkManager.getBundleDeploymentLink(bundle.getId(), deployment
- .getId()), true);
+ CoreGUI.goToView(
+ LinkManager.getBundleDeploymentLink(bundle.getId(), deployment.getId()),
+ true);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 1e47427..d0966f2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -101,7 +101,12 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
addMember(backButton);
addMember(header);
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
+
addMember(createSummaryForm());
addMember(createDeploymentsTable());
addMember(detail);
@@ -223,8 +228,8 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
new Message(MSG.view_bundle_dest_purgeSuccessful(destination.getName()),
Message.Severity.Info));
// Bundle destination is purged, go back to bundle destination view
- CoreGUI.goToView(LinkManager.getBundleDestinationLink(bundle.getId(), destination
- .getId()), true);
+ CoreGUI.goToView(
+ LinkManager.getBundleDestinationLink(bundle.getId(), destination.getId()), true);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
index e8eabfa..7a39e5a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
@@ -108,7 +108,11 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
addMember(backButton);
addMember(headerLabel);
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
addMember(tabs);
@@ -184,8 +188,8 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
StaticTextItem versionCountItem = new StaticTextItem("versionCount", MSG.view_bundle_list_versionsCount());
versionCountItem.setValue(bundle.getBundleVersions() != null ? bundle.getBundleVersions().size() : 0);
- StaticTextItem destinationsCountItem = new StaticTextItem("destinationsCount", MSG
- .view_bundle_list_destinationsCount());
+ StaticTextItem destinationsCountItem = new StaticTextItem("destinationsCount",
+ MSG.view_bundle_list_destinationsCount());
destinationsCountItem.setValue(bundle.getDestinations() != null ? bundle.getDestinations().size() : 0);
StaticTextItem descriptionItem = new StaticTextItem("description", MSG.common_title_description());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
index 19116bb..5737a9c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
@@ -93,7 +93,10 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleVersion_24.png"), version.getName() + ": "
+ version.getVersion()));
- addMember(createTagEditor());
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
@@ -268,16 +271,17 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
criteria.fetchConfigurationDefinition(true);
criteria.fetchTags(true);
- bundleManager.findBundleVersionsByCriteriaWithDestinationFilter(criteria, new AsyncCallback<PageList<BundleVersion>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_bundle_version_loadFailure(), caught);
- }
+ bundleManager.findBundleVersionsByCriteriaWithDestinationFilter(criteria,
+ new AsyncCallback<PageList<BundleVersion>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_bundle_version_loadFailure(), caught);
+ }
- public void onSuccess(PageList<BundleVersion> result) {
- BundleVersion version = result.get(0);
- ViewId nextPath = viewPath.next().getCurrent();
- viewBundleVersion(version, nextPath);
- }
- });
+ public void onSuccess(PageList<BundleVersion> result) {
+ BundleVersion version = result.get(0);
+ ViewId nextPath = viewPath.next().getCurrent();
+ viewBundleVersion(version, nextPath);
+ }
+ });
}
}
commit ca7c3763fd627f0c26a8f6cfd48f3e929f64e2be
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 22 15:58:36 2011 -0500
[BZ 759640] this also appears related to BZ 765670 - have the installer ping the startup servlet to know if the server is fully installed and ready
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
index 673b018..7c04d9d 100644
--- a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
+++ b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
@@ -20,7 +20,7 @@
<c:if test="<%= new ServerInformation().isFullyDeployed() && request.getRequestURI().indexOf("installer/start") == -1 %>">
<script type="text/javascript" language="JavaScript">
- var startPage = '/Dashboard.do';
+ var startPage = '/startupstatus';
var xmlRequest = false;
function doLoad()
@@ -49,7 +49,7 @@
}
xmlRequest.onreadystatechange = processStateChange;
- xmlRequest.open('GET', startPage, true);
+ xmlRequest.open('HEAD', startPage, true);
xmlRequest.send(null);
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
index bc3942a..3add80f 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.startup;
+import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.sql.Connection;
@@ -31,6 +32,8 @@ import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import org.apache.commons.logging.Log;
@@ -44,7 +47,6 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.common.ProductInfo;
-import org.rhq.core.domain.common.ServerDetails;
import org.rhq.core.domain.configuration.PropertyDynamicType;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.gui.configuration.helper.PropertyRenderingUtility;
@@ -65,7 +67,17 @@ import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainer;
import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.scheduler.SchedulerLocal;
-import org.rhq.enterprise.server.scheduler.jobs.*;
+import org.rhq.enterprise.server.scheduler.jobs.AsyncResourceDeleteJob;
+import org.rhq.enterprise.server.scheduler.jobs.CheckForSuspectedAgentsJob;
+import org.rhq.enterprise.server.scheduler.jobs.CheckForTimedOutConfigUpdatesJob;
+import org.rhq.enterprise.server.scheduler.jobs.CheckForTimedOutContentRequestsJob;
+import org.rhq.enterprise.server.scheduler.jobs.CheckForTimedOutOperationsJob;
+import org.rhq.enterprise.server.scheduler.jobs.CloudManagerJob;
+import org.rhq.enterprise.server.scheduler.jobs.DataPurgeJob;
+import org.rhq.enterprise.server.scheduler.jobs.DynaGroupAutoRecalculationJob;
+import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob;
+import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob;
+import org.rhq.enterprise.server.scheduler.jobs.SavedSearchResultCountRecalculationJob;
import org.rhq.enterprise.server.util.LookupUtil;
import org.rhq.enterprise.server.util.concurrent.AlertSerializer;
import org.rhq.enterprise.server.util.concurrent.AvailabilityReportSerializer;
@@ -73,6 +85,8 @@ import org.rhq.enterprise.server.util.concurrent.AvailabilityReportSerializer;
/**
* This servlet is ensured to be initialized after the rest of the RHQ Server has been deployed and started.
* Specifically, we know that at {@link #init()} time, all EJBs have been deployed and available.
+ *
+ * This also accepts requests and responds with information regarding the state of the startup.
*/
public class StartupServlet extends HttpServlet {
@@ -80,6 +94,20 @@ public class StartupServlet extends HttpServlet {
private Log log = LogFactory.getLog(this.getClass());
+ private boolean initialized = false;
+
+ /**
+ * This merely returns an HTTP status code to indicate the status of the startup.
+ * Under normal conditions, this will always return a 200 status code.
+ */
+ @Override
+ protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ resp.setHeader("Cache-Control", "no-cache, no-store");
+ resp.setHeader("Expires", "-1");
+ resp.setHeader("Pragma", "no-cache");
+ resp.setStatus(initialized ? HttpServletResponse.SC_OK : HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ }
+
/**
* Performs the final RHQ Server initialization work that needs to talk place. EJBs are available in this method.
*
@@ -87,6 +115,8 @@ public class StartupServlet extends HttpServlet {
*/
@Override
public void init() throws ServletException {
+ initialized = false;
+
log.info("All business tier deployments are complete - finishing the startup...");
// As a security measure, make sure the installer has been undeployed
@@ -138,6 +168,7 @@ public class StartupServlet extends HttpServlet {
logServerStartedMessage();
+ initialized = true;
return;
}
@@ -339,8 +370,12 @@ public class StartupServlet extends HttpServlet {
try {
ServerCommunicationsServiceUtil.getService().startCommunicationServices();
- ServerCommunicationsServiceUtil.getService().getServiceContainer().addCommandListener(
- new ExternalizableStrategyCommandListener(org.rhq.core.server.ExternalizableStrategy.Subsystem.AGENT));
+ ServerCommunicationsServiceUtil
+ .getService()
+ .getServiceContainer()
+ .addCommandListener(
+ new ExternalizableStrategyCommandListener(
+ org.rhq.core.server.ExternalizableStrategy.Subsystem.AGENT));
} catch (Exception e) {
throw new ServletException("Cannot start the server-side communications services.", e);
}
@@ -574,19 +609,19 @@ public class StartupServlet extends HttpServlet {
Server server = LookupUtil.getServerManager().getServer();
if (agentAddress == null || agentAddress.trim().equals("")) {
- overrides.setProperty(ServiceContainerConfigurationConstants.CONNECTOR_BIND_ADDRESS, server
- .getAddress());
+ overrides.setProperty(ServiceContainerConfigurationConstants.CONNECTOR_BIND_ADDRESS,
+ server.getAddress());
}
if (serverAddress == null || serverAddress.trim().equals("")) {
overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_ADDRESS, server.getAddress());
}
if (serverPort == null || serverPort.trim().equals("")) {
if (SecurityUtil.isTransportSecure(serverTransport)) {
- overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_PORT, Integer.toString(server
- .getSecurePort()));
+ overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_PORT,
+ Integer.toString(server.getSecurePort()));
} else {
- overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_PORT, Integer.toString(server
- .getPort()));
+ overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_PORT,
+ Integer.toString(server.getPort()));
}
}
@@ -684,7 +719,8 @@ public class StartupServlet extends HttpServlet {
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
ProductInfo productInfo = LookupUtil.getSystemManager().getProductInfo(overlord);
log.info("--------------------------------------------------"); // 50 dashes
- log.info(productInfo.getFullName() + " " + productInfo.getVersion() + " (build " + productInfo.getBuildNumber() + ") Server started.");
+ log.info(productInfo.getFullName() + " " + productInfo.getVersion() + " (build " + productInfo.getBuildNumber()
+ + ") Server started.");
log.info("--------------------------------------------------"); // 50 dashes
}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
index 1beef97..7528dd9 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
@@ -457,13 +457,18 @@
<url-pattern>/client/download</url-pattern>
</servlet-mapping>
+ <!-- provides startup progress information (mainly for the installer) -->
+ <servlet-mapping>
+ <servlet-name>initializer</servlet-name>
+ <url-pattern>/startupstatus</url-pattern>
+ </servlet-mapping>
+
+ <!-- TODO what is this for? -->
<servlet-mapping>
<servlet-name>sessionAccess</servlet-name>
<url-pattern>/sessionAccess</url-pattern>
</servlet-mapping>
-
-
<!-- The download servlet; this URI /downloads will effectively look like its pointing to rhq-downloads -->
<servlet-mapping>
<servlet-name>DownloadServlet</servlet-name>
commit 14141686e5d0c9cac395a13ceb52f2817287ce7b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Dec 22 15:31:49 2011 +0100
Jnp port is now detected from system properties rather than hardcoded.
jnpserver is declared as a provided dep.
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 9d7d603..0974431 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -43,6 +43,7 @@
<groupId>jboss</groupId>
<artifactId>jnpserver</artifactId>
<version>4.2.2.GA</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
index 1a9562a..e529347 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -77,7 +77,6 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
private static final String[] CHECKED_SCHEMES = { "java" };
private static final Set<InetAddress> SERVER_BIND_IPS;
-
static {
SERVER_BIND_IPS = new HashSet<InetAddress>();
@@ -98,10 +97,11 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
LOG.error("Could not obtain the list of local IPs", e);
} catch (UnknownHostException e) {
LOG.error("Failed to get the binding address of the RHQ server.", e);
- }
-
+ }
}
+ private static final int JNP_PORT = Integer.parseInt(System.getProperty("rhq.server.startup.namingservice.port", "2099"));
+
/**
* This is the default initial context factory that is returned when no other is
* configured using the environment variables.
@@ -159,10 +159,7 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
//check if we are accessing the RHQ server through some remoting
//interface.
- //I just can't find where to read the magic number 1099 from.
- //it is defined in the jboss config files, but in the code
- //it seems hardcoded - see JDBCLoginModule.
- if (uri.getPort() == 1099 && SERVER_BIND_IPS.contains(providerHost)) {
+ if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
} else {
return new URLPreferringInitialContextFactoryDecorator(factory);
commit 41c87d1c7ed3f0719cee76067afb3e84c7644481
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Dec 21 21:29:45 2011 +0100
Fix compile errors.
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java b/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java
index fbf81b5..6714c40 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java
+++ b/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java
@@ -57,9 +57,11 @@ import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
public abstract class AbstractIntegrationTest {
protected static final String DC_HOST = "localhost";
protected static final int DC_HTTP_PORT = 9990;
+ protected static final String DC_USER = "rhqadmin";
+ protected static final String DC_PASS = "rhqadmin";
String uploadToAs(String deploymentName) throws IOException {
- ASUploadConnection conn = new ASUploadConnection(DC_HOST, DC_HTTP_PORT);
+ ASUploadConnection conn = new ASUploadConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
OutputStream os = conn.getOutputStream(deploymentName);
@@ -92,7 +94,7 @@ public abstract class AbstractIntegrationTest {
}
ASConnection getASConnection() {
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
return connection;
}
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java b/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java
index 9b35471..cc55f1c 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java
+++ b/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java
@@ -90,7 +90,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest {
System.out.println("sha: " + bytes_value);
System.out.println();
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
Address deploymentsAddress = new Address("deployment", TEST_WAR);
Operation op = new Operation("add",deploymentsAddress);
@@ -168,7 +168,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest {
System.out.println("sha: " + bytes_value);
System.out.println();
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
/*
Address deploymentsAddress = new Address();
@@ -275,7 +275,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest {
cop.addStep(step2a);
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
JsonNode ret = connection.executeRaw(cop);
System.out.println(ret);
System.out.flush();
@@ -326,7 +326,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest {
cop.addStep(step1);
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
JsonNode ret = connection.executeRaw(cop);
System.out.println(ret);
System.out.flush();
commit 47086c02a2ed841262811c5a9ac1b92e22e7368d
Author: Mohamed Hamza Ben Mansour <>
Date: Wed Dec 21 18:19:37 2011 +0100
BZ 744262 - add resource lineage to SNMP traps.
diff --git a/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt b/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt
index 61fdb09..20bb110 100644
--- a/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt
+++ b/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt
@@ -11,14 +11,14 @@ IMPORTS
FROM SNMPv2-TC;
rhqMIB MODULE-IDENTITY
- LAST-UPDATED "201010180000Z"
+ LAST-UPDATED "201112200000Z"
ORGANIZATION "RHQ-Project"
CONTACT-INFO "http://www.rhq-project.org/"
DESCRIPTION
"The MIB module for RHQ alerts.
This file is part of the RHQ management platform
- Copyright (C) 2005-2010 Red Hat, Inc.
+ Copyright (C) 2005-2011 Red Hat, Inc.
All rights reserved.
"
@@ -26,6 +26,8 @@ rhqMIB MODULE-IDENTITY
DESCRIPTION "Initial version"
REVISION "201010180000Z"
DESCRIPTION "Better trap support"
+ REVISION "201112200000Z"
+ DESCRIPTION "Also emit resource lineage"
::= { snmpModules 1 }
jboss OBJECT IDENTIFIER ::= {enterprises 18016 }
@@ -85,6 +87,14 @@ alertUrl OBJECT-TYPE
"The url of the individual alert"
::= { alert 6 }
+alertHierarchy OBJECT-TYPE
+ SYNTAX DisplayString (SIZE (0..1024))
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The hierarchy of the resource that triggered the alert"
+ ::= { alert 6 }
+
-- conformance information
snmpMIBConformance
@@ -110,7 +120,8 @@ alertGroup OBJECT-GROUP
alertPlatformName,
alertCondition,
alertSeverity,
- alertUrl }
+ alertUrl,
+ alertHierarchy }
STATUS current
DESCRIPTION "A collection of objects providing information about an alert"
::= { snmpMIBGroups 1 }
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
index 664be6d..3e753f0 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Random;
import javax.persistence.EntityManager;
+import javax.transaction.NotSupportedException;
+import javax.transaction.SystemException;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -110,6 +112,95 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase {
assert errors.size() == 0;
}
+
+ public void testResourceLineage() throws Exception {
+ // given a resource id for the leaf resource in a resource hierachy
+ int leafResourceId = givenASampleResourceHierarchy();
+
+ // when
+ List<Resource> resourceLineage = resourceManager.getResourceLineage(leafResourceId);
+
+ // then
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Resource resource : resourceLineage) {
+ stringBuilder.append(resource.getName());
+ if (resourceLineage.indexOf(resource) != resourceLineage.size() - 1) {
+ stringBuilder.append("::");
+ }
+ }
+ System.err.println(stringBuilder.toString());
+
+ }
+
+ private int givenASampleResourceHierarchy() throws NotSupportedException,
+ SystemException {
+ getTransactionManager().begin();
+ EntityManager em = getEntityManager();
+ int leafResoureId = 0;
+ try {
+ ResourceType platformType = createResourceType(em, "platform"
+ + System.currentTimeMillis(), "test", null,
+ ResourceCategory.PLATFORM);
+ ResourceType appserverType = createResourceType(em, "jboss AS 5"
+ + System.currentTimeMillis(), "jbossas5", platformType,
+ ResourceCategory.SERVER);
+ ResourceType jvmType = createResourceType(em,
+ "JVM" + System.currentTimeMillis(), "jbossas5",
+ appserverType, ResourceCategory.SERVICE);
+ ResourceType memType = createResourceType(em, "Memory Subsystem"
+ + System.currentTimeMillis(), "jbossas5", jvmType,
+ ResourceCategory.SERVICE);
+ Agent agent = new Agent("hamza007", "hamzahost", 1, "", "hamzatoken");
+ em.persist(agent);
+ em.flush();
+
+ Resource platform = createResource(em, platformType, agent,
+ "platformKey" + System.currentTimeMillis(),
+ "host.dev.corp", null);
+ Resource appserver = createResource(em, appserverType, agent,
+ "JEAP" + System.currentTimeMillis(), "JBOSS EAP 5.1.1",
+ platform);
+ Resource jvm = createResource(em, memType, agent, "jvm"
+ + System.currentTimeMillis(), "JBoss AS JVM", appserver);
+ Resource memSubystem = createResource(em, appserverType, agent,
+ "mem" + System.currentTimeMillis(), "Memory Subsystem", jvm);
+ leafResoureId = memSubystem.getId();
+ getTransactionManager().commit();
+ } catch (Exception e) {
+ try {
+ System.out.println("CANNOT Prepare TEST: Cause: " + e);
+ getTransactionManager().rollback();
+ } catch (Exception ignore) {
+ }
+ } finally {
+ em.close();
+ }
+ return leafResoureId;
+ }
+
+ private Resource createResource(EntityManager em, ResourceType platformType,
+ Agent agent, String resourceKey, String resourceName,
+ Resource parent) {
+ Resource resource = new Resource(resourceKey, resourceName, platformType);
+ resource.setUuid("" + new Random().nextInt());
+ resource.setAgent(agent);
+ resource.setParentResource(parent);
+ em.persist(resource);
+ return resource;
+ }
+
+
+ private ResourceType createResourceType(EntityManager em, String name,
+ String pluginName, ResourceType parentResourceType,
+ ResourceCategory resourceCategory) {
+ ResourceType platformType = new ResourceType(name, pluginName,
+ resourceCategory, parentResourceType);
+ ResourceType resourceType = platformType;
+ em.persist(resourceType);
+ return resourceType;
+ }
+
+
private Resource createNewResourceWithNewType() throws Exception {
getTransactionManager().begin();
EntityManager em = getEntityManager();
@@ -173,4 +264,4 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
index 627e23d..1ea5e0b 100644
--- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
+++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
@@ -60,16 +60,30 @@ public class SnmpSender extends AlertSender {
String platformName = lineage.get(0).getName();
String conditions = alertManager.prettyPrintAlertConditions(alert, false);
String alertUrl = alertManager.prettyPrintAlertURL(alert);
+
+
+ String hierarchy = getResourceHierarchyAsString(lineage);
Date bootTime = new Date(); // TODO: want to use LookupUtil.getCoreServer().getBootTime() but ServiceMBean is not visible
String result = snmpTrapSender.sendSnmpTrap(alert, alertParameters, platformName, conditions, bootTime,
- alertUrl);
+ alertUrl, hierarchy);
return SenderResult.getSimpleSuccess(result);
} catch (Throwable t) {
return SenderResult.getSimpleFailure("failed - cause: " + t);
}
}
+ private String getResourceHierarchyAsString(List<Resource> lineage) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Resource resource : lineage) {
+ stringBuilder.append(resource.getName());
+ if (lineage.indexOf(resource) != lineage.size() - 1) {
+ stringBuilder.append("::");
+ }
+ }
+ return stringBuilder.toString();
+ }
+
@Override
public String previewConfiguration() {
SnmpInfo info = SnmpInfo.load(alertParameters);
diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java
index ba4bf84..53bfd85 100644
--- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java
+++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java
@@ -464,7 +464,7 @@ public class SnmpTrapSender implements PDUFactory {
* @return 'Error code' of the operation
*/
public String sendSnmpTrap(Alert alert, Configuration alertParameters, String platformName, String conditions,
- Date bootTime, String alertUrl) {
+ Date bootTime, String alertUrl, String hierarchy) {
if (!this.snmpEnabled) {
return "SNMP is not enabled.";
}
@@ -486,6 +486,8 @@ public class SnmpTrapSender implements PDUFactory {
getVariableBindings(baseOid + ".5" + "={s}" + alert.getAlertDefinition().getPriority().toString().toLowerCase());
// url of the alert detail
getVariableBindings(baseOid + ".6" + "={s}" + alertUrl);
+ // hierarchy of the resource on alert
+ getVariableBindings(baseOid + ".7" + "={s}" + hierarchy);
setSysUpTimeFromBootTime(bootTime); // needs to be called before checkTrapVariables();
checkTrapVariables(this.vbs);
commit 470dc5a6f40012d3632fef4f07c3b3c6f5951016
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Dec 21 12:10:54 2011 +0100
Add tests for child:key=value groups in config. Also update Jackson.
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 8220355..f39c296 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -16,7 +16,7 @@
<properties>
<json.version>${project.json.version}</json.version>
- <jackson.version>1.7.4</jackson.version>
+ <jackson.version>1.9.3</jackson.version>
<jboss.sasl.version>1.0.0.Beta9</jboss.sasl.version>
</properties>
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index ee6b902..7e88906 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -765,7 +765,7 @@
<c:simple-property name="mapped-file" required="false" type="boolean" defaultValue="true"
description="Map to the JSP source."/>
<c:simple-property name="check-interval" required="false" type="integer" defaultValue="60"
- description="Check interval for JSP updates using a background thread."/> <!-- TODO revisit default when https://issues.jboss.org/browse/AS7-3098 is fixed -->
+ description="Check interval in seconds for JSP updates using a background thread."/> <!-- TODO revisit default when https://issues.jboss.org/browse/AS7-3098 is fixed -->
<c:simple-property name="modification-test-interval" required="false" type="integer" defaultValue="4"
description="Minimum amount of time between two tests for updates, in seconds."/>
<c:simple-property name="recompile-on-fail" required="false" type="boolean" defaultValue="false"
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
index 0266071..e1627e3 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
@@ -28,6 +28,8 @@ import javax.xml.bind.util.ValidationEventCollector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.node.ObjectNode;
import org.rhq.core.clientapi.agent.metadata.ConfigurationMetadataParser;
import org.rhq.core.clientapi.agent.metadata.InvalidPluginDescriptorException;
@@ -35,6 +37,7 @@ import org.rhq.core.clientapi.descriptor.DescriptorPackages;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
import org.rhq.core.clientapi.descriptor.plugin.ServerDescriptor;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.Operation;
/**
@@ -107,6 +110,30 @@ public class AbstractConfigurationHandlingTest {
public JsonNode executeRaw(Operation operation) {
if (content==null)
throw new IllegalStateException("Content not yet set");
+
+ Address address = operation.getAddress();
+ if (address!=null && !address.isEmpty()) {
+ // we need to clone the content and then for the result find the right sub-content to put into result and
+ // return this one.
+
+ // find the sub-content we want
+ String[] parts = address.getPath().split("=");
+ String key = parts[0];
+ String val = parts[1];
+ JsonNode result = content.get("result");
+ JsonNode keyNode = result.get(key);
+ JsonNode valNode = keyNode.get(val);
+
+ // clone the original content
+ ObjectMapper tmpMapper = new ObjectMapper();
+ JsonNode tmp = tmpMapper.createObjectNode();
+ ((ObjectNode)tmp).putAll(((ObjectNode)content));
+
+ // replace the result with the sub-content
+ ((ObjectNode)tmp).put("result",valNode);
+
+ return tmp;
+ }
return content;
}
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
index 0a46516..ef58967 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
@@ -416,6 +416,51 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest
}
+ public void test9() throws Exception {
+ String resultString = loadJsonFromFile("web.json");
+ ConfigurationDefinition definition = loadDescriptor("test9");
+
+ ObjectMapper mapper = new ObjectMapper();
+ ComplexResult result = mapper.readValue(resultString,ComplexResult.class);
+ JsonNode json = mapper.valueToTree(result);
+
+ FakeConnection connection = new FakeConnection();
+ connection.setContent(json);
+
+ ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(definition,connection,null);
+ Configuration config = delegate.loadResourceConfiguration();
+ assert config!=null;
+ assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5";
+ PropertySimple simple = config.getSimple("check-interval");
+ assert simple !=null;
+ Integer integerValue = simple.getIntegerValue();
+ assert integerValue !=null : "check-interval was null";
+ assert integerValue ==17 : "check-interval was not 17 but " + integerValue;
+ PropertySimple disabled = config.getSimple("disabled");
+ assert disabled !=null : "disabled was null";
+ Boolean booleanValue = disabled.getBooleanValue();
+ assert booleanValue !=null;
+ assert booleanValue;
+ PropertySimple listings = config.getSimple("listings");
+ assert listings !=null;
+ Boolean booleanValue1 = listings.getBooleanValue();
+ assert booleanValue1 !=null;
+ assert !booleanValue1;
+ PropertySimple simple1 = config.getSimple("max-depth");
+ assert simple1 !=null;
+ Integer integerValue1 = simple1.getIntegerValue();
+ assert integerValue1 !=null;
+ assert integerValue1 ==3;
+ PropertySimple simple2 = config.getSimple("default-virtual-server");
+ assert simple2 !=null;
+ String stringValue = simple2.getStringValue();
+ assert stringValue !=null;
+ assert stringValue.equals("default-host");
+
+
+
+ }
+
private String loadJsonFromFile(String fileName) throws Exception {
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileName);
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index a512133..09439f3 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -31,6 +31,7 @@ import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
@@ -62,7 +63,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(new PropertySimple("needed","test"));
conf.put(new PropertySimple("optional",null));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1;
Operation step1 = cop.step(0);
@@ -89,7 +90,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -120,7 +121,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -148,7 +149,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -176,7 +177,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -207,7 +208,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -240,7 +241,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 3 : "#Steps should be 3 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -289,7 +290,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 5 : "#Steps should be 5 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -317,4 +318,48 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
assert step4.getAddress().get(0).equals("socket-binding=https");
assert step5.getAddress().get(0).equals("socket-binding=https");
}
+
+ public void test9() throws Exception {
+
+ ConfigurationDefinition definition = loadDescriptor("test9");
+
+ FakeConnection connection = new FakeConnection();
+
+ ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition,connection,null);
+
+ Configuration conf = new Configuration();
+
+ conf.put(new PropertySimple("default-virtual-server","hulla")); // this is read-only and must not show up in result
+ conf.put(new PropertySimple("test-prop","Heiko"));
+ conf.put(new PropertySimple("check-interval",23));
+ conf.put(new PropertySimple("disabled",true));
+ conf.put(new PropertySimple("listings",false));
+ conf.put(new PropertySimple("max-depth",17));
+
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
+
+ assert cop.numberOfSteps() == 5 : "#Steps should be 5 but were " + cop.numberOfSteps();
+
+ Operation step1 = cop.step(0);
+ Operation step2 = cop.step(1);
+ Operation step3 = cop.step(2);
+ Operation step4 = cop.step(3);
+ Operation step5 = cop.step(4);
+
+ assert step1.getAddress().isEmpty();
+ assert step2.getAddress().size()==1;
+ assert step3.getAddress().size()==1;
+ assert step4.getAddress().size()==1;
+ assert step5.getAddress().size()==1;
+ assert step2.getAddress().get(0).equals("configuration=jsp-configuration");
+ assert step3.getAddress().get(0).equals("configuration=jsp-configuration");
+ assert step4.getAddress().get(0).equals("configuration=static-resources");
+ assert step5.getAddress().get(0).equals("configuration=static-resources");
+
+ assert step1.getAdditionalProperties().get("name").equals("test-prop");
+ assert step1.getAdditionalProperties().get("value").equals("Heiko");
+ assert step2.getAdditionalProperties().get("name").equals("check-interval");
+ assert step2.getAdditionalProperties().get("value").equals("23");
+
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
index 69201e2..53f351a 100644
--- a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
@@ -89,6 +89,21 @@
</server>
+ <server class="foo" discovery="foo" name="test9">
+ <resource-configuration>
+ <c:simple-property name="default-virtual-server" type="string" readOnly="true"/>
+ <c:simple-property name="test-prop" type="string" required="true" defaultValue="Hello"/>
+ <c:group name="child:configuration=jsp-configuration">
+ <c:simple-property name="check-interval" type="integer" units="seconds" readOnly="false" default="1"/>
+ <c:simple-property name="disabled" type="boolean" default="false"/>
+ </c:group>
+ <c:group name="child:configuration=static-resources">
+ <c:simple-property name="listings" default="true" type="boolean"/>
+ <c:simple-property name="max-depth" default="9" type="integer" />
+ </c:group>
+ </resource-configuration>
+ </server>
+
<server class="foo" discovery="foo" name="simple1">
<resource-configuration>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/web.json b/modules/plugins/jboss-as-7/src/test/resources/web.json
new file mode 100644
index 0000000..96f0565
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/web.json
@@ -0,0 +1,62 @@
+{
+ "outcome" : "success",
+ "result" :
+
+
+ {"default-virtual-server" : "default-host",
+ "native" : true,
+ "configuration" : {
+ "container" : {},
+ "static-resources" : {
+ "disabled" : false,
+ "listings" : false,
+ "max-depth" : 3,
+ "read-only" : true,
+ "sendfile" : 49152,
+ "webdav" : false},
+ "jsp-configuration" : {
+ "check-interval" : 17,
+ "development" : false,
+ "disabled" : true,
+ "display-source-fragment" : true,
+ "dump-smap" : false,
+ "error-on-use-bean-invalid-class-attribute" : false,
+ "generate-strings-as-char-arrays" : false,
+ "java-encoding" : "UTF-8",
+ "keep-generated" : true,
+ "mapped-file" : true,
+ "modification-test-interval" : "7",
+ "recompile-on-fail" : false,
+ "smap" : false,
+ "source-vm" : "1.5",
+ "tag-pooling" : true,
+ "target-vm" : "1.5",
+ "trim-spaces" : true,
+ "x-powered-by" : true}
+ },
+ "connector" : {
+ "http" : {
+ "enable-lookups" : true,
+ "enabled" : true,
+ "max-post-size" : 2097152,
+ "max-save-post-size" : 4096,
+ "protocol" : "HTTP/1.1",
+ "redirect-port" : 8443,
+ "scheme" : "http",
+ "secure" : false,
+ "socket-binding" : "http",
+ "ssl" : null,
+ "virtual-server" : null}
+ },
+
+ "virtual-server" : {
+ "default-host" : {
+ "access-log" : null,
+ "alias" : ["localhost","example.com"],
+ "default-web-module" : "ROOT.war",
+ "enable-welcome-root" : true,
+ "rewrite" : null,
+ "sso" : null}
+ }
+ }
+}
commit 74fe0df63135344a74cf0f58edf6f22a5c6c9124
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 20 17:28:21 2011 -0500
[BZ 766574] for some reason, the remote interface was removed from the discovery SLSB. put it back.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index fcb2f9e..2ea6234 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -99,7 +99,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author Greg Hinkle
*/
@Stateless
-public class DiscoveryBossBean implements DiscoveryBossLocal {
+public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemote {
private final Log log = LogFactory.getLog(DiscoveryBossBean.class.getName());
commit a638398ba148f419eba537b5851dac8955dad482
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 20 14:40:53 2011 -0500
[BZ 766574] fix NPE if there is no availability yet
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
index 6ead45c..94a4d05 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
@@ -44,6 +44,7 @@ import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.ResourceAvailability;
import org.rhq.core.domain.resource.ResourceType;
@@ -715,7 +716,8 @@ public class TabularWriter {
} else if (object instanceof ResourceType) {
return ((ResourceType) object).getName();
} else if (object instanceof ResourceAvailability) {
- return ((ResourceAvailability) object).getAvailabilityType().getName();
+ AvailabilityType availType = ((ResourceAvailability) object).getAvailabilityType();
+ return (availType == null) ? "?" : availType.getName();
} else if (object != null && object.getClass().isArray()) {
return Arrays.toString((Object[]) object);
} else {
commit 19097edb5d591dae5ae6fdf7565b682cd5b1506c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Nov 18 15:23:26 2011 +0100
Several improvements to the AS7 plugin:
* BZ 754858 - in as7.1 the management port is now determined via socket binding reference. Also allow discover older versions.
The xml parsing code has been rewritten to use XPath expressions.
* BZ 754849 supply authentication to the remote. The JVM calls back to the AS7 Authenticator when needed.
* Prevent a NPE in the case we get no results.
* Add an operation to install a management user.
* BZ 709678 - update jboss web to latest code and enable updating of properties.
* Allow to merge in new/changed properties instead of requiring to supply the whole configuration in the standalone container.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
index 10b1b1b..07e2965 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
@@ -21,7 +21,6 @@ package org.rhq.core.pc;
import java.io.*;
import java.util.ArrayList;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -31,6 +30,7 @@ import java.util.Stack;
import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.clientapi.agent.configuration.ConfigurationUpdateRequest;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinition;
@@ -75,8 +75,6 @@ public class StandaloneContainer {
InventoryManager inventoryManager;
/** Global operation counter */
Integer opId = 0;
- /** Map of resource plugin configurations */
- Map<Integer, Configuration> resConfigMap = new HashMap<Integer, Configuration>();
/** variable set by find() and which can be used in set() */
int dollarR = 0;
/** Do we read from stdin ? */
@@ -340,32 +338,58 @@ public class StandaloneContainer {
}
- private void setResourcePluginConfig(String[] tokens,boolean pluginConfig) {
+ private void setResourcePluginConfig(String[] tokens,boolean isPluginConfig) throws PluginContainerException {
if (resourceId == 0) {
System.err.println("No resource set");
return;
}
+ Configuration newConfig = null;
Configuration config = null;
- if (tokens.length > 1)
- config = createConfigurationFromString(tokens[1]);
- else {
+ boolean merge=false;
+ int pos = 1;
+ if (tokens.length < 2) {
+ System.err.println("Need at least 1 token");
+ return;
+ }
+ if (tokens[1].equals("-m")) {
+ merge = true;
+ pos++;
+ }
+ if (tokens.length < pos+1) {
System.err.println("Need at least 1 token");
return;
}
- ConfigurationUpdateRequest request = new ConfigurationUpdateRequest(1,config,resourceId);
+ newConfig = createConfigurationFromString(tokens[pos]);
ConfigurationManager cm = pc.getConfigurationManager();
- if (pluginConfig) {
- pc.getInventoryManager().getResourceContainer(resourceId).getResource().setPluginConfiguration(config);
- } else
- cm.updateResourceConfiguration(request);
-
-
+ if (isPluginConfig) {
+ Resource targetResource = pc.getInventoryManager().getResourceContainer(resourceId).getResource();
+ config = targetResource.getPluginConfiguration();
+ if (merge) {
+ // copy over existing properties that are not in newConfig
+ for (Property p : config.getProperties()) {
+ if (newConfig.get(p.getName())==null)
+ newConfig.put(p);
+ }
+ }
+ targetResource.setPluginConfiguration(newConfig);
+ } else {
+ config = pc.getConfigurationManager().loadResourceConfiguration(resourceId);
+ if (merge) {
+ // copy over existing properties that are not in newConfig
+ for (Property p : config.getProperties()) {
+ if (newConfig.get(p.getName())==null)
+ newConfig.put(p);
+ }
+ }
+ ConfigurationUpdateRequest request = new ConfigurationUpdateRequest(1,newConfig,resourceId);
+ cm.updateResourceConfiguration(request);
+ }
}
@@ -715,7 +739,7 @@ public class StandaloneContainer {
}
private void showConfig(Configuration config) {
- System.out.println(config.getProperties());
+ System.out.println(config.getProperties()); // TODO convert to input format or key=value or json
}
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java
index c992000..0f1d01d 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java
@@ -47,8 +47,8 @@ public enum Command {
WAIT("w", "milliseconds", 1, "Waits the given amount of time"),
P_CONFIG("pc", "", 0, "Shows the plugin configuration of the current resource."),
R_CONFIG("rc", "", 0, "Shows the resource configuration of the current resource."),
- SR_CONFIG("rcs", "", 0, "[parameters] set resource config "),
- SP_CONFIG("pcs", "", 0, "[parameters] set plugin config ")
+ SR_CONFIG("rcs", "", 1, "[-m] [parameters] set resource config. '-m' merges with current config; default is overwrite."),
+ SP_CONFIG("pcs", "", 1, "[-m] [parameters] set plugin config.'-m' merges with current config; default is overwrite.")
;
private String abbrev;
diff --git a/modules/plugins/jboss-as-7/d2d.sh b/modules/plugins/jboss-as-7/d2d.sh
index 16c1e57..d36d8e9 100755
--- a/modules/plugins/jboss-as-7/d2d.sh
+++ b/modules/plugins/jboss-as-7/d2d.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-java -cp target/rhq-jboss-as-7-plugin-4.1.0-SNAPSHOT.jar:/im/rhq/modules/enterprise/agent/target/rhq-agent/lib/commons-logging-1.1.0.jboss.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*
+java -cp target/rhq-jboss-as-7-plugin-4.3.0-SNAPSHOT.jar:/im/rhq/modules/enterprise/agent/target/rhq-agent/lib/commons-logging-1.1.0.jboss.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index e069be3..8220355 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -17,6 +17,7 @@
<properties>
<json.version>${project.json.version}</json.version>
<jackson.version>1.7.4</jackson.version>
+ <jboss.sasl.version>1.0.0.Beta9</jboss.sasl.version>
</properties>
<build>
@@ -49,6 +50,11 @@
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.sasl</groupId>
+ <artifactId>jboss-sasl</artifactId>
+ <version>${jboss.sasl.version}</version>
+ </artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
@@ -76,7 +82,7 @@
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -204,6 +210,13 @@
<scope>provided</scope>
</dependency>
+ <!-- for the password hashing - we may want to copy the relevant stuff over ourselves -->
+ <dependency>
+ <groupId>org.jboss.sasl</groupId>
+ <artifactId>jboss-sasl</artifactId>
+ <version>${jboss.sasl.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java
new file mode 100644
index 0000000..703e177
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java
@@ -0,0 +1,26 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+
+/**
+ * Authenticator to authenticate against as7
+ * @author Heiko W. Rupp
+ */
+public class AS7Authenticator extends Authenticator {
+
+ private String user;
+ private String pass;
+
+ public AS7Authenticator(String user, String pass) {
+ this.user = user;
+ this.pass = pass;
+ if (this.pass==null)
+ this.pass=""; // prevent NPE later
+ }
+
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(user,pass.toCharArray());
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 40561a0..cf0b5b9 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -23,15 +23,14 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
@@ -51,15 +50,17 @@ public class ASConnection {
String urlString;
private ObjectMapper mapper;
public static boolean verbose = false; // This is a variable on purpose, so devs can switch it on in the debugger or in the agent
- private HttpURLConnection conn;
+ Authenticator passwordAuthenticator ;
/**
* Construct an ASConnection object. The real "physical" connection is done in
* #executeRaw.
* @param host Host of the DomainController or standalone server
* @param port Port of the JSON api.
+ * @param user user needed for authentication
+ * @param password password needed for authentication
*/
- public ASConnection(String host, int port) {
+ public ASConnection(String host, int port, String user, String password) {
try {
url = new URL("http", host, port, MANAGEMENT);
@@ -69,6 +70,9 @@ public class ASConnection {
throw new IllegalArgumentException(e.getMessage());
}
+ passwordAuthenticator = new AS7Authenticator(user,password);
+ Authenticator.setDefault(passwordAuthenticator);
+
// read system property "as7plugin.verbose"
verbose = Boolean.getBoolean("as7plugin.verbose");
@@ -92,14 +96,15 @@ public class ASConnection {
InputStream inputStream = null;
BufferedReader br = null;
InputStream es = null;
+ HttpURLConnection conn=null;
long t1 = System.currentTimeMillis();
try {
-
conn = (HttpURLConnection) url.openConnection();
conn.setDoOutput(true);
conn.setRequestMethod("POST");
- conn.addRequestProperty("Content-Type","application/json");
+ conn.addRequestProperty("Content-Type", "application/json");
conn.addRequestProperty("Accept","application/json");
+
OutputStream out = conn.getOutputStream();
String result = mapper.writeValueAsString(operation);
@@ -236,6 +241,7 @@ public class ASConnection {
if (node==null) {
log.warn("Operation [" + op + "] returned null");
+ return null;
}
try {
Result res;
@@ -250,22 +256,5 @@ public class ASConnection {
}
}
- public void writeValue(OutputStream out, Object value) throws IOException, JsonGenerationException,
- JsonMappingException {
- // JsonGenerator jgen = _jsonFactory.createJsonGenerator(out, JsonEncoding.UTF8);
- // JsonGenerator jgen = mapper.createJsonGenerator(out, JsonEncoding.UTF8);
- // JsonGenerator jgen = new Js
- // boolean closed = false;
- // try {
- // writeValue(jgen, value);
- // closed = true;
- // jgen.close();
- // } finally {
- // if (!closed) {
- // jgen.close();
- // }
- // }
-
- }
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
index d17a311..a5b8bdd 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -55,15 +56,18 @@ public class ASUploadConnection {
private static final Log log = LogFactory.getLog(ASUploadConnection.class);
+ Authenticator passwordAuthenticator ;
BufferedOutputStream os = null;
InputStream is = null;
private HttpURLConnection connection;
private String host;
private int port;
- public ASUploadConnection(String dcHost, int port) {
+ public ASUploadConnection(String dcHost, int port, String user, String password) {
this.host = dcHost;
this.port = port;
+ passwordAuthenticator = new AS7Authenticator(user,password);
+ Authenticator.setDefault(passwordAuthenticator);
}
public OutputStream getOutputStream(String fileName) {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
index 8736495..78b1543 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
@@ -24,15 +24,16 @@ import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.system.ProcessInfo;
/**
@@ -40,14 +41,24 @@ import org.rhq.core.system.ProcessInfo;
* in the area of processes and host.xml
* @author Heiko W. Rupp
*/
-public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> implements ResourceDiscoveryComponent<T> {
+public class AbstractBaseDiscovery {
static final String DORG_JBOSS_BOOT_LOG_FILE = "-Dorg.jboss.boot.log.file=";
private static final String DJBOSS_SERVER_HOME_DIR = "-Djboss.home.dir";
static final int DEFAULT_MGMT_PORT = 9990;
private static final String JBOSS_AS_PREFIX = "jboss-as-";
+ static final String CALL_READ_STANDALONE_OR_HOST_XML_FIRST = "hostXml is null. You need to call 'readStandaloneOrHostXml' first.";
protected Document hostXml;
protected final Log log = LogFactory.getLog(this.getClass());
private static final String JBOSS_EAP_PREFIX = "jboss-eap-";
+ private XPathFactory factory;
+
+
+
+ protected AbstractBaseDiscovery() {
+ synchronized (this) {
+ factory = XPathFactory.newInstance();
+ }
+ }
/**
* Read the host.xml or standalone.xml file depending on isDomainMode. If isDomainMode is true,
@@ -58,6 +69,10 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected void readStandaloneOrHostXml(ProcessInfo processInfo, boolean isDomainMode) {
String hostXmlFile = getHostXmlFileLocation(processInfo,isDomainMode);
+ readStandaloneOrHostXmlFromFile(hostXmlFile);
+ }
+
+ protected void readStandaloneOrHostXmlFromFile(String hostXmlFile) {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
try {
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -107,99 +122,50 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected HostPort getManagementPortFromHostXml(String[] commandLine) {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
- Element host = hostXml.getDocumentElement();
- NodeList interfaceParent = host.getElementsByTagName("management-interfaces");
- if (interfaceParent ==null || interfaceParent.getLength()==0) {
- log.warn("No <management-interfaces> found in host.xml");
- return new HostPort();
- }
- NodeList mgmtInterfaces = interfaceParent.item(0).getChildNodes();
- if (mgmtInterfaces==null || mgmtInterfaces.getLength()==0) {
- log.warn("No <*-interface> found in host.xml");
- return new HostPort();
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ String portString;
+ String interfaceExpession;
+
+ String socketBindingName = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/socket-binding/@http");
+ if (socketBindingName==null || socketBindingName.isEmpty()) {
+ // old AS7.0, early 7.1 style
+ portString = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@port");
+ String interfaceName = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/@interface");
+ interfaceExpession = obtainXmlPropertyViaXPath(
+ "/server/interfaces/interface[@name='" + interfaceName + "']/inet-address/@value");
}
- for (int i = 0 ; i < mgmtInterfaces.getLength(); i++) {
- if (!(mgmtInterfaces.item(i) instanceof Element))
- continue;
-
- Element mgmtInterface = (Element) mgmtInterfaces.item(i);
- if (mgmtInterface.getNodeName().equals("http-interface")) {
- String tmp = mgmtInterface.getAttribute("port"); // TODO if we don't find it, check for socket-binding
- int port;
- if (!tmp.isEmpty())
- port = Integer.valueOf(tmp);
- else
- port = DEFAULT_MGMT_PORT;
- HostPort hp = new HostPort();
- hp.isLocal=true; // TODO adjust when host != localhost
- hp.port = port;
-
- String nIf = mgmtInterface.getAttribute("interface");
- if (!nIf.isEmpty())
- hp.host = getInterface(nIf, commandLine);
- else
- hp.host = "localhost";
- return hp;
- }
- }
- return new HostPort();
- }
+ else {
+ // later AS7.1 and EAP6
+ portString = obtainXmlPropertyViaXPath(
+ "/server/socket-binding-group/socket-binding[@name='" + socketBindingName + "']/@port");
+ String interfaceName = obtainXmlPropertyViaXPath(
+ "/server/socket-binding-group/socket-binding[@name='" + socketBindingName + "']/@interface");
- /**
- * Try to obtain the management interface IP from the host/standalone.xml files
- *
- * @param nIf Interface to look for
- * @param commandLine Command line arguments of the process
- * @return IP address to use
- */
- private String getInterface(String nIf, String[] commandLine) {
- if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
+ // TODO the next may also be expressed differently
+ interfaceExpession = obtainXmlPropertyViaXPath(
+ "/server/interfaces/interface[@name='" + interfaceName + "']/inet-address/@value");
- Element host = hostXml.getDocumentElement();
- NodeList interfaceParent = host.getElementsByTagName("interfaces");
- if (interfaceParent ==null || interfaceParent.getLength()==0) {
- log.warn("No <interfaces> found in host.xml");
- return null;
- }
- NodeList mgmtInterfaces = interfaceParent.item(0).getChildNodes();
- if (mgmtInterfaces==null || mgmtInterfaces.getLength()==0) {
- log.warn("No <*-interface> found in host.xml");
- return null;
}
- for (int i = 0 ; i < mgmtInterfaces.getLength(); i++) {
- if (!(mgmtInterfaces.item(i) instanceof Element))
- continue;
- Element mgmtInterface = (Element) mgmtInterfaces.item(i);
- if (mgmtInterface.getNodeName().equals("interface")) {
- String name = mgmtInterface.getAttribute("name");
- if (!name.equals(nIf))
- continue;
-
- NodeList nl = mgmtInterface.getChildNodes();
- if (nl!=null) {
- for (int j = 0 ; j < nl.getLength(); j++) {
- if (!(nl.item(j) instanceof Element))
- continue;
-
- String nodeName = nl.item(j).getNodeName();
- if (nodeName.equals("any-ipv4-address"))
- return "0.0.0.0";
-
- String value = ((Element) nl.item(j)).getAttribute("value");
- value = replaceExpression(value, commandLine);
- return value;
-
- // TODO check for <any> and so on
- }
- }
- }
+ HostPort hp = new HostPort();
+
+ if (!interfaceExpession.isEmpty())
+ hp.host = replaceDollarExpression(interfaceExpession, commandLine);
+ else
+ hp.host = "localhost"; // Fallback
+
+ if (portString!=null && !portString.isEmpty()) {
+ hp.port = Integer.valueOf(portString);
}
- return null; // TODO: Customise this generated block
+ else
+ hp.port = 9990; // Fallback to default
+ return hp;
}
+
/**
* Check if the passed value has an expression in the form of ${var} or ${var:default},
* try to resolve it. Resolution is done by looking at the command line to see if
@@ -209,7 +175,7 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
* @param commandLine The command line from the process
* @return resolved value
*/
- private String replaceExpression(String value, String[] commandLine) {
+ private String replaceDollarExpression(String value, String[] commandLine) {
if (!value.contains("${"))
return value;
@@ -250,12 +216,12 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
/**
* Try to determine the host name - that is the name of a standalone server or a
- * host in domain mode by looking at the standalone/host.xml files
+ * host in domain mode by looking at the standalone.xml/host.xml files
* @return server name
*/
protected String findHostName() {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
String hostName = hostXml.getDocumentElement().getAttribute("name");
return hostName;
@@ -267,29 +233,53 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected HostPort getDomainControllerFromHostXml() {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
-
- Element host = hostXml.getDocumentElement();
- NodeList dcParent = host.getElementsByTagName("domain-controller");
- if (dcParent==null || dcParent.getLength()==0)
- return new HostPort(false);
- NodeList interfs = dcParent.item(0).getChildNodes();
- for (int i = 0; i < interfs.getLength(); i++) {
- if (!(interfs.item(i)instanceof Element))
- continue;
-
- Element interf = (Element) interfs.item(i);
- if (interf.getNodeName().equals("local"))
- return new HostPort();
-
- // not local, so get the remote
- HostPort hp = new HostPort(false);
- hp.host = interf.getAttribute("host");
- hp.port = Integer.parseInt(interf.getAttribute("port"));
- return hp;
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+
+ // first check remote, as we can't distinguish between a missing local element or
+ // and empty one which is the default
+ String remoteHost = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@host");
+ String portString = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@port");
+
+ HostPort hp;
+ if (!remoteHost.isEmpty() && !portString.isEmpty()) {
+ hp = new HostPort(false);
+ hp.host = remoteHost;
+ hp.port = Integer.parseInt(portString);
}
+ else {
+ hp = new HostPort(true);
+ hp.port = 9999;
+ }
+
+ return hp;
+
+ }
+
+ String getManagementSecurtiyRealmFromHostXml() {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ String realm = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+
+ return realm;
+ }
+
+ String getSecurityPropertyFileFromHostXml(String baseDir, AS7Mode mode, String realm) {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ // TODO make realm variable
+ String fileName = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@path");
+ String relDir = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@relative-to");
+
+ String fullName ;
+ if (relDir.equals("jboss.server.config.dir"))
+ fullName = baseDir + File.separator + mode.getBaseDir() + File.separator + "configuration" + File.separator + fileName;
+ else
+ fullName = relDir + File.separator + fileName;
- return new HostPort(false);
+ return fullName;
}
/**
@@ -332,6 +322,34 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
}
/**
+ * Run the passed xpathExpression on the prepopulated hostXml document and
+ * return the target element or attribute as a String.
+ * @param xpathExpression XPath Expression to evaluate
+ * @return String value of the Element or Attribute the XPath was pointing to.
+ * Null in case the xpathExpression could not be evaluated.
+ * @throws IllegalArgumentException if hostXml is null
+ *
+ */
+ protected String obtainXmlPropertyViaXPath(String xpathExpression) {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+
+ XPath xpath = factory.newXPath();
+ try {
+ XPathExpression expr = xpath.compile(xpathExpression);
+
+ Object result = expr.evaluate(hostXml, XPathConstants.STRING);
+
+ return result.toString();
+ } catch (XPathExpressionException e) {
+ log.error("Evaluation XPath expression failed: " + e.getMessage());
+ return null;
+ }
+ }
+
+
+ /**
* Helper class that holds information about the host,port tuple
*/
protected static class HostPort {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index 7395233..3f03e52 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -89,6 +89,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
String host;
int port;
private boolean verbose = ASConnection.verbose;
+ String managementUser;
+ String managementPassword;
/**
* Return availability of this resource
@@ -99,7 +101,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
ReadResource op = new ReadResource(address);
Result res = connection.execute(op);
- return res.isSuccess()? AvailabilityType.UP: AvailabilityType.DOWN;
+ return (res!=null && res.isSuccess()) ? AvailabilityType.UP: AvailabilityType.DOWN;
}
@@ -115,7 +117,9 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
host = pluginConfiguration.getSimpleValue("hostname", LOCALHOST);
String portString = pluginConfiguration.getSimpleValue("port", DEFAULT_HTTP_MANAGEMENT_PORT);
port = Integer.parseInt(portString);
- connection = new ASConnection(host,port);
+ managementUser = pluginConfiguration.getSimpleValue("user","-unset-");
+ managementPassword = pluginConfiguration.getSimpleValue("password","-unset-");
+ connection = new ASConnection(host,port, managementUser, managementPassword);
}
else {
connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection();
@@ -310,7 +314,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
ContentServices contentServices = cctx.getContentServices();
String resourceTypeName = report.getResourceType().getName();
- ASUploadConnection uploadConnection = new ASUploadConnection(host,port);
+ ASUploadConnection uploadConnection = new ASUploadConnection(host,port, managementUser, managementPassword);
OutputStream out = uploadConnection.getOutputStream(details.getFileName());
contentServices.downloadPackageBitsForChildResource(cctx, resourceTypeName, details.getKey(), out);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
index 54e7e78..3f049dc 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -75,7 +75,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String serverNameFull;
String serverName;
String psName = psr.getProcessScan().getName();
- String description = discoveryContext.getResourceType().getDescription();
+ String description;
String homeDir = getHomeDirFromCommandLine(commandLine);
String version = determineServerVersionFromHomeDir(homeDir);
boolean isEAP = false;
@@ -115,7 +115,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String host = findHost(psr.getProcessInfo(), true);
config.put(new PropertySimple("domainHost", host));
- fillUserPassFromFile(config, "domain", homeDir);
+ fillUserPassFromFile(config, AS7Mode.DOMAIN, homeDir);
// provide running config
String domainConfig = getServerConfigFromCommandLine(commandLine, AS7Mode.DOMAIN);
@@ -157,7 +157,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
config.put(new PropertySimple("config",serverConfig));
config.put(new PropertySimple("startScript",AS7Mode.STANDALONE.getStartScript()));
- fillUserPassFromFile(config, "standalone", serverNameFull);
+ fillUserPassFromFile(config, AS7Mode.STANDALONE, serverNameFull);
//preload server.log file for event log monitoring
logFile = bootLogFile.substring(0, bootLogFile.lastIndexOf("/")) + File.separator + "server.log";
@@ -173,6 +173,8 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
HostPort managmentPort = getManagementPortFromHostXml(commandLine);
config.put(new PropertySimple("hostname", managmentPort.host));
config.put(new PropertySimple("port", managmentPort.port));
+ config.put(new PropertySimple("realm",getManagementSecurtiyRealmFromHostXml()));
+
// String javaClazz = psr.getProcessInfo().getName();
/*
@@ -207,11 +209,14 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
- private void fillUserPassFromFile(Configuration config, String mode, String baseDir) {
+ private void fillUserPassFromFile(Configuration config, AS7Mode mode, String baseDir) {
+
+// String configDir = baseDir + File.separator + mode + File.separator + "configuration";
+ String realm = getManagementSecurtiyRealmFromHostXml();
+ String fileName = getSecurityPropertyFileFromHostXml(baseDir,mode, realm);
- String configDir = baseDir + File.separator + mode + File.separator + "configuration";
- File file = new File(configDir, "mgmt-users.properties");
+ File file = new File(fileName);
if (!file.exists() || !file.canRead()) {
if (log.isDebugEnabled())
log.debug("No console user properties file found at [" + file.getAbsolutePath()
@@ -234,7 +239,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String user = line.substring(0, line.indexOf("="));
String pass = line.substring(line.indexOf("=") + 1);
config.put(new PropertySimple("user", user));
- config.put(new PropertySimple("password", pass));
+// config.put(new PropertySimple("password", pass)); // this is now hashed, so no point in supplying it
}
} catch (IOException e) {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 581c4e1..3a3fa03 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -19,13 +19,20 @@
package org.rhq.modules.plugins.jbossas7;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.net.ConnectException;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.sasl.util.UsernamePasswordHashUtil;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
@@ -137,6 +144,11 @@ public class BaseServerComponent extends BaseComponent {
*/
protected OperationResult postProcessResult(String name, Result res) {
OperationResult operationResult = new OperationResult();
+ if (res==null) {
+ operationResult.setErrorMessage("No result received from server");
+ return operationResult;
+ }
+
if (name.equals("shutdown") || name.equals("reload")) {
/*
* Shutdown needs a special treatment, because after sending the operation, if shutdown suceeds,
@@ -168,4 +180,55 @@ public class BaseServerComponent extends BaseComponent {
return operationResult;
}
+ protected OperationResult installManagementUser(Configuration parameters, Configuration pluginConfig, AS7Mode mode) {
+ String user = parameters.getSimpleValue("user","");
+ String password = parameters.getSimpleValue("password","");
+
+ OperationResult result = new OperationResult();
+ if (user.isEmpty() || password.isEmpty()) {
+ result.setErrorMessage("User and Password must not be empty");
+ return result;
+ }
+
+ String baseDir = pluginConfig.getSimpleValue("baseDir","");
+ if (baseDir.isEmpty()) {
+ result.setErrorMessage("No baseDir found, can not continue");
+ return result;
+ }
+ String standaloneXmlFile = pluginConfig.getSimpleValue("config",mode.getDefaultXmlFile());
+
+ String standaloneXml = baseDir + File.separator + mode.getBaseDir() + File.separator + "configuration" + File.separator + standaloneXmlFile;
+
+ AbstractBaseDiscovery abd = new AbstractBaseDiscovery();
+ abd.readStandaloneOrHostXmlFromFile(standaloneXml);
+
+ String realm = pluginConfig.getSimpleValue("realm","ManagementRealm");
+ String propertiesFilePath = abd.getSecurityPropertyFileFromHostXml(baseDir,mode, realm);
+
+
+ Properties p = new Properties();
+ try {
+ UsernamePasswordHashUtil util = new UsernamePasswordHashUtil();
+ String value = util.generateHashedHexURP(user, realm, password.toCharArray());
+
+
+ FileInputStream fis = new FileInputStream(propertiesFilePath);
+ p.load(fis);
+ fis.close();
+ p.setProperty(user,value);
+ FileOutputStream fos = new FileOutputStream(propertiesFilePath);
+ p.store(fos,null);
+ fos.flush();
+ fos.close();
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ result.setErrorMessage(e.getMessage());
+ } catch (NoSuchAlgorithmException nsae) {
+ log.error(nsae.getMessage());
+ result.setErrorMessage(nsae.getMessage());
+ }
+ result.setSimpleResult("User/Password set or updated");
+
+ return result;
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
index c844d78..cbed07e 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
@@ -120,6 +120,15 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
operation = new ReadChildrenResources(address,type);
operation.addAdditionalProperty("recursive", "true");
}
+ else if (groupName.startsWith("child:")) {
+ String subPath = groupName.substring("child:".length());
+ if (!subPath.contains("="))
+ throw new IllegalArgumentException("subPath of 'child:' expression has no =");
+
+ Address address1 = new Address(address);
+ address1.addSegment(subPath);
+ operation = new ReadResource(address1);
+ }
else {
throw new IllegalArgumentException("Unknown operation in group name [" + groupName + "]");
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
index e966ba3..4f07bfc 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
@@ -50,7 +50,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
final Log log = LogFactory.getLog(this.getClass());
- private Address address;
+ private Address _address;
private ASConnection connection;
private ConfigurationDefinition configurationDefinition;
private String namePropLocator;
@@ -65,7 +65,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
public ConfigurationWriteDelegate(ConfigurationDefinition configDef, ASConnection connection, Address address) {
this.configurationDefinition = configDef;
this.connection = connection;
- this.address = address;
+ this._address = address;
}
/**
@@ -89,7 +89,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
Configuration conf = report.getConfiguration();
- CompositeOperation cop = updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = updateGenerateOperationFromProperties(conf, _address);
Result result = connection.execute(cop);
if (!result.isSuccess()) {
@@ -103,13 +103,13 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
- protected CompositeOperation updateGenerateOperationFromProperties(Configuration conf) {
+ protected CompositeOperation updateGenerateOperationFromProperties(Configuration conf, Address address) {
CompositeOperation cop = new CompositeOperation();
for (PropertyDefinition propDef : configurationDefinition.getNonGroupedProperties()) {
- updateProperty(conf, cop, propDef);
+ updateProperty(conf, cop, propDef, address);
}
for (PropertyGroupDefinition pgd: configurationDefinition.getGroupDefinitions()) {
String groupName = pgd.getName();
@@ -126,8 +126,21 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
List<PropertyDefinition> definitions = configurationDefinition.getPropertiesInGroup(groupName);
for (PropertyDefinition def : definitions) {
- updateProperty(conf,cop,def);
+ updateProperty(conf,cop,def, address);
}
+ } if (groupName.startsWith("child:")) {
+ String subPath = groupName.substring("child:".length());
+ if (!subPath.contains("="))
+ throw new IllegalArgumentException("subPath of 'child:' expression has no =");
+
+ Address address1 = new Address(address);
+ address1.addSegment(subPath);
+
+ List<PropertyDefinition> definitions = configurationDefinition.getPropertiesInGroup(groupName);
+ for (PropertyDefinition def : definitions) {
+ updateProperty(conf,cop,def, address1);
+ }
+
} // TODO handle attribute: case
}
@@ -135,7 +148,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
return cop;
}
- private void updateProperty(Configuration conf, CompositeOperation cop, PropertyDefinition propDef) {
+ private void updateProperty(Configuration conf, CompositeOperation cop, PropertyDefinition propDef,
+ Address baseAddress) {
// Skip over read-only properties, the AS can not use them anyway
if (propDef.isReadOnly())
@@ -147,7 +161,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
PropertyList pl = (PropertyList) conf.get("*"); // TODO loop over the list content
for (Property prop2 : pl.getList()) {
- updateHandlePropertyMapSpecial(cop, (PropertyMap) prop2, (PropertyDefinitionMap) propDef);
+ updateHandlePropertyMapSpecial(cop, (PropertyMap) prop2, (PropertyDefinitionMap) propDef, baseAddress);
}
}
else {
@@ -155,25 +169,27 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
Property prop = conf.get(propDef.getName());
if (prop instanceof PropertySimple) {
- updateHandlePropertySimple(cop, (PropertySimple)prop, (PropertyDefinitionSimple) propDef);
+ updateHandlePropertySimple(cop, (PropertySimple)prop, (PropertyDefinitionSimple) propDef, baseAddress);
}
else if (prop instanceof PropertyList) {
- updateHandlePropertyList(cop, (PropertyList) prop, (PropertyDefinitionList) propDef);
+ updateHandlePropertyList(cop, (PropertyList) prop, (PropertyDefinitionList) propDef, baseAddress);
}
else {
- updateHandlePropertyMap(cop,(PropertyMap)prop,(PropertyDefinitionMap)propDef);
+ updateHandlePropertyMap(cop,(PropertyMap)prop,(PropertyDefinitionMap)propDef, baseAddress);
}
}
}
- private void updateHandlePropertyMap(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef) {
- Map<String,Object> results = updateHandleMap(prop,propDef);
+ private void updateHandlePropertyMap(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef,
+ Address address) {
+ Map<String,Object> results = updateHandleMap(prop,propDef, address);
Operation writeAttribute = new WriteAttribute(address,prop.getName(),results);
cop.addStep(writeAttribute);
}
- private void updateHandlePropertyMapSpecial(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef) {
- Map<String,Object> results = updateHandleMap(prop,propDef);
+ private void updateHandlePropertyMapSpecial(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef,
+ Address address) {
+ Map<String,Object> results = updateHandleMap(prop,propDef, address);
if (prop.get(namePropLocator)==null) {
throw new IllegalArgumentException("There is no element in the map with the name " + namePropLocator);
}
@@ -186,7 +202,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
}
- private void updateHandlePropertyList(CompositeOperation cop, PropertyList prop, PropertyDefinitionList propDef) {
+ private void updateHandlePropertyList(CompositeOperation cop, PropertyList prop, PropertyDefinitionList propDef,
+ Address address) {
PropertyDefinition memberDef = propDef.getMemberDefinition();
// We need to collect the list members, create an array and attach this to the cop
@@ -201,7 +218,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
if (memberDef instanceof PropertyDefinitionMap) {
- Map<String,Object> mapResult = updateHandleMap((PropertyMap) inner,(PropertyDefinitionMap)memberDef);
+ Map<String,Object> mapResult = updateHandleMap((PropertyMap) inner,(PropertyDefinitionMap)memberDef,
+ address);
values.add(mapResult);
}
}
@@ -210,7 +228,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
- private void updateHandlePropertySimple(CompositeOperation cop, PropertySimple propertySimple, PropertyDefinitionSimple propDef) {
+ private void updateHandlePropertySimple(CompositeOperation cop, PropertySimple propertySimple,
+ PropertyDefinitionSimple propDef, Address address) {
// If the property value is null and the property is optional, skip too
if (propertySimple.getStringValue()==null && !propDef.isRequired())
@@ -221,7 +240,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
cop.addStep(writeAttribute);
}
- private Map<String, Object> updateHandleMap(PropertyMap map, PropertyDefinitionMap mapDef) {
+ private Map<String, Object> updateHandleMap(PropertyMap map, PropertyDefinitionMap mapDef, Address address) {
Map<String,PropertyDefinition> memberDefinitions = mapDef.getPropertyDefinitions();
Map<String,Object> results = new HashMap<String,Object>();
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
index df5362c..bc7d601 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
@@ -54,28 +54,47 @@ public class Domain2Descriptor {
private void run(String[] args) {
D2DMode mode = null;
+ String user = null;
+ String pass = null;
+
int pos = 0;
- if (args[0].startsWith("-")) {
- if (args[0].equals("-m"))
- mode = D2DMode.METRICS;
- else if (args[0].equals("-p"))
- mode = D2DMode.PROPERTIES;
- else if (args[0].equals("-o"))
- mode = D2DMode.OPERATION;
- else {
- usage();
- return;
+ boolean optionFound=false;
+
+ String arg;
+ do {
+ arg = args[pos];
+ if (arg.startsWith("-")) {
+ if (args[0].equals("-m"))
+ mode = D2DMode.METRICS;
+ else if (arg.equals("-p"))
+ mode = D2DMode.PROPERTIES;
+ else if (arg.equals("-o"))
+ mode = D2DMode.OPERATION;
+ else if (arg.startsWith("-U")) {
+ String tmp = arg.substring(2);
+ if (!tmp.contains(":"))
+ usage();
+ user = tmp.substring(0,tmp.indexOf(":"));
+ pass = tmp.substring(tmp.indexOf(":")+1);
+ }
+ else {
+ usage();
+ return;
+ }
+ pos++;
+ optionFound=true;
}
- pos++;
- }
+ else
+ optionFound=false;
+ }while(optionFound);
- String path = args[pos];
+ String path = arg;
path = path.replaceAll("/",","); // Allow path from jboss-admin.sh's pwd command
String childType = null;
if (args.length>pos+1)
childType = args[pos+1];
- ASConnection conn = new ASConnection("localhost",9990);
+ ASConnection conn = new ASConnection("localhost",9990, user, pass);
Address address = new Address(path);
Operation op = new Operation("read-resource-description",address);
@@ -87,6 +106,10 @@ public class Domain2Descriptor {
op.addAdditionalProperty("include-runtime",true);
ComplexResult res = conn.executeComplex(op);
+ if (res==null) {
+ System.err.println("Got no result");
+ return;
+ }
if (!res.isSuccess()) {
System.err.println("Failure: " + res.getFailureDescription());
return;
@@ -313,6 +336,8 @@ public class Domain2Descriptor {
typeString = "long"; break;
case BIG_DECIMAL:
typeString = "long"; break; // TODO better float or double?
+ case DOUBLE:
+ typeString = "long"; break; // TODO float or double?
case LIST:
typeString = "-list-";
break; // Handled below
@@ -412,6 +437,7 @@ public class Domain2Descriptor {
System.out.println(" -p create properties (default)");
System.out.println(" -m create metrics");
System.out.println(" -o create operations");
+ System.out.println(" -U<user>:<pass> - supply credentials to talk to AS7" );
}
public enum Type {
@@ -421,7 +447,8 @@ public class Domain2Descriptor {
LONG,
BIG_DECIMAL,
OBJECT,
- LIST
+ LIST,
+ DOUBLE
;
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
index 6168dad..f4fa473 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
@@ -61,6 +61,10 @@ public class HostControllerComponent extends BaseServerComponent implements Oper
return postProcessResult(name,res);
}
+ else if (name.equals("installRhqUser")) {
+ return installManagementUser(parameters, pluginConfiguration, AS7Mode.HOST);
+ }
+
// Defer other stuff to the base component for now
return super.invokeOperation(name, parameters);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
index 8df1c47..3e90588 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
@@ -48,6 +48,7 @@ import org.rhq.modules.plugins.jbossas7.json.ReadResource;
*
* @author Heiko W. Rupp
*/
+@SuppressWarnings("unused")
public class ManagedASDiscovery extends AbstractBaseDiscovery
{
@@ -138,7 +139,7 @@ public class ManagedASDiscovery extends AbstractBaseDiscovery
}
private ServerInfo getBindingsFromDC(HostPort domainController, String serverGroup) {
- ASConnection dcConnection = new ASConnection(domainController.host, domainController.port);
+ ASConnection dcConnection = new ASConnection(domainController.host, domainController.port, "-TODO-", "-TODO-"); // TODO where do we get these from?
List<PROPERTY_VALUE> address = new ArrayList<PROPERTY_VALUE>();
Address theAddress = new Address("server-group", serverGroup);
Operation op = new ReadResource(theAddress);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
index c703635..c5a17a8 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
@@ -74,7 +74,7 @@ public class ServerGroupComponent extends ManagedASComponent implements ContentF
for (ResourcePackageDetails details : packages) {
- ASUploadConnection uploadConnection = new ASUploadConnection(host,port);
+ ASUploadConnection uploadConnection = new ASUploadConnection(host,port, super.managementUser, super.managementPassword);
String fileName = details.getFileName();
OutputStream out = uploadConnection.getOutputStream(fileName);
contentServices.downloadPackageBits(cctx, details.getKey(), out, false);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
index 11a0e4d..f3c3184 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
@@ -40,6 +40,8 @@ public class StandaloneASComponent extends BaseServerComponent implements Operat
} else if (name.equals("restart")) {
return restartServer(parameters, AS7Mode.STANDALONE);
+ } else if (name.equals("installRhqUser")) {
+ return installManagementUser(parameters, pluginConfiguration, AS7Mode.STANDALONE);
}
// reload, shutdown go to the remote server
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
index c0a9196..51fc3a2 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
@@ -83,11 +83,7 @@ public class Address {
if (tmp.contains("=")) {
// strip / from the start of the key if it happens to be there
- if (tmp.startsWith("/"))
- tmp = tmp.substring(1);
-
- String[] pair = tmp.split("=");
- PROPERTY_VALUE valuePair = new PROPERTY_VALUE(pair[0], pair[1]);
+ PROPERTY_VALUE valuePair = pathFromSegment(tmp);
this.path.add(valuePair);
}
}
@@ -95,6 +91,19 @@ public class Address {
}
/**
+ * Generates a path from a segment in the form of key=value.
+ * @param segment A segment in the form key=value
+ * @return A path
+ */
+ private PROPERTY_VALUE pathFromSegment(String segment) {
+ if (segment.startsWith("/"))
+ segment = segment.substring(1);
+
+ String[] pair = segment.split("=");
+ return new PROPERTY_VALUE(pair[0], pair[1]);
+ }
+
+ /**
* Add a key value pair to the path
* @param key Key part of this path element
* @param value Value part of this path element
@@ -103,6 +112,14 @@ public class Address {
path.add(new PROPERTY_VALUE(key,value));
}
+ public void addSegment(String segment) {
+ if (!segment.contains("="))
+ throw new IllegalArgumentException("Segment [" + segment + "] contains no '='");
+
+ PROPERTY_VALUE pv = pathFromSegment(segment);
+ path.add(pv);
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder( "Address{" +
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 8048100..ee6b902 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -50,31 +50,11 @@
xmlns:c="urn:xmlns:rhq-configuration"
>
- <depends plugin="JMX" useClasses="true"/>
-
<!-- TODO I think we should introduce an abstract AS7 plugin that contains some base functionality and then
~~ additional 'Personalities' for the kinds of servers (PM, SM, Standalone AS, Managed AS)
-->
- <!-- TODO do we want to show the process controller at all? We have no benefit from it
- <server name="ProcessController"
- discovery="BaseProcessDiscovery"
- class="BaseComponent"
- description="Reaper process for other AS7 services"
- >
-
- <plugin-configuration>
- <c:simple-property name="hostname" default="localhost" required="true"/>
- <c:simple-property name="port" default="9990" type="integer" required="true"/>
-
- </plugin-configuration>
-
- <process-scan name="ProcessController" query="process|basename|match=^java.*,arg|org.jboss.as.process-controller|match=.*"/>
-
-
- </server>
- -->
<server name="JBossAS7 Host Controller"
discovery="BaseProcessDiscovery"
class="HostControllerComponent"
@@ -84,8 +64,8 @@
<plugin-configuration>
<c:simple-property name="hostname" default="localhost" required="true" description="Host name of the domain API"/>
<c:simple-property name="port" default="9990" type="integer" required="true" description="Port of the domain API"/>
- <c:simple-property name="user" type="string" description="Management user for a secured Host controller" required="false"/>
- <c:simple-property name="password" type="password" description="Password for the management user" required="false"/>
+ <c:simple-property name="user" type="string" default="rhqadmin" description="Management user for a secured Host controller" required="false"/>
+ <c:simple-property name="password" type="password" default="rhqadmin" description="Password for the management user" required="false"/>
<c:simple-property name="domainConfig" type="string" default="domain.xml" description="Running configuration (domain part)" displayName="Domain Configuration"/>
<c:simple-property name="hostConfig" type="string" default="host.xml" description="Running configuration (host part)" displayName="Host Configuration"/>
<c:simple-property name="baseDir" type="file" description="Base directory of the server installation" displayName="Base directory" readOnly="true" required="false"/>
@@ -179,6 +159,15 @@
<c:simple-property name="operationResult" description="Outcome of the stop operation"/>
</results>
</operation>
+ <operation name="installRhqUser" description="Installs a user in the server for management" displayName="Install RHQ user">
+ <parameters>
+ <c:simple-property name="user" displayName="Username" description="Name of the management user" default="rhqadmin"/>
+ <c:simple-property name="password" displayName="Password" description="Password of this management user" default="rhqadmin" type="password"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
<metric property="_internal:mgmtRequests" category="performance" dataType="measurement" defaultInterval="120000"
@@ -192,6 +181,11 @@
displayType="summary" measurementType="dynamic" description="Max time for a request since last metric get" units="milliseconds"
displayName="Maximum request time"/>
+ <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
+ displayType="summary"/>
+ <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
+ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
+
<event name="logEntry" description="an entry in a log file"/>
<resource-configuration>
@@ -206,11 +200,10 @@
</c:group>
-->
- <c:group name="children:extension" displayName="Installed extensions">
-
+ <c:group name="children:extension" displayName="Installed extensions" hiddenByDefault="true">
<c:list-property name="*" displayName="Installed extensions" readOnly="true" required="false">
<c:map-property name="*" displayName="Name" readOnly="true">
- <c:simple-property name="module" displayName="Module name"/>
+ <c:simple-property name="module" displayName="Module name" readOnly="true"/>
</c:map-property>
</c:list-property>
</c:group>
@@ -332,8 +325,8 @@
<plugin-configuration>
<c:simple-property name="hostname" default="localhost" required="true"/>
<c:simple-property name="port" default="9990" type="integer" required="true"/>
- <c:simple-property name="user" type="string" description="Management user for a secured AS" required="false"/>
- <c:simple-property name="password" type="password" description="Password for the management user" required="false"/>
+ <c:simple-property name="user" default="rhqadmin" type="string" description="Management user for a secured AS" required="false"/>
+ <c:simple-property name="password" default="rhqadmin" type="password" description="Password for the management user" required="false"/>
<c:simple-property name="config" type="string" default="standalone.xml" description="Running configuration" displayName="Configuration"/>
<c:simple-property name="baseDir" type="file" description="Base directory of the server installation" displayName="Base directory" readOnly="true" required="false"/>
<c:simple-property name="startScript" type="file" default="bin/standalone.sh" description="Script used to start the server. If the path is not absolute, it is relative to the base directory"/>
@@ -404,6 +397,15 @@
<c:simple-property name="operationResult"/>
</results>
</operation>
+ <operation name="installRhqUser" description="Installs a user in the server for management" displayName="Install RHQ user">
+ <parameters>
+ <c:simple-property name="user" displayName="Username" description="Name of the management user" default="rhqadmin"/>
+ <c:simple-property name="password" displayName="Password" description="Password of this management user" default="rhqadmin" type="password"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
<metric property="_internal:mgmtRequests" category="performance" dataType="measurement" defaultInterval="120000"
@@ -416,6 +418,11 @@
displayType="summary" measurementType="dynamic" description="Max time for a request since last metric get" units="milliseconds"
displayName="Maximum request time"/>
+ <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
+ displayType="summary"/>
+ <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
+ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
+
<event name="logEntry" description="an entry in a log file"/>
<resource-configuration>
@@ -431,11 +438,10 @@
</c:group>
-->
- <c:group name="children:extension" displayName="Installed extensions">
-
+ <c:group name="children:extension" displayName="Installed extensions" hiddenByDefault="true">
<c:list-property name="*" displayName="Installed extensions" readOnly="true" required="false">
<c:map-property name="*" displayName="Name" readOnly="true">
- <c:simple-property name="module" displayName="Module name"/>
+ <c:simple-property name="module" displayName="Module name" readOnly="true"/>
</c:map-property>
</c:list-property>
</c:group>
@@ -515,31 +521,98 @@
</results>
</operation>
- <metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
+ <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
displayType="summary"/>
+ <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
+ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
<event name="logEntry" description="an entry in a log file"/>
</server>
- <server name="JBoss AS JVM"
- description="JVM of the JBossAS"
- sourcePlugin="JMX"
- sourceType="JMX Server"
- discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent"
- class="org.rhq.plugins.jmx.JMXServerComponent"
- singleton="true">
+ <server name="JVM"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Information about the underlying JVM"
+ singleton="true">
<runs-inside>
<parent-resource-type name="JBossAS7 Managed Server" plugin="jboss-as-7"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
- </server>
- <server name="Messaging"
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="core-service=platform-mbean"/>
+ </plugin-configuration>
+
+ <service name="Operating System"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ >
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=operating-system"/>
+ </plugin-configuration>
+
+ <metric property="available-processors"
+ description="The number of processors available to the Java virtual machine."/>
+ <metric property="system-load-average"
+ description="The system load average for the last minute. The load average may not be available on some platforms; if the load average is not available, a negative value is returned."/>
+ </service>
+
+ <service name="Runtime"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ >
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=runtime"/>
+ </plugin-configuration>
+
+ <metric property="uptime" description="The uptime of the Java virtual machine in milliseconds."/>
+ </service>
+
+ <service name="Threading"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ >
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=threading"/>
+ </plugin-configuration>
+
+ <metric property="thread-count" description="The current number of live threads including both daemon and non-daemon threads."/>
+ <metric property="peak-thread-count" description="The peak live thread count since the Java virtual machine started or peak was reset."/>
+ <metric property="total-started-thread-count" description="The total number of threads created and also started since the Java virtual machine started."/>
+ <metric property="daemon-thread-count" description="The current number of live daemon threads."/>
+ <metric property="current-thread-cpu-time" description="The total CPU time for the current thread in nanoseconds, or -1 if 'thread-cpu-time-enabled' is 'false'. A Java virtual machine implementation may not support CPU time measurement. If 'thread-cpu-time-supported', is 'false' undefined."/>
+ <metric property="current-thread-user-time" description="The CPU time that the current thread has executed in user mode in nanoseconds, or -1 if 'thread-cpu-time-enabled' is 'false'. A Java virtual machine implementation may not support CPU time measurement. If 'thread-cpu-time-supported', is 'false' the result will be undefined "/>
+
+ <resource-configuration>
+ <c:simple-property name="thread-contention-monitoring-enabled" required="false" type="boolean" readOnly="false" description="Whether thread contention monitoring is enabled."/>
+ <c:simple-property name="thread-cpu-time-enabled" required="false" type="boolean" readOnly="false" description="Whether thread CPU time measurement is enabled."/>
+ <c:list-property name="all-thread-ids" description="All live thread IDs. If a security manager is installed and the caller does not have ManagementPermission('monitor'), the result will be und
+ ." >
+ <c:simple-property name="all-thread-ids" />
+ </c:list-property>
+ <c:simple-property name="thread-contention-monitoring-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports thread contention monitoring."/>
+ <c:simple-property name="thread-cpu-time-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine implementation supports CPU time measurement for any thread."/>
+ <c:simple-property name="current-thread-cpu-time-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports CPU time measurement for the current thread."/>
+ <c:simple-property name="object-monitor-usage-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports monitoring of object monitor usage."/>
+ <c:simple-property name="synchronizer-usage-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports monitoring of ownable synchronizer usage."/>
+ </resource-configuration>
+ </service>
+
+
+
+ </server>
+
+ <server name="Messaging-Provider"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="The HornetQ based messaging subsystem"
+ description="The messaging subsystems"
singleton="true"
>
<runs-inside>
@@ -551,82 +624,94 @@
<c:simple-property name="path" readOnly="true" default="subsystem=messaging"/>
</plugin-configuration>
- <operation name="destination:add" displayName="Add destination" description="Add a Queue or Topic">
- <parameters>
- <c:simple-property name="name" description="Name of the Destination" required="true"/>
- <c:list-property name="entries" description="The JNDI names the destination should be bound to." required="true">
- <c:simple-property name="entry" description="A single JNDI name. Note, this is relative to java:jboss/jms/"/>
- </c:list-property>
- <c:simple-property name="type" description="Type of Destination to create" default="Queue">
- <c:property-options>
- <c:option value="jms-queue" name="Queue"/>
- <c:option value="jms-topic" name="Topic"/>
- </c:property-options>
- </c:simple-property>
- <c:simple-property name="durable" description="Defines whether the queue is durable (for Queues only)." type="boolean" default="false"/>
- </parameters>
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
- <operation name="destination:remove" displayName="Remove Destination" description="Remove a destination">
- <parameters>
- <c:simple-property name="name" description="Name of the Destination" required="true"/>
- </parameters>
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
-
- <resource-configuration>
- <c:simple-property name="journal-min-files" />
- <c:simple-property name="journal-type" />
- </resource-configuration>
+ <server name="HornetQ"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The HornetQ based messaging subsystem"
+ >
- <service name="JMS Queue"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="delete-only"
- >
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="jms-queue"/>
+ <c:simple-property name="path" readOnly="true" default="hornetq-server"/>
</plugin-configuration>
+
+ <operation name="destination:add" displayName="Add destination" description="Add a Queue or Topic">
+ <parameters>
+ <c:simple-property name="name" description="Name of the Destination" required="true"/>
+ <c:list-property name="entries" description="The JNDI names the destination should be bound to." required="true">
+ <c:simple-property name="entry" description="A single JNDI name. Note, this is relative to java:jboss/jms/"/>
+ </c:list-property>
+ <c:simple-property name="type" description="Type of Destination to create" default="Queue">
+ <c:property-options>
+ <c:option value="jms-queue" name="Queue"/>
+ <c:option value="jms-topic" name="Topic"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="durable" description="Defines whether the queue is durable (for Queues only)." type="boolean" default="false"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="destination:remove" displayName="Remove Destination" description="Remove a destination">
+ <parameters>
+ <c:simple-property name="name" description="Name of the Destination" required="true"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+
<resource-configuration>
- <c:simple-property name="durable" required="false" type="boolean" readOnly="true" default="false"
- description="Whether the queue is durable or not."/>
- <c:list-property name="entries" required="false" readOnly="true"
- description="The jndi names the queue will be bound to.">
- <c:simple-property name="entries" type="string"/>
- </c:list-property>
- <c:simple-property name="selector" required="false" type="string" readOnly="true" description="The queue selector."/>
- </resource-configuration>
- </service>
- <service name="JMS Topic"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="delete-only"
- >
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="jms-topic"/>
- </plugin-configuration>
- <resource-configuration>
- <c:list-property name="entries" required="false" readOnly="true"
- description="The jndi names the queue will be bound to.">
- <c:simple-property name="entries" type="string"/>
- </c:list-property>
+ <c:simple-property name="journal-min-files" />
+ <c:simple-property name="journal-type" />
</resource-configuration>
- </service>
- <service name="Connection-Factory"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="both"
- >
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="connection-factory"/>
- </plugin-configuration>
- </service>
+ <service name="JMS Queue"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="delete-only"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="jms-queue"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="durable" required="false" type="boolean" readOnly="true" default="false"
+ description="Whether the queue is durable or not."/>
+ <c:list-property name="entries" required="false" readOnly="true"
+ description="The jndi names the queue will be bound to.">
+ <c:simple-property name="entries" type="string"/>
+ </c:list-property>
+ <c:simple-property name="selector" required="false" type="string" readOnly="true" description="The queue selector."/>
+ </resource-configuration>
+ </service>
+ <service name="JMS Topic"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="delete-only"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="jms-topic"/>
+ </plugin-configuration>
+ <resource-configuration>
+ <c:list-property name="entries" required="false" readOnly="true"
+ description="The jndi names the queue will be bound to.">
+ <c:simple-property name="entries" type="string"/>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+ <service name="Connection-Factory"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="both"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="connection-factory"/>
+ </plugin-configuration>
+ </service>
+
+ </server>
</server>
<server name="JBossWeb"
@@ -649,61 +734,64 @@
description="The web container's default virtual server."/>
<c:simple-property name="native" required="false" type="boolean" readOnly="true" defaultValue="true"
description="Add the native initialization listener to the web container."/>
- <c:map-property name="configuration" description="The common web container configuration." >
- <c:map-property name="static-resources" description="Configuration for static resources" >
- <c:simple-property name="listings" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="instance-id" readOnly="true" required="false" type="string" description="The identifier for this server instance."/>
+ <c:group name="child:configuration=static-resources" displayName="Static Resources" >
+ <c:simple-property name="listings" required="false" type="boolean" defaultValue="false"
description="Enable folder listings."/>
- <c:simple-property name="sendfile" required="false" type="integer" readOnly="true" defaultValue="49152"
+ <c:simple-property name="sendfile" required="false" type="integer" defaultValue="49152"
description="Enable sendfile if possible, for files bigger than the specified byte size."/>
- <c:simple-property name="read-only" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="file-encoding" required="false" description="Force a file encoding." type="string"/>
+ <c:simple-property name="read-only" required="false" type="boolean" defaultValue="true"
description="Allow write HTTP methods (PUT, DELETE)."/>
- <c:simple-property name="webdav" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="webdav" required="false" type="boolean" defaultValue="false"
description="Enable WebDAV functionality."/>
<c:simple-property name="secret" required="false" type="string" readOnly="true" description="Secret for WebDAV locking operations."/>
- <c:simple-property name="max-depth" required="false" type="integer" readOnly="true" defaultValue="3"
+ <c:simple-property name="max-depth" required="false" type="integer" defaultValue="3"
description="Maximum recursion for PROPFIND."/>
- <c:simple-property name="disabled" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="disabled" required="false" type="boolean" defaultValue="false"
+ description="Enable the default Servlet mapping."/>
+ </c:group>
+ <c:group name="child:configuration=jsp-configuration" displayName="JSP Configuration">
+ <c:simple-property name="development" required="false" type="boolean" default="false"
+ description="Enable the development mode, which gives more information when an error occurs. And also enables automatic JSP recompiles."/>
+ <c:simple-property name="disabled" required="false" type="boolean" defaultValue="false"
description="Enable the JSP container."/>
- </c:map-property>
- <c:map-property name="jsp-configuration" description="JSP container configuration">
- <c:simple-property name="development" required="false" type="boolean" readOnly="true" defaultValue="false"
- description="Enable the development mode, which gives more information when an error occurs."/>
- <c:simple-property name="file-encoding" required="false" type="string" readOnly="true" description="Force a file encoding."/>
- <c:simple-property name="keep-generated" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="keep-generated" required="false" type="boolean" defaultValue="true"
description="Keep the generated Servlets."/>
<c:simple-property name="trim-spaces" required="false" type="boolean" readOnly="true" defaultValue="true"
- description="Trim some spaces from the generated Servlet."/>
- <c:simple-property name="tag-pooling" required="false" type="boolean" readOnly="true" defaultValue="true"
+ description="Trim some spaces from the generated Servlet."/> <!-- TODO make r/w when https://issues.jboss.org/browse/AS7-3097 is solved -->
+ <c:simple-property name="tag-pooling" required="false" type="boolean" defaultValue="true"
description="Enable tag pooling."/>
- <c:simple-property name="mapped-file" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="mapped-file" required="false" type="boolean" defaultValue="true"
description="Map to the JSP source."/>
- <c:simple-property name="check-interval" required="false" type="integer" readOnly="true" defaultValue="0"
- description="Check interval for JSP updates using a background thread."/>
- <c:simple-property name="modification-test-interval" required="false" type="integer" readOnly="true" defaultValue="4"
+ <c:simple-property name="check-interval" required="false" type="integer" defaultValue="60"
+ description="Check interval for JSP updates using a background thread."/> <!-- TODO revisit default when https://issues.jboss.org/browse/AS7-3098 is fixed -->
+ <c:simple-property name="modification-test-interval" required="false" type="integer" defaultValue="4"
description="Minimum amount of time between two tests for updates, in seconds."/>
- <c:simple-property name="recompile-on-fail" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="recompile-on-fail" required="false" type="boolean" defaultValue="false"
description="Retry failed JSP compilations on each request."/>
- <c:simple-property name="smap" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="smap" required="false" type="boolean" defaultValue="false"
description="Enable SMAP."/>
- <c:simple-property name="dump-smap" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="dump-smap" required="false" type="boolean" defaultValue="false"
description="Write SMAP data to a file."/>
- <c:simple-property name="generate-strings-as-char-arrays" required="false" type="boolean" readOnly="true"
+ <c:simple-property name="generate-strings-as-char-arrays" required="false" type="boolean"
defaultValue="false"
description="Generate String constants as char arrays."/>
- <c:simple-property name="error-on-use-bean-invalid-class-attribute" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="error-on-use-bean-invalid-class-attribute" required="false" type="boolean" defaultValue="false"
description="Enable errors when using a bad class in useBean."/>
- <c:simple-property name="scratch-dir" required="false" type="string" readOnly="true" description="Specify a different work directory."/>
- <c:simple-property name="source-vm" required="false" type="string" readOnly="true" defaultValue="1.5"
+ <c:simple-property name="scratch-dir" required="false" type="string" description="Specify a different work directory."/>
+ <c:simple-property name="source-vm" required="false" type="string" defaultValue="1.5"
description="Source VM level for compilation."/>
- <c:simple-property name="target-vm" required="false" type="string" readOnly="true" defaultValue="1.5"
+ <c:simple-property name="target-vm" required="false" type="string" defaultValue="1.5"
description="Target VM level for compilation."/>
- <c:simple-property name="java-encoding" required="false" type="string" readOnly="true" defaultValue="UTF-8"
+ <c:simple-property name="java-encoding" required="false" type="string" defaultValue="UTF-8"
description="Specify the encoding used for Java sources."/>
- <c:simple-property name="x-powered-by" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="x-powered-by" required="false" type="boolean" defaultValue="true"
description="Enable advertising the JSP engine in x-powered-by."/>
- <c:simple-property name="display-source-fragment" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="display-source-fragment" required="false" type="boolean" defaultValue="true"
description="When a runtime error occurs, attempts to display corresponding JSP source fragment."/>
- </c:map-property>
+ </c:group>
+ <!-- <c:group name="child:configuration=container" displayName="Container">
<c:list-property name="mime-mapping" description="A mime-mapping definition." >
<c:map-property name="mime-mapping" >
<c:simple-property name="name" description="A MIME mapping name"/>
@@ -713,8 +801,8 @@
<c:list-property name="welcome-file" description="A welcome file declaration." >
<c:simple-property name="welcome-file" />
</c:list-property>
- </c:map-property>
- </resource-configuration>
+ </c:group>
+--> </resource-configuration>
<service name="Connector"
discovery="SubsystemDiscovery"
@@ -726,41 +814,41 @@
</plugin-configuration>
- <metric property="bytesSent" measurementType="trendsup"/>
- <metric property="bytesReceived" measurementType="trendsup"/>
- <metric property="processingTime" measurementType="trendsup" units="milliseconds"/>
- <metric property="errorCount" measurementType="trendsup" displayType="summary"/>
- <metric property="maxTime" units="milliseconds"/>
- <metric property="requestCount" measurementType="trendsup" displayType="summary"/>
+ <metric property="bytesSent" measurementType="trendsup" description="Number of byte sent by the connector."/>
+ <metric property="bytesReceived" measurementType="trendsup" description="Number of byte received by the connector (POST data)."/>
+ <metric property="processingTime" measurementType="trendsup" units="milliseconds" description="Processing time used by the connector. Im milli-seconds."/>
+ <metric property="errorCount" measurementType="trendsup" displayType="summary" description="Number of error that occurs when processing requests by the connector."/>
+ <metric property="maxTime" units="milliseconds" description="Max time spent to process a requests."/>
+ <metric property="requestCount" measurementType="trendsup" displayType="summary" description="Number of the request processed by the connector."/>
<resource-configuration>
- <c:simple-property name="protocol" required="true" type="string" readOnly="true" description="The web connector protocol."/>
- <c:simple-property name="socket-binding" required="true" type="string" readOnly="true"
+ <c:simple-property name="protocol" required="true" type="string" description="The web connector protocol."/>
+ <c:simple-property name="socket-binding" required="true" type="string"
description="The web connector socket-binding reference, this connector should be bound to.">
<c:option-source target="configuration" expression="socket-binding=name:type=SocketBindingGroup"/> <!-- TODO different for Domain vs standalone -->
</c:simple-property>
- <c:simple-property name="scheme" type="string" readOnly="true" default="http" description="The web connector scheme." required="true"/>
- <c:simple-property name="executor" type="string" readOnly="true" required="false"
+ <c:simple-property name="scheme" type="string" default="http" description="The web connector scheme." required="true"/>
+ <c:simple-property name="executor" type="string" required="false"
description="The name of the executor that should be used for the processing threads of this connector. Defaults to using an internal pool."/>
- <c:simple-property name="enabled" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="enabled" type="boolean" default="true"
description="Defines whether the connector should be started on startup."/>
- <c:simple-property name="enable-lookups" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="enable-lookups" type="boolean" defaultValue="false"
description="Enable DNS lookups for Servlet API."/>
- <c:simple-property name="proxy-name" type="string" readOnly="true" required="false"
+ <c:simple-property name="proxy-name" type="string" required="false"
description="The host name that will be used when sending a redirect. The default value is null."/>
- <c:simple-property name="proxy-port" type="integer" readOnly="true" required="false"
+ <c:simple-property name="proxy-port" type="integer" required="false"
description="The port that will be used when sending a redirect."/>
- <c:simple-property name="max-post-size" type="integer" readOnly="true" defaultValue="2097152"
+ <c:simple-property name="max-post-size" type="integer" defaultValue="2097152"
description="Maximum size in bytes of a POST request that can be parsed by the container."/>
- <c:simple-property name="max-save-post-size" type="integer" readOnly="true" defaultValue="4096"
+ <c:simple-property name="max-save-post-size" type="integer" defaultValue="4096"
description="Maximum size in bytes of a POST request that will be saved during certain authentication schemes."/>
<c:simple-property name="secure" type="boolean" readOnly="true" defaultValue="false"
description="Indicates if content sent or recieved by the connector is secured from the user perspective."/>
<c:simple-property name="redirect-port" type="integer" readOnly="true" defaultValue="8443"
description="The port for redirection to a secure connector."/>
- <c:simple-property name="max-connections" type="integer" readOnly="true" required="false"
+ <c:simple-property name="max-connections" type="integer" required="false"
description="Amount of concurrent connections that can be processed by the connector with optimum performance. The default value depends on the connector used."/>
- <c:list-property name="virtual-server" description="The list of virtual servers that can be accessed through this connector. The default is to allow all virtual servers." readOnly="true" required="false">
+ <c:list-property name="virtual-server" description="The list of virtual servers that can be accessed through this connector. The default is to allow all virtual servers." required="false">
<c:simple-property name="virtual-server" />
</c:list-property>
<c:map-property name="ssl" description="The SSL configuration of the connector." readOnly="true" required="false">
@@ -795,10 +883,10 @@
</plugin-configuration>
<resource-configuration>
- <c:list-property name="alias" >
+ <c:list-property name="alias" description="The virtual server aliases" displayName="Virtual server aliases" >
<c:simple-property name="alias" />
</c:list-property>
- <c:simple-property name="default-web-module" type="string" readOnly="true" defaultValue="ROOT.war"
+ <c:simple-property name="default-web-module" type="string" defaultValue="ROOT.war"
description="The web module deployment name that will be mapped as the root webapp."/>
<c:map-property name="access-log" description="The access log configuration for this virtual server." >
<c:simple-property name="pattern" type="string" readOnly="true" defaultValue="common" required="false" description="The access log pattern."/>
@@ -825,7 +913,7 @@
</c:list-property>
</c:map-property>
</c:list-property>
- <c:simple-property name="enable-welcome-root" type="boolean" />
+ <c:simple-property name="enable-welcome-root" type="boolean" description="Whether or not the bundled welcome directory is used as the root web context."/>
</resource-configuration>
</service>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
index 16c94f9..0266071 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
@@ -28,7 +28,6 @@ import javax.xml.bind.util.ValidationEventCollector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
-import org.testng.annotations.BeforeSuite;
import org.rhq.core.clientapi.agent.metadata.ConfigurationMetadataParser;
import org.rhq.core.clientapi.agent.metadata.InvalidPluginDescriptorException;
@@ -97,7 +96,7 @@ public class AbstractConfigurationHandlingTest {
JsonNode content;
public FakeConnection() {
- super("localhost", 1234);
+ super("localhost", 1234, "fake", "fake");
}
public void setContent(JsonNode content) {
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index d021ab2..a512133 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -62,7 +62,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(new PropertySimple("needed","test"));
conf.put(new PropertySimple("optional",null));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1;
Operation step1 = cop.step(0);
@@ -89,7 +89,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -120,7 +120,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -148,7 +148,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -176,7 +176,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -207,7 +207,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -240,7 +240,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 3 : "#Steps should be 3 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -289,7 +289,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 5 : "#Steps should be 5 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java
new file mode 100644
index 0000000..2365d19
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java
@@ -0,0 +1,133 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.net.URL;
+
+import org.testng.annotations.Test;
+
+/**
+ * Test the ability to read information from the AS7 xml files (standalone.xml and so on)
+ * @author Heiko W. Rupp
+ */
+@Test
+public class XmlFileReadingTest {
+
+ public void hostPort70() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone70.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getManagementPortFromHostXml(new String[]{});
+ System.out.println(hp);
+ assert hp.host.equals("127.0.0.70") : "Host is " + hp.host;
+ assert hp.port==19990 : "Port is " + hp.port;
+ }
+
+ public void hostPort71() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getManagementPortFromHostXml(new String[]{});
+ System.out.println(hp);
+ // hp : HostPort{host='localhost', port=9990, isLocal=true}
+ assert hp.host.equals("127.0.0.71") : "Host is " + hp.host;
+ assert hp.port==29990 : "Port is " + hp.port;
+ }
+
+ public void domainController1() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("host1.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getDomainControllerFromHostXml();
+ assert hp.isLocal : "DC is not local as expected: " + hp;
+
+ }
+
+ public void domainController2() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("host2.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getDomainControllerFromHostXml();
+ assert "192.168.100.1".equals(hp.host) : "DC is at " + hp.host;
+ assert hp.port == 9559 : "DC port is at " + hp.port;
+ }
+
+
+
+ public void testXpath70() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone70.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+/*
+ String realm = bd.obtainXmlPropertyViaXPath("/management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+*/
+
+ String pathExpr = "//management/management-interfaces/http-interface/@port";
+ String port = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "19990".equals(port) : "Port was [" + port + "]";
+
+ pathExpr = "//management/management-interfaces/http-interface/@interface";
+ String interfName = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "management".equals(interfName) : "Interface was " + interfName;
+
+ pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value";
+ String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "${jboss.bind.address.management:127.0.0.70}".equals(interfElem) : "InterfElem was " + interfElem;
+
+ }
+
+
+ public void testXpath71() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+ String sbindingRef = bd.obtainXmlPropertyViaXPath(
+ ("//management/management-interfaces/http-interface/socket-binding/@http"));
+ assert "management-http".equals(sbindingRef): "Socketbinding was " + sbindingRef;
+
+ String pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@port";
+ String port = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "29990".equals(port) : "Port was [" + port + "]";
+
+ pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@interface";
+ String interfName = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "management".equals(interfName) : "Interface was " + interfName;
+
+ pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value";
+ String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "${jboss.bind.address.management:127.0.0.71}".equals(interfElem) : "InterfElem was " + interfElem;
+
+ }
+
+ public void testGetRealm() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+
+ String xpathExpression = "//management//security-realm[@name ='%s']/authentication/properties/@path";
+
+ String propsFileName = bd.obtainXmlPropertyViaXPath(String.format(xpathExpression,realm));
+ assert "mgmt-users.properties".equals(propsFileName) : "File name was " + propsFileName;
+
+ String propsFilePathRel = bd.obtainXmlPropertyViaXPath("//management//security-realm[@name ='" + realm + "']/authentication/properties/@relative-to");
+ assert "jboss.server.config.dir".equals(propsFilePathRel) : "Path was " + propsFileName;
+
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/host1.xml b/modules/plugins/jboss-as-7/src/test/resources/host1.xml
new file mode 100644
index 0000000..2e35b78
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/host1.xml
@@ -0,0 +1,92 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<host xmlns="urn:jboss:domain:1.1"
+ name="master">
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9999"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9990"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <domain-controller>
+ <local/>
+ <!-- Alternative remote domain controller configuration with a host and port -->
+ <!-- <remote host="192.168.100.1" port="9999"/> -->
+ </domain-controller>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <jvms>
+ <jvm name="default">
+ <heap size="64m" max-size="128m"/>
+ </jvm>
+ </jvms>
+
+ <servers>
+ <server name="server-one" group="main-server-group">
+ <!-- server-one inherits the default socket-group declared in the server-group -->
+ <jvm name="default">
+ <!-- Remote JPDA debugging for a specific server
+ <jvm-options>
+ <option value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+ </jvm-options>
+ -->
+ </jvm>
+ </server>
+
+ <server name="server-two" group="main-server-group" auto-start="true">
+ <!-- server-two avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="standard-sockets" port-offset="150"/>
+ <jvm name="default">
+ <heap size="64m" max-size="256m"/>
+ </jvm>
+ </server>
+
+ <server name="server-three" group="other-server-group" auto-start="false">
+ <!-- server-three avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="ha-sockets" port-offset="250"/>
+ </server>
+ </servers>
+</host>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/host2.xml b/modules/plugins/jboss-as-7/src/test/resources/host2.xml
new file mode 100644
index 0000000..38ada1a
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/host2.xml
@@ -0,0 +1,91 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<host xmlns="urn:jboss:domain:1.1"
+ name="master">
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9999"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9990"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <domain-controller>
+ <!-- Alternative remote domain controller configuration with a host and port -->
+ <remote host="192.168.100.1" port="9559"/>
+ </domain-controller>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <jvms>
+ <jvm name="default">
+ <heap size="64m" max-size="128m"/>
+ </jvm>
+ </jvms>
+
+ <servers>
+ <server name="server-one" group="main-server-group">
+ <!-- server-one inherits the default socket-group declared in the server-group -->
+ <jvm name="default">
+ <!-- Remote JPDA debugging for a specific server
+ <jvm-options>
+ <option value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+ </jvm-options>
+ -->
+ </jvm>
+ </server>
+
+ <server name="server-two" group="main-server-group" auto-start="true">
+ <!-- server-two avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="standard-sockets" port-offset="150"/>
+ <jvm name="default">
+ <heap size="64m" max-size="256m"/>
+ </jvm>
+ </server>
+
+ <server name="server-three" group="other-server-group" auto-start="false">
+ <!-- server-three avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="ha-sockets" port-offset="250"/>
+ </server>
+ </servers>
+</host>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml b/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml
new file mode 100644
index 0000000..e07b9ef
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml
@@ -0,0 +1,433 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<server xmlns="urn:jboss:domain:1.1">
+
+ <extensions>
+ <extension module="org.jboss.as.clustering.infinispan"/>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.deployment-scanner"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jacorb"/>
+ <extension module="org.jboss.as.jaxrs"/>
+ <extension module="org.jboss.as.jmx"/>
+ <extension module="org.jboss.as.jpa"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.mail"/>
+ <extension module="org.jboss.as.messaging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.osgi"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.sar"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.threads"/>
+ <extension module="org.jboss.as.transactions"/>
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
+ </extensions>
+
+ <management>
+ <security-realms>
+ <security-realm name="PropertiesMgmtSecurityRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface interface="management" port="9999"/>
+ <http-interface interface="management" port="19990"/>
+ </management-interfaces>
+ </management>
+
+ <profile>
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+
+ <periodic-rotating-file-handler name="FILE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ </periodic-rotating-file-handler>
+
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup -->
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
+ pool-name="H2DS">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <pool></pool>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+ <drivers>
+ <driver name="h2" module="com.h2database.h2">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ </driver>
+ </drivers>
+ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
+ <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0" />
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
+
+ <remote connector-ref="remoting-connector" thread-pool-name="default" />
+ <async thread-pool-name="default" />
+
+ <timer-service thread-pool-name="default" >
+ <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ </timer-service>
+
+ <!-- EJB3 pools -->
+ <pools>
+ <bean-instance-pools>
+ <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+
+ <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+ </bean-instance-pools>
+ </pools>
+
+ <!-- Default MDB configurations -->
+ <mdb>
+ <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
+ <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+ </mdb>
+
+ <!-- Session bean configurations -->
+ <session-bean>
+ <stateless>
+ <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+ </stateless>
+ </session-bean>
+
+ <default-stateful-access-timeout>5000</default-stateful-access-timeout>
+ <default-singleton-access-timeout>5000</default-singleton-access-timeout>
+
+ <thread-pools>
+ <thread-pool name="default" max-threads="10" keepalive-time="100" />
+ </thread-pools>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate">
+ <cache-container name="hibernate" default-cache="local-query">
+ <local-cache name="entity">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="local-query">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="timestamps">
+ <eviction strategy="NONE"/>
+ </local-cache>
+ </cache-container>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.0">
+ <orb name="JBoss" print-version="off" giop-minor-version="2">
+ <connection max-managed-buf-size="24" outbuf-cache-timeout="-1"/>
+ <naming root-context="JBoss/Naming/root" export-corbaloc="on"/>
+ </orb>
+ <poa monitoring="off" queue-wait="off">
+ <request-processors pool-size="2" max-threads="8"/>
+ </poa>
+ <interop sun="on" chunk-custom-rmi-valuetypes="on" strict-check-on-tc-creation="off"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.0">
+ <archive-validation enabled="false"/>
+ <bean-validation enabled="false"/>
+ <default-workmanager>
+ <short-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </short-running-threads>
+ <long-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </long-running-threads>
+ </default-workmanager>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true">
+ <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" />
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:mail:1.0">
+ <mail-session jndi-name="java:jboss/mail/Default">
+ <smtp-server address="localhost" port="25"/>
+ </mail-session>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:1.1">
+ <hornetq-server>
+ <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
+ <journal-type>NIO</journal-type>
+ <!-- disable messaging persistence -->
+ <persistence-enabled>false</persistence-enabled>
+
+ <connectors>
+ <netty-connector name="netty" socket-binding="messaging"/>
+ <netty-connector name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
+
+ <acceptors>
+ <netty-acceptor name="netty" socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ <param key="direct-deliver" value="false"/>
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-full-policy>BLOCK</address-full-policy>
+ </address-setting>
+ </address-settings>
+
+ <!--JMS Stuff-->
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <connection-factory name="RemoteConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="RemoteConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <pooled-connection-factory name="hornetq-ra">
+ <transaction mode="xa"/>
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/JmsXA"/>
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+
+ <jms-destinations>
+ <jms-queue name="testQueue">
+ <entry name="queue/test"/>
+ </jms-queue>
+ <jms-topic name="testTopic">
+ <entry name="topic/test"/>
+ </jms-topic>
+ </jms-destinations>
+ </hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
+ <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
+ <property name="manager.root" value="jboss-osgi"/>
+ </configuration>
+ <properties>
+ <!-- Specifies the beginning start level of the framework -->
+ <property name="org.osgi.framework.startlevel.beginning">1</property>
+ </properties>
+ <capabilities>
+ <!-- modules registered with the OSGi layer on startup -->
+ <capability name="javax.api"/>
+ <capability name="javax.servlet.api"/>
+ <capability name="javax.transaction.api"/>
+ <!-- bundles installed on startup -->
+ <capability name="org.apache.aries.util"/>
+ <capability name="org.jboss.osgi.webconsole"/>
+ <capability name="org.osgi.compendium"/>
+ <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log" startlevel="1"/>
+ <capability name="org.jboss.osgi.logging" startlevel="1"/>
+ <capability name="org.apache.felix.configadmin" startlevel="1"/>
+ <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+ <!-- bundles started in startlevel 2 -->
+ <capability name="org.apache.aries.jmx" startlevel="2"/>
+ <capability name="org.apache.felix.eventadmin" startlevel="2"/>
+ <capability name="org.apache.felix.metatype" startlevel="2"/>
+ <capability name="org.apache.felix.scr" startlevel="2"/>
+ <capability name="org.apache.felix.webconsole" startlevel="2"/>
+ <capability name="org.jboss.netty" startlevel="2"/>
+ <capability name="org.jboss.osgi.jmx" startlevel="2"/>
+ <capability name="org.jboss.osgi.http" startlevel="2"/>
+ <capability name="org.projectodd.stilts" startlevel="2"/>
+ <!-- bundles started in startlevel 3 -->
+ <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
+ <capability name="org.jboss.osgi.webapp" startlevel="3"/>
+ <capability name="org.jboss.osgi.xerces" startlevel="3"/>
+ </capabilities>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:remoting:1.0">
+ <connector name="remoting-connector" socket-binding="remoting"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required"/>
+ </authentication>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.0">
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <core-environment>
+ <process-id>
+ <uuid/>
+ </process-id>
+ </core-environment>
+ <coordinator-environment default-timeout="300"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
+ <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/>
+ <virtual-server name="default-host" enable-welcome-root="true">
+ <alias name="localhost"/>
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.0">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>localhost</wsdl-host>
+ <!--
+ <wsdl-port>8080</wsdl-port>
+ <wsdl-secure-port>8443</wsdl-secure-port>
+ -->
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Standard-Endpoint-Config</ws:config-name>
+ </endpoint-config>
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Recording-Endpoint-Config</ws:config-name>
+ <ws:pre-handler-chains>
+ <handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
+ <protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM
+ </protocol-bindings>
+ <handler>
+ <handler-name>RecordingHandler</handler-name>
+ <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+ </ws:pre-handler-chains>
+ </endpoint-config>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.70}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.70}"/>
+ </interface>
+ </interfaces>
+
+ <socket-binding-group name="standard-sockets" default-interface="public">
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
+ <socket-binding name="jacorb" port="3528"/>
+ <socket-binding name="jacorb-ssl" port="3529"/>
+ <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
+ <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
+ <socket-binding name="jndi" port="1099"/>
+ <socket-binding name="messaging" port="5445"/>
+ <socket-binding name="messaging-throughput" port="5455"/>
+ <socket-binding name="osgi-http" interface="management" port="8090"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+ <socket-binding name="txn-status-manager" port="4713"/>
+ </socket-binding-group>
+
+</server>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml b/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml
new file mode 100644
index 0000000..0de6d00
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml
@@ -0,0 +1,453 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<server xmlns="urn:jboss:domain:1.1">
+
+ <extensions>
+ <extension module="org.jboss.as.clustering.infinispan"/>
+ <extension module="org.jboss.as.cmp"/>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.deployment-scanner"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jacorb"/>
+ <extension module="org.jboss.as.jaxr"/>
+ <extension module="org.jboss.as.jaxrs"/>
+ <extension module="org.jboss.as.jdr"/>
+ <extension module="org.jboss.as.jmx"/>
+ <extension module="org.jboss.as.jpa"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.mail"/>
+ <extension module="org.jboss.as.messaging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.osgi"/>
+ <extension module="org.jboss.as.pojo"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.sar"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.threads"/>
+ <extension module="org.jboss.as.transactions"/>
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
+ </extensions>
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket-binding native="management-native"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket-binding http="management-http"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <profile>
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+
+ <periodic-rotating-file-handler name="FILE">
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ <append value="true"/>
+ </periodic-rotating-file-handler>
+
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup -->
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:cmp:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
+ pool-name="H2DS">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <pool></pool>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+ <drivers>
+ <driver name="h2" module="com.h2database.h2">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ </driver>
+ </drivers>
+ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
+ <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0" />
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
+
+ <remote connector-ref="remoting-connector" thread-pool-name="default" />
+ <async thread-pool-name="default" />
+
+ <timer-service thread-pool-name="default" >
+ <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ </timer-service>
+
+ <!-- EJB3 pools -->
+ <pools>
+ <bean-instance-pools>
+ <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+
+ <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+ </bean-instance-pools>
+ </pools>
+
+ <!-- Default MDB configurations -->
+ <mdb>
+ <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
+ <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+ </mdb>
+
+ <!-- Session bean configurations -->
+ <session-bean>
+ <stateless>
+ <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+ </stateless>
+ <stateful default-access-timeout="5000"/>
+ <singleton default-access-timeout="5000"/>
+ </session-bean>
+
+ <thread-pools>
+ <thread-pool name="default" max-threads="10" keepalive-time="100" />
+ </thread-pools>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate">
+ <cache-container name="hibernate" default-cache="local-query">
+ <local-cache name="entity">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="local-query">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="timestamps">
+ <eviction strategy="NONE"/>
+ </local-cache>
+ </cache-container>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
+ <datasource jndi-name="java:jboss/datasources/ExampleDS"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.0">
+ <archive-validation enabled="false"/>
+ <bean-validation enabled="false"/>
+ <default-workmanager>
+ <short-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </short-running-threads>
+ <long-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </long-running-threads>
+ </default-workmanager>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true">
+ <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" />
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:mail:1.0">
+ <mail-session jndi-name="java:jboss/mail/Default">
+ <smtp-server address="localhost" port="25"/>
+ </mail-session>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:1.1">
+ <hornetq-server>
+ <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
+ <!-- disable messaging persistence -->
+ <persistence-enabled>false</persistence-enabled>
+
+ <connectors>
+ <netty-connector name="netty" socket-binding="messaging-client"/>
+ <netty-connector name="netty-throughput" socket-binding="messaging-throughput-client">
+ <param key="batch-delay" value="50"/>
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
+
+ <acceptors>
+ <netty-acceptor name="netty" socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ <param key="direct-deliver" value="false"/>
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-full-policy>BLOCK</address-full-policy>
+ </address-setting>
+ </address-settings>
+
+ <!--JMS Stuff-->
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <connection-factory name="RemoteConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="RemoteConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <pooled-connection-factory name="hornetq-ra">
+ <transaction mode="xa"/>
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/JmsXA"/>
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+
+ <jms-destinations>
+ <jms-queue name="testQueue">
+ <entry name="queue/test"/>
+ </jms-queue>
+ <jms-topic name="testTopic">
+ <entry name="topic/test"/>
+ </jms-topic>
+ </jms-destinations>
+ </hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
+ <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
+ <property name="manager.root" value="jboss-osgi"/>
+ </configuration>
+ <properties>
+ <!-- Specifies the beginning start level of the framework -->
+ <property name="org.osgi.framework.startlevel.beginning">1</property>
+ </properties>
+ <capabilities>
+ <!-- modules registered with the OSGi layer on startup -->
+ <capability name="javax.api"/>
+ <capability name="javax.servlet.api"/>
+ <capability name="javax.transaction.api"/>
+ <!-- bundles installed on startup -->
+ <capability name="org.apache.aries.util"/>
+ <capability name="org.jboss.osgi.webconsole"/>
+ <capability name="org.osgi.compendium"/>
+ <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log" startlevel="1"/>
+ <capability name="org.jboss.osgi.logging" startlevel="1"/>
+ <capability name="org.apache.felix.configadmin" startlevel="1"/>
+ <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+ <!-- bundles started in startlevel 2 -->
+ <capability name="org.apache.aries.jmx" startlevel="2"/>
+ <capability name="org.apache.felix.eventadmin" startlevel="2"/>
+ <capability name="org.apache.felix.metatype" startlevel="2"/>
+ <capability name="org.apache.felix.scr" startlevel="2"/>
+ <capability name="org.apache.felix.webconsole" startlevel="2"/>
+ <capability name="org.jboss.netty" startlevel="2"/>
+ <capability name="org.jboss.osgi.jmx" startlevel="2"/>
+ <capability name="org.jboss.osgi.http" startlevel="2"/>
+ <capability name="org.projectodd.stilts" startlevel="2"/>
+ <!-- bundles started in startlevel 3 -->
+ <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
+ <capability name="org.jboss.osgi.webapp" startlevel="3"/>
+ <capability name="org.jboss.osgi.xerces" startlevel="3"/>
+ </capabilities>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:pojo:1.0" />
+ <subsystem xmlns="urn:jboss:domain:remoting:1.0">
+ <connector name="remoting-connector" socket-binding="remoting"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required"/>
+ </authentication>
+ </security-domain>
+ <security-domain name="jboss-web-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ <security-domain name="jboss-ejb-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.1">
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <core-environment>
+ <process-id>
+ <uuid/>
+ </process-id>
+ </core-environment>
+ <coordinator-environment default-timeout="300"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
+ <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/>
+ <virtual-server name="default-host" enable-welcome-root="true">
+ <alias name="localhost"/>
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.0">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+ <!--
+ <wsdl-port>8080</wsdl-port>
+ <wsdl-secure-port>8443</wsdl-secure-port>
+ -->
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Standard-Endpoint-Config</ws:config-name>
+ </endpoint-config>
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Recording-Endpoint-Config</ws:config-name>
+ <ws:pre-handler-chains>
+ <handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
+ <protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM
+ </protocol-bindings>
+ <handler>
+ <handler-name>RecordingHandler</handler-name>
+ <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+ </ws:pre-handler-chains>
+ </endpoint-config>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.71}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.71}"/>
+ </interface>
+ </interfaces>
+
+ <socket-binding-group name="standard-sockets" default-interface="public">
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
+ <socket-binding name="jacorb" port="3528"/>
+ <socket-binding name="jacorb-ssl" port="3529"/>
+ <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
+ <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
+ <socket-binding name="management-native" interface="management" port="9999"/>
+ <socket-binding name="management-http" interface="management" port="29990"/>
+ <socket-binding name="messaging" port="5445"/>
+ <socket-binding name="messaging-throughput" port="5455"/>
+ <socket-binding name="osgi-http" interface="management" port="8090"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+ <socket-binding name="txn-status-manager" port="4713"/>
+ <outbound-socket-binding name="messaging-client">
+ <local-destination socket-binding-ref="messaging"/>
+ </outbound-socket-binding>
+ <outbound-socket-binding name="messaging-throughput-client">
+ <local-destination socket-binding-ref="messaging-throughput"/>
+ </outbound-socket-binding>
+ </socket-binding-group>
+
+</server>
commit 846c73c606a445dbe9f4627d28eafc154421eec6
Merge: f2803b9 572db8c
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Dec 19 19:57:58 2011 +0100
Merge branch 'master' into lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs
commit f2803b9046bfe26c9cbc80ec15bd458ac4f46db5
Merge: 8f9acfd 35fcafb
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Dec 19 19:56:15 2011 +0100
Merge branch 'master' into lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs
commit 8f9acfd64f725fb1ce4d1fafb3e44fde57de4b99
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Dec 19 19:55:08 2011 +0100
Revamped the script security to apply the checks at the JNDI lookup level
to support restricting access to EntityManager or a datasource.
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 6932b60..4dfd109 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -93,6 +93,13 @@
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
index 9c9d1bb..dc1fc83 100644
--- a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
+++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
@@ -22,9 +22,6 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.SerializablePermission;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.security.PermissionCollection;
import java.util.Collections;
@@ -41,9 +38,9 @@ import org.rhq.bindings.StandardScriptPermissions;
import org.rhq.bindings.util.PackageFinder;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.client.LocalClient;
-import org.rhq.enterprise.server.security.AllowEjbAccessPermission;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
/**
*
@@ -78,7 +75,7 @@ public class EjbAccessTest extends AbstractEJB3Test {
Assert.fail("The script shouldn't have been able to call local SLSB method.");
} catch (ScriptException e) {
- assert e.getMessage().contains(AllowEjbAccessPermission.class.getName());
+ checkIsDesiredSecurityException(e);
}
}
@@ -95,66 +92,34 @@ public class EjbAccessTest extends AbstractEJB3Test {
Assert.fail("The script shouldn't have been able to call remote SLSB method directly.");
} catch (ScriptException e) {
- //TODO java.io.IOException: access denied (java.io.SerializablePermission enableSubclassImplementation)
- assert e.getMessage().contains(AllowEjbAccessPermission.class.getName());
+ checkIsDesiredSecurityException(e);
}
}
- public void testScriptCantUseSessionManager() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval("org.rhq.enterprise.server.auth.SessionManager.getInstance();");
-
- Assert.fail("The script shouldn't have been able to get instance of SessionManager.");
- } catch (ScriptException e) {
- assert e.getMessage().contains(AllowEjbAccessPermission.class.getName());
- }
- }
-
- @SuppressWarnings("unused")
public void testScriptCantUseSessionManagerMethods() throws Exception {
- //The code below cannot work in Rhino because as of now, Rhino modifies
- //the return value of Class.getDeclaredField() to be null when there
- //is a security manager installed.
- //This has been filed as a bug at Oracle (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7119959)
-
- if (true) {
- return;
- }
-
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
final ScriptEngine engine = getEngine(overlord);
class G {
- private String obtainSessionManagerUsingReflection = ""
- + "var sessionManagerClass = java.lang.Class.forName(\"org.rhq.enterprise.server.auth.SessionManager\");\n"
- + "println(sessionManagerClass);\n"
- + "var managerField = sessionManagerClass.getDeclaredField(\"_manager\");\n"
- + "println(managerField);\n"
- + "managerField.setAccessible(true);\n"
- + "var manager = managerField.get(null);\n"
- + "println(manager);\n"
- + "manager.";
+ private String sessionManager = ""
+ + "org.rhq.enterprise.server.auth.SessionManager.getInstance().";
public void testInvoke(String methodCall) throws ScriptException {
- String code = obtainSessionManagerUsingReflection + methodCall;
+ String code = sessionManager + methodCall;
try {
engine.eval(code);
- Assert.fail("The script shouldn't have been able to a method on a SessionManager.");
+ Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall);
} catch (ScriptException e) {
- assert e.getMessage().contains(AllowEjbAccessPermission.class.getName());
+ checkIsDesiredSecurityException(e);
}
}
};
G manager = new G();
- manager.testInvoke("getLastAccess(0);");
+ manager.testInvoke("getlastAccess(0);");
manager.testInvoke("getOverlord()");
manager.testInvoke("getSubject(2);");
manager.testInvoke("invalidate(0);");
@@ -163,6 +128,57 @@ public class EjbAccessTest extends AbstractEJB3Test {
manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);");
}
+ public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "datasource = context.lookup('java:/RHQDS');\n"
+ + "con = datasource.getConnection();");
+
+ Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
+ public void testScriptCantUseEntityManager() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
+ + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
+
+ Assert.fail("The script shouldn't have been able to use the EntityManager.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+
+ //try harder with manually specifying the initial context factory
+ try {
+ engine.eval(""
+ + "env = new java.util.Hashtable();"
+ + "env.put('java.naming.factory.initial', 'org.jnp.interfaces.LocalOnlyContextFactory');"
+ + "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');"
+ + "context = new javax.naming.InitialContext(env);\n"
+ + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
+ + "entityManager = entityManagerFactory.createEntityManager();\n"
+ + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
+
+ Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory.");
+ } catch (ScriptException e) {
+ checkIsDesiredSecurityException(e);
+ }
+ }
+
private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
@@ -172,4 +188,11 @@ public class EjbAccessTest extends AbstractEJB3Test {
return new SandboxedScriptEngine(engine, perms);
}
+
+ private static void checkIsDesiredSecurityException(ScriptException e) {
+ String message = e.getMessage();
+ String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
+
+ Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
+ }
}
diff --git a/modules/enterprise/server/client-api/src/test/resources/META-INF/ejb-jar.xml b/modules/enterprise/server/client-api/src/test/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index caa7513..0000000
--- a/modules/enterprise/server/client-api/src/test/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0">
-
- <description>RHQ</description>
- <display-name>RHQ</display-name>
-
- <assembly-descriptor>
-
- <!-- This interceptor checks that the alert CLI scripts don't try to circumvent our access objects by accessing the local SLSB beans directly. -->
- <interceptor-binding>
- <ejb-name>*</ejb-name>
- <interceptor-class>org.rhq.enterprise.server.security.AllowEjbAccessInterceptor</interceptor-class>
- </interceptor-binding>
-
- <!-- all our EJB3 SLSBs can define custom @RequiredPermissions annotations for authorization checks-->
- <interceptor-binding>
- <ejb-name>*</ejb-name>
- <interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class>
- </interceptor-binding>
- <interceptor-binding>
- <ejb-name>*</ejb-name>
- <interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class>
- </interceptor-binding>
- <interceptor-binding>
- <ejb-name>*</ejb-name>
- <interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class>
- </interceptor-binding>
-
- </assembly-descriptor>
-
-</ejb-jar>
diff --git a/modules/enterprise/server/client-api/src/test/resources/META-INF/jboss.xml b/modules/enterprise/server/client-api/src/test/resources/META-INF/jboss.xml
deleted file mode 100644
index b7c5c66..0000000
--- a/modules/enterprise/server/client-api/src/test/resources/META-INF/jboss.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
- version="3.0">
-
- <enterprise-beans>
-
- <!--
- The AlertConditionLogManagerBean, AlertConditionManagerBean, AlertDampeningManagerBean,
- AlertDefinitionManagerBean, AlertManagerBean, AuthorizationManagerBean, CachedConditionManagerBean, and
- SubjectManager SLSB's are all invoked, either directly or indirectly, by the AlertConditionConsumerBean MDB.
- Since MDB invocations are always done in new threads, using the default SLSB pool impl (ThreadlocalPool) would
- cause a new instance of these SLSB's to be created every time they were invoked by AlertConditionConsumerBean.
- This would be bad if only because existing instances would
- not be reused, but it is really bad because the instances would also never get destroyed, causing heap space to
- gradually leak until the Server eventually ran out of memory. Hence, we must use a StrictMaxPool, which
- will use a fixed pool of instances of this SLSB, instead of a ThreadlocalPool. Because lots of alert
- definitions could result in many concurrent calls to AlertConditionConsumerBean, and because most of these
- SLSB's are also invoked by other callers (i.e. Agents, GUI's, or CLI's), we set the max pool size to 100 to
- minimize the chances of AlertConditionConsumerBean invocations, which are the most critical, from having to
- block and potentially getting backed up in the queue. We set the pool timeout extremely high to essentially
- prevent queued callers from timing out. Note, MDB's are configured in ejb3-interceptors-aop.xml to use a strict
- max pool with a max of 15 and a timeout of 10000, so AlertConditionConsumerBean might become a bottleneck for
- systems with a lot of alerts defined. (ips, 05/10/11)
-
- For more details, see https://bugzilla.redhat.com/show_bug.cgi?id=693232 .
- -->
-
- <session>
- <ejb-name>AlertConditionLogManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>100</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>AlertConditionManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>100</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>AlertDampeningManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>100</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>AlertDefinitionManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>100</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>AlertManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>100</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>AuthorizationManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>100</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>CachedConditionManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>100</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>SubjectManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>100</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
-
- <!--
- The CacheConsistencyManagerBean, CloudManagerBean, ServerManagerBean, StatusManagerBean, and SystemManagerBean
- SLSB's are all invoked, either directly or indirectly, by EJB timers. Since EJB timer invocations are always
- done in new threads, using the default SLSB pool impl (ThreadlocalPool) would cause a new instance of this
- SLSB to be created every time it was invoked by an EJB timer. This would be bad if only because an existing
- instance would not be reused, but it is really bad because the instance would also never get destroyed, causing
- heap space to gradually leak until the Server eventually ran out of memory. Hence, we must use a
- StrictMaxPool, which will use a fixed pool of instances of this SLSB, instead of a ThreadlocalPool.
- The timer invocations will only require one or two instances at any given time, but because most of these
- SLSB's are also invoked by other callers (i.e. Agents, GUI's, or CLI's, we set the max pool size to 30, to
- minimize the chances of EJB timer invocations, which are the most critical, from having to block and
- potentially getting backed up in the queue. We set the pool timeout extremely high to essentially prevent
- queued callers from timing out. (ips, 05/10/11)
-
- For more details, see https://bugzilla.redhat.com/show_bug.cgi?id=693232 .
- -->
-
- <session>
- <ejb-name>CacheConsistencyManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>30</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>CloudManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>30</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>ServerManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>30</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>StatusManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>30</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- <session>
- <ejb-name>SystemManagerBean</ejb-name>
- <pool-config>
- <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
- <pool-max-size>30</pool-max-size>
- <pool-timeout>1000000000</pool-timeout>
- </pool-config>
- </session>
-
- </enterprise-beans>
-
-</jboss>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index b832b06..9d7d603 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -39,6 +39,11 @@
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>4.2.2.GA</version>
+ </dependency>
</dependencies>
<profiles>
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java
new file mode 100644
index 0000000..df42afe
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java
@@ -0,0 +1,237 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+/**
+ * This is the "meat" of the RHQ's secured JNDI access. This {@link Context} decorator
+ * applied security checks in each method (lookups, (un)bindings, etc).
+ * <p>
+ * The security check consists of checking if the current callstack has the {@link AllowRhqServerInternalsAccessPermission}.
+ * <p>
+ * This decorator applies the security check on any JNDI name without a scheme and
+ * on any name that has a scheme listed in the {@link #checkedSchemes} list supplied
+ * in the constructor.
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingContextDecorator implements Context {
+
+ private static final AllowRhqServerInternalsAccessPermission PERM = new AllowRhqServerInternalsAccessPermission();
+ private Context original;
+ private List<String> checkedSchemes;
+
+ public AccessCheckingContextDecorator(Context original, String... checkedSchemes) {
+ this.original = original;
+ this.checkedSchemes = Arrays.asList(checkedSchemes);
+ }
+
+ private static void check() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) sm.checkPermission(PERM);
+ }
+
+ private void checkScheme(String scheme) {
+ if (scheme == null || checkedSchemes.contains(scheme)) {
+ check();
+ }
+ }
+
+ private void check(String name) {
+ checkScheme(getURLScheme(name));
+ }
+
+ private void check(Name name) {
+ if (name.size() == 0) {
+ check();
+ } else {
+ String first = name.get(0);
+ checkScheme(getURLScheme(first));
+ }
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ check(name);
+ return original.lookup(name);
+ }
+
+ public Object lookup(String name) throws NamingException {
+ check(name);
+ return original.lookup(name);
+ }
+
+ public void bind(Name name, Object obj) throws NamingException {
+ check(name);
+ original.bind(name, obj);
+ }
+
+ public void bind(String name, Object obj) throws NamingException {
+ check(name);
+ original.bind(name, obj);
+ }
+
+ public void rebind(Name name, Object obj) throws NamingException {
+ check(name);
+ original.rebind(name, obj);
+ }
+
+ public void rebind(String name, Object obj) throws NamingException {
+ check(name);
+ original.rebind(name, obj);
+ }
+
+ public void unbind(Name name) throws NamingException {
+ check(name);
+ original.unbind(name);
+ }
+
+ public void unbind(String name) throws NamingException {
+ check(name);
+ original.unbind(name);
+ }
+
+ public void rename(Name oldName, Name newName) throws NamingException {
+ check(oldName);
+ check(newName);
+ original.rename(oldName, newName);
+ }
+
+ public void rename(String oldName, String newName) throws NamingException {
+ check(oldName);
+ check(newName);
+ original.rename(oldName, newName);
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+ check(name);
+ return original.list(name);
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
+ check(name);
+ return original.list(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+ check(name);
+ return original.listBindings(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
+ check(name);
+ return original.listBindings(name);
+ }
+
+ public void destroySubcontext(Name name) throws NamingException {
+ check(name);
+ original.destroySubcontext(name);
+ }
+
+ public void destroySubcontext(String name) throws NamingException {
+ check(name);
+ original.destroySubcontext(name);
+ }
+
+ public Context createSubcontext(Name name) throws NamingException {
+ check(name);
+ return original.createSubcontext(name);
+ }
+
+ public Context createSubcontext(String name) throws NamingException {
+ check(name);
+ return original.createSubcontext(name);
+ }
+
+ public Object lookupLink(Name name) throws NamingException {
+ check(name);
+ return original.lookupLink(name);
+ }
+
+ public Object lookupLink(String name) throws NamingException {
+ check(name);
+ return original.lookupLink(name);
+ }
+
+ public NameParser getNameParser(Name name) throws NamingException {
+ check(name);
+ return original.getNameParser(name);
+ }
+
+ public NameParser getNameParser(String name) throws NamingException {
+ check(name);
+ return original.getNameParser(name);
+ }
+
+ public Name composeName(Name name, Name prefix) throws NamingException {
+ check(name);
+ return original.composeName(name, prefix);
+ }
+
+ public String composeName(String name, String prefix) throws NamingException {
+ check(name);
+ return original.composeName(name, prefix);
+ }
+
+ public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+ check();
+ return original.addToEnvironment(propName, propVal);
+ }
+
+ public Object removeFromEnvironment(String propName) throws NamingException {
+ check();
+ return original.removeFromEnvironment(propName);
+ }
+
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
+ check();
+ return original.getEnvironment();
+ }
+
+ public void close() throws NamingException {
+ check();
+ original.close();
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ check();
+ return original.getNameInNamespace();
+ }
+
+ //copied from InitialContext
+ private static String getURLScheme(String str) {
+ int colon_posn = str.indexOf(':');
+ int slash_posn = str.indexOf('/');
+
+ if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
+ return str.substring(0, colon_posn);
+ return null;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
new file mode 100644
index 0000000..1a9562a
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -0,0 +1,180 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.InitialContextFactoryBuilder;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jnp.interfaces.NamingContextFactory;
+
+/**
+ * This initial context factory builder is installed early on during the RHQ server startup
+ * and is later on used for obtaining the {@link Context}s for all JNDI lookups in the
+ * RHQ server.
+ * <p>
+ * We use a custom initial context factory builder to prevent the potential malicious 3rd party
+ * code (like CLI alert scripts) from supplying custom environment variables to {@link InitialContext}
+ * that would modify the JNDI lookup to skip our security access checks.
+ * <p>
+ * By using a builder we effectively take control of the initial context creation process
+ * and are free to ignore whatever the script is trying to supply.
+ * <p>
+ * This builder makes sure to install the RHQ server's security access checks to whatever
+ * initial context that is configured by the standard environment variables
+ * ({@link Context#INITIAL_CONTEXT_FACTORY}, etc.)
+ * <p>
+ * This class is heavily inspired by the implementation of a similar builder in JBoss AS 7.
+ *
+ * @see AllowRhqServerInternalsAccessPermission
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingInitialContextFactoryBuilder implements InitialContextFactoryBuilder {
+ private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
+
+ /**
+ * The list of JNDI name schemes that should be checked for security permissions
+ * (in addition to the names with no scheme).
+ *
+ * @see AccessCheckingContextDecorator
+ */
+ private static final String[] CHECKED_SCHEMES = { "java" };
+
+ private static final Set<InetAddress> SERVER_BIND_IPS;
+
+ static {
+ SERVER_BIND_IPS = new HashSet<InetAddress>();
+
+ try {
+ String bindingAddressString = System.getProperty("jboss.bind.address");
+ InetAddress bindingAddress = InetAddress.getByName(bindingAddressString);
+
+ if (bindingAddress.isAnyLocalAddress()) {
+ Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
+ while(ifaces.hasMoreElements()) {
+ NetworkInterface iface = ifaces.nextElement();
+ SERVER_BIND_IPS.addAll(Collections.list(iface.getInetAddresses()));
+ }
+ } else {
+ SERVER_BIND_IPS.add(bindingAddress);
+ }
+ } catch (SocketException e) {
+ LOG.error("Could not obtain the list of local IPs", e);
+ } catch (UnknownHostException e) {
+ LOG.error("Failed to get the binding address of the RHQ server.", e);
+ }
+
+ }
+
+ /**
+ * This is the default initial context factory that is returned when no other is
+ * configured using the environment variables.
+ * <p>
+ * It uses {@link NamingContextFactory} as the underlying mechanism - the same
+ * as the default configuration in JBoss 4.
+ */
+ private static final InitialContextFactory DEFAULT_FACTORY = new InitialContextFactory() {
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ return createSecureWrapper(new NamingContextFactory(), environment).getInitialContext(environment);
+ }
+ };
+
+ /**
+ * Create a InitialContext factory. If the environment does not override the factory class it will use the
+ * default context factory.
+ *
+ * @param environment The environment
+ * @return An initial context factory
+ * @throws NamingException If an error occurs loading the factory class.
+ */
+ public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> environment) throws NamingException {
+ final String factoryClassName = (String) environment.get(Context.INITIAL_CONTEXT_FACTORY);
+ if (factoryClassName == null) {
+ return DEFAULT_FACTORY;
+ }
+ final ClassLoader classLoader = getContextClassLoader();
+ try {
+ final Class<?> factoryClass = Class.forName(factoryClassName, true, classLoader);
+ InitialContextFactory configuredFactory = (InitialContextFactory) factoryClass.newInstance();
+ return createSecureWrapper(configuredFactory, environment);
+ } catch (Exception e) {
+ throw new NamingException("Failed instantiate InitialContextFactory " + factoryClassName
+ + " from classloader " + classLoader);
+ }
+ }
+
+ private ClassLoader getContextClassLoader() {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ private static InitialContextFactory createSecureWrapper(InitialContextFactory factory, Hashtable<?, ?> environment) {
+ String providerUrl = (String) environment.get(Context.PROVIDER_URL);
+
+ if (providerUrl == null) {
+ return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ } else {
+ try {
+ URI uri = new URI(providerUrl);
+ InetAddress providerHost = InetAddress.getByName(uri.getHost());
+
+ //check if we are accessing the RHQ server through some remoting
+ //interface.
+ //I just can't find where to read the magic number 1099 from.
+ //it is defined in the jboss config files, but in the code
+ //it seems hardcoded - see JDBCLoginModule.
+ if (uri.getPort() == 1099 && SERVER_BIND_IPS.contains(providerHost)) {
+ return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ } else {
+ return new URLPreferringInitialContextFactoryDecorator(factory);
+ }
+ } catch (URISyntaxException e) {
+ return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ } catch (UnknownHostException e) {
+ //let the factory deal with the unknown host...
+ //this most probably shouldn't be secured because localhost addresses
+ //should be resolvable.
+ return new URLPreferringInitialContextFactoryDecorator(factory);
+ }
+ }
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java
new file mode 100644
index 0000000..b23935f
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java
@@ -0,0 +1,60 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+/**
+ * A decorator of an {@link InitialContextFactory} that adds the security checking
+ * machinery to the returned initial contexts.
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingInitialContextFactoryDecorator extends URLPreferringInitialContextFactoryDecorator {
+
+ private final String[] checkedSchemes;
+
+ /**
+ * @param factory the factory to wrap
+ * @param checkedSchemes the list of JNDI name schemes to check for permissions
+ * @see AccessCheckingContextDecorator
+ */
+ public AccessCheckingInitialContextFactoryDecorator(InitialContextFactory factory, String... checkedSchemes) {
+ super(factory);
+ this.checkedSchemes = checkedSchemes;
+ }
+
+ /**
+ * @param environment the environment variables for the return {@link Context} to use
+ *
+ * @return the initial context returned by the decorated factory wrapped in
+ * {@link URLPreferringContext} and {@link AccessCheckingContextDecorator} in that
+ * order.
+ */
+ @Override
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ return new AccessCheckingContextDecorator(super.getInitialContext(environment), checkedSchemes);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java
new file mode 100644
index 0000000..aa807d6
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java
@@ -0,0 +1,36 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.security.BasicPermission;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AllowRhqServerInternalsAccessPermission extends BasicPermission {
+
+ private static final long serialVersionUID = 1L;
+
+ public AllowRhqServerInternalsAccessPermission() {
+ super("org.rhq.allow.server.internals.access");
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
new file mode 100644
index 0000000..b291c3e
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
@@ -0,0 +1,104 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.NamingManager;
+
+/**
+ * This is a modification of the default {@link InitialContext} class that
+ * ignores the initial context factory builder when constructing the default
+ * context to use in lookups etc.
+ * <p>
+ * This is important because RHQ server has its own initial context factory
+ * builder that creates factories that in turn create contexts. If the default
+ * {@link InitialContext} implementation was used, we'd end up with a stack overflow
+ * error caused by the callchain loop when the {@link InitialContext} would ask
+ * the builder for a factory that would create another context that would ask the
+ * builder for the factory, etc. ad infinitum.
+ * <p>
+ * This class prevents that by acting exactly like the InitialContext would if
+ * the initial context factory builder wasn't installed. This enables the callers
+ * to still use the standard InitialContext when doing lookups etc. This standard
+ * initial context will ask our initial context factory builder which will then
+ * in chain create this {@link URLPreferringContext} that behaves like the original
+ * InitialContext would if the builder wasn't there.
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContext extends InitialContext {
+
+ public URLPreferringContext(InitialContextFactory defaultContextFactory) throws NamingException {
+ super(true);
+ this.defaultInitCtx = defaultContextFactory.getInitialContext(null);
+ this.gotDefault = true;
+ init(null);
+ }
+
+ public URLPreferringContext(Hashtable<?, ?> environment, InitialContextFactory defaultContextFactory) throws NamingException {
+ super(true);
+ this.defaultInitCtx = defaultContextFactory.getInitialContext(environment);
+ this.gotDefault = true;
+ init(environment);
+ }
+
+ @Override
+ protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
+ if (name.size() > 0) {
+ String first = name.get(0);
+ String scheme = getURLScheme(first);
+ if (scheme != null) {
+ Context ctx = NamingManager.getURLContext(scheme, myProps);
+ if (ctx != null) {
+ return ctx;
+ }
+ }
+ }
+ return getDefaultInitCtx();
+ }
+
+ @Override
+ protected Context getURLOrDefaultInitCtx(String name) throws NamingException {
+ String scheme = getURLScheme(name);
+ if (scheme != null) {
+ Context ctx = NamingManager.getURLContext(scheme, myProps);
+ if (ctx != null) {
+ return ctx;
+ }
+ }
+ return getDefaultInitCtx();
+ }
+
+ //copied from InitialContext
+ private static String getURLScheme(String str) {
+ int colon_posn = str.indexOf(':');
+ int slash_posn = str.indexOf('/');
+
+ if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
+ return str.substring(0, colon_posn);
+ return null;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
new file mode 100644
index 0000000..6c311c7
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
@@ -0,0 +1,54 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+/**
+ * A decorator of an {@link InitialContextFactory} that returns an {@link URLPreferringContext}
+ * backed by the wrapped initial context factory.
+ * <p>
+ * This is to support contexts that don't need to be secured, yet we need to make sure to
+ * break the call-chain loop caused by the {@link InitialContext} asking the RHQ's {@link AccessCheckingInitialContextFactoryBuilder} for
+ * default contexts.
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringInitialContextFactoryDecorator implements InitialContextFactory {
+
+ private final InitialContextFactory factory;
+
+ public URLPreferringInitialContextFactoryDecorator(InitialContextFactory factory) {
+ this.factory = factory;
+ }
+
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ return new URLPreferringContext(environment, getFactory());
+ }
+
+ protected InitialContextFactory getFactory() {
+ return factory;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
new file mode 100644
index 0000000..d938c50
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
@@ -0,0 +1,45 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.mbean;
+
+import javax.naming.spi.NamingManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingInitialContextFactoryBuilderInstaller implements AccessCheckingInitialContextFactoryBuilderInstallerMBean {
+ private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
+
+ public void start() throws Exception {
+ LOG.info("Installing RHQ's access permission checking initial context factory builder");
+
+ NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
+ }
+
+ public void stop() throws Exception {
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java
new file mode 100644
index 0000000..87d19ab
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java
@@ -0,0 +1,32 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.mbean;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public interface AccessCheckingInitialContextFactoryBuilderInstallerMBean {
+
+ void start() throws Exception;
+
+ void stop() throws Exception;
+}
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
index 859b552..f231f15 100644
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
+++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
@@ -225,6 +225,13 @@
<!-- JNDI -->
<!-- ==================================================================== -->
+ <!-- This installs a custom initial context factory builder into the JVM
+ that will ensure that all the default InitialContexts are going to check
+ for the permission to access the RHQ internals. -->
+ <mbean code="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
+ name="org.rhq:service=AccessCheckingInitialContextFactoryBuilderInstaller">
+ </mbean>
+
<!-- A simple mbean wrapper around the jndi Naming object. This
only handles an in memory instance. The NamingService uses this
as the JNDI store and exposes it remotely.
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index db286a1..a876809 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -78,6 +78,13 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>com.googlecode.java-diff-utils</groupId>
<artifactId>diffutils</artifactId>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
index b4a19b7..ecf2f6f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.Random;
import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.server.security.AllowEjbAccessPermission;
import org.rhq.enterprise.server.util.LookupUtil;
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
/**
* This is the JON Server's own session ID generator. It is outside any container-provided session mechanism. Its sole
@@ -45,7 +45,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
public final class SessionManager {
- private static final AllowEjbAccessPermission ACCESS_PERMISSION = new AllowEjbAccessPermission();
+ private static final AllowRhqServerInternalsAccessPermission ACCESS_PERMISSION = new AllowRhqServerInternalsAccessPermission();
/**
* Our source for random session IDs.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessInterceptor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessInterceptor.java
deleted file mode 100644
index 350453fb..0000000
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessInterceptor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.security;
-
-import java.security.Permission;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AllowEjbAccessInterceptor {
-
- private static final Permission PERM = new AllowEjbAccessPermission();
-
- @AroundInvoke
- public Object intercept(InvocationContext invocationContext) throws Exception {
- //check that the caller has permissions to access the EJBs.
- //normal code does, only alert CLI scripts that try to circumvent our
- //manager proxies don't.
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(PERM);
-
- return invocationContext.proceed();
- }
-}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessPermission.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessPermission.java
deleted file mode 100644
index 67f418d..0000000
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessPermission.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.security;
-
-import java.security.BasicPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AllowEjbAccessPermission extends BasicPermission {
-
- private static final long serialVersionUID = 1L;
-
- public AllowEjbAccessPermission() {
- super("rhq.allow.ejb.access");
- }
-}
diff --git a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
index caa7513..8222948 100644
--- a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
+++ b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
@@ -9,12 +9,6 @@
<assembly-descriptor>
- <!-- This interceptor checks that the alert CLI scripts don't try to circumvent our access objects by accessing the local SLSB beans directly. -->
- <interceptor-binding>
- <ejb-name>*</ejb-name>
- <interceptor-class>org.rhq.enterprise.server.security.AllowEjbAccessInterceptor</interceptor-class>
- </interceptor-binding>
-
<!-- all our EJB3 SLSBs can define custom @RequiredPermissions annotations for authorization checks-->
<interceptor-binding>
<ejb-name>*</ejb-name>
diff --git a/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml b/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
index 05edefa..85e2fb3 100644
--- a/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
+++ b/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
@@ -4,6 +4,14 @@
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- This installs a custom initial context factory builder into the JVM
+ that will ensure that all the default InitialContexts are going to check
+ for the permission to access the RHQ internals. -->
+ <bean class="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
+ name="AccessCheckingInitialContextFactoryBuilderInstaller">
+ </bean>
+
+
<bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
<bean name="InitialContextProperties" class="java.util.Hashtable">
@@ -20,7 +28,7 @@
</entry>
</map>
</parameter>
- </constructor>
+ </constructor>
</bean>
<bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
commit 572db8ca18f25bea345b03243bf9b9bb8d9bdf8a
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 19 10:34:58 2011 -0500
Adding/updating javadocs
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java
index ac707cc..5a79413 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java
@@ -140,8 +140,28 @@ public interface DriftManagerLocal extends DriftManagerRemote {
void updateDriftDefinition(Subject subject, DriftDefinition driftDefinition);
/**
- * Update the provided driftDef (identified by name) on the specified EntityContext. If it exists it will be replaced. If not it will
- * be added. Agents, if available, will be notified of the change.
+ * <p>
+ * Saves or updates the provided drift definition. If the definition, identified by name, already exists, an update
+ * is performed; otherwise, a new drift definition is saved. Agents if available will be notified of the change.
+ * If agents are unreachable, the definition will still be saved/updated. Changes will then propagate to agents
+ * the next time they do an inventory sync.
+ * </p>
+ * <p>
+ * Several validation checks are performed before the definition is persisted. If it is a new definition, the
+ * following checks are performed:
+ * <ul>
+ * <li>Verify that the resource supports drift management</li>
+ * <li>Verify that the template (if specified) already exists in the database</li>
+ * <li>Verify that the template (if specified) belongs to the correct resource type</li>
+ * </ul>
+ * For new and existing definitions these additional checks are performed:
+ * <ul>
+ * <li>Verify that the definition name does not contain illegal characters</li>
+ * <li>Verify that the base directory does not contain illegal characters</li>
+ * <li>Verify that filters do not contain illegal characters</li>
+ * </ul>
+ * </p>
+ *
* @param subject
* @param entityContext
* @param driftDef
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
index 1d3dc82..a39108e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
@@ -119,5 +119,32 @@ public interface DriftManagerRemote {
void pinSnapshot(Subject subject, int driftDefId, int snapshotVersion);
- void updateDriftDefinition(Subject subject, EntityContext entityContext, DriftDefinition driftConfig);
+ /**
+ * <p>
+ * Saves or updates the provided drift definition. If the definition, identified by name, already exists, an update
+ * is performed; otherwise, a new drift definition is saved. Agents if available will be notified of the change.
+ * If agents are unreachable, the definition will still be saved/updated. Changes will then propagate to agents
+ * the next time they do an inventory sync.
+ * </p>
+ * <p>
+ * Several validation checks are performed before the definition is persisted. If it is a new definition, the
+ * following checks are performed:
+ * <ul>
+ * <li>Verify that the resource supports drift management</li>
+ * <li>Verify that the template (if specified) already exists in the database</li>
+ * <li>Verify that the template (if specified) belongs to the correct resource type</li>
+ * </ul>
+ * For new and existing definitions these additional checks are performed:
+ * <ul>
+ * <li>Verify that the definition name does not contain illegal characters</li>
+ * <li>Verify that the base directory does not contain illegal characters</li>
+ * <li>Verify that filters do not contain illegal characters</li>
+ * </ul>
+ * </p>
+ *
+ * @param subject
+ * @param entityContext
+ * @param driftDef
+ */
+ void updateDriftDefinition(Subject subject, EntityContext entityContext, DriftDefinition driftDef);
}
commit 4a37ccc0f13f860f4e4831eac70431ad6beaa8a7
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 19 09:34:47 2011 -0500
Commenting out tests that I added for BZ 768099
I ran into an issue where TestNG executes method in an unexpected order
that causes tests to fail.
http://groups.google.com/group/testng-users/browse_thread/thread/da2790679a…
provides some more background on the issue.
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
index ac55445..36ff31f 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
@@ -26,16 +26,12 @@ import org.rhq.core.domain.criteria.JPADriftChangeSetCriteria;
import org.rhq.core.domain.drift.*;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.domain.shared.ResourceBuilder;
-import org.rhq.core.domain.shared.ResourceTypeBuilder;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
import org.rhq.test.AssertUtils;
import org.rhq.test.TransactionCallback;
import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import javax.ejb.EJBException;
import javax.persistence.EntityManager;
import java.util.ArrayList;
import java.util.List;
@@ -47,7 +43,6 @@ import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
import static org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext.fileSystem;
import static org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode.normal;
import static org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode.BOTH_BASE_INFO_AND_DIRECTORY_SPECIFICATIONS;
-import static org.rhq.core.domain.resource.ResourceCategory.SERVER;
import static org.rhq.enterprise.server.util.LookupUtil.getDriftManager;
import static org.rhq.enterprise.server.util.LookupUtil.getDriftTemplateManager;
@@ -104,51 +99,60 @@ public class ManageDriftDefinitionsTest extends DriftServerTest {
assertEquals("The template association was not set on the definition", template, newDef.getTemplate());
}
- public void createEntitiesThatDoNotSupportDrift() {
- // first create the resource type that does not support drift
- driftNotSupportedType = new ResourceTypeBuilder()
- .createResourceType()
- .withId(0)
- .withName(DRIFT_NOT_SUPPORTED_TYPE)
- .withCategory(SERVER)
- .withPlugin(DRIFT_NOT_SUPPORTED_TYPE.toLowerCase())
- .build();
-
- // create a resource of the type that does not support drift
- driftNotSupportedResource = new ResourceBuilder()
- .createResource()
- .withId(0)
- .withName(DRIFT_NOT_SUPPORTED_RESOURCE)
- .withResourceKey(DRIFT_NOT_SUPPORTED_RESOURCE)
- .withRandomUuid()
- .withResourceType(driftNotSupportedType)
- .build();
-
- executeInTransaction(new TransactionCallback() {
- @Override
- public void execute() throws Exception {
- EntityManager em = getEntityManager();
- em.persist(driftNotSupportedType);
- em.persist(driftNotSupportedResource);
- }
- });
- }
-
- @Test(dependsOnMethods = "createEntitiesThatDoNotSupportDrift",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*Cannot create drift definition.*type.*does not support drift management")
- @InitDB(false)
- public void doNotAllowDefinitionToBeCreatedForTypeThatDoesNotSupportDrift() {
- DriftDefinition driftDef = new DriftDefinition(new Configuration());
- driftDef.setName("test_typeDoesNotSupportDrift");
- driftDef.setEnabled(true);
- driftDef.setInterval(1800L);
- driftDef.setDriftHandlingMode(normal);
- driftDef.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
-
- driftMgr.updateDriftDefinition(getOverlord(), EntityContext.forResource(driftNotSupportedResource.getId()),
- driftDef);
- }
+ // The following two tests are commented out because when they are enabled
+ // and all tests in the itests module are run, the @AfterClass method for
+ // DriftTemplateManagerBeanTest does not run immediately after all of its
+ // test methods have finished running. Instead, some of the tests in
+ // ManageDriftDefinitionsTest start running. This leads to some database
+ // constraint violations because of how agents are created in the parent
+ // class, DriftServerTest. See http://groups.google.com/group/testng-users/browse_thread/thread/da2790679a…
+ // more info on the order in which TestNG executes tests.
+
+// public void createEntitiesThatDoNotSupportDrift() {
+// // first create the resource type that does not support drift
+// driftNotSupportedType = new ResourceTypeBuilder()
+// .createResourceType()
+// .withId(0)
+// .withName(DRIFT_NOT_SUPPORTED_TYPE)
+// .withCategory(SERVER)
+// .withPlugin(DRIFT_NOT_SUPPORTED_TYPE.toLowerCase())
+// .build();
+//
+// // create a resource of the type that does not support drift
+// driftNotSupportedResource = new ResourceBuilder()
+// .createResource()
+// .withId(0)
+// .withName(DRIFT_NOT_SUPPORTED_RESOURCE)
+// .withResourceKey(DRIFT_NOT_SUPPORTED_RESOURCE)
+// .withRandomUuid()
+// .withResourceType(driftNotSupportedType)
+// .build();
+//
+// executeInTransaction(new TransactionCallback() {
+// @Override
+// public void execute() throws Exception {
+// EntityManager em = getEntityManager();
+// em.persist(driftNotSupportedType);
+// em.persist(driftNotSupportedResource);
+// }
+// });
+// }
+//
+// @Test(dependsOnMethods = "createEntitiesThatDoNotSupportDrift",
+// expectedExceptions = EJBException.class,
+// expectedExceptionsMessageRegExp = ".*Cannot create drift definition.*type.*does not support drift management")
+// @InitDB(false)
+// public void doNotAllowDefinitionToBeCreatedForTypeThatDoesNotSupportDrift() {
+// DriftDefinition driftDef = new DriftDefinition(new Configuration());
+// driftDef.setName("test_typeDoesNotSupportDrift");
+// driftDef.setEnabled(true);
+// driftDef.setInterval(1800L);
+// driftDef.setDriftHandlingMode(normal);
+// driftDef.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
+//
+// driftMgr.updateDriftDefinition(getOverlord(), EntityContext.forResource(driftNotSupportedResource.getId()),
+// driftDef);
+// }
@SuppressWarnings("unchecked")
public void createDefinitionFromPinnedTemplate() throws Exception {
commit 615c99b2a0d856b316b558a4e6fd7989b4004a15
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 19 09:20:56 2011 -0500
[BZ 768099] Add validation checks when creating a drift definition
The following validation checks have been added:
* verify that the resource supports drift management
* verify that the template attached to the def exists in the db
* verify that that the template is from the correct resource type
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
index 6e93bb3..ac55445 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java
@@ -19,56 +19,64 @@
package org.rhq.enterprise.server.drift;
+import org.rhq.core.domain.common.EntityContext;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
+import org.rhq.core.domain.criteria.JPADriftChangeSetCriteria;
+import org.rhq.core.domain.drift.*;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.shared.ResourceBuilder;
+import org.rhq.core.domain.shared.ResourceTypeBuilder;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
+import org.rhq.test.AssertUtils;
+import org.rhq.test.TransactionCallback;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import javax.ejb.EJBException;
+import javax.persistence.EntityManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import static java.util.Arrays.asList;
import static org.rhq.core.domain.drift.DriftCategory.FILE_ADDED;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
import static org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext.fileSystem;
import static org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode.normal;
import static org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode.BOTH_BASE_INFO_AND_DIRECTORY_SPECIFICATIONS;
+import static org.rhq.core.domain.resource.ResourceCategory.SERVER;
import static org.rhq.enterprise.server.util.LookupUtil.getDriftManager;
import static org.rhq.enterprise.server.util.LookupUtil.getDriftTemplateManager;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.persistence.EntityManager;
-
-import org.testng.annotations.BeforeClass;
+public class ManageDriftDefinitionsTest extends DriftServerTest {
-import org.rhq.core.domain.common.EntityContext;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
-import org.rhq.core.domain.criteria.JPADriftChangeSetCriteria;
-import org.rhq.core.domain.drift.Drift;
-import org.rhq.core.domain.drift.DriftChangeSet;
-import org.rhq.core.domain.drift.DriftComplianceStatus;
-import org.rhq.core.domain.drift.DriftConfigurationDefinition;
-import org.rhq.core.domain.drift.DriftDefinition;
-import org.rhq.core.domain.drift.DriftDefinitionComparator;
-import org.rhq.core.domain.drift.DriftDefinitionTemplate;
-import org.rhq.core.domain.drift.DriftSnapshot;
-import org.rhq.core.domain.drift.JPADrift;
-import org.rhq.core.domain.drift.JPADriftChangeSet;
-import org.rhq.core.domain.drift.JPADriftFile;
-import org.rhq.core.domain.drift.JPADriftSet;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
-import org.rhq.test.AssertUtils;
-import org.rhq.test.TransactionCallback;
+ private final String DRIFT_NOT_SUPPORTED_TYPE = getClass().getSimpleName() + "DRIFT_NOT_SUPPORTED_RESOURCE_TYPE";
-public class ManageDriftDefinitionsTest extends DriftServerTest {
+ private final String DRIFT_NOT_SUPPORTED_RESOURCE = getClass().getSimpleName() + "DRIFT_NOT_SUPPORTED_RESOURCE";
private DriftManagerLocal driftMgr;
private DriftTemplateManagerLocal templateMgr;
+ private ResourceType driftNotSupportedType;
+
+ private Resource driftNotSupportedResource;
+
@BeforeClass
public void initClass() throws Exception {
driftMgr = getDriftManager();
templateMgr = getDriftTemplateManager();
}
+ @Override
+ protected void purgeDB(EntityManager em) {
+ deleteEntity(Resource.class, DRIFT_NOT_SUPPORTED_RESOURCE, em);
+ deleteEntity(ResourceType.class, DRIFT_NOT_SUPPORTED_TYPE, em);
+ }
+
public void createDefinitionFromUnpinnedTemplate() {
// first create a template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
@@ -96,6 +104,52 @@ public class ManageDriftDefinitionsTest extends DriftServerTest {
assertEquals("The template association was not set on the definition", template, newDef.getTemplate());
}
+ public void createEntitiesThatDoNotSupportDrift() {
+ // first create the resource type that does not support drift
+ driftNotSupportedType = new ResourceTypeBuilder()
+ .createResourceType()
+ .withId(0)
+ .withName(DRIFT_NOT_SUPPORTED_TYPE)
+ .withCategory(SERVER)
+ .withPlugin(DRIFT_NOT_SUPPORTED_TYPE.toLowerCase())
+ .build();
+
+ // create a resource of the type that does not support drift
+ driftNotSupportedResource = new ResourceBuilder()
+ .createResource()
+ .withId(0)
+ .withName(DRIFT_NOT_SUPPORTED_RESOURCE)
+ .withResourceKey(DRIFT_NOT_SUPPORTED_RESOURCE)
+ .withRandomUuid()
+ .withResourceType(driftNotSupportedType)
+ .build();
+
+ executeInTransaction(new TransactionCallback() {
+ @Override
+ public void execute() throws Exception {
+ EntityManager em = getEntityManager();
+ em.persist(driftNotSupportedType);
+ em.persist(driftNotSupportedResource);
+ }
+ });
+ }
+
+ @Test(dependsOnMethods = "createEntitiesThatDoNotSupportDrift",
+ expectedExceptions = EJBException.class,
+ expectedExceptionsMessageRegExp = ".*Cannot create drift definition.*type.*does not support drift management")
+ @InitDB(false)
+ public void doNotAllowDefinitionToBeCreatedForTypeThatDoesNotSupportDrift() {
+ DriftDefinition driftDef = new DriftDefinition(new Configuration());
+ driftDef.setName("test_typeDoesNotSupportDrift");
+ driftDef.setEnabled(true);
+ driftDef.setInterval(1800L);
+ driftDef.setDriftHandlingMode(normal);
+ driftDef.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
+
+ driftMgr.updateDriftDefinition(getOverlord(), EntityContext.forResource(driftNotSupportedResource.getId()),
+ driftDef);
+ }
+
@SuppressWarnings("unchecked")
public void createDefinitionFromPinnedTemplate() throws Exception {
// We first need to create a pinned template. Users can only create a pinned
@@ -209,8 +263,19 @@ public class ManageDriftDefinitionsTest extends DriftServerTest {
}
public void unpinDefinition() {
+ // First create the template
+ final DriftDefinition templateDef = new DriftDefinition(new Configuration());
+ templateDef.setName("test_unpin_def_template");
+ templateDef.setEnabled(true);
+ templateDef.setDriftHandlingMode(normal);
+ templateDef.setInterval(2400L);
+ templateDef.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
+
+ final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(), resourceType.getId(), true,
+ templateDef);
+
// First create the definition
- DriftDefinition definition = new DriftDefinition(new Configuration());
+ DriftDefinition definition = template.createDefinition();
definition.setName("test_unpin");
definition.setEnabled(true);
definition.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index 12c7233..3da8bd2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -18,73 +18,25 @@
*/
package org.rhq.enterprise.server.drift;
-import static java.util.Arrays.asList;
-import static javax.ejb.TransactionAttributeType.NOT_SUPPORTED;
-import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.core.domain.drift.DriftComplianceStatus.IN_COMPLIANCE;
-import static org.rhq.core.domain.drift.DriftComplianceStatus.OUT_OF_COMPLIANCE_DRIFT;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
import difflib.DiffUtils;
import difflib.Patch;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Hibernate;
-
import org.jboss.remoting.CannotConnectException;
-
import org.rhq.core.clientapi.agent.drift.DriftAgentService;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.EntityContext;
-import org.rhq.core.domain.criteria.DriftChangeSetCriteria;
-import org.rhq.core.domain.criteria.DriftCriteria;
-import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
-import org.rhq.core.domain.criteria.GenericDriftChangeSetCriteria;
-import org.rhq.core.domain.criteria.GenericDriftCriteria;
-import org.rhq.core.domain.drift.Drift;
-import org.rhq.core.domain.drift.DriftCategory;
-import org.rhq.core.domain.drift.DriftChangeSet;
-import org.rhq.core.domain.drift.DriftChangeSetCategory;
-import org.rhq.core.domain.drift.DriftComplianceStatus;
-import org.rhq.core.domain.drift.DriftComposite;
-import org.rhq.core.domain.drift.DriftConfigurationDefinition;
+import org.rhq.core.domain.criteria.*;
+import org.rhq.core.domain.drift.*;
import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode;
-import org.rhq.core.domain.drift.DriftDefinition;
import org.rhq.core.domain.drift.DriftDefinition.BaseDirectory;
-import org.rhq.core.domain.drift.DriftDefinitionComparator;
import org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode;
-import org.rhq.core.domain.drift.DriftDefinitionComposite;
-import org.rhq.core.domain.drift.DriftDefinitionTemplate;
-import org.rhq.core.domain.drift.DriftDetails;
-import org.rhq.core.domain.drift.DriftFile;
-import org.rhq.core.domain.drift.DriftSnapshot;
-import org.rhq.core.domain.drift.DriftSnapshotRequest;
-import org.rhq.core.domain.drift.FileDiffReport;
-import org.rhq.core.domain.drift.Filter;
import org.rhq.core.domain.drift.dto.DriftChangeSetDTO;
import org.rhq.core.domain.drift.dto.DriftDTO;
import org.rhq.core.domain.drift.dto.DriftFileDTO;
import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
@@ -103,6 +55,28 @@ import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
import org.rhq.enterprise.server.util.CriteriaQueryRunner;
import org.rhq.enterprise.server.util.LookupUtil;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.jms.*;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.io.File;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static java.util.Arrays.asList;
+import static javax.ejb.TransactionAttributeType.NOT_SUPPORTED;
+import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftComplianceStatus.IN_COMPLIANCE;
+import static org.rhq.core.domain.drift.DriftComplianceStatus.OUT_OF_COMPLIANCE_DRIFT;
+
+import java.lang.IllegalStateException;
+
/**
* The SLSB supporting Drift management to clients.
*
@@ -716,7 +690,6 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@Override
public void updateDriftDefinition(Subject subject, EntityContext entityContext, DriftDefinition driftDef) {
-
// before we do anything, validate certain field values to prevent downstream errors
validateDriftDefinition(driftDef);
@@ -728,6 +701,11 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
throw new IllegalArgumentException("Entity not found [" + entityContext + "]");
}
+ if (!isDriftMgmtSupported(resource)) {
+ throw new IllegalArgumentException("Cannot create drift definition. The resource type " +
+ resource.getResourceType() + " does not support drift management");
+ }
+
// Update or add the driftDef as necessary
DriftDefinitionComparator comparator = new DriftDefinitionComparator(
CompareMode.ONLY_DIRECTORY_SPECIFICATIONS);
@@ -752,6 +730,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
}
if (!isUpdated) {
+ validateTemplateForNewDef(driftDef, resource);
resource.addDriftDefinition(driftDef);
// We call persist here because if this definition is created
// from a pinned template, then we need to generate the initial
@@ -826,6 +805,32 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
}
}
+ private boolean isDriftMgmtSupported(Resource resource) {
+ ResourceType type = resource.getResourceType();
+ return type.getDriftDefinitionTemplates() != null && !type.getDriftDefinitionTemplates().isEmpty();
+ }
+
+ private void validateTemplateForNewDef(DriftDefinition driftDef, Resource resource) {
+ if (driftDef.getTemplate() == null) {
+ return;
+ }
+
+ DriftDefinitionTemplate template = entityManager.find(DriftDefinitionTemplate.class,
+ driftDef.getTemplate().getId());
+
+ if (template == null) {
+ throw new IllegalArgumentException("Cannot create drift definition with template " +
+ DriftDefinitionTemplate.class.getSimpleName() + "[" + driftDef.getTemplate().getName() +
+ "] that has not been saved");
+ }
+
+ if (!template.getResourceType().equals(resource.getResourceType())) {
+ throw new IllegalArgumentException("Cannot create drift definition with template " +
+ DriftDefinitionTemplate.class.getSimpleName() + "[" + driftDef.getTemplate().getName() +
+ "] that is from a different resource type, " + template.getResourceType());
+ }
+ }
+
@Override
public boolean isBinaryFile(Subject subject, Drift<?, ?> drift) {
return DriftUtil.isBinaryFile(drift);
commit 95df570457b745fc77231ea8ffa86ac82b6063e4
Author: Fusayuki Minamoto <fminamot(a)redhat.com>
Date: Mon Dec 19 10:19:02 2011 +0100
Translate remaining properties
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 67d4a7f..41a33be 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -425,7 +425,7 @@ view_adminRoles_permissions_permDesc_manageBundles = (誰でも閲覧可能な)
view_adminRoles_permissions_permDesc_manageInventory = すべてのリソースについて、以下に示すように、すべてのリソース権限を持ちます。つまり、グループの作成、更新、削除、そして自動検出された、または手動で検出されたリソースのインポートができます
view_adminRoles_permissions_permDesc_manageRepositories = (自分自身のリポジトリを作成可能な)ユーザーのリポジトリの作成、更新、削除が可能です。
view_adminRoles_permissions_permDesc_manageSecurity = (誰でも閲覧可能な)ユーザーとロールの作成、更新、削除
-## view_adminRoles_permissions_permDesc_manageSettings = RHQサーバー構成の修正と任意のサーバー関連の機能の実行ができます
+view_adminRoles_permissions_permDesc_manageSettings = {0}サーバーの修正と任意のサーバー関連の機能の実行ができます
view_adminRoles_permissions_permReadDesc_configure = リソース構成とリソース構成リビジョン履歴の閲覧
view_adminRoles_permissions_permReadDesc_control = 利用可能オペレーションとオペレーション実行履歴の(暗黙的な)閲覧
view_adminRoles_permissions_permReadDesc_createChildResources = (暗黙的な)子リソースの作成履歴の閲覧
@@ -496,30 +496,30 @@ view_admin_configuration = 構成
view_admin_content = コンテント
view_admin_downloads_agentDownload = エージェントのダウンロード
view_admin_downloads_agent_buildNumber = エージェントビルド
-## view_admin_downloads_agent_help = <p> これはRHQ Agentの更新バイナリJARファイルです。このJARファイルの目的はユーザーがエージェントがまだ存在しないマシン上に新しいエージェントをインストールできるようにすることと、すでにインストール済みのエージェントを更新できるようにするためです。詳細は、このエージェントダウンロードJARで次のように--helpコマンドラインオプションをつけて実行してください。<br/> <b>java -jar <agent-download.jar> --help</b> </p> <h3>エージェントのインストール</h3> <p> <b>java -jar <agent-download.jar> --install[=<新しいエージェントディレクトリ>]</b><br/> このコマンドは新しいエージェントをインストールします。もし新しいディレクトリを指定しなければ、デフォルトは"."となります。</p> <h3>エージェントの更新</h3> <p> <b>java -jar <agent-download.jar> --update[=<古いエージェントディレクトリ>]</b><br/> これはすでにインストールされた既存のエージェントを更新します。もし古い、既存のエージェントがインストールされたディレクトリを指定しなかったなら、"rhq-agent"が仮定されます。</p>
+view_admin_downloads_agent_help = <p> これは {0} Agentの更新バイナリJARファイルです。このJARファイルの目的はユーザーがエージェントがまだ存在しないマシン上に新しいエージェントをインストールできるようにすることと、すでにインストール済みのエージェントを更新できるようにするためです。詳細は、このエージェントダウンロードJARで次のように--helpコマンドラインオプションをつけて実行してください。<br/> <b>java -jar <agent-download.jar> --help</b> </p> <h3>エージェントのインストール</h3> <p> <b>java -jar <agent-download.jar> --install[=<新しいエージェントディレクトリ>]</b><br/> このコマンドは新しいエージェントをインストールします。もし新しいディレクトリを指定しなければ、デフォルトは"."となります。</p> <h3>エージェントの更新</h3> <p> <b>java -jar <agent-download.jar> --update[=<古いエージェントディレクトリ>]</b><br/> これはすでにインストールされた既存のエージェントを更新します。もし古い、既存のエージェントがインストールされたディレクトリを指定しなかったなら、"rhq-agent"が仮定されます。</p>
view_admin_downloads_agent_link_label = リンク
view_admin_downloads_agent_link_value = エージェント {0} ({1}) のダウンロード
view_admin_downloads_agent_loadError = エージェントバージョン情報が取得できません
view_admin_downloads_agent_md5 = エージェント MD5
view_admin_downloads_agent_version = エージェントバージョン
view_admin_downloads_bundleDownload = バンドルデプロイヤのダウンロード
-## view_admin_downloads_bundle_help = <p> これはバンドルデプロイヤツールで、開発者とRHQバンドルによって使われます。このスタンドアロンツールを使うとバンドルやコンソールからのレシピをテストできるようにします。</p>
+view_admin_downloads_bundle_help = <p> これはバンドルデプロイヤツールで、{0}バンドルの開発者とパッケージ開発者によって使われます。このスタンドアロンツールを使うとバンドルやコンソールからのレシピをテストできるようにします。</p>
view_admin_downloads_bundle_link_label = リンク
view_admin_downloads_bundle_link_value = バンドルデプロイヤー {0} をダウンロード
view_admin_downloads_bundle_loadError = バンドルデプロイヤー情報が取得できません
view_admin_downloads_cliDownload = コマンドラインクライアントのダウンロード
view_admin_downloads_cli_buildNumber = CLIビルド
-## view_admin_downloads_cli_help = <p> これはコマンドラインツールで、CLIとして知られているものです。コンソールから実行するスタンドアロンツールで、RHQサーバーに対してコマンドラインインタフェースを提供します。自動化されたタスクを実行するためにCLIやrunスクリプトを介してコマンドを呼び出すことが可能です。CLIのインストール方法と使い方についての詳細情報はドキュメントをご覧ください。</p>
+view_admin_downloads_cli_help = <p> これはコマンドラインツールで、CLIとして知られているものです。コンソールから実行するスタンドアロンツールで、{0}サーバーに対してコマンドラインインタフェースを提供します。自動化されたタスクを実行するためにCLIやrunスクリプトを介してコマンドを呼び出すことが可能です。CLIのインストール方法と使い方についての詳細情報はドキュメントをご覧ください。</p>
view_admin_downloads_cli_link_label = リンク
view_admin_downloads_cli_link_value = CLI {0} ({1}) をダウンロード
view_admin_downloads_cli_loadError = CLIバージョン情報が取得できません
view_admin_downloads_cli_md5 = CLI MD5
view_admin_downloads_cli_version = CLIバージョン
view_admin_downloads_connectorsDownload = コネクタのダウンロード
-## view_admin_downloads_connectors_help = コネクターは製品がRHQによって管理可能であるために必要となるソフトウェアです。RHQエージェントが通信できるように、管理製品にコネクターをインストールします。詳細はドキュメントをご覧ください。
+view_admin_downloads_connectors_help = コネクターは製品が{0}によって管理可能であるために必要となるソフトウェアです。RHQエージェントが通信できるように、管理製品にコネクターをインストールします。詳細はドキュメントをご覧ください。
view_admin_downloads_connectors_loadError = コネクター情報を取得できません
view_admin_downloads_connectors_none = ダウンロードのためのコネクターが見つかりません
-## view_admin_landing = このセクションにおいて、RHQグローバル設定が管理されます。これはセキュリティ構成、プラグイン設定、RHQサーバーとエージェントの管理を含みます。
+view_admin_landing = このセクションにおいて、{0}グローバル設定が管理されます。これはセキュリティ構成、プラグイン設定、RHQサーバーとエージェントの管理を含みます。
view_admin_measTemplates_updateExisting_title = 既存スケジュールの更新
view_admin_measTemplates_updateExisting_tooltip = このボックスをチェックすると、このタイプのすべてのリソースを対象に選択したメトリックスの収集スケジュールを更新します。もしこれがチェックされていなければ、テンプレートスケジュールが将来的にインベントリに追加されるこのタイプの新規リソースに適用されるだけです。
view_admin_plugins_agent = エージェント
@@ -1171,7 +1171,7 @@ view_dashboardManager_saved = ダッシュボード {0} をサーバーへ保存
view_dashboardManager_success = ダッシュボードを保存しました
view_dashboard_favorites_error1 = 好みのリソースをロードするのに失敗しました
view_dashboardsManager_error1 = 新しいダッシュボードを追加するのに失敗しました
-## view_dashboardsManager_message_title_details = <h1>RHQへようこそ</h1>\n<p>RHQプロジェクトは抽象化されたプラグインベースのシステム管理スイートで、複数のプロダクトやプラットフォームに対してコア機能を横断的に適用できる拡張可能で、統合化されたシステム管理を提供します。このプロジェクトはレイヤ化されたモジュールによって設計されていて、デプロイのための柔軟なアーキテクチャを提供します。それは企業全体に対する監査と履歴の管理を提供するコアとなるユーザーインタフェースを導入します。サーバー/エージェントアーキテクチャはリモートでの管理と特定プロダクトのサポートを実現するプラグインを提供します。 </p>\n <p>このデフォルトのダッシュボードは上の「編集モード」ボタンをすることで編集可能です。</p>
+view_dashboardsManager_message_title_details = <h1>{0}へようこそ</h1>\n<p>RHQプロジェクトは抽象化されたプラグインベースのシステム管理スイートで、複数のプロダクトやプラットフォームに対してコア機能を横断的に適用できる拡張可能で、統合化されたシステム管理を提供します。このプロジェクトはレイヤ化されたモジュールによって設計されていて、デプロイのための柔軟なアーキテクチャを提供します。それは企業全体に対する監査と履歴の管理を提供するコアとなるユーザーインタフェースを導入します。サーバー/エージェントアーキテクチャはリモートでの管理と特定プロダクトのサポートを実現するプラグインを提供します。 </p>\n <p>このデフォルトのダッシュボードは上の「編集モード」ボタンをすることで編集可能です。</p>
view_dashboards_confirm1 = 削除してもよろしいですか
view_dashboards_portlets_refresh_fail1 = 自動リフレッシュするポートレットのリフレッシュ間隔の更新に失敗しました
view_dashboards_portlets_refresh_fail2 = 自動リフレッシュするポートレットのリロードの無効化に失敗しました
@@ -1341,10 +1341,10 @@ view_groupConfigEdit_tooltip_1 = メンバー値の違い - 編集するため
view_groupConfigEdit_unset = 設定解除
view_groupConfigEdit_valsDiff = メンバー値の違い
view_groupConfigEdit_valsDiffForProp = プロパティ [{0}] のためのメンバー値
-## view_groupCreateWizard_createFailure = リソースグループの作成に失敗しました
+view_groupCreateWizard_createFailure = リソースグループ [{0}] の作成に失敗しました : {1}
view_groupCreateWizard_createStepName = グループ設定
view_groupCreateWizard_createStep_recursive = 再帰
-## view_groupCreateWizard_createSuccessful_concise = 新規のリソースグループを作成しました。
+view_groupCreateWizard_createSuccessful_concise = [{0}] という名前の新規のリソースグループを作成しました。
view_groupCreateWizard_createSuccessful_full = [{2}] メンバーリソースを含む 名前 [{1}] の新規 [{0}] リソースグループを作成しました。
view_groupCreateWizard_membersStepName = メンバーの選択
view_groupCreateWizard_title = グループ作成
@@ -1505,7 +1505,7 @@ view_login_prompt = ログインしてください
view_login_registerLater = (キャンセル - 登録を後で完成させてください)
view_login_registerLdapSuccess = 新しいLDAPユーザーの登録に成功しました
view_login_registerUser = ユーザの登録
-## view_login_welcomeMsg = RHQへようこそ! <br/><br/> 登録を完成させるために次のフィールドを入力/更新してください。<br/> "OK"をクリックしたら、ログインします。<br/><br/>
+view_login_welcomeMsg = {0}へようこそ! <br/><br/> 登録を完成させるために次のフィールドを入力/更新してください。<br/> "OK"をクリックしたら、ログインします。<br/><br/>
view_measureRange_last = 時間の範囲 - 直前
view_measureRange_simple = シンプル...
view_measureRange_start = 時間の範囲 - 開始
@@ -1545,7 +1545,7 @@ view_operationScheduleDetails_enterParametersBelow = 以下にパラメーター
view_operationScheduleDetails_fieldDefault_description = 説明を見るとためオペレーションを選択してください
view_operationScheduleDetails_fieldDefault_parameters = パラメーターを見るためにオペレーションを選択してください
view_operationScheduleDetails_fieldHelp_description = このスケジュールされたオペレーションのための任意の説明 (例、夜間保守のためのアプリサーバー再起動）
-## view_operationScheduleDetails_fieldHelp_timeout = 時間間隔 - もし指定されていて、その間隔がスケジュールされたオペレーション実行が完了する前に経過してしまったならば、RHQサーバーはそのオペレーションをタイムアウトにし、それを失敗させることを検討します。注意：通常はすでに開始させられた根本の管理リソースオペレーションをアボートすることは不可能です。
+view_operationScheduleDetails_fieldHelp_timeout = 時間間隔 - もし指定されていて、その間隔がスケジュールされたオペレーション実行が完了する前に経過してしまったならば、{0} サーバーはそのオペレーションをタイムアウトにし、それを失敗させることを検討します。注意：通常はすでに開始させられた根本の管理リソースオペレーションをアボートすることは不可能です。
view_operationScheduleDetails_field_description = 説明
view_operationScheduleDetails_field_parameters = パラメーター
view_operationScheduleDetails_field_timeout = タイムアウト
@@ -1919,7 +1919,7 @@ widget_resourceFactoryWizard_infoStepName = リソース情報
widget_resourceFactoryWizard_infoStep_loadFail = アーキテクチャーを利用可能にするのに失敗しました
widget_resourceFactoryWizard_namePrompt = 新規リソース名
widget_resourceFactoryWizard_templatePrompt = コネクション設定テンプレート
-## widget_resourceFactoryWizard_timeoutHelp = タイムアウト間隔。もし指定されたならば(RHQエージェント上での)子のリソース作成のためのデフォルトタイムアウトを上書きします。大きなアプリケーションのデプロイのような長時間かかる作成アクションに特に有用です。通常、前回の試みのときにタイムアウトの失敗だった場合に使われます。
+widget_resourceFactoryWizard_timeoutHelp = タイムアウト間隔。もし指定されたならば({0}エージェント上での)子のリソース作成のためのデフォルトタイムアウトを上書きします。大きなアプリケーションのデプロイのような長時間かかる作成アクションに特に有用です。通常、前回の試みのときにタイムアウトの失敗だった場合に使われます。
widget_resourceFactoryWizard_uploadFailure = ファイルアップロードの失敗
widget_resourceFactoryWizard_uploadFileStepName = リソースコンテントファイルのアップロード
widget_resourceFactoryWizard_uploadInProgress = アップロードは処理中です... 大きなファイルを配布するには数分かかることもあります。
commit 227c63ec1caf645f19173e1e39b588b5b112ca4a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Dec 16 17:34:31 2011 -0500
eclipse tool to build for both FF and chrome
diff --git a/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,Chrome).launch b/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,Chrome).launch
new file mode 100644
index 0000000..9fcb8fb
--- /dev/null
+++ b/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,Chrome).launch
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+<stringAttribute key="bad_container_name" value="\rhq\etc\eclipse-tools\maven"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:M2_HOME}/bin/${MAVEN_EXE}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-o -Dgwt.userAgent=gecko1_8,safari -Dmaven.test.skip=true -Pdev gwt:clean install"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/rhq/modules/enterprise/gui/coregui}"/>
+</launchConfiguration>
commit 14256b6e778bbb02703dd82e1804f69d2b639f64
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Dec 16 16:18:03 2011 -0500
[Bug 535538 - (RHQ-2222) Installer: db "Test Connection" button clears password field]
An attempt to improve the situation by alerting the user, and not processing
"Test Connection" or "Install Server!" buttons, if the password field
is empty.
- Note, the message displayed is in English since I'm not proficient enough
to figure out how to get javascript to interact with the resource bundle.
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp
index c9aee8f..ad0219e 100644
--- a/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp
+++ b/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp
@@ -4,6 +4,7 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
<f:view>
<f:loadBundle var="bundle" basename="InstallerMessages" />
@@ -19,6 +20,13 @@
var thisDiv = document.getElementById( _levelId );
thisDiv.style.display = "block";
}
+ function checkForPassword() {
+ if ( document.getElementById('propForm:databasepassword').value == '' ) {
+ alert("Please enter database password.");
+ return false;
+ }
+ return true;
+ }
</script>
</head>
@@ -144,6 +152,7 @@
<h:outputText value="#{bundle.testDatabaseNote}" style="font-size: 100%"/>
<h:panelGrid columns="2">
<h:commandButton id="testDatabaseButton"
+ onclick="if (!checkForPassword()) return false"
action="#{configurationBean.testConnection}"
value="#{bundle.testDatabaseButton}"/>
<h:panelGroup rendered="#{configurationBean.lastTest != null && configurationBean.lastTest != 'OK'}">
@@ -326,7 +335,11 @@
</tr></table>
--%>
<table border="1"><tr>
- <td><h:commandButton id="save" action="#{configurationBean.save}" value="#{bundle.save}" /></td>
+ <td><h:commandButton id="save"
+ onclick="if (!checkForPassword()) return false"
+ action="#{configurationBean.save}"
+ value="#{bundle.save}" />
+ </td>
</tr></table>
</p>
</h:form>
@@ -335,4 +348,4 @@
</html>
-</f:view>
\ No newline at end of file
+</f:view>
commit 8937a7db8b70b606ef0847dbb2b100ddcf2d89ee
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Fri Dec 16 09:18:45 2011 -0500
[BZ 760139] additionally modifying MeasurmentManager to always return non-null values even for erroneous runtime conditions.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
index c019cde..be408b5 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
@@ -421,17 +421,20 @@ public class MeasurementManager extends AgentService implements MeasurementAgent
// corresponding metric defs - one for the raw value and one for the derived per-minute value. There's no
// way to tell which value the caller wants. For now, it assumes the caller wants the raw value.
// (ips, 09/05/08)
+ // spinder 12/16/11. BZ 760139. Modified to return empty sets instead of 'null' even for erroneous conditions.
+ // Server side logging or erroneous runtime conditions still occurs, but callers to getRealTimeMeasurementValues
+ // won't have to additionally check for null values now. This is a safe and better pattern.
public Set<MeasurementData> getRealTimeMeasurementValue(int resourceId, List<MeasurementDataRequest> requests) {
if (requests.size() == 0) {
// There's no need to even call getValues() on the ResourceComponent if the list of metric names is empty.
return Collections.emptySet();
}
MeasurementFacet measurementFacet;
- ResourceContainer resourceContainer = PluginContainer.getInstance().getInventoryManager().getResourceContainer(
- resourceId);
+ ResourceContainer resourceContainer = PluginContainer.getInstance().getInventoryManager()
+ .getResourceContainer(resourceId);
if (resourceContainer == null) {
LOG.warn("Can not get resource container for resource with id " + resourceId);
- return null;
+ return Collections.emptySet();
}
Resource resource = resourceContainer.getResource();
ResourceType resourceType = resource.getResourceType();
@@ -443,7 +446,7 @@ public class MeasurementManager extends AgentService implements MeasurementAgent
FACET_METHOD_TIMEOUT, true, true);
} catch (Exception e) {
LOG.warn("Cannot get measurement facet for Resource [" + resourceId + "]. Cause: " + e);
- return null;
+ return Collections.emptySet();
}
MeasurementReport report = new MeasurementReport();
@@ -457,7 +460,7 @@ public class MeasurementManager extends AgentService implements MeasurementAgent
measurementFacet.getValues(report, allMeasurements);
} catch (Throwable t) {
LOG.error("Could not get measurement values", t);
- return null;
+ return Collections.emptySet();
}
Set<MeasurementData> values = new HashSet<MeasurementData>();
commit b07f2c488f9487b8e142955048e7b140bcb72172
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Dec 15 17:31:50 2011 -0500
A CLI script for generating random files
I put this together while doing perf testing for drift. This script
needs some updating and docs, but it is generally useful.
diff --git a/etc/cli-scripts/create_files.js b/etc/cli-scripts/create_files.js
new file mode 100644
index 0000000..b0a2bab
--- /dev/null
+++ b/etc/cli-scripts/create_files.js
@@ -0,0 +1,186 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+importPackage(java.io);
+
+/**
+ * The first argument is a string that specifies the base directory in which
+ * file sets will be generated.
+ *
+ * {
+ * basedir: '/drift/files',
+ * fileSets: [
+ * {numFiles: 500, size: 10, extension: 'jar', dir:}
+ * {numFiles: 750, size: 8, extension: 'jar', dir:}
+ * ]
+ * }
+ *
+ * @param basedir
+ * @param fileSpecs
+ */
+
+/**
+ *
+ * @param opts
+ * basedir:
+ * fileSets:
+ * dir
+ * dirLayout
+ * numDirectories
+ * numFiles
+ * size
+ * extension
+ */
+function createFiles(opts) {
+ var basedir = File(opts.basedir);
+ basedir.mkdirs();
+
+ for (var i = 0; i < opts.fileSets.length; ++i) {
+ var fileSetOpts = bindFileSetOpts(opts.fileSets[i], i);
+ var dir = File(basedir, fileSetOpts.dir);
+ dir.mkdir();
+
+ var getSize;
+
+ if (fileSetOpts.size.constructor == Array) {
+ var nextSize = 0;
+ getSize = function() {
+ return fileSetOpts.size[(nextSize++ % fileSetOpts.size.length)]
+ }
+ } else {
+ getSize = function() { return fileSetOpts.size; }
+ }
+
+ for (var j = 0; j < fileSetOpts.numFiles; ++j) {
+ createFile({
+ dir: dir.path,
+ name: j + '.' + fileSetOpts.extension,
+ size: getSize()
+ });
+ }
+ }
+}
+
+function bindFileSetOpts(options, index) {
+ var defaultOpts = {
+ dir: index,
+ dirLayout: 'single',
+ numDirectories: 1,
+ numFiles: 100,
+ size: 4,
+ extension: 'gen'
+ };
+
+ for (var optName in defaultOpts) {
+ if (typeof options[optName] === 'undefined') {
+ options[optName] = defaultOpts[optName];
+ }
+ }
+
+ return options;
+}
+
+function fileSets(num, createFileSet) {
+ var array = [];
+ for (var i = 0; i < num; ++i) {
+ array.push(createFileSet());
+ }
+ return array;
+}
+
+/**
+ * Takes a map of options that provide specifications for creating the file and
+ * writes a file to disk according to those specifications. Unless stated
+ * otherwise, each option should be specified as a string.
+ *
+ * @param opts A map of options that specify how the file is to be generated.
+ * dir: The directory in which the file should be created. (required)
+ * name: The file name (required)
+ * size: The file size which can be specified in bytes, kilobytes, megabytes
+ * or gigabytes, e.g., 10B, 10KB, 10MB, 10GB (required)
+ */
+function createFile(opts) {
+ var file = File(opts.dir, opts.name);
+ var random = java.util.Random();
+ var sizeObj = parseFileSize(opts.size);
+ var calcSize = fileSizeConverter(sizeObj.units);
+ var numBytes = calcSize(sizeObj.number);
+
+ withWriter(file, function(writer) {
+ for (var i = 0; i < numBytes; i++) {
+ writer.write(random.nextInt(128));
+ }
+ });
+}
+
+/**
+ * Parses the file size option into an object. The size argument is validated
+ * to ensure it has the proper format. An exception is thrown if the syntax is
+ * invalid.
+ *
+ * @param size The file size specified as a string. The format is an integer
+ * followed by the units where recognized units are bytes (B), kilobytes (KB),
+ * megabytes (MB), and gigabytes(GB). Here are some examples of legal values,
+ *
+ * 12B // 12 bytes
+ * 12KB // 12 kilobytes
+ * 12MB // 12 megabytes
+ * 12GB // 12 gigabytes
+ *
+ * @return An object that contains two properties - number and units. number is
+ * the integer portion of the size argument and units is the one or two character
+ * units abbreviation.
+ */
+function parseFileSize(size) {
+ var pattern = /^\d+(B|KB|MB|GB)$/;
+
+ if (!pattern.test(size)) {
+ throw 'Illegal Syntax: ' + size + ' - file size must be an integer followed by units ' +
+ 'which is one of B, KB, MB, GB';
+ }
+
+ var unitsIndex = size.search(/(B|KB|MB|GB)/);
+ return {number: size.substring(0, unitsIndex), units: size.substring(unitsIndex)};
+}
+
+function fileSizeConverter(units) {
+ var converters = {
+ 'B': function(size) { return size; },
+ 'KB': function(size) { return size * 1024; },
+ 'MB': function(size) { return size * 1024 * 1024; },
+ 'GB': function(size) { return size * 1024 * 1024 * 1024; }
+ }
+ return converters[units];
+}
+
+function withWriter(file, fn) {
+ var writer = BufferedWriter(FileWriter(file));
+ try {
+ fn(writer);
+ } finally {
+ writer.close();
+ }
+}
+
+if (typeof create != 'undefined') {
+ println('creating files...');
+ var defs = eval('(' + create + ');');
+ createFiles(defs);
+ println('finished');
+}
commit c0987558d5ccbb366bf78e26c27400d02d53405c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 15 16:27:55 2011 -0500
Fix compilation isue after merge.
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
index c3aa13c..0d878a5 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
@@ -70,7 +70,7 @@ public class DriftFilesSenderTest extends DriftTest {
Headers headers = createHeaders(driftDefName, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("server.conf", serverConfHash));
+ writer.write(addedFileEntry("server.conf", serverConfHash, serverConf.lastModified(), serverConf.length()));
writer.close();
sender.setDriftFiles(driftFiles(serverConfHash));
@@ -198,7 +198,8 @@ public class DriftFilesSenderTest extends DriftTest {
Headers headers = createHeaders(driftDefName, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("conf/server.conf", serverConfHash));
+ writer
+ .write(addedFileEntry("conf/server.conf", serverConfHash, serverConf.lastModified(), serverConf.length()));
writer.close();
serverConf.delete();
commit cf001e9bc410896e57b7767164711fd8f819ccd8
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Dec 15 16:00:57 2011 -0500
DBInstallationTest needs to use its own dedicated database
DBInstallationTest runs through several database upgrades and it has
been using the same database as other tests on a jenkins build. This bug
probably goes back to the initial implementation. It wasn't a problem
previously because most if not all tests run before DBInstallationTest.
To avoid causing interference with other tests, it should use its own
dedicated database. This commit includes a fix for postgresql but not
for oracle. Oracle will have to be addressed separately.
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 7f79832..bd1474a 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -35,6 +35,8 @@
<product.help.guide.agent>Running+the+RHQ+Agent</product.help.guide.agent>
<product.help.FAQ>FAQ</product.help.FAQ>
<product.help.config.props>http://support.rhq-project.org/display/JOPR2/Startup+Properties#Configuring…</product.help.config.props>
+
+ <rhq.db.installation.test.db-name>rhq_installer_test_db</rhq.db.installation.test.db-name>
</properties>
<dependencies>
@@ -149,6 +151,8 @@
<rhq.db.admin.password>${rhq.db.admin.password}</rhq.db.admin.password>
<rhq.test.ds.user-name>${rhq.test.ds.user-name}</rhq.test.ds.user-name>
<rhq.test.ds.password>${rhq.test.ds.password}</rhq.test.ds.password>
+ <rhq.db.installation.test.db-name>${rhq.db.installation.test.db-name}</rhq.db.installation.test.db-name>
+ <rhq.db.installation.test.connection-url>jdbc:postgresql://${rhq.test.ds.server-name}:5432/${rhq.db.installation.test.db-name}</rhq.db.installation.test.connection-url>
</systemPropertyVariables>
</configuration>
</plugin>
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
index 6633cb7..3bff054 100644
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
+++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
@@ -23,17 +23,14 @@
package org.rhq.enterprise.installer;
-import java.io.File;
-import java.net.URL;
-import java.util.Properties;
-
+import org.rhq.core.db.reset.DBReset;
+import org.rhq.core.db.setup.DBSetup;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.rhq.core.db.reset.DBReset;
-import org.rhq.core.db.setup.DBSetup;
-import org.rhq.enterprise.installer.ServerInformation;
-import org.rhq.enterprise.installer.ServerProperties;
+import java.io.File;
+import java.net.URL;
+import java.util.Properties;
/**
* The tests in this class exercise the dbsetup/dbupgrade code that is run in the installer. The tests currently only
@@ -46,12 +43,12 @@ import org.rhq.enterprise.installer.ServerProperties;
public class DBInstallationTest {
private final String LOG_DIRECTORY = System.getProperty("java.io.tmpdir", "rhq/installer-test");
- private final String DB_NAME = System.getProperty("rhq.test.ds.db-name", "rhq_installer_test_db");
+ private final String DB_NAME = System.getProperty("rhq.db.installation.test.db-name", "rhq_installer_test_db");
private final String USERNAME = System.getProperty("rhq.test.ds.user-name", "rhqadmin");
private final String PASSWORD = System.getProperty("rhq.test.ds.password", "rhqadmin");
private final String SERVER = System.getProperty("rhq.test.ds.server-name", "127.0.0.1");
- private final String DB_URL = System.getProperty("rhq.test.ds.connection-url", "jdbc:postgresql://" + SERVER
- + ":5432/" + DB_NAME);
+ private final String DB_URL = System.getProperty("rhq.db.installation.test.connection-url",
+ "jdbc:postgresql://" + SERVER + ":5432/" + DB_NAME);
private final String ADMIN_USERNAME = System.getProperty("rhq.db.admin.username", "postgres");
private final String ADMIN_PASSWORD = System.getProperty("rhq.db.admin.password", "postgres");
private static final String DB_TYPE_MAPPING = System.getProperty("rhq.test.ds.type-mapping", "PostgreSQL");
commit 260fbda7005ebd20b436c55eca4dd07f8c803d31
Merge: 6e70db5 638de1b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 15 13:38:47 2011 -0500
Merge branch 'jsanda/drift'
Conflicts:
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
diff --cc modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
index d427229,b102300..c3aa13c
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
@@@ -19,29 -19,23 +19,30 @@@
package org.rhq.core.pc.drift;
- import org.rhq.common.drift.ChangeSetWriter;
- import org.rhq.common.drift.Headers;
- import org.rhq.core.domain.drift.DriftChangeSetCategory;
- import org.rhq.core.domain.drift.DriftFile;
- import org.rhq.core.domain.drift.JPADriftFile;
- import org.rhq.core.util.ZipUtil;
- import org.rhq.test.AssertUtils;
- import org.testng.annotations.BeforeMethod;
- import org.testng.annotations.Test;
+ import static org.rhq.common.drift.FileEntry.addedFileEntry;
+ import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+ import static org.testng.Assert.assertEquals;
+ import static org.testng.Assert.assertTrue;
import java.io.File;
+import java.io.FilenameFilter;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
- import static org.rhq.common.drift.FileEntry.addedFileEntry;
- import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
- import static org.testng.Assert.assertEquals;
- import static org.testng.Assert.assertTrue;
+ import org.testng.annotations.BeforeMethod;
+ import org.testng.annotations.Test;
+
+ import org.rhq.common.drift.ChangeSetWriter;
+ import org.rhq.common.drift.Headers;
+ import org.rhq.core.domain.drift.DriftChangeSetCategory;
+ import org.rhq.core.domain.drift.DriftFile;
+ import org.rhq.core.domain.drift.JPADriftFile;
++import org.rhq.core.util.ZipUtil;
++import org.rhq.test.AssertUtils;
public class DriftFilesSenderTest extends DriftTest {
@@@ -96,8 -69,10 +97,10 @@@
Headers headers = createHeaders(driftDefName, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash));
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(),
- server1Conf.length()));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(),
- server2Conf.length()));
++ writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(), server1Conf
++ .length()));
++ writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(), server2Conf
++ .length()));
writer.close();
sender.setDriftFiles(driftFiles(server1ConfHash, server2ConfHash));
@@@ -129,10 -107,14 +132,14 @@@
Headers headers = createHeaders(driftDefName, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash));
- writer.write(addedFileEntry("lib/server-1.jar", server1JarHash));
- writer.write(addedFileEntry("lib/server-2.jar", server2JarHash));
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(),
- server1Conf.length()));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(),
- server2Conf.length()));
- writer.write(addedFileEntry("lib/server-1.jar", server1JarHash, server1Jar.lastModified(),
- server1Jar.length()));
- writer.write(addedFileEntry("lib/server-2.jar", server2JarHash, server2Jar.lastModified(),
- server2Jar.length()));
++ writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(), server1Conf
++ .length()));
++ writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(), server2Conf
++ .length()));
++ writer
++ .write(addedFileEntry("lib/server-1.jar", server1JarHash, server1Jar.lastModified(), server1Jar.length()));
++ writer
++ .write(addedFileEntry("lib/server-2.jar", server2JarHash, server2Jar.lastModified(), server2Jar.length()));
writer.close();
// Note that the order of the drift files is random. When the server sends a request
@@@ -161,77 -148,25 +168,78 @@@
Headers headers = createHeaders(driftDefName, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash));
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(),
- server1Conf.length()));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(),
- server2Conf.length()));
++ writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(), server1Conf
++ .length()));
++ writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(), server2Conf
++ .length()));
writer.close();
// It is possible that the server can request a file that has been deleted since it
// it was initially detected during drift detection.
server1Conf.delete();
--
sender.setDriftFiles(driftFiles(server1ConfHash, server2ConfHash));
sender.setHeaders(headers);
sender.run();
- File contentDir = mkdir(changeSetDir, "content");
+ assertContentFileExists(changeSetDir);
+ assertContentFileMatches(changeSetDir, server2ConfHash);
+ }
+
+ @Test
- public void doNotSendEmptyZipFileToServer() throws Exception {
++ public void doNotSendEmptyZipFileToServer() throws Exception {
+ String driftDefName = "empty_content_test";
+
+ File confDir = mkdir(resourceDir, "conf");
+ File serverConf = createRandomFile(confDir, "server.conf");
+
+ String serverConfHash = sha256(serverConf);
+
+ Headers headers = createHeaders(driftDefName, COVERAGE);
+
+ ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
+ writer.write(addedFileEntry("conf/server.conf", serverConfHash));
+ writer.close();
+
+ serverConf.delete();
+
+ sender.setDriftFiles(driftFiles(serverConfHash));
+ sender.setHeaders(headers);
+ sender.run();
+
+ assertEquals(driftClient.getSendChangeSetContentInvocationCount(), 0,
- "Do not call DriftClient to send content to server when there is no content to send.");
++ "Do not call DriftClient to send content to server when there is no content to send.");
+ assertContentFileExists(changeSetDir(driftDefName));
+ }
+
+ void assertContentFileExists(File changeSetDir) {
+ File[] files = getContentFiles(changeSetDir);
+ assertEquals(files.length, 1, "Expected to find a single content zip file but found " + Arrays.toString(files));
+ }
+
+ void assertContentFileMatches(File changeSetDir, String... expectedFileNames) throws Exception {
+ File contentFile = getContentFiles(changeSetDir)[0];
+ final List<String> actualFileNames = new LinkedList<String>();
+
+ ZipUtil.walkZipFile(contentFile, new ZipUtil.ZipEntryVisitor() {
+ @Override
+ public boolean visit(ZipEntry entry, ZipInputStream stream) throws Exception {
+ actualFileNames.add(entry.getName());
+ return true;
+ }
+ });
+
+ AssertUtils.assertCollectionEqualsNoOrder(Arrays.asList(expectedFileNames), actualFileNames,
- "The content file " + contentFile.getPath() + " does not contain the correct entries");
++ "The content file " + contentFile.getPath() + " does not contain the correct entries");
+ }
- assertEquals(contentDir.list().length, 1, "Expected to find one file in " + contentDir.getAbsolutePath());
- assertFileCopiedToContentDir(contentDir, server2ConfHash);
+ private File[] getContentFiles(File changeSetDir) {
+ return changeSetDir.listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("content_") && name.endsWith(".zip");
+ }
+ });
}
/**
@@@ -245,8 -180,8 +253,8 @@@
*/
void assertFileCopiedToContentDir(File contentDir, String fileHash) {
File file = new File(contentDir, fileHash);
-- assertTrue(file.exists(), "Expected to find file named " + file.getName() + " in content directory " +
-- contentDir.getPath() + ". The SHA-256 hash should be used as the file name.");
++ assertTrue(file.exists(), "Expected to find file named " + file.getName() + " in content directory "
++ + contentDir.getPath() + ". The SHA-256 hash should be used as the file name.");
}
Headers createHeaders(String configName, DriftChangeSetCategory type) {
commit 638de1b71e5eb15b137ca2deda01299a30f5482c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 15 13:18:32 2011 -0500
[Bug 768031 - Pin template failure on upgraded dbs]
Set RHQ_DRIFT_CHANGE_SET.DRIFT_DEFINITION_ID nullable in the db upgrade.
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 9e3bbd6..24c536d 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3826,7 +3826,10 @@
<schemaSpec version="2.117">
<!-- Remove an obsolete drift table that may be hanging around -->
- <schema-dropTable table="RHQ_DRIFT_TEMPLATE_MAP" />
+ <schema-dropTable table="RHQ_DRIFT_TEMPLATE_MAP" />
+
+ <!-- Remove an unwanted null consraint -->
+ <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_DEFINITION_ID" nullable="TRUE" />
</schemaSpec>
</dbupgrade>
commit 4da6f3724d6492ae449ea76100aac8d9948f6303
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 15 13:16:59 2011 -0500
Supporting check-in for [Bug 768031 - Pin template failure on upgraded dbs]
- Fix a long standing issue in dbupgrade due to Oracle throwing exceptions
when trying to set nullable to the current value. In other words, the
upgrade would fail on oracle if you tried to set nullable false on a
column that was already nullable false. (same for nullable true). This
caused issues when you can't guarantee the current state, you just know
what you need it to be. Now, catch the relevant exceptions and toss
them as needed.
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
index b4ea5e9..9dcbb89 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
@@ -25,6 +25,8 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import mazz.i18n.Logger;
+
/**
* Superclass of all versions of the Oracle database.
*
@@ -32,6 +34,8 @@ import java.util.List;
*
*/
public abstract class OracleDatabaseType extends DatabaseType {
+ private static final Logger LOG = DbUtilsI18NFactory.getLogger(OracleDatabaseType.class);
+
/**
* The vendor name for all Oracle databases.
*/
@@ -150,7 +154,24 @@ public abstract class OracleDatabaseType extends DatabaseType {
sql += ")";
- executeSql(conn, sql);
+ try {
+ executeSql(conn, sql);
+ } catch (SQLException e) {
+ // Oracle throws an exception if you try to set nullable to its current setting. Ignore errors
+ // generated when a nullable setting is already the way we want it to be.
+ // ORA-01442: column to be modified to NOT NULL is already NOT NULL
+ // ORA-01451: column to be modified to NULL cannot be modified to NULL
+ if (nullable != null) {
+ String msg = e.getMessage();
+ if (msg.contains("ORA-01442") || msg.contains("ORA-01451")) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Ignoring exception, column already set to nullable=" + nullable, e);
+ }
+ } else {
+ throw e;
+ }
+ }
+ }
if ((reindex != null) && reindex.booleanValue()) {
reindexTable(conn, table);
commit 6e70db5abb0b3db8b93730c27695503a461f8f40
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Dec 14 18:07:25 2011 -0500
[BZ 765593] escape HTML in unified diff output (https://bugzilla.redhat.com/show_bug.cgi?id=765593)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
index b3de83f..d7477af 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
@@ -20,17 +20,13 @@ package org.rhq.enterprise.gui.coregui.client.drift;
import java.util.ArrayList;
import java.util.LinkedHashMap;
-import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.CanvasItem;
import com.smartgwt.client.widgets.form.fields.SelectItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
-import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
@@ -45,12 +41,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.DetailsView;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
-import org.rhq.enterprise.gui.coregui.client.PopupWindow;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.carousel.BookmarkableCarousel;
import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
import org.rhq.enterprise.gui.coregui.client.drift.DriftCarouselMemberView.DriftSelectionListener;
+import org.rhq.enterprise.gui.coregui.client.drift.util.DiffUtility;
import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -266,7 +262,6 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
addCarouselAction("Compare", MSG.common_button_compare(), null, new CarouselAction() {
public void executeAction(Object actionValue) {
-
Record record1 = selectedRecords.get(0);
Record record2 = selectedRecords.get(1);
final String path = record1.getAttribute(DriftDataSource.ATTR_PATH);
@@ -280,68 +275,16 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
GWTServiceLookup.getDriftService().generateUnifiedDiffByIds(diffOldId, diffNewId,
new AsyncCallback<FileDiffReport>() {
- @Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to generate diff", caught);
+ CoreGUI.getErrorHandler().handleError("Failed to generate diff.", caught);
}
- @Override
public void onSuccess(FileDiffReport diffReport) {
- String diffContents = toHtml(diffReport.getDiff(), 1, 2);
- LocatableWindow window = createDiffViewer(diffContents, path, 1, 2);
+ String diffContents = DiffUtility.formatAsHtml(diffReport.getDiff(), 1, 2);
+ LocatableWindow window = DiffUtility.createDiffViewerWindow(diffContents, path, 1, 2);
window.show();
}
-
- private String toHtml(List<String> deltas, int oldVersion, int newVersion) {
- StringBuilder diff = new StringBuilder();
- diff.append("<font color=\"red\">").append(deltas.get(0)).append(":").append(oldVersion)
- .append("</font><br/>");
- diff.append("<font color=\"green\">").append(deltas.get(1)).append(":").append(newVersion)
- .append("</font><br/>");
-
- for (String line : deltas.subList(2, deltas.size())) {
- if (line.startsWith("@@")) {
- diff.append("<font color=\"purple\">").append(line).append("</font><br/>");
- } else if (line.startsWith("-")) {
- diff.append("<font color=\"red\">").append(line).append("</font><br/>");
- } else if (line.startsWith("+")) {
- diff.append("<font color=\"green\">").append(line).append("</font><br/>");
- } else {
- diff.append(line).append("<br/>");
- }
- }
- return diff.toString();
- }
-
- private LocatableWindow createDiffViewer(String contents, String path, int oldVersion,
- int newVersion) {
- VLayout layout = new VLayout();
- DynamicForm form = new DynamicForm();
- form.setWidth100();
- form.setHeight100();
-
- CanvasItem canvasItem = new CanvasItem();
- canvasItem.setColSpan(2);
- canvasItem.setShowTitle(false);
- canvasItem.setWidth("*");
- canvasItem.setHeight("*");
-
- Canvas canvas = new Canvas();
- canvas.setContents(contents);
- canvasItem.setCanvas(canvas);
-
- form.setItems(canvasItem);
- layout.addMember(form);
-
- PopupWindow window = new PopupWindow("diffViewer", layout);
- window.setTitle(path + ":" + oldVersion + ":" + newVersion);
- window.setIsModal(false);
-
- return window;
- }
-
});
-
}
public boolean isEnabled() {
@@ -354,6 +297,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
return false;
}
+
});
super.configureCarousel();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
index 0cd08a1..d359e6b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
@@ -47,6 +47,7 @@ import org.rhq.core.domain.drift.FileDiffReport;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.PopupWindow;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
+import org.rhq.enterprise.gui.coregui.client.drift.util.DiffUtility;
import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -286,51 +287,23 @@ public class DriftDetailsView extends LocatableVLayout {
return window;
}
- private LocatableWindow createDiffViewer(String contents, String path, int oldVersion, int newVersion) {
- VLayout layout = new VLayout();
- DynamicForm form = new DynamicForm();
- form.setWidth100();
- form.setHeight100();
-
- CanvasItem canvasItem = new CanvasItem();
- canvasItem.setColSpan(2);
- canvasItem.setShowTitle(false);
- canvasItem.setWidth("*");
- canvasItem.setHeight("*");
-
- Canvas canvas = new Canvas();
- canvas.setContents(contents);
- canvasItem.setCanvas(canvas);
-
- form.setItems(canvasItem);
- layout.addMember(form);
-
- PopupWindow window = new PopupWindow("diffViewer", layout);
- window.setTitle(path + ":" + oldVersion + ":" + newVersion);
- window.setIsModal(false);
-
- return window;
- }
-
private LinkItem createViewDiffLink(final Drift<?, ?> drift, final int oldVersion) {
LinkItem viewDiffLink = new LinkItem("viewDiff");
viewDiffLink.setLinkTitle("(view diff)");
viewDiffLink.setShowTitle(false);
viewDiffLink.addClickHandler(new ClickHandler() {
- @Override
public void onClick(ClickEvent clickEvent) {
GWTServiceLookup.getDriftService().generateUnifiedDiff(drift, new AsyncCallback<FileDiffReport>() {
- @Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to generate diff", caught);
+ CoreGUI.getErrorHandler().handleError("Failed to generate diff.", caught);
}
- @Override
public void onSuccess(FileDiffReport diffReport) {
int newVersion = drift.getChangeSet().getVersion();
- String diffContents = toHtml(diffReport.getDiff(), oldVersion, newVersion);
- LocatableWindow window = createDiffViewer(diffContents, drift.getPath(), oldVersion, newVersion);
+ String diffContents = DiffUtility.formatAsHtml(diffReport.getDiff(), oldVersion, newVersion);
+ LocatableWindow window = DiffUtility.createDiffViewerWindow(diffContents, drift.getPath(),
+ oldVersion, newVersion);
window.show();
}
});
@@ -339,24 +312,4 @@ public class DriftDetailsView extends LocatableVLayout {
return viewDiffLink;
}
- private String toHtml(List<String> deltas, int oldVersion, int newVersion) {
- StringBuilder diff = new StringBuilder();
- diff.append("<font color=\"red\">").append(deltas.get(0)).append(":").append(oldVersion).append("</font><br/>");
- diff.append("<font color=\"green\">").append(deltas.get(1)).append(":").append(newVersion).append(
- "</font><br/>");
-
- for (String line : deltas.subList(2, deltas.size())) {
- if (line.startsWith("@@")) {
- diff.append("<font color=\"purple\">").append(line).append("</font><br/>");
- } else if (line.startsWith("-")) {
- diff.append("<font color=\"red\">").append(line).append("</font><br/>");
- } else if (line.startsWith("+")) {
- diff.append("<font color=\"green\">").append(line).append("</font><br/>");
- } else {
- diff.append(line).append("<br/>");
- }
- }
- return diff.toString();
- }
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java
new file mode 100644
index 0000000..dc3fbb0
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java
@@ -0,0 +1,112 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.drift.util;
+
+import java.util.List;
+
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.CanvasItem;
+import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.enterprise.gui.coregui.client.PopupWindow;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
+
+/**
+ * A collection of utility methods for working with unified diffs.
+ */
+public class DiffUtility {
+
+ /**
+ * Formats the specified unified diff output as HTML.
+ *
+ * @param deltas
+ * @param oldVersion
+ * @param newVersion
+ *
+ * @return the specified unified diff output formatted as HTML
+ */
+ public static String formatAsHtml(List<String> deltas, int oldVersion, int newVersion) {
+ StringBuilder html = new StringBuilder();
+
+ String originalFilename = deltas.get(0);
+ html.append("<b>").append(StringUtility.escapeHtml(originalFilename)).
+ append(":").append(oldVersion).append("</b><br/>");
+ String revisedFilename = deltas.get(1);
+ html.append("<b>").append(StringUtility.escapeHtml(revisedFilename)).
+ append(":").append(newVersion).append("</b><br/>");
+
+ List<String> lines = deltas.subList(2, deltas.size());
+ for (String line : lines) {
+ String escapedLine = StringUtility.escapeHtml(line);
+ if (line.startsWith("@@")) {
+ html.append("<font color=\"blue\">").append(escapedLine).append("</font>");
+ } else if (line.startsWith("-")) {
+ html.append("<font color=\"red\">").append(escapedLine).append("</font>");
+ } else if (line.startsWith("+")) {
+ html.append("<font color=\"green\">").append(escapedLine).append("</font>");
+ } else {
+ html.append(escapedLine);
+ }
+ html.append("<br/>");
+ }
+
+ return html.toString();
+ }
+
+ /**
+ * Create a non-modal window containing unified diff HTML.
+ *
+ * @param contents
+ * @param path
+ * @param oldVersion
+ * @param newVersion
+ *
+ * @return a non-modal window containing unified diff HTML
+ */
+ public static LocatableWindow createDiffViewerWindow(String contents, String path, int oldVersion, int newVersion) {
+ VLayout layout = new VLayout();
+ DynamicForm form = new DynamicForm();
+ form.setWidth100();
+ form.setHeight100();
+
+ CanvasItem canvasItem = new CanvasItem();
+ canvasItem.setColSpan(2);
+ canvasItem.setShowTitle(false);
+ canvasItem.setWidth("*");
+ canvasItem.setHeight("*");
+
+ Canvas canvas = new Canvas();
+ canvas.setContents(contents);
+ canvasItem.setCanvas(canvas);
+
+ form.setItems(canvasItem);
+ layout.addMember(form);
+
+ PopupWindow window = new PopupWindow("diffViewer", layout);
+ window.setTitle(path + ":" + oldVersion + ":" + newVersion);
+ window.setIsModal(false);
+
+ return window;
+ }
+
+ private DiffUtility() {
+ }
+
+}
commit 9f18aee38ed44f992ce26e7f8141a057af716533
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Dec 14 20:59:56 2011 -0500
[BZ 767205] Only read snapshot file once when looking for content to send to server
With this commit DriftFilesSender now builds an index of the file
entries key offed of the SHA so that is can quickly find files without
having to repeatedly scan the snapshot file on disk.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftClient.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftClient.java
index 1649819..761b3df 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftClient.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftClient.java
@@ -24,7 +24,8 @@ public interface DriftClient {
* @param driftDefinitionName
* @param contentDir
*/
- void sendChangeSetContentToServer(int resourceId, String driftDefinitionName, File contentDir);
+ //void sendChangeSetContentToServer(int resourceId, String driftDefinitionName, File contentDir);
+ void sendChangeSetContentToServer(int resourceId, String driftDefName, File contentZipFile);
void repeatChangeSet(int resourceId, String driftDefName, int version);
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java
index 4181472..59d3054 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java
@@ -10,6 +10,10 @@ import org.rhq.core.util.stream.StreamUtil;
import java.io.*;
import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
public class DriftFilesSender implements Runnable {
@@ -47,41 +51,95 @@ public class DriftFilesSender implements Runnable {
@Override
public void run() {
+ ZipOutputStream stream = null;
try {
if (log.isInfoEnabled()) {
log.info("Preparing to send content to server for " + defToString());
}
-
+ long startTime = System.currentTimeMillis();
File changeSet = changeSetMgr.findChangeSet(resourceId, headers.getDriftDefinitionName());
- File contentDir = new File(changeSet.getParentFile(), "content");
- contentDir.mkdir();
-
- for (DriftFile driftFile : driftFiles) {
+ File changeSetDir = changeSet.getParentFile();
+
+ // Note that the content file has a specific format that the server
+ // expects. The file name is of the form content_<token>.zip where
+ // token is a unique string that the agent can use to identify the
+ // content zip file when the server sends an acknowledgement. The
+ // token is necessary because it is possible, albeit not likely,
+ // for a a particular definition to wind up with multiple content
+ // zip files and there is no guarantee that they will be acked in
+ // the order in which they were sent. The name of each file in the
+ // zip file should be the SHA for that file. The server uses that
+ // SHA to look up the DriftFile object it has already created for
+ // the content.
+ //
+ // jsanda
+
+ String timestamp = Long.toString(System.currentTimeMillis());
+ String contentFileName = "content_" + timestamp + ".zip";
+ final File zipFile = new File(changeSetDir, contentFileName);
+ stream = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(zipFile)));
+
+ if (driftFiles.size() == 1) {
+ DriftFile driftFile = driftFiles.get(0);
File file = find(driftFile);
if (file == null || !file.exists()) {
log.warn("Unable to find file for " + driftFile);
} else {
if (log.isDebugEnabled()) {
- log.debug("Copying " + file.getPath() + " to " + contentDir.getPath());
+ log.debug("Adding " + file.getPath() + " to " + contentFileName);
}
- StreamUtil.copy(new BufferedInputStream(new FileInputStream(file)), new BufferedOutputStream(
- new FileOutputStream(new File(contentDir, driftFile.getHashId()))), true);
- }
- }
-
- File[] content = contentDir.listFiles();
- if (content == null || content.length == 0) {
- if (log.isDebugEnabled()) {
- log.debug("Could not find any of the requested content for " + defToString());
+ addFileToContentZipFile(stream, driftFile, file);
}
} else {
- if (log.isDebugEnabled()) {
- log.debug("Sending " + content.length + " files to the server for " + defToString());
+ Map<String, FileEntry> fileEntries = createSnapshotIndex();
+
+ for (DriftFile driftFile : driftFiles) {
+ FileEntry entry = fileEntries.get(driftFile.getHashId());
+ if (entry == null) {
+ continue;
+ }
+ File file = new File(headers.getBasedir(), entry.getFile());
+ if (file == null || !file.exists()) {
+ log.warn("Unable to find file for " + driftFile);
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Adding " + file.getPath() + " to " + contentFileName);
+ }
+ addFileToContentZipFile(stream, driftFile, file);
+ }
}
- driftClient.sendChangeSetContentToServer(resourceId, headers.getDriftDefinitionName(), contentDir);
}
+
+ stream.close();
+ stream = null;
+
+ driftClient.sendChangeSetContentToServer(resourceId, headers.getDriftDefinitionName(), zipFile);
+
+ if (log.isInfoEnabled()) {
+ long endTime = System.currentTimeMillis();
+ log.info("Finished submitting request to send content to server in " + (endTime - startTime) +
+ " ms");
+ }
+
} catch (IOException e) {
log.error("Failed to send drift files.", e);
+ } finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+ }
+
+ private void addFileToContentZipFile(ZipOutputStream stream, DriftFile driftFile, File file) throws IOException {
+ FileInputStream fis = new FileInputStream(file);
+ try {
+ stream.putNextEntry(new ZipEntry(driftFile.getHashId()));
+ StreamUtil.copy(fis, stream, false);
+ } finally {
+ fis.close();
}
}
@@ -100,6 +158,19 @@ public class DriftFilesSender implements Runnable {
}
}
+ private Map<String, FileEntry> createSnapshotIndex() throws IOException {
+ ChangeSetReader reader = changeSetMgr.getChangeSetReader(resourceId, headers.getDriftDefinitionName());
+ try {
+ Map<String, FileEntry> map = new TreeMap<String, FileEntry>();
+ for (FileEntry entry : reader) {
+ map.put(entry.getNewSHA(), entry);
+ }
+ return map;
+ } finally {
+ reader.close();
+ }
+ }
+
private String defToString() {
return "[resourceId: " + resourceId + ", driftDefinitionId: " + headers.getDriftDefinitionId() +
", driftDefinitionName: " + headers.getDriftDefinitionName() + "]";
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index 2790f13..3602267 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@ -19,30 +19,8 @@
package org.rhq.core.pc.drift;
-import static org.rhq.common.drift.FileEntry.addedFileEntry;
-import static org.rhq.common.drift.FileEntry.changedFileEntry;
-import static org.rhq.common.drift.FileEntry.removedFileEntry;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
-import static org.rhq.core.domain.drift.DriftComplianceStatus.OUT_OF_COMPLIANCE_NO_BASEDIR;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.rhq.common.drift.ChangeSetWriter;
import org.rhq.common.drift.Headers;
import org.rhq.core.clientapi.agent.drift.DriftAgentService;
@@ -63,6 +41,18 @@ import org.rhq.core.pc.measurement.MeasurementManager;
import org.rhq.core.util.file.FileUtil;
import org.rhq.core.util.stream.StreamUtil;
+import java.io.*;
+import java.util.List;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import static org.rhq.common.drift.FileEntry.*;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
+import static org.rhq.core.domain.drift.DriftComplianceStatus.OUT_OF_COMPLIANCE_NO_BASEDIR;
+
public class DriftManager extends AgentService implements DriftAgentService, DriftClient, ContainerService {
private final Log log = LogFactory.getLog(DriftManager.class);
@@ -252,7 +242,8 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
if (log.isDebugEnabled()) {
log.debug("Resending " + contentZipFile.getPath());
}
- sendContentZipFile(Integer.parseInt(resourceDir.getName()), defDir.getName(), contentZipFile);
+ sendChangeSetContentToServer(Integer.parseInt(resourceDir.getName()), defDir.getName(),
+ contentZipFile);
}
}
}
@@ -343,46 +334,7 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
}
@Override
- public void sendChangeSetContentToServer(int resourceId, String driftDefinitionName, final File contentDir) {
- ZipOutputStream stream = null;
- try {
- String timestamp = Long.toString(System.currentTimeMillis());
- String contentFileName = "content_" + timestamp + ".zip";
- final File zipFile = new File(contentDir.getParentFile(), contentFileName);
- stream = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(zipFile)));
-
- for (File file : contentDir.listFiles()) {
- FileInputStream fis = new FileInputStream(file);
- try {
- stream.putNextEntry(new ZipEntry(file.getName()));
- StreamUtil.copy(fis, stream, false);
- } finally {
- fis.close();
- }
- }
- stream.close();
- stream = null;
- sendContentZipFile(resourceId, driftDefinitionName, zipFile);
- } catch (IOException e) {
- log.error("An error occurred while trying to send content for changeset[resourceId: " + resourceId
- + ", driftDefinition: " + driftDefinitionName + "]", e);
- } finally {
- if (stream != null) {
- try {
- stream.close();
- } catch (IOException e) {
- }
- }
- }
-
- for (File file : contentDir.listFiles()) {
- if (!file.delete()) {
- log.warn("Unable to clean up content directory. Failed to delete " + file.getPath());
- }
- }
- }
-
- private void sendContentZipFile(int resourceId, String driftDefName, File contentZipFile) {
+ public void sendChangeSetContentToServer(int resourceId, String driftDefName, File contentZipFile) {
try {
int startIndex = "content_".length();
int endIndex = contentZipFile.getName().indexOf(".");
@@ -390,10 +342,10 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
DriftServerService driftServer = pluginContainerConfiguration.getServerServices().getDriftServerService();
driftServer.sendFilesZip(resourceId, driftDefName, token, contentZipFile.length(),
- remoteInputStream(new BufferedInputStream(new FileInputStream(contentZipFile))));
+ remoteInputStream(new BufferedInputStream(new FileInputStream(contentZipFile))));
} catch (FileNotFoundException e) {
log.error("An error occurred while trying to send change set content zip file " + contentZipFile.getPath()
- + " to server.", e);
+ + " to server.", e);
}
}
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
index 77db6b2..d427229 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
@@ -24,12 +24,19 @@ import org.rhq.common.drift.Headers;
import org.rhq.core.domain.drift.DriftChangeSetCategory;
import org.rhq.core.domain.drift.DriftFile;
import org.rhq.core.domain.drift.JPADriftFile;
+import org.rhq.core.util.ZipUtil;
+import org.rhq.test.AssertUtils;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.io.File;
+import java.io.FilenameFilter;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
import static org.rhq.common.drift.FileEntry.addedFileEntry;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
@@ -53,6 +60,27 @@ public class DriftFilesSenderTest extends DriftTest {
}
@Test
+ public void sendOneFile() throws Exception {
+ String driftDefName = "send-one-file-test";
+ File serverConf = createRandomFile(resourceDir, "server.conf");
+ String serverConfHash = sha256(serverConf);
+
+ File changeSetDir = changeSetDir(driftDefName);
+ Headers headers = createHeaders(driftDefName, COVERAGE);
+
+ ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
+ writer.write(addedFileEntry("server.conf", serverConfHash));
+ writer.close();
+
+ sender.setDriftFiles(driftFiles(serverConfHash));
+ sender.setHeaders(headers);
+ sender.run();
+
+ assertContentFileExists(changeSetDir);
+ assertContentFileMatches(changeSetDir, serverConfHash);
+ }
+
+ @Test
public void sendFilesInOneDirectory() throws Exception {
String driftDefName = "single-directory-test";
@@ -73,14 +101,11 @@ public class DriftFilesSenderTest extends DriftTest {
writer.close();
sender.setDriftFiles(driftFiles(server1ConfHash, server2ConfHash));
- sender.setHeaders(createHeaders(driftDefName, COVERAGE));
+ sender.setHeaders(headers);
sender.run();
- File contentDir = mkdir(changeSetDir, "content");
-
- assertEquals(contentDir.list().length, 2, "Expected to find two files in " + contentDir.getAbsolutePath());
- assertFileCopiedToContentDir(contentDir, server1ConfHash);
- assertFileCopiedToContentDir(contentDir, server2ConfHash);
+ assertContentFileExists(changeSetDir);
+ assertContentFileMatches(changeSetDir, server1ConfHash, server2ConfHash);
}
@Test
@@ -113,16 +138,11 @@ public class DriftFilesSenderTest extends DriftTest {
// Note that the order of the drift files is random. When the server sends a request
// for files we cannot assume that the files will be in any particular order.
sender.setDriftFiles(driftFiles(server1JarHash, server2ConfHash, server2JarHash, server1ConfHash));
- sender.setHeaders(createHeaders(driftDefName, COVERAGE));
+ sender.setHeaders(headers);
sender.run();
- File contentDir = mkdir(changeSetDir, "content");
-
- assertEquals(contentDir.list().length, 4, "Expected to find four files in " + contentDir.getAbsolutePath());
- assertFileCopiedToContentDir(contentDir, server1ConfHash);
- assertFileCopiedToContentDir(contentDir, server2ConfHash);
- assertFileCopiedToContentDir(contentDir, server1JarHash);
- assertFileCopiedToContentDir(contentDir, server2JarHash);
+ assertContentFileExists(changeSetDir);
+ assertContentFileMatches(changeSetDir, server1ConfHash, server2ConfHash, server1JarHash, server2JarHash);
}
@Test
@@ -154,10 +174,8 @@ public class DriftFilesSenderTest extends DriftTest {
sender.setHeaders(headers);
sender.run();
- File contentDir = mkdir(changeSetDir, "content");
-
- assertEquals(contentDir.list().length, 1, "Expected to find one file in " + contentDir.getAbsolutePath());
- assertFileCopiedToContentDir(contentDir, server2ConfHash);
+ assertContentFileExists(changeSetDir);
+ assertContentFileMatches(changeSetDir, server2ConfHash);
}
@Test
@@ -183,6 +201,37 @@ public class DriftFilesSenderTest extends DriftTest {
assertEquals(driftClient.getSendChangeSetContentInvocationCount(), 0,
"Do not call DriftClient to send content to server when there is no content to send.");
+ assertContentFileExists(changeSetDir(driftDefName));
+ }
+
+ void assertContentFileExists(File changeSetDir) {
+ File[] files = getContentFiles(changeSetDir);
+ assertEquals(files.length, 1, "Expected to find a single content zip file but found " + Arrays.toString(files));
+ }
+
+ void assertContentFileMatches(File changeSetDir, String... expectedFileNames) throws Exception {
+ File contentFile = getContentFiles(changeSetDir)[0];
+ final List<String> actualFileNames = new LinkedList<String>();
+
+ ZipUtil.walkZipFile(contentFile, new ZipUtil.ZipEntryVisitor() {
+ @Override
+ public boolean visit(ZipEntry entry, ZipInputStream stream) throws Exception {
+ actualFileNames.add(entry.getName());
+ return true;
+ }
+ });
+
+ AssertUtils.assertCollectionEqualsNoOrder(Arrays.asList(expectedFileNames), actualFileNames,
+ "The content file " + contentFile.getPath() + " does not contain the correct entries");
+ }
+
+ private File[] getContentFiles(File changeSetDir) {
+ return changeSetDir.listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("content_") && name.endsWith(".zip");
+ }
+ });
}
/**
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java
index c3e28f5..e1ec00d 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java
@@ -133,7 +133,8 @@ public class DriftManagerTest extends DriftTest {
File changeSetDir = changeSetDir(config.getName());
File snapshotFile = createRandomFile(changeSetDir, "changeset.txt");
File previousSnapshotFile = createRandomFile(changeSetDir, "changeset.txt.previous");
- File changeSetZipFile = createRandomFile(changeSetDir, "changeset_" + System.currentTimeMillis() + ".zip");
+
+ createRandomFile(changeSetDir, "changeset_" + System.currentTimeMillis() + ".zip");
driftMgr.ackChangeSet(resourceId(), config.getName());
@@ -145,53 +146,11 @@ public class DriftManagerTest extends DriftTest {
}
@Test
- public void writeContentZipFileToChangeSetContentDirectory() throws Exception {
- String configName = "send-content-in-zip";
- final File changeSetDir = changeSetDir(configName);
- final File contentDir = mkdir(changeSetDir, "content");
-
- createRandomFile(contentDir, "content-1");
- createRandomFile(contentDir, "content-2");
-
- setDriftServiceCallback(new DriftServiceCallback() {
- @Override
- public void execute() {
- assertThatZipFileExists(changeSetDir, "content_", "Expected to find content zip file in "
- + changeSetDir.getPath() + ". The file name should follow the pattern "
- + "content_<integer_timestamp>.zip");
- }
- });
-
- driftMgr.sendChangeSetContentToServer(resourceId(), configName, contentDir);
- }
-
- @Test
- public void sendContentToServerInZipFile() throws Exception {
- String configName = "send-content-in-zip";
- File changeSetDir = changeSetDir(configName);
- File contentDir = mkdir(changeSetDir, "content");
-
- final File content1 = createRandomFile(contentDir, "content-1");
- final File content2 = createRandomFile(contentDir, "content-2");
-
- setDriftServiceCallback(new DriftServiceCallback() {
- @Override
- public void execute() {
- assertZipFileMatches(driftServerService.inputStream, content1, content2);
- }
- });
-
- driftMgr.sendChangeSetContentToServer(resourceId(), configName, contentDir);
-
- // verify that the content directory is purged
- assertThatDirectoryIsEmpty(contentDir);
- }
-
- @Test
public void cleanUpWhenServerAcksChangeSetContent() throws Exception {
String configName = "cleanup-when-server-acks-content";
File changeSetDir = changeSetDir(configName);
- File contentDir = mkdir(changeSetDir, "content");
+
+ mkdir(changeSetDir, "content");
String token = Long.toString(System.currentTimeMillis());
File contentZipFile = createRandomFile(changeSetDir, "content_" + token + ".zip");
@@ -309,10 +268,6 @@ public class DriftManagerTest extends DriftTest {
}
}
- private void assertThatDirectoryIsEmpty(File dir) {
- assertEquals(dir.listFiles().length, 0, "Expected " + dir.getPath() + " to be empty");
- }
-
private File findFile(File dir, File file) {
for (File f : dir.listFiles()) {
if (f.getName().equals(file.getName())) {
commit e60b0694356357d6c73b04128606afe6d75e3041
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 14 16:00:07 2011 -0500
[Bug 756100 - RFE: use timestamp and file size during drift detection scans]
Worked in review feedback.
- consolidated removed and cantRead entry logic
- fixed up some comments
- clear collections after they are used to possibly help out gc
Decided to still keep around the "bucket" collections and assemble the
snapshot and delta entry lists using the buckets. It just seemed more
clear to me.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 869e376..76d7afb 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
package org.rhq.core.pc.drift;
import static org.rhq.common.drift.FileEntry.addedFileEntry;
@@ -30,6 +29,7 @@ import static org.rhq.core.util.file.FileUtil.forEachFile;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -49,6 +49,11 @@ import org.rhq.core.domain.drift.Filter;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.file.FileVisitor;
+/**
+ * Mechanism to detect and report Drift for active Drift Definitions.
+ *
+ * @author John Sanda
+ */
public class DriftDetector implements Runnable {
private Log log = LogFactory.getLog(DriftDetector.class);
@@ -220,119 +225,142 @@ public class DriftDetector implements Runnable {
}
final List<FileEntry> unchangedEntries = new LinkedList<FileEntry>();
- final List<FileEntry> removedEntries = new LinkedList<FileEntry>();
- final List<FileEntry> cantReadEntries = new LinkedList<FileEntry>();
final List<FileEntry> changedEntries = new LinkedList<FileEntry>();
+ final List<FileEntry> removedEntries = new LinkedList<FileEntry>();
+ final List<FileEntry> addedEntries = new LinkedList<FileEntry>();
+ // for pinned snapshots, keep track of the original FileEntry objects for changed entries. These
+ // are used if we re-write the pinned snapshot file.
final List<FileEntry> changedPinnedEntries = isPinned ? new LinkedList<FileEntry>() : null;
- ChangeSetReader snapshotReader = null;
- int newVersion;
- boolean updateSnapshot = false;
try {
- snapshotReader = changeSetMgr.getChangeSetReader(snapshotFile);
-
- if (!basedir.exists()) {
- log.warn("The base directory [" + basedir.getAbsolutePath() + "] for " + schedule + " does not exist.");
- }
+ ChangeSetReader snapshotReader = null;
+ int newVersion;
+ boolean updateSnapshot = false;
+ try {
+ snapshotReader = changeSetMgr.getChangeSetReader(snapshotFile);
- if (isPinned) {
- // If pinned we compare against the pinned snapshot but we need to know the current snapshot version,
- // get it from the current full snapshot.
- ChangeSetReader currentFullSnapshotReader = null;
- try {
- currentFullSnapshotReader = changeSetMgr.getChangeSetReader(currentFullSnapshot);
- newVersion = currentFullSnapshotReader.getHeaders().getVersion() + 1;
- } finally {
- currentFullSnapshotReader.close();
+ if (!basedir.exists()) {
+ log.warn("The base directory [" + basedir.getAbsolutePath() + "] for " + schedule
+ + " does not exist.");
}
- } else {
- newVersion = snapshotReader.getHeaders().getVersion() + 1;
- }
-
- // First look for files that have either been modified or deleted
- updateSnapshot = scanSnapshotFiles(schedule, basedir, snapshotReader, newFiles, unchangedEntries,
- removedEntries, cantReadEntries, changedEntries, changedPinnedEntries);
- } finally {
- snapshotReader.close();
- }
+ if (isPinned) {
+ // If pinned we compare against the pinned snapshot but we need to know the current snapshot version,
+ // get it from the current full snapshot.
+ ChangeSetReader currentFullSnapshotReader = null;
+ try {
+ currentFullSnapshotReader = changeSetMgr.getChangeSetReader(currentFullSnapshot);
+ newVersion = currentFullSnapshotReader.getHeaders().getVersion() + 1;
+ } finally {
+ currentFullSnapshotReader.close();
+ }
+ } else {
+ newVersion = snapshotReader.getHeaders().getVersion() + 1;
+ }
- // if necessary, re-write the pinned snapshot file because we've updated timestamp/filesize info, which
- // on subsequent detection runs will help us avoid SHA generation. It must maintain the same entries.
- if (isPinned && updateSnapshot) {
- changedPinnedEntries.addAll(unchangedEntries);
+ // First look for files that have either been changed or removed
+ updateSnapshot = scanSnapshot(schedule, basedir, snapshotReader, newFiles, unchangedEntries,
+ changedEntries, removedEntries, changedPinnedEntries);
- backupAndDeleteCurrentSnapshot(snapshotFile);
- updatePinnedSnapshot(schedule, snapshotFile, changedPinnedEntries);
- }
+ } finally {
+ snapshotReader.close();
+ }
- final List<FileEntry> snapshotEntries = new LinkedList<FileEntry>(unchangedEntries);
- snapshotEntries.addAll(changedEntries);
+ // if necessary, re-write the pinned snapshot file because we've updated timestamp/filesize info, which
+ // on subsequent detection runs will help us avoid SHA generation. It must maintain the same entries.
+ if (isPinned && updateSnapshot) {
+ changedPinnedEntries.addAll(unchangedEntries);
- final List<FileEntry> deltaEntries = new LinkedList<FileEntry>(changedEntries);
- deltaEntries.addAll(removedEntries);
- deltaEntries.addAll(cantReadEntries);
+ backupAndDeleteCurrentSnapshot(snapshotFile);
+ updatePinnedSnapshot(schedule, snapshotFile, changedPinnedEntries);
+ }
- for (File file : newFiles) {
- try {
- if (log.isInfoEnabled()) {
- log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
- }
+ // add new files to the snapshotEntries and deltaEntries
+ for (File file : newFiles) {
+ try {
+ if (log.isInfoEnabled()) {
+ log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
+ }
- FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file), file.lastModified(),
- file.length());
+ FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file), file.lastModified(),
+ file.length());
- deltaEntries.add(newEntry);
- snapshotEntries.add(newEntry);
+ addedEntries.add(newEntry);
- } catch (IOException e) {
- log.error("An error occurred while generating a drift change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException("An error occurred while generating a drift change set", e);
+ } catch (IOException e) {
+ log.error("An error occurred while generating a drift change set for " + schedule + ": "
+ + e.getMessage());
+ throw new DriftDetectionException("An error occurred while generating a drift change set", e);
+ }
}
- }
-
- if (deltaEntries.isEmpty()) {
- File newSnapshot = currentFullSnapshot;
- if (!isPinned) {
- // If unpinned and there is no detected drift then we generally don't need to add/update any files.
- // But, if we have timestamp/filesize updates then we want to replace the current snapshot with
- // the updated entries, so we can avoid SHA generation on subsequent runs.
- if (updateSnapshot) {
- currentFullSnapshot.delete();
- newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion - 1);
+ // The new snapshot contains all changed, unchanged and added files. Not removed files.
+ final List<FileEntry> snapshotEntries = new LinkedList<FileEntry>(unchangedEntries);
+ snapshotEntries.addAll(changedEntries);
+ snapshotEntries.addAll(addedEntries);
+
+ // The snapshot delta contains all changed, added and removed files.
+ final List<FileEntry> deltaEntries = new LinkedList<FileEntry>(changedEntries);
+ deltaEntries.addAll(removedEntries);
+ deltaEntries.addAll(addedEntries);
+
+ if (deltaEntries.isEmpty()) {
+ File newSnapshot = currentFullSnapshot;
+
+ if (!isPinned) {
+ // If unpinned and there is no detected drift then we generally don't need to add/update any files.
+ // But, if we have timestamp/filesize updates then we want to replace the current snapshot with
+ // the updated entries, so we can avoid SHA generation on subsequent runs.
+ if (updateSnapshot) {
+ currentFullSnapshot.delete();
+ newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion - 1);
+ }
+ } else {
+ // If pinned and returning to compliance (meaning no drift now but the previous snapshot did have drift)
+ // then we need to reset the current snapshot to match the pinned snapshot. Note though that we
+ // increment the snapshot version in order to let the server know about the state change.
+ if (newVersion > 1
+ && !isPreviousChangeSetEmpty(schedule.getResourceId(), schedule.getDriftDefinition())) {
+ currentFullSnapshot.delete();
+ newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
+
+ updateDeltaSnapshot(summary, schedule, deltaEntries, newVersion, currentFullSnapshot,
+ newSnapshot);
+ }
}
+
+ summary.setNewSnapshot(newSnapshot);
+
} else {
- // If pinned and returning to compliance (meaning no drift now but the previous snapshot did have drift)
- // then we need to reset the current snapshot to match the pinned snapshot. Note though that we
- // increment the snapshot version in order to let the server know about the state change.
- if (newVersion > 1
- && !isPreviousChangeSetEmpty(schedule.getResourceId(), schedule.getDriftDefinition())) {
- currentFullSnapshot.delete();
- newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
-
- updateDeltaSnapshot(summary, schedule, deltaEntries, newVersion, currentFullSnapshot, newSnapshot);
- }
- }
+ // if there is drift, but we're pinned and the drift is the same as the previous detection, just
+ // mark it as a repeat to indicate that we're out of compliance but not in any new way.
+ if (isPinned && newVersion > 1 && isSameAsPreviousChangeSet(deltaEntries, currentFullSnapshot)) {
+ summary.setVersion(newVersion - 1);
+ summary.setRepeat(true);
- summary.setNewSnapshot(newSnapshot);
+ return;
+ }
- } else {
- // if there is drift, but we're pinned and the drift is the same as the previous detection, just
- // mark it as a repeat to indicate that we're out of compliance but not in any new way.
- if (isPinned && newVersion > 1 && isSameAsPreviousChangeSet(deltaEntries, currentFullSnapshot)) {
- summary.setVersion(newVersion - 1);
- summary.setRepeat(true);
+ // otherwise, generate a new current snapshot, and a snapshot delta reflecting the latest drift
+ File oldSnapshot = backupAndDeleteCurrentSnapshot(currentFullSnapshot);
+ File newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
- return;
+ updateDeltaSnapshot(summary, schedule, deltaEntries, newVersion, oldSnapshot, newSnapshot);
}
+ } finally {
+ // Help out the garbage collector by clearing all of our collections
+ safeClear(newFiles, unchangedEntries, changedEntries, changedPinnedEntries);
+ }
+ }
- // otherwise, generate a new current snapshot, and a snapshot delta reflecting the latest drift
- File oldSnapshot = backupAndDeleteCurrentSnapshot(currentFullSnapshot);
- File newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
-
- updateDeltaSnapshot(summary, schedule, deltaEntries, newVersion, oldSnapshot, newSnapshot);
+ static private void safeClear(Collection<?>... collections) {
+ if (null == collections) {
+ return;
+ }
+ for (Collection<?> c : collections) {
+ if (null != c) {
+ c.clear();
+ }
}
}
@@ -363,10 +391,9 @@ public class DriftDetector implements Runnable {
* snapshot should be re-written to disk even if there was no drift.
* @throws IOException
*/
- private boolean scanSnapshotFiles(DriftDetectionSchedule schedule, File basedir, ChangeSetReader snapshotReader,
- Set<File> newFiles, List<FileEntry> unchangedEntries, List<FileEntry> removedEntries,
- List<FileEntry> cantReadEntries, List<FileEntry> modifiedEntries, List<FileEntry> changedPinnedEntries)
- throws IOException {
+ private boolean scanSnapshot(DriftDetectionSchedule schedule, File basedir, ChangeSetReader snapshotReader,
+ Set<File> newFiles, List<FileEntry> unchangedEntries, List<FileEntry> changedEntries,
+ List<FileEntry> removedEntries, List<FileEntry> changedPinnedEntries) throws IOException {
boolean result = false;
@@ -374,10 +401,11 @@ public class DriftDetector implements Runnable {
File file = new File(basedir, entry.getFile());
newFiles.remove(file);
- if (!file.exists()) {
- // The file has been deleted since the last scan
+ if (!(file.exists() && file.canRead())) {
+ // The file has been deleted or is no longer readable, since the last scan
if (log.isDebugEnabled()) {
- log.debug("Detected deleted file for " + schedule + " --> " + file.getAbsolutePath());
+ log.debug("Detected " + (file.exists() ? "unreadable" : "deleted") + " file for " + schedule
+ + " --> " + file.getAbsolutePath());
}
removedEntries.add(removedFileEntry(entry.getFile(), entry.getNewSHA()));
@@ -387,37 +415,25 @@ public class DriftDetector implements Runnable {
continue;
- } else if (!file.canRead()) {
- if (log.isDebugEnabled()) {
- log.debug(file.getPath() + " is no longer readable. Treating it as a deleted file.");
- }
- cantReadEntries.add(removedFileEntry(entry.getFile(), entry.getNewSHA()));
-
- if (null != changedPinnedEntries) {
- changedPinnedEntries.add(entry);
- }
-
- continue;
-
} else {
String currentSHA = null;
- boolean isModified = false;
+ boolean isChanged = false;
// perform a SHA comparison if we are unable to compare size and lastModified or if the
- // size or lastModified test fails. We may not have size of lastModified values for the
+ // size or lastModified test fails. We may not have size or lastModified values for the
// entry when the current snapshot was provided by the server, either due to a synch or
// pinning scenario. The server does not store that information and will provide -1 for defaults.
if (entry.getLastModified() == -1 || entry.getSize() == -1
|| entry.getLastModified() != file.lastModified() || entry.getSize() != file.length()) {
currentSHA = sha256(file);
- isModified = !entry.getNewSHA().equals(currentSHA);
+ isChanged = !entry.getNewSHA().equals(currentSHA);
}
- if (isModified) {
- FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA, file
+ if (isChanged) {
+ FileEntry changedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA, file
.lastModified(), file.length());
- modifiedEntries.add(modifiedEntry);
+ changedEntries.add(changedEntry);
if (null != changedPinnedEntries) {
changedPinnedEntries.add(entry);
commit b7ff74899be79a903a40483691e4916f313e3500
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 14 15:59:24 2011 -0500
- Add some unit tests ensuring timestamp info is updated appropriately.
- remove a bunch of IDE warnings
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
index b0b1143..0f2d30a 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
@@ -19,12 +19,22 @@
package org.rhq.core.pc.drift;
-import org.rhq.common.drift.*;
-import org.rhq.core.domain.drift.DriftDefinition;
-import org.rhq.core.system.OperatingSystemType;
-import org.rhq.core.system.SystemInfoFactory;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static org.apache.commons.io.FileUtils.copyFile;
+import static org.apache.commons.io.FileUtils.deleteDirectory;
+import static org.apache.commons.io.FileUtils.touch;
+import static org.rhq.common.drift.FileEntry.addedFileEntry;
+import static org.rhq.common.drift.FileEntry.changedFileEntry;
+import static org.rhq.common.drift.FileEntry.removedFileEntry;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
+import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
+import static org.rhq.test.AssertUtils.assertPropertiesMatch;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import java.io.BufferedReader;
import java.io.File;
@@ -33,15 +43,18 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static org.apache.commons.io.FileUtils.*;
-import static org.rhq.common.drift.FileEntry.*;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
-import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
-import static org.rhq.test.AssertUtils.assertPropertiesMatch;
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import org.rhq.common.drift.ChangeSetReader;
+import org.rhq.common.drift.ChangeSetReaderImpl;
+import org.rhq.common.drift.ChangeSetWriter;
+import org.rhq.common.drift.ChangeSetWriterImpl;
+import org.rhq.common.drift.FileEntry;
+import org.rhq.common.drift.Headers;
+import org.rhq.core.domain.drift.DriftDefinition;
+import org.rhq.core.system.OperatingSystemType;
+import org.rhq.core.system.SystemInfoFactory;
public class DriftDetectorTest extends DriftTest {
@@ -66,7 +79,6 @@ public class DriftDetectorTest extends DriftTest {
detector.setScheduleQueue(scheduleQueue);
}
- @SuppressWarnings("unchecked")
@Test
public void excludeEmptyDirsFromCoverageChangeSet() throws Exception {
File confDir = mkdir(resourceDir, "conf");
@@ -74,6 +86,7 @@ public class DriftDetectorTest extends DriftTest {
// create an empty directory
File libDir = mkdir(resourceDir, "lib");
+ assert (libDir.isDirectory());
DriftDefinition driftDef = driftDefinition("coverage-test", resourceDir.getAbsolutePath());
@@ -82,14 +95,13 @@ public class DriftDetectorTest extends DriftTest {
File changeSet = changeSet(driftDef.getName(), COVERAGE);
Headers headers = createHeaders(driftDef, COVERAGE);
- List<FileEntry> expected = asList(addedFileEntry("conf/server.conf", sha256(serverConf),
- serverConf.lastModified(), serverConf.length()));
+ List<FileEntry> expected = asList(addedFileEntry("conf/server.conf", sha256(serverConf), serverConf
+ .lastModified(), serverConf.length()));
assertHeaderEquals(changeSet, headers);
assertFileEntriesMatch("Only files should be included in a change set.", expected, changeSet);
}
- @SuppressWarnings("unchecked")
@Test
public void includeMultipleFilesInDirInCoverageChangeSet() throws Exception {
File confDir = mkdir(resourceDir, "conf");
@@ -102,16 +114,15 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File changeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> entries = asList(
- addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
- addedFileEntry("conf/server-2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf
+ .lastModified(), server1Conf.length()), addedFileEntry("conf/server-2.conf", sha256(server2Conf),
+ server2Conf.lastModified(), server2Conf.length()));
assertHeaderEquals(changeSet, createHeaders(def, COVERAGE));
assertFileEntriesMatch("Each file in a directory should be included in a coverage change set", entries,
changeSet);
}
- @SuppressWarnings("unchecked")
@Test
public void includedSiblingDirsInCoverageChangeSet() throws Exception {
File confDir = mkdir(resourceDir, "conf");
@@ -126,16 +137,15 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File changeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> entries = asList(
- addedFileEntry("conf/server.conf", sha256(serverConf), serverConf.lastModified(), serverConf.length()),
- addedFileEntry("lib/server.jar", sha256(serverLib), serverLib.lastModified(), serverLib.length()));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", sha256(serverConf), serverConf
+ .lastModified(), serverConf.length()), addedFileEntry("lib/server.jar", sha256(serverLib), serverLib
+ .lastModified(), serverLib.length()));
assertHeaderEquals(changeSet, createHeaders(def, COVERAGE));
assertFileEntriesMatch("A coverage change set should include files from multiple, sibling directories",
entries, changeSet);
}
- @SuppressWarnings("unchecked")
@Test
public void includeNestedDirsInCoverageChangeSet() throws Exception {
File confDir = mkdir(resourceDir, "conf");
@@ -150,9 +160,9 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File changeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> entries = asList(
- addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
- addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf
+ .lastModified(), server1Conf.length()), addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf),
+ server2Conf.lastModified(), server2Conf.length()));
assertHeaderEquals(changeSet, createHeaders(def, COVERAGE));
assertFileEntriesMatch("A coverage change set should include files in nested sub directories", entries,
@@ -161,12 +171,13 @@ public class DriftDetectorTest extends DriftTest {
@Test
public void updateScheduleAfterGeneratingCoverageChangeSet() throws Exception {
- DriftDefinition driftDef = driftDefinition("update-schedule-after-coverage-changeset",
- resourceDir.getAbsolutePath());
+ DriftDefinition driftDef = driftDefinition("update-schedule-after-coverage-changeset", resourceDir
+ .getAbsolutePath());
DriftDetectionSchedule schedule = new DriftDetectionSchedule(resourceId(), driftDef);
File confDir = mkdir(resourceDir, "conf");
File serverConf = createRandomFile(confDir, "server.conf");
+ assert (serverConf.exists());
long currentTime = System.currentTimeMillis();
@@ -174,8 +185,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
assertTrue(schedule.getNextScan() >= (currentTime + driftDef.getInterval()),
- "Failed to update schedule. next scan is " + schedule.getNextScan() + " and should be greater than " +
- (currentTime + driftDef.getInterval()));
+ "Failed to update schedule. next scan is " + schedule.getNextScan() + " and should be greater than "
+ + (currentTime + driftDef.getInterval()));
}
@Test
@@ -183,11 +194,11 @@ public class DriftDetectorTest extends DriftTest {
}
- @SuppressWarnings("unchecked")
@Test
public void doNotUpdateSnapshotOrGenerateDriftChangeSetIfNothingChanges() throws Exception {
File confDir = mkdir(resourceDir, "conf");
File serverConf = createRandomFile(confDir, "server.conf");
+ assert (serverConf.exists());
DriftDefinition def = driftDefinition("nothing-to-update", resourceDir.getAbsolutePath());
@@ -217,7 +228,6 @@ public class DriftDetectorTest extends DriftTest {
+ "no drift");
}
- @SuppressWarnings("unchecked")
@Test
public void skipDetectionForScheduledThatIsDisabled() throws Exception {
detector.setDriftClient(new DriftClientTestStub() {
@@ -245,8 +255,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
// make sure that the next scan time is not updated
- assertEquals(schedule.getNextScan(), nextScan, "The next scan time for the drift detection schedule should " +
- " not get updated if drift detection does not actually run for the definition.");
+ assertEquals(schedule.getNextScan(), nextScan, "The next scan time for the drift detection schedule should "
+ + " not get updated if drift detection does not actually run for the definition.");
}
@Test
@@ -255,7 +265,8 @@ public class DriftDetectorTest extends DriftTest {
DriftDetectionSchedule schedule = new DriftDetectionSchedule(resourceId(), driftDef);
File confDir = mkdir(resourceDir, "conf");
- File server1Conf = new File(confDir, "server.conf");
+ File server1Conf = createRandomFile(confDir, "server.conf");
+ assert (server1Conf.exists());
scheduleQueue.addSchedule(schedule);
detector.run();
@@ -263,8 +274,8 @@ public class DriftDetectorTest extends DriftTest {
long nextScan = schedule.getNextScan();
detector.run();
- assertEquals(schedule.getNextScan(), nextScan, "The next scan time for the drift detection schedule should " +
- " not get updated if drift detection does not actually run for the definition.");
+ assertEquals(schedule.getNextScan(), nextScan, "The next scan time for the drift detection schedule should "
+ + " not get updated if drift detection does not actually run for the definition.");
}
@Test
@@ -277,18 +288,17 @@ public class DriftDetectorTest extends DriftTest {
scheduleQueue.addSchedule(new DriftDetectionSchedule(resourceId(), def));
detector.run();
- assertEquals(driftClient.getReportMissingBaseDirInvocationCount(), 1, "A missing base directory should be " +
- "reported to the server if no initial snapshot has already been generated.");
- assertEquals(driftClient.getSendChangeSetInvocationCount(), 0, "No initial change set should be sent to " +
- "the server if the base directory does not exist.");
+ assertEquals(driftClient.getReportMissingBaseDirInvocationCount(), 1, "A missing base directory should be "
+ + "reported to the server if no initial snapshot has already been generated.");
+ assertEquals(driftClient.getSendChangeSetInvocationCount(), 0, "No initial change set should be sent to "
+ + "the server if the base directory does not exist.");
// verify that the initial change set was not generated
File snapshot = changeSet(def.getName(), COVERAGE);
- assertFalse(snapshot.exists(), "An initial snapshot should not be written to disk if the base directory " +
- "does not exist.");
+ assertFalse(snapshot.exists(), "An initial snapshot should not be written to disk if the base directory "
+ + "does not exist.");
}
- @SuppressWarnings("unchecked")
@Test
public void skipDetectionWhenPreviousSnapshotFileExists() throws Exception {
// The presence of a previous snapshot file means that the server has
@@ -327,7 +337,6 @@ public class DriftDetectorTest extends DriftTest {
+ "drift detection should not have run until the server acked the previous snapshot.");
}
- @SuppressWarnings("unchecked")
@Test
public void includeAddedFileInDriftChangeSet() throws Exception {
DriftDefinition def = driftDefinition("file-added-drift-test", resourceDir.getAbsolutePath());
@@ -336,8 +345,8 @@ public class DriftDetectorTest extends DriftTest {
File server1Conf = createRandomFile(confDir, "server-1.conf");
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(),
- server1Conf.length()));
+ writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf
+ .length()));
writer.close();
// Create some drift
@@ -347,8 +356,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File driftChangeSet = changeSet(def.getName(), DRIFT);
- List<FileEntry> driftEntries = asList(addedFileEntry("conf/server-2.conf", sha256(server2Conf),
- server2Conf.lastModified(), server2Conf.length()));
+ List<FileEntry> driftEntries = asList(addedFileEntry("conf/server-2.conf", sha256(server2Conf), server2Conf
+ .lastModified(), server2Conf.length()));
// verify that the drift change set was generated
assertTrue(driftChangeSet.exists(), "Expected to find drift change set " + driftChangeSet.getPath());
@@ -356,9 +365,9 @@ public class DriftDetectorTest extends DriftTest {
assertFileEntriesMatch("The drift change set does not match the expected values", driftEntries, driftChangeSet);
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(
- addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
- addedFileEntry("conf/server-2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
+ List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf
+ .lastModified(), server1Conf.length()), addedFileEntry("conf/server-2.conf", sha256(server2Conf),
+ server2Conf.lastModified(), server2Conf.length()));
// verify that the coverage change set was updated
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
@@ -366,7 +375,6 @@ public class DriftDetectorTest extends DriftTest {
coverageChangeSet);
}
- @SuppressWarnings("unchecked")
@Test
public void includeModifiedFileInDriftChangeSet() throws Exception {
DriftDefinition def = driftDefinition("file-modified-drift-test", resourceDir.getAbsolutePath());
@@ -388,8 +396,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File driftChangeSet = changeSet(def.getName(), DRIFT);
- List<FileEntry> driftEntries = asList(changedFileEntry("conf/server-1.conf", oldHash, newHash,
- server1Conf.lastModified(), server1Conf.length()));
+ List<FileEntry> driftEntries = asList(changedFileEntry("conf/server-1.conf", oldHash, newHash, server1Conf
+ .lastModified(), server1Conf.length()));
// verify that the drift change set was generated
assertTrue(driftChangeSet.exists(), "Expected to find drift change set " + driftChangeSet.getPath());
@@ -397,8 +405,8 @@ public class DriftDetectorTest extends DriftTest {
assertFileEntriesMatch("The drift change set does not match the expected values", driftEntries, driftChangeSet);
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(changedFileEntry("conf/server-1.conf", oldHash, newHash,
- server1Conf.lastModified(), server1Conf.length()));
+ List<FileEntry> coverageEntries = asList(changedFileEntry("conf/server-1.conf", oldHash, newHash, server1Conf
+ .lastModified(), server1Conf.length()));
// verify that the coverage change set was updated
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
@@ -406,7 +414,6 @@ public class DriftDetectorTest extends DriftTest {
coverageChangeSet);
}
- @SuppressWarnings("unchecked")
@Test(enabled = false)
public void includeFiledAddedInNewDirectoryInDriftChangeSet() throws Exception {
DriftDefinition def = driftDefinition("file-added-in-new-dir", resourceDir.getAbsolutePath());
@@ -415,8 +422,8 @@ public class DriftDetectorTest extends DriftTest {
File server1Conf = createRandomFile(confDir, "server-1.conf");
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(),
- server1Conf.length()));
+ writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf
+ .length()));
writer.close();
// create some drift
@@ -436,9 +443,9 @@ public class DriftDetectorTest extends DriftTest {
assertFileEntriesMatch("The drift change set does not match the expected values", driftEntries, driftChangeSet);
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(
- addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
- addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
+ List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf
+ .lastModified(), server1Conf.length()), addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf),
+ server2Conf.lastModified(), server2Conf.length()));
// verify that the coverage change set was updated
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
@@ -446,7 +453,6 @@ public class DriftDetectorTest extends DriftTest {
coverageChangeSet);
}
- @SuppressWarnings("unchecked")
@Test
public void includeRemovedFileInDriftChangeSet() throws Exception {
DriftDefinition def = driftDefinition("file-removed-drift-test", resourceDir.getAbsolutePath());
@@ -458,10 +464,10 @@ public class DriftDetectorTest extends DriftTest {
String server2ConfHash = sha256(server2Conf);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(),
- server1Conf.length()));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(),
- server2Conf.length()));
+ writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf
+ .length()));
+ writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(), server2Conf
+ .length()));
writer.close();
// create some drift
@@ -480,8 +486,8 @@ public class DriftDetectorTest extends DriftTest {
// verify that the coverage change set was updated
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf),
- server1Conf.lastModified(), server1Conf.length()));
+ List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf
+ .lastModified(), server1Conf.length()));
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
assertFileEntriesMatch("The coverage change set was not updated as expected", coverageEntries,
@@ -529,7 +535,6 @@ public class DriftDetectorTest extends DriftTest {
}
- @SuppressWarnings("unchecked")
@Test
public void includeFilesInRemovedDirectoryInDriftChangeSet() throws Exception {
DriftDefinition def = driftDefinition("dir-removed-test", resourceDir.getAbsolutePath());
@@ -539,7 +544,8 @@ public class DriftDetectorTest extends DriftTest {
String server1Hash = sha256(server1Conf);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", server1Hash, server1Conf.lastModified(), server1Conf.length()));
+ writer
+ .write(addedFileEntry("conf/server-1.conf", server1Hash, server1Conf.lastModified(), server1Conf.length()));
writer.close();
// create some drift
@@ -566,7 +572,6 @@ public class DriftDetectorTest extends DriftTest {
coverageChangeSet);
}
- @SuppressWarnings("unchecked")
@Test
public void revertToPreviousSnapshotWhenSendingChangeSetFails() throws Exception {
DriftDefinition def = driftDefinition("revert-snapshot-test", resourceDir.getAbsolutePath());
@@ -574,6 +579,7 @@ public class DriftDetectorTest extends DriftTest {
File confDir = mkdir(resourceDir, "conf");
File server1Conf = createRandomFile(confDir, "server.conf");
+ assert (server1Conf.exists());
scheduleQueue.addSchedule(schedule);
// generate the initial snapshot
@@ -612,7 +618,6 @@ public class DriftDetectorTest extends DriftTest {
+ "should be deleted once we have reverted back to it and have a new, current snapsot file.");
}
- @SuppressWarnings("unchecked")
@Test
public void purgeSnapshotWhenSendingInitialChangeSetFails() throws Exception {
// If we have just generated the initial change set and sending it to
@@ -650,8 +655,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File changeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> entries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf),
- server1Conf.lastModified(), server1Conf.length()));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf
+ .lastModified(), server1Conf.length()));
assertHeaderEquals(changeSet, createHeaders(def, COVERAGE));
assertFileEntriesMatch("Files that are non-readable should be skipped but other, readable file should still "
@@ -760,14 +765,14 @@ public class DriftDetectorTest extends DriftTest {
String newPinnedHash = sha256(pinnedSnapshot);
- assertEquals(newPinnedHash, originalPinnedHash, "When a snapshot is pinned, it should not get updated during " +
- "drift detection");
+ assertEquals(newPinnedHash, originalPinnedHash, "When a snapshot is pinned, it should not get updated during "
+ + "drift detection");
// We always generate/update the current snapshot so we still need to verify that it
// was generated/updated correctly
- List<FileEntry> fileEntries = asList(
- addedFileEntry("conf/server1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
- addedFileEntry("conf/server2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
+ List<FileEntry> fileEntries = asList(addedFileEntry("conf/server1.conf", sha256(server1Conf), server1Conf
+ .lastModified(), server1Conf.length()), addedFileEntry("conf/server2.conf", sha256(server2Conf),
+ server2Conf.lastModified(), server2Conf.length()));
assertHeaderEquals(currentSnapshot, createHeaders(driftDef, COVERAGE, 1));
assertFileEntriesMatch("The current snapshot file should still get updated even when using a pinned snapshot",
@@ -801,10 +806,10 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
// verify that the current snapshot was updated
- List<FileEntry> currentSnapshotEntries = asList(
- addedFileEntry("conf/server1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
- addedFileEntry("conf/server2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()),
- addedFileEntry("conf/server3.conf", sha256(server3Conf), server3Conf.lastModified(), server3Conf.length()));
+ List<FileEntry> currentSnapshotEntries = asList(addedFileEntry("conf/server1.conf", sha256(server1Conf),
+ server1Conf.lastModified(), server1Conf.length()), addedFileEntry("conf/server2.conf", sha256(server2Conf),
+ server2Conf.lastModified(), server2Conf.length()), addedFileEntry("conf/server3.conf", sha256(server3Conf),
+ server3Conf.lastModified(), server3Conf.length()));
assertHeaderEquals(currentSnapshot, createHeaders(driftDef, COVERAGE, 2));
assertFileEntriesMatch("The current snapshot file should still get updated even when using a pinned snapshot",
@@ -812,9 +817,9 @@ public class DriftDetectorTest extends DriftTest {
// verify that the the drift/delta change set was generated
File driftChangeSet = changeSet(driftDef.getName(), DRIFT);
- List<FileEntry> driftEntries = asList(
- addedFileEntry("conf/server2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()),
- addedFileEntry("conf/server3.conf", sha256(server3Conf), server3Conf.lastModified(), server3Conf.length()));
+ List<FileEntry> driftEntries = asList(addedFileEntry("conf/server2.conf", sha256(server2Conf), server2Conf
+ .lastModified(), server2Conf.length()), addedFileEntry("conf/server3.conf", sha256(server3Conf),
+ server3Conf.lastModified(), server3Conf.length()));
assertHeaderEquals(driftChangeSet, createHeaders(driftDef, DRIFT, 2));
assertFileEntriesMatch("The drift change set was not generated correctly when using a pinned snapshot",
@@ -835,16 +840,16 @@ public class DriftDetectorTest extends DriftTest {
File changeSet = changeSet(driftDef.getName(), COVERAGE);
File pinnedSnapshot = new File(changeSet.getParentFile(), "snapshot.pinned");
- List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", sha256(serverConf),
- serverConf.lastModified(), serverConf.length()));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", sha256(serverConf), serverConf
+ .lastModified(), serverConf.length()));
assertTrue(changeSet.exists(), "An initial snapshot file should be generated even when it is pinned");
assertHeaderEquals(changeSet, createHeaders(driftDef, COVERAGE));
assertFileEntriesMatch("Initial snapshot entries are wrong for pinned snapshot", entries, changeSet);
assertTrue(pinnedSnapshot.exists(), "Pinned snapshot file should be generated when initial version is pinned");
- assertEquals(sha256(changeSet), sha256(pinnedSnapshot), "The contents of the pinned snapshot file and the " +
- "initial snapshot should be identical");
+ assertEquals(sha256(changeSet), sha256(pinnedSnapshot), "The contents of the pinned snapshot file and the "
+ + "initial snapshot should be identical");
}
@Test
@@ -895,8 +900,8 @@ public class DriftDetectorTest extends DriftTest {
public void repeatChangeSet(int resourceId, String driftDefName, int version) {
repeatChangeSetCalled.set(true);
assertEquals(resourceId, resourceId(), "The resource id for the repeat change set is wrong");
- assertEquals(driftDefName, driftDef.getName(), "The drift definition name for the repeat change set " +
- "is wrong");
+ assertEquals(driftDefName, driftDef.getName(), "The drift definition name for the repeat change set "
+ + "is wrong");
assertEquals(version, 1, "The snapshot version should not have changed since no new drift was detected");
}
});
@@ -914,8 +919,8 @@ public class DriftDetectorTest extends DriftTest {
assertTrue(repeatChangeSetCalled.get(), "Failed to notify server of repeat change set");
// verify that the previous version snapshot file has been deleted
- assertFalse(previousSnapshot.exists(), "There should be no previous version snapshot file because the " +
- "server has already acknowledged the current snapshot.");
+ assertFalse(previousSnapshot.exists(), "There should be no previous version snapshot file because the "
+ + "server has already acknowledged the current snapshot.");
}
@@ -933,7 +938,8 @@ public class DriftDetectorTest extends DriftTest {
// generate the pinned snapshot which is version zero
File pinnedSnapshot = pinnedSnapshot(driftDef.getName());
ChangeSetWriter writer = new ChangeSetWriterImpl(pinnedSnapshot, headers);
- writer.write(addedFileEntry("conf/server.conf", serverConfHash, serverConf.lastModified(), serverConf.length()));
+ writer
+ .write(addedFileEntry("conf/server.conf", serverConfHash, serverConf.lastModified(), serverConf.length()));
writer.close();
// generate the current snapshot file. we will take a shortcut here by
@@ -946,6 +952,7 @@ public class DriftDetectorTest extends DriftTest {
// now generate some drift causing the resource to go out of compliance
File newServerConf = createRandomFile(confDir, "new_server.conf");
String newServerConfHash = sha256(newServerConf);
+ assert (null != newServerConfHash);
// do a drift detection run
DriftDetectionSchedule schedule = new DriftDetectionSchedule(resourceId(), driftDef);
@@ -965,12 +972,81 @@ public class DriftDetectorTest extends DriftTest {
// verify that that current snapshot has been updated to reflect that
// the resource is back in compliance.
- List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", serverConfHash,
- serverConf.lastModified(), serverConf.length()));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", serverConfHash, serverConf.lastModified(),
+ serverConf.length()));
assertHeaderEquals(currentSnapshot, createHeaders(driftDef, COVERAGE, 2));
- assertFileEntriesMatch("The entries in the current snapshot should match those in the pinned snapshot " +
- "once the resource has gone back into compliance.", entries, currentSnapshot);
+ assertFileEntriesMatch("The entries in the current snapshot should match those in the pinned snapshot "
+ + "once the resource has gone back into compliance.", entries, currentSnapshot);
+ }
+
+ @Test
+ public void updateTimestampInfoNoDriftTest() throws Exception {
+ DriftDefinition def = driftDefinition("update-timestamp-nodrift-test", resourceDir.getAbsolutePath());
+
+ File confDir = mkdir(resourceDir, "conf");
+ File server1Conf = createRandomFile(confDir, "server-1.conf");
+ String server1Hash = sha256(server1Conf);
+
+ ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
+ writer.write(addedFileEntry("conf/server-1.conf", server1Hash, -1L, -1L));
+ writer.close();
+
+ scheduleQueue.addSchedule(new DriftDetectionSchedule(resourceId(), def));
+ detector.run();
+
+ // verify that no drift change set was generated
+ File driftChangeSet = changeSet(def.getName(), DRIFT);
+ assertFalse(driftChangeSet.exists(), "Expected no drift change set " + driftChangeSet.getPath());
+
+ // verify that the coverage change set was updated with timestamp info, version is still 0
+ File coverageChangeSet = changeSet(def.getName(), COVERAGE);
+ List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", server1Hash, server1Conf
+ .lastModified(), server1Conf.length()));
+
+ assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 0));
+ assertFileEntriesMatch("The coverage change set was not updated as expected", coverageEntries,
+ coverageChangeSet);
+ }
+
+ @Test
+ public void updateTimestampInfoDriftTest() throws Exception {
+ DriftDefinition def = driftDefinition("update-timestamp-drift-test", resourceDir.getAbsolutePath());
+
+ File confDir = mkdir(resourceDir, "conf");
+ File server1Conf = createRandomFile(confDir, "server-1.conf");
+ String server1Hash = sha256(server1Conf);
+ File server2Conf = createRandomFile(confDir, "server-2.conf");
+ String server2Hash = sha256(server2Conf);
+
+ ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
+ writer.write(addedFileEntry("conf/server-1.conf", server1Hash, -1L, -1L));
+ writer.write(addedFileEntry("conf/server-2.conf", server2Hash, -1L, -1L));
+ writer.close();
+
+ // create some drift
+ server1Conf.delete();
+ confDir.delete();
+
+ scheduleQueue.addSchedule(new DriftDetectionSchedule(resourceId(), def));
+ detector.run();
+
+ File driftChangeSet = changeSet(def.getName(), DRIFT);
+ List<FileEntry> driftEntries = asList(removedFileEntry("conf/server-1.conf", server1Hash));
+
+ // verify that the drift change set was generated
+ assertTrue(driftChangeSet.exists(), "Expected to find drift change set " + driftChangeSet.getPath());
+ assertHeaderEquals(driftChangeSet, createHeaders(def, DRIFT, 1));
+ assertFileEntriesMatch("The drift change set does not match the expected values", driftEntries, driftChangeSet);
+
+ // verify that the coverage change set was updated with timestamp info and incremented version
+ File coverageChangeSet = changeSet(def.getName(), COVERAGE);
+ List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-2.conf", server2Hash, server2Conf
+ .lastModified(), server2Conf.length()));
+
+ assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
+ assertFileEntriesMatch("The coverage change set was not updated as expected", coverageEntries,
+ coverageChangeSet);
}
private void assertHeaderEquals(File changeSet, Headers expected) throws Exception {
commit 3300dff0ec830f6b4f5295240cebea76a6a00a38
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Dec 14 15:46:58 2011 -0500
[BZ 760139] have live data requests return empty lists even when random runtime exceptions occur to avoid serialization issues in UI.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
index a57f522..7ffb8e1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
@@ -724,8 +724,8 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
List<List<MeasurementDataNumericHighLowComposite>> findDataForCompatibleGroup(Subject subject, int groupId,
int definitionId, long beginTime, long endTime, int numPoints) {
- List<List<MeasurementDataNumericHighLowComposite>> ret = findDataForContext(subject, EntityContext
- .forGroup(groupId), definitionId, beginTime, endTime, numPoints);
+ List<List<MeasurementDataNumericHighLowComposite>> ret = findDataForContext(subject,
+ EntityContext.forGroup(groupId), definitionId, beginTime, endTime, numPoints);
return ret;
}
@@ -790,6 +790,11 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
AgentClient ac = agentClientManager.getAgentClient(agent);
Set<MeasurementData> values = ac.getMeasurementAgentService().getRealTimeMeasurementValue(resourceId,
createRequests(definitions));
+ //[BZ 760139] always return non-null value even when there are errors on the server side. Avoids cryptic
+ // Global UI Exceptions when attempting to serialize null responses.
+ if (values == null) {
+ values = Collections.emptySet();
+ }
return values;
}
commit 37dac4382571c22297dc4ff7497564eb7864b1fd
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Dec 14 15:24:35 2011 -0500
Add dependency needed as a result of REST integration into server/jar
Also adding itests module to enterprise profile so that it will get
built by jenkins.
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index e119090..eb6a9cf 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -73,6 +73,7 @@
<module>server/container-lib</module>
<module>server/container</module>
<module>server/client-api</module>
+ <module>server/itests</module>
</modules>
</profile>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index f269e77..8753e6f 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -220,6 +220,12 @@
<version>2.3.18</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
</dependencies>
<build>
commit 4f832a42b5477490cdcdaaf334846980b813ff4e
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Dec 14 14:38:43 2011 -0500
[BZ 760185] fix NPEs that occurred if user hovered over the Severity or Source Location columns while grid data was still loading (https://bugzilla.redhat.com/show_bug.cgi?id=760185)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
index c935e70..afcca26 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -99,22 +99,25 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
});
severityField.setShowHover(true);
severityField.setHoverCustomizer(new HoverCustomizer() {
- @Override
public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
- EventSeverity severity = EventSeverity.valueOf(record.getAttribute("severity"));
+ if (value == null) {
+ return null;
+ }
+ EventSeverity severity = EventSeverity.valueOf((String)value);
switch (severity) {
- case DEBUG:
- return MSG.common_severity_debug();
- case INFO:
- return MSG.common_severity_info();
- case WARN:
- return MSG.common_severity_warn();
- case ERROR:
- return MSG.common_severity_error();
- case FATAL:
- return MSG.common_severity_fatal();
+ case DEBUG:
+ return MSG.common_severity_debug();
+ case INFO:
+ return MSG.common_severity_info();
+ case WARN:
+ return MSG.common_severity_warn();
+ case ERROR:
+ return MSG.common_severity_error();
+ case FATAL:
+ return MSG.common_severity_fatal();
+ default:
+ return null;
}
- return null;
}
});
fields.add(severityField);
@@ -147,9 +150,11 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
});
sourceField.setShowHover(true);
sourceField.setHoverCustomizer(new HoverCustomizer() {
- @Override
public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
- String sourceLocation = record.getAttribute("source");
+ if (value == null) {
+ return null;
+ }
+ String sourceLocation = (String)value;
return (sourceLocation.length() > 40) ? sourceLocation : null;
}
});
@@ -166,7 +171,6 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
});
resourceNameField.setShowHover(true);
resourceNameField.setHoverCustomizer(new HoverCustomizer() {
-
public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) {
return AncestryUtil.getResourceHoverHTML(listGridRecord, 0);
}
commit 2e75028c77cc24a2b097e82385d4c7dfb9b774d5
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 13 17:17:29 2011 -0500
[Bug 756100 - RFE: use timestamp and file size during drift detection scans]
More work on using timestamp (and filesize) info to avoid SHA digest
generation. Handle situations where the current changeset is supplied
by the server, due to pinning or agent sync. In these situations work
to replace the non-timestamped changesets with timestamped versions as
soon as possible.
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java b/modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java
index e1766a3..564e9c5 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java
@@ -29,7 +29,7 @@ import java.util.Date;
import org.rhq.core.domain.drift.DriftCategory;
import org.rhq.core.util.file.FileUtil;
-public class FileEntry implements Serializable {
+public class FileEntry implements Serializable, Comparable<FileEntry> {
private static final long serialVersionUID = 1L;
@@ -117,9 +117,23 @@ public class FileEntry implements Serializable {
return size;
}
+ public void setLastModified(Long lastModified) {
+ this.lastModified = lastModified;
+ }
+
+ public void setSize(Long size) {
+ this.size = size;
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "[newSHA: " + newSHA + ", oldSHA: " + oldSHA + ", file: " + file
+ ", type: " + type.code() + ", lastModified: " + new Date(lastModified) + ", size: " + size + "]";
}
+
+ // Support Sets and Ordering by deferring to a String compare on the file path
+ @Override
+ public int compareTo(FileEntry o) {
+ return this.file.compareTo(o.getFile());
+ }
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 10d2006..869e376 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -184,117 +184,152 @@ public class DriftDetector implements Runnable {
log.debug("Generating drift change set for " + schedule);
- File currentSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(), schedule.getDriftDefinition()
+ boolean isPinned = schedule.getDriftDefinition().isPinned();
+ final File basedir = new File(basedir(schedule.getResourceId(), schedule.getDriftDefinition()));
+
+ File currentFullSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(), schedule.getDriftDefinition()
.getName(), COVERAGE);
- File snapshotFile = currentSnapshot;
- if (schedule.getDriftDefinition().isPinned()) {
- snapshotFile = new File(snapshotFile.getParentFile(), FILE_SNAPSHOT_PINNED);
+ // unless pinned use the current full snapshot file for the definition, otherwise use the pinned snapshot
+ File snapshotFile = isPinned ? new File(currentFullSnapshot.getParentFile(), FILE_SNAPSHOT_PINNED)
+ : currentFullSnapshot;
+
+ // get a Set of all files in the detection, consider them initially new files, and we'll knock the
+ // list down as we go. As we build up FileEntries in memory this Set will shrink. It's marginally
+ // less memory than if we had both in memory at the same time.
+ final Set<File> newFiles = new HashSet<File>(1000);
+
+ // If the basedir is still valid we need to do a directory tree scan to look for newly added files
+ if (basedir.isDirectory()) {
+ DriftDefinition driftDef = schedule.getDriftDefinition();
+ List<Filter> includes = driftDef.getIncludes();
+ List<Filter> excludes = driftDef.getExcludes();
+
+ for (File dir : getScanDirectories(basedir, includes)) {
+ forEachFile(dir, new FilterFileVisitor(basedir, includes, excludes, new FileVisitor() {
+ @Override
+ public void visit(File file) {
+ if (file.canRead()) {
+ newFiles.add(file);
+ } else if (log.isDebugEnabled()) {
+ log.debug("Skipping " + file.getPath() + " as new file since it is not readable.");
+ }
+ }
+ }));
+ }
}
- final File basedir = new File(basedir(schedule.getResourceId(), schedule.getDriftDefinition()));
- final Set<File> processedFiles = new HashSet<File>();
- final List<FileEntry> snapshotEntries = new LinkedList<FileEntry>();
- final List<FileEntry> deltaEntries = new LinkedList<FileEntry>();
+ final List<FileEntry> unchangedEntries = new LinkedList<FileEntry>();
+ final List<FileEntry> removedEntries = new LinkedList<FileEntry>();
+ final List<FileEntry> cantReadEntries = new LinkedList<FileEntry>();
+ final List<FileEntry> changedEntries = new LinkedList<FileEntry>();
+ final List<FileEntry> changedPinnedEntries = isPinned ? new LinkedList<FileEntry>() : null;
- ChangeSetReader coverageReader = null;
+ ChangeSetReader snapshotReader = null;
int newVersion;
+ boolean updateSnapshot = false;
try {
- coverageReader = changeSetMgr.getChangeSetReader(snapshotFile);
+ snapshotReader = changeSetMgr.getChangeSetReader(snapshotFile);
if (!basedir.exists()) {
log.warn("The base directory [" + basedir.getAbsolutePath() + "] for " + schedule + " does not exist.");
}
- if (schedule.getDriftDefinition().isPinned()) {
- ChangeSetReader snapshotReader = null;
+ if (isPinned) {
+ // If pinned we compare against the pinned snapshot but we need to know the current snapshot version,
+ // get it from the current full snapshot.
+ ChangeSetReader currentFullSnapshotReader = null;
try {
- snapshotReader = changeSetMgr.getChangeSetReader(currentSnapshot);
- newVersion = snapshotReader.getHeaders().getVersion() + 1;
+ currentFullSnapshotReader = changeSetMgr.getChangeSetReader(currentFullSnapshot);
+ newVersion = currentFullSnapshotReader.getHeaders().getVersion() + 1;
} finally {
- snapshotReader.close();
+ currentFullSnapshotReader.close();
}
} else {
- newVersion = coverageReader.getHeaders().getVersion() + 1;
+ newVersion = snapshotReader.getHeaders().getVersion() + 1;
}
// First look for files that have either been modified or deleted
- scanForModifiedOrDeletedFiles(schedule, basedir, processedFiles, snapshotEntries, deltaEntries,
- coverageReader);
+ updateSnapshot = scanSnapshotFiles(schedule, basedir, snapshotReader, newFiles, unchangedEntries,
+ removedEntries, cantReadEntries, changedEntries, changedPinnedEntries);
+
} finally {
- coverageReader.close();
+ snapshotReader.close();
}
- // If the basedir is still valid we need to do a directory tree scan to look for newly added files
- if (basedir.isDirectory()) {
- DriftDefinition driftDef = schedule.getDriftDefinition();
- List<Filter> includes = driftDef.getIncludes();
- List<Filter> excludes = driftDef.getExcludes();
+ // if necessary, re-write the pinned snapshot file because we've updated timestamp/filesize info, which
+ // on subsequent detection runs will help us avoid SHA generation. It must maintain the same entries.
+ if (isPinned && updateSnapshot) {
+ changedPinnedEntries.addAll(unchangedEntries);
- for (File dir : getScanDirectories(basedir, includes)) {
- forEachFile(dir, new FilterFileVisitor(basedir, includes, excludes, new FileVisitor() {
- @Override
- public void visit(File file) {
- try {
- if (processedFiles.contains(file)) {
- return;
- }
+ backupAndDeleteCurrentSnapshot(snapshotFile);
+ updatePinnedSnapshot(schedule, snapshotFile, changedPinnedEntries);
+ }
- if (!file.canRead()) {
- if (log.isDebugEnabled()) {
- log.debug("Skipping " + file.getPath() + " since it is not readable.");
- }
- return;
- }
+ final List<FileEntry> snapshotEntries = new LinkedList<FileEntry>(unchangedEntries);
+ snapshotEntries.addAll(changedEntries);
- if (log.isInfoEnabled()) {
- log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
- }
+ final List<FileEntry> deltaEntries = new LinkedList<FileEntry>(changedEntries);
+ deltaEntries.addAll(removedEntries);
+ deltaEntries.addAll(cantReadEntries);
- FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file), file
- .lastModified(), file.length());
- deltaEntries.add(newEntry);
- snapshotEntries.add(newEntry);
- } catch (IOException e) {
- log.error("An error occurred while generating a drift change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException("An error occurred while generating a drift change set",
- e);
- }
- }
- }));
+ for (File file : newFiles) {
+ try {
+ if (log.isInfoEnabled()) {
+ log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
+ }
+
+ FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file), file.lastModified(),
+ file.length());
+
+ deltaEntries.add(newEntry);
+ snapshotEntries.add(newEntry);
+
+ } catch (IOException e) {
+ log.error("An error occurred while generating a drift change set for " + schedule + ": "
+ + e.getMessage());
+ throw new DriftDetectionException("An error occurred while generating a drift change set", e);
}
}
if (deltaEntries.isEmpty()) {
- summary.setNewSnapshot(currentSnapshot);
-
- // If nothing has changed, there is no need to add/update any files
- // unless the definition is pinned in which case we need to reset
- // the current snapshot to match the pinned snapshot. Note though
- // that we increment the snapshot version in order to let the server
- // know about the state change.
- // if no timestamp must re-gen the files.
- if (schedule.getDriftDefinition().isPinned() && newVersion > 1
- && !isPreviousChangeSetEmpty(schedule.getResourceId(), schedule.getDriftDefinition())) {
- currentSnapshot.delete();
- File newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
-
- updateDeltaSnapshot(summary, schedule, deltaEntries, newVersion, currentSnapshot, newSnapshot);
- // TODO report back to the server that we are back in compliance
+ File newSnapshot = currentFullSnapshot;
+
+ if (!isPinned) {
+ // If unpinned and there is no detected drift then we generally don't need to add/update any files.
+ // But, if we have timestamp/filesize updates then we want to replace the current snapshot with
+ // the updated entries, so we can avoid SHA generation on subsequent runs.
+ if (updateSnapshot) {
+ currentFullSnapshot.delete();
+ newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion - 1);
+ }
+ } else {
+ // If pinned and returning to compliance (meaning no drift now but the previous snapshot did have drift)
+ // then we need to reset the current snapshot to match the pinned snapshot. Note though that we
+ // increment the snapshot version in order to let the server know about the state change.
+ if (newVersion > 1
+ && !isPreviousChangeSetEmpty(schedule.getResourceId(), schedule.getDriftDefinition())) {
+ currentFullSnapshot.delete();
+ newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
+
+ updateDeltaSnapshot(summary, schedule, deltaEntries, newVersion, currentFullSnapshot, newSnapshot);
+ }
}
+
+ summary.setNewSnapshot(newSnapshot);
+
} else {
- if (schedule.getDriftDefinition().isPinned() && newVersion > 1
- && isSameAsPreviousChangeSet(deltaEntries, currentSnapshot)) {
- // if we are still out of compliance just report, we report a
- // repeat change set to indicate no changes but also still out
- // of compliance.
+ // if there is drift, but we're pinned and the drift is the same as the previous detection, just
+ // mark it as a repeat to indicate that we're out of compliance but not in any new way.
+ if (isPinned && newVersion > 1 && isSameAsPreviousChangeSet(deltaEntries, currentFullSnapshot)) {
summary.setVersion(newVersion - 1);
summary.setRepeat(true);
+
return;
}
- File oldSnapshot = backupAndDeleteCurrentSnapshot(currentSnapshot);
+ // otherwise, generate a new current snapshot, and a snapshot delta reflecting the latest drift
+ File oldSnapshot = backupAndDeleteCurrentSnapshot(currentFullSnapshot);
File newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
updateDeltaSnapshot(summary, schedule, deltaEntries, newVersion, oldSnapshot, newSnapshot);
@@ -321,55 +356,88 @@ public class DriftDetector implements Runnable {
return directories;
}
- private void scanForModifiedOrDeletedFiles(DriftDetectionSchedule schedule, File basedir, Set<File> processedFiles,
- List<FileEntry> snapshotEntries, List<FileEntry> deltaEntries, ChangeSetReader coverageReader)
+ /**
+ * Process the entries for the snapshotReader. Each entry will be placed in one of the various Lists depending
+ * on what bucket it fall into.
+ * @return true if unchangedEntries (meaning no drift) had timestamp/filesize info updated, in which case the
+ * snapshot should be re-written to disk even if there was no drift.
+ * @throws IOException
+ */
+ private boolean scanSnapshotFiles(DriftDetectionSchedule schedule, File basedir, ChangeSetReader snapshotReader,
+ Set<File> newFiles, List<FileEntry> unchangedEntries, List<FileEntry> removedEntries,
+ List<FileEntry> cantReadEntries, List<FileEntry> modifiedEntries, List<FileEntry> changedPinnedEntries)
throws IOException {
- for (FileEntry entry : coverageReader) {
+ boolean result = false;
+
+ for (FileEntry entry : snapshotReader) {
File file = new File(basedir, entry.getFile());
+ newFiles.remove(file);
+
if (!file.exists()) {
// The file has been deleted since the last scan
if (log.isDebugEnabled()) {
log.debug("Detected deleted file for " + schedule + " --> " + file.getAbsolutePath());
}
- deltaEntries.add(removedFileEntry(entry.getFile(), entry.getNewSHA()));
+ removedEntries.add(removedFileEntry(entry.getFile(), entry.getNewSHA()));
+
+ if (null != changedPinnedEntries) {
+ changedPinnedEntries.add(entry);
+ }
+
+ continue;
+
} else if (!file.canRead()) {
- processedFiles.add(file);
if (log.isDebugEnabled()) {
log.debug(file.getPath() + " is no longer readable. Treating it as a deleted file.");
}
- deltaEntries.add(removedFileEntry(entry.getFile(), entry.getNewSHA()));
+ cantReadEntries.add(removedFileEntry(entry.getFile(), entry.getNewSHA()));
+
+ if (null != changedPinnedEntries) {
+ changedPinnedEntries.add(entry);
+ }
+
+ continue;
+
} else {
- processedFiles.add(file);
- // if we do not have the last modification time and the file size, then we
- // have to compare SHAs. We can wind up without a timestamp of a file size
- // when the agent is restarted and the data directory is purged. The server
- // sends snapshots down to the agent and since the server does not store the
- // file modification time or size, the fields will get initialized to -1.
- if (entry.getLastModified() == -1 || entry.getSize() == -1) {
- String currentSHA = sha256(file);
- if (!entry.getNewSHA().equals(currentSHA)) {
- FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA, file
- .lastModified(), file.length());
- deltaEntries.add(modifiedEntry);
- snapshotEntries.add(modifiedEntry);
- }
- } else if (entry.getLastModified() != -1 && entry.getSize() != -1
- && (entry.getLastModified() != file.lastModified() || entry.getSize() != file.length())) {
- if (log.isDebugEnabled()) {
- log.debug("Detected modified file for " + schedule + " --> " + file.getAbsolutePath());
- }
- String currentSHA = sha256(file);
+ String currentSHA = null;
+ boolean isModified = false;
+
+ // perform a SHA comparison if we are unable to compare size and lastModified or if the
+ // size or lastModified test fails. We may not have size of lastModified values for the
+ // entry when the current snapshot was provided by the server, either due to a synch or
+ // pinning scenario. The server does not store that information and will provide -1 for defaults.
+ if (entry.getLastModified() == -1 || entry.getSize() == -1
+ || entry.getLastModified() != file.lastModified() || entry.getSize() != file.length()) {
+
+ currentSHA = sha256(file);
+ isModified = !entry.getNewSHA().equals(currentSHA);
+ }
+
+ if (isModified) {
FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA, file
.lastModified(), file.length());
- deltaEntries.add(modifiedEntry);
- snapshotEntries.add(modifiedEntry);
+ modifiedEntries.add(modifiedEntry);
+
+ if (null != changedPinnedEntries) {
+ changedPinnedEntries.add(entry);
+ }
+
} else {
- // The file has not changed
- snapshotEntries.add(entry);
+ if (-1 == entry.getLastModified()) {
+ entry.setLastModified(file.lastModified());
+ result = true;
+ }
+ if (-1 == entry.getSize()) {
+ entry.setSize(file.length());
+ result = true;
+ }
+ unchangedEntries.add(entry);
}
}
}
+
+ return result;
}
@SuppressWarnings("unused")
@@ -449,6 +517,26 @@ public class DriftDetector implements Runnable {
}
}
+ private File updatePinnedSnapshot(DriftDetectionSchedule schedule, File pinnedSnapshot,
+ List<FileEntry> snapshotEntries) throws IOException {
+
+ ChangeSetWriter newSnapshotWriter = null;
+
+ try {
+ Headers snapshotHeaders = createHeaders(schedule, COVERAGE, 0);
+ newSnapshotWriter = changeSetMgr.getChangeSetWriter(pinnedSnapshot, snapshotHeaders);
+
+ for (FileEntry entry : snapshotEntries) {
+ newSnapshotWriter.write(entry);
+ }
+
+ return pinnedSnapshot;
+
+ } finally {
+ newSnapshotWriter.close();
+ }
+ }
+
private boolean isSameAsPreviousChangeSet(List<FileEntry> entries, File currentSnapsotFile) throws IOException {
HashMap<String, FileEntry> entriesMap = new HashMap<String, FileEntry>();
for (FileEntry e : entries) {
commit ee66d10c7c3dee5a9c9bd102d9ea2db347e0e769
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Dec 13 17:12:32 2011 -0500
[BZ 767328] Make sure that each drift def is loaded into the persistence context
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java
index 361eb44..9a1c980 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java
@@ -19,26 +19,11 @@
package org.rhq.enterprise.server.drift;
-import static javax.ejb.TransactionAttributeType.NEVER;
-import static org.rhq.core.domain.common.EntityContext.forResource;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode.normal;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
import org.rhq.core.domain.criteria.DriftDefinitionTemplateCriteria;
-import org.rhq.core.domain.drift.DriftDefinition;
-import org.rhq.core.domain.drift.DriftDefinitionComparator;
-import org.rhq.core.domain.drift.DriftDefinitionTemplate;
-import org.rhq.core.domain.drift.DriftSnapshot;
-import org.rhq.core.domain.drift.DriftSnapshotRequest;
+import org.rhq.core.domain.drift.*;
import org.rhq.core.domain.drift.dto.DriftChangeSetDTO;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
@@ -49,6 +34,17 @@ import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException;
import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
import org.rhq.enterprise.server.util.CriteriaQueryRunner;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static javax.ejb.TransactionAttributeType.NEVER;
+import static org.rhq.core.domain.common.EntityContext.forResource;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode.normal;
+
@Stateless
public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, DriftTemplateManagerRemote {
@@ -205,13 +201,15 @@ public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, Drif
DriftDefinition templateDef = template.getTemplateDefinition();
for (DriftDefinition resourceDef : template.getDriftDefinitions()) {
- if (resourceDef.isAttached()) {
- resourceDef.setInterval(templateDef.getInterval());
- resourceDef.setDriftHandlingMode(templateDef.getDriftHandlingMode());
- resourceDef.setEnabled(templateDef.isEnabled());
+ DriftDefinition driftDef = entityMgr.find(DriftDefinition.class, resourceDef.getId());
+ if (driftDef.isAttached()) {
+ driftDef.setInterval(templateDef.getInterval());
+ driftDef.setDriftHandlingMode(templateDef.getDriftHandlingMode());
+ driftDef.setEnabled(templateDef.isEnabled());
- driftMgr.updateDriftDefinition(subject, forResource(resourceDef.getResource().getId()), resourceDef);
+ driftMgr.updateDriftDefinition(subject, forResource(driftDef.getResource().getId()), driftDef);
}
}
}
+
}
commit bf599134469592012e7ee69a00354cc815e7db8e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 13 16:22:13 2011 -0500
Make sure the drift def id is also in the copy so it can be applied to
generated changeset headers.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java
index 8ddfc03..60fb35b 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java
@@ -43,6 +43,7 @@ public class DriftDetectionSchedule implements Comparable<DriftDetectionSchedule
public DriftDetectionSchedule copy() {
DriftDetectionSchedule copy = new DriftDetectionSchedule(resourceId, new DriftDefinition(driftDef
.getConfiguration().deepCopyWithoutProxies()));
+ copy.driftDef.setId(driftDef.getId());
copy.nextScan = nextScan;
return copy;
}
commit 9b42a3a83b51bdce587b6841774e373b25343e5a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 13 14:48:51 2011 -0500
baseDir might be null, so don't assume it isn't
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index c06f7a4..12c7233 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -68,8 +68,11 @@ import org.rhq.core.domain.drift.DriftChangeSetCategory;
import org.rhq.core.domain.drift.DriftComplianceStatus;
import org.rhq.core.domain.drift.DriftComposite;
import org.rhq.core.domain.drift.DriftConfigurationDefinition;
+import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode;
import org.rhq.core.domain.drift.DriftDefinition;
+import org.rhq.core.domain.drift.DriftDefinition.BaseDirectory;
import org.rhq.core.domain.drift.DriftDefinitionComparator;
+import org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode;
import org.rhq.core.domain.drift.DriftDefinitionComposite;
import org.rhq.core.domain.drift.DriftDefinitionTemplate;
import org.rhq.core.domain.drift.DriftDetails;
@@ -78,9 +81,6 @@ import org.rhq.core.domain.drift.DriftSnapshot;
import org.rhq.core.domain.drift.DriftSnapshotRequest;
import org.rhq.core.domain.drift.FileDiffReport;
import org.rhq.core.domain.drift.Filter;
-import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode;
-import org.rhq.core.domain.drift.DriftDefinition.BaseDirectory;
-import org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode;
import org.rhq.core.domain.drift.dto.DriftChangeSetDTO;
import org.rhq.core.domain.drift.dto.DriftDTO;
import org.rhq.core.domain.drift.dto.DriftFileDTO;
@@ -803,7 +803,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
if (null == baseDir
|| !baseDir.getValueName().matches(DriftConfigurationDefinition.PROP_BASEDIR_PATH_REGEX_PATTERN)) {
throw new IllegalArgumentException(
- "Drift definition base directory is null or contains invalid characters: " + baseDir.getValueName());
+ "Drift definition base directory is null or contains invalid characters: " + baseDir);
}
List<List<Filter>> filtersList = new ArrayList<List<Filter>>(2);
filtersList.add(driftDef.getIncludes());
commit 1c2b7c69036191a7a79a9421aba63dff18cf0a8b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 13 13:46:12 2011 -0500
[BZ 767263] don't assume there is always a template
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
index b29e9a6..bece740 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
@@ -198,6 +198,9 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
templateField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
DriftDefinition def = (DriftDefinition) listGridRecord.getAttributeAsObject(ATTR_ENTITY);
+ if (null == def.getTemplate()) {
+ return MSG.common_val_none();
+ }
if (null != globalPermissions && globalPermissions.contains(Permission.MANAGE_SETTINGS)) {
int typeId = def.getResource().getResourceType().getId();
int templateId = def.getTemplate().getId();
@@ -422,7 +425,11 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
record.setAttribute(ATTR_IS_PINNED, def.isPinned() ? ImageManager.getPinnedIcon() : ImageManager
.getUnpinnedIcon());
record.setAttribute(ATTR_ATTACHED, def.isAttached() ? MSG.common_val_yes() : MSG.common_val_no());
- record.setAttribute(ATTR_TEMPLATE, def.getTemplate().getName());
+ if (def.getTemplate() != null) {
+ record.setAttribute(ATTR_TEMPLATE, def.getTemplate().getName());
+ } else {
+ record.setAttribute(ATTR_TEMPLATE, MSG.common_val_none());
+ }
record.setAttribute(ATTR_CHANGE_SET_VERSION, (null != changeSet) ? String.valueOf(changeSet.getVersion()) : MSG
.common_label_none());
commit b664d35951234f42400d90d1b5c7b477b0e9d3d5
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Dec 13 13:05:19 2011 -0500
minor - fix some typos in javadoc
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java
index d786ee3..570f7da 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java
@@ -453,7 +453,7 @@ public class PluginContainerConfiguration {
}
/**
- * When measurement's are scheduled for collection, the collection will be performed by threads from a thread pool.
+ * When measurements are scheduled for collection, the collection will be performed by threads from a thread pool.
* This defines the number of threads within that thread pool, effectively defining the number of measurements that
* can be collected concurrently.
*
@@ -465,9 +465,9 @@ public class PluginContainerConfiguration {
}
/**
- * Defines the number of threads that can concurrent collection measurements.
+ * Defines the number of threads that can concurrently collection measurements.
*
- * @param size the new size of the threadpool
+ * @param size the new size of the thread pool
*/
public void setMeasurementCollectionThreadPoolSize(int size) {
configuration.put(MEASUREMENT_COLLECTION_THREADCOUNT_PROP, Integer.valueOf(size));
@@ -609,7 +609,7 @@ public class PluginContainerConfiguration {
/**
* Defines the number of threads that can concurrent execute operations.
*
- * @param size the new size of the threadpool
+ * @param size the new size of the thread pool
*/
public void setOperationInvokerThreadPoolSize(int size) {
configuration.put(OPERATION_INVOKER_THREADCOUNT_PROP, Integer.valueOf(size));
commit 54ccb75ffb746b3e167f8fdfb2fba3cc70dc13e2
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 12 15:53:14 2011 -0500
Ensure we have both the timestamp and the filesize before we skip using
a SHA test.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 11a2d85..10d2006 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -346,7 +346,7 @@ public class DriftDetector implements Runnable {
// when the agent is restarted and the data directory is purged. The server
// sends snapshots down to the agent and since the server does not store the
// file modification time or size, the fields will get initialized to -1.
- if (entry.getLastModified() == -1 && entry.getSize() == -1) {
+ if (entry.getLastModified() == -1 || entry.getSize() == -1) {
String currentSHA = sha256(file);
if (!entry.getNewSHA().equals(currentSHA)) {
FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA, file
commit 610d9447060444806f5fd27c29a5f118195636c0
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 12 15:51:46 2011 -0500
Just some cleanup
- remove unused/obsolete methods from ChangeSetManager and the impl
- move some commonly referenced filenames into constants
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManager.java
index 1fc9fe9..5117ab1 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManager.java
@@ -26,7 +26,6 @@ import org.rhq.common.drift.ChangeSetReader;
import org.rhq.common.drift.ChangeSetWriter;
import org.rhq.common.drift.Headers;
import org.rhq.core.domain.drift.DriftChangeSetCategory;
-import org.rhq.core.domain.drift.DriftDefinition;
public interface ChangeSetManager {
@@ -66,11 +65,4 @@ public interface ChangeSetManager {
ChangeSetWriter getChangeSetWriter(int resourceId, Headers headers) throws IOException;
ChangeSetWriter getChangeSetWriter(File changeSetFile, Headers headers) throws IOException;
-
- ChangeSetWriter getChangeSetWriterForUpdate(int resourceId, Headers headers) throws IOException;
-
- void updateChangeSet(int resourceId, Headers headers) throws IOException;
-
- void addFileToChangeSet(int resourceId, DriftDefinition driftDefinition, File file);
-
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManagerImpl.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManagerImpl.java
index 132a7ca..97e92d3 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManagerImpl.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManagerImpl.java
@@ -21,11 +21,7 @@ package org.rhq.core.pc.drift;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import org.rhq.common.drift.ChangeSetReader;
@@ -34,8 +30,6 @@ import org.rhq.common.drift.ChangeSetWriter;
import org.rhq.common.drift.ChangeSetWriterImpl;
import org.rhq.common.drift.Headers;
import org.rhq.core.domain.drift.DriftChangeSetCategory;
-import org.rhq.core.domain.drift.DriftDefinition;
-import org.rhq.core.util.stream.StreamUtil;
public class ChangeSetManagerImpl implements ChangeSetManager {
@@ -51,13 +45,13 @@ public class ChangeSetManagerImpl implements ChangeSetManager {
if (changeSetDir == null || !changeSetDir.exists()) {
return false;
}
- return new File(changeSetDir, "changeset.txt").exists();
+ return new File(changeSetDir, DriftDetector.FILE_CHANGESET_FULL).exists();
}
@Override
public File findChangeSet(int resourceId, String driftDefinitionName) throws IOException {
File changeSetDir = findChangeSetDir(resourceId, driftDefinitionName);
- File changeSetFile = new File(changeSetDir, "changeset.txt");
+ File changeSetFile = new File(changeSetDir, DriftDetector.FILE_CHANGESET_FULL);
if (changeSetFile.exists()) {
return changeSetFile;
@@ -76,9 +70,9 @@ public class ChangeSetManagerImpl implements ChangeSetManager {
switch (type) {
case COVERAGE:
- return new File(changeSetDir, "changeset.txt");
+ return new File(changeSetDir, DriftDetector.FILE_CHANGESET_FULL);
case DRIFT:
- return new File(changeSetDir, "drift-changeset.txt");
+ return new File(changeSetDir, DriftDetector.FILE_CHANGESET_DELTA);
default:
throw new IllegalArgumentException(type + " is not a recognized, supported change set type.");
}
@@ -111,9 +105,9 @@ public class ChangeSetManagerImpl implements ChangeSetManager {
File changeSet;
if (headers.getType() == COVERAGE) {
- changeSet = new File(changeSetDir, "changeset.txt");
+ changeSet = new File(changeSetDir, DriftDetector.FILE_CHANGESET_FULL);
} else {
- changeSet = new File(changeSetDir, "drift-changeset.txt");
+ changeSet = new File(changeSetDir, DriftDetector.FILE_CHANGESET_DELTA);
}
return new ChangeSetWriterImpl(changeSet, headers);
}
@@ -123,35 +117,6 @@ public class ChangeSetManagerImpl implements ChangeSetManager {
return new ChangeSetWriterImpl(changeSetFile, headers);
}
- @Override
- public ChangeSetWriter getChangeSetWriterForUpdate(int resourceId, Headers headers) throws IOException {
- File resourceDir = new File(changeSetsDir, Integer.toString(resourceId));
- File changeSetDir = new File(resourceDir, headers.getDriftDefinitionName());
-
- return new ChangeSetWriterImpl(new File(changeSetDir, "changeset.working"), headers);
- }
-
- @Override
- public void updateChangeSet(int resourceId, Headers headers) throws IOException {
- File resourceDir = new File(changeSetsDir, Integer.toString(resourceId));
- File changeSetDir = new File(resourceDir, headers.getDriftDefinitionName());
- File newChangeSet = new File(changeSetDir, "changeset.working");
- File changeSet = new File(changeSetDir, "changeset.txt");
-
- if (!newChangeSet.exists()) {
- return;
- }
-
- changeSet.delete();
-
- StreamUtil.copy(new BufferedInputStream(new FileInputStream(newChangeSet)), new BufferedOutputStream(
- new FileOutputStream(changeSet)));
- }
-
- @Override
- public void addFileToChangeSet(int resourceId, DriftDefinition driftDefinition, File file) {
- }
-
private File findChangeSetDir(int resourceId, String driftDefinitionName) {
File resourceDir = new File(changeSetsDir, Integer.toString(resourceId));
if (!resourceDir.exists()) {
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 848ae93..11a2d85 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -19,8 +19,26 @@
package org.rhq.core.pc.drift;
+import static org.rhq.common.drift.FileEntry.addedFileEntry;
+import static org.rhq.common.drift.FileEntry.changedFileEntry;
+import static org.rhq.common.drift.FileEntry.removedFileEntry;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
+import static org.rhq.core.util.file.FileUtil.copyFile;
+import static org.rhq.core.util.file.FileUtil.forEachFile;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.rhq.common.drift.ChangeSetReader;
import org.rhq.common.drift.ChangeSetWriter;
import org.rhq.common.drift.FileEntry;
@@ -31,20 +49,13 @@ import org.rhq.core.domain.drift.Filter;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.file.FileVisitor;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.*;
-
-import static org.rhq.common.drift.FileEntry.*;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
-import static org.rhq.core.util.file.FileUtil.copyFile;
-import static org.rhq.core.util.file.FileUtil.forEachFile;
-
public class DriftDetector implements Runnable {
private Log log = LogFactory.getLog(DriftDetector.class);
+ static final String FILE_CHANGESET_FULL = "changeset.txt";
+ static final String FILE_CHANGESET_DELTA = "drift-changeset.txt";
+ static final String FILE_SNAPSHOT_PINNED = "snapshot.pinned";
+
private ScheduleQueue scheduleQueue;
private ChangeSetManager changeSetMgr;
@@ -178,7 +189,7 @@ public class DriftDetector implements Runnable {
File snapshotFile = currentSnapshot;
if (schedule.getDriftDefinition().isPinned()) {
- snapshotFile = new File(snapshotFile.getParentFile(), "snapshot.pinned");
+ snapshotFile = new File(snapshotFile.getParentFile(), FILE_SNAPSHOT_PINNED);
}
final File basedir = new File(basedir(schedule.getResourceId(), schedule.getDriftDefinition()));
@@ -240,14 +251,16 @@ public class DriftDetector implements Runnable {
log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
}
- FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file),
- file.lastModified(), file.length());
- deltaEntries.add(newEntry);
- snapshotEntries.add(newEntry);
- } catch (IOException e) {
- log.error("An error occurred while generating a drift change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException("An error occurred while generating a drift change set", e);
+ FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file), file
+ .lastModified(), file.length());
+ deltaEntries.add(newEntry);
+ snapshotEntries.add(newEntry);
+ } catch (IOException e) {
+ log.error("An error occurred while generating a drift change set for " + schedule + ": "
+ + e.getMessage());
+ throw new DriftDetectionException("An error occurred while generating a drift change set",
+ e);
+ }
}
}));
}
@@ -261,6 +274,7 @@ public class DriftDetector implements Runnable {
// the current snapshot to match the pinned snapshot. Note though
// that we increment the snapshot version in order to let the server
// know about the state change.
+ // if no timestamp must re-gen the files.
if (schedule.getDriftDefinition().isPinned() && newVersion > 1
&& !isPreviousChangeSetEmpty(schedule.getResourceId(), schedule.getDriftDefinition())) {
currentSnapshot.delete();
@@ -335,19 +349,19 @@ public class DriftDetector implements Runnable {
if (entry.getLastModified() == -1 && entry.getSize() == -1) {
String currentSHA = sha256(file);
if (!entry.getNewSHA().equals(currentSHA)) {
- FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA,
- file.lastModified(), file.length());
+ FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA, file
+ .lastModified(), file.length());
deltaEntries.add(modifiedEntry);
snapshotEntries.add(modifiedEntry);
}
- } else if (entry.getLastModified() != -1 && entry.getSize() != -1 &&
- (entry.getLastModified() != file.lastModified() || entry.getSize() != file.length())) {
+ } else if (entry.getLastModified() != -1 && entry.getSize() != -1
+ && (entry.getLastModified() != file.lastModified() || entry.getSize() != file.length())) {
if (log.isDebugEnabled()) {
log.debug("Detected modified file for " + schedule + " --> " + file.getAbsolutePath());
}
String currentSHA = sha256(file);
- FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA,
- file.lastModified(), file.length());
+ FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA, file
+ .lastModified(), file.length());
deltaEntries.add(modifiedEntry);
snapshotEntries.add(modifiedEntry);
} else {
@@ -443,7 +457,7 @@ public class DriftDetector implements Runnable {
ChangeSetReader reader = null;
try {
- File deltaChangeSet = new File(currentSnapsotFile.getParentFile(), "drift-changeset.txt");
+ File deltaChangeSet = new File(currentSnapsotFile.getParentFile(), FILE_CHANGESET_DELTA);
reader = changeSetMgr.getChangeSetReader(deltaChangeSet);
int numEntries = 0;
@@ -511,7 +525,7 @@ public class DriftDetector implements Runnable {
writer = null;
}
if (schedule.getDriftDefinition().isPinned()) {
- copyFile(snapshot, new File(snapshot.getParentFile(), "snapshot.pinned"));
+ copyFile(snapshot, new File(snapshot.getParentFile(), FILE_SNAPSHOT_PINNED));
}
summary.setNewSnapshot(snapshot);
} finally {
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index 1182407..386ad73 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@ -201,7 +201,7 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
// change set.
DriftSnapshot pinnedSnapshot = driftServer.getSnapshot(driftDefinition.getId(), 0, 0);
Headers pinnedHeaders = createHeaders(resource.getId(), driftDefinition);
- File pinnedSnapshotFile = new File(currentSnapshotFile.getParent(), "snapshot.pinned");
+ File pinnedSnapshotFile = new File(currentSnapshotFile.getParent(), DriftDetector.FILE_SNAPSHOT_PINNED);
log.info("Preparing to write pinned snapshot to disk for "
+ toString(resource.getId(), driftDefinition));
writeSnapshotToFile(pinnedSnapshot, pinnedSnapshotFile, pinnedHeaders);
@@ -212,7 +212,7 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
// drift that has already been reported to the server.
DriftSnapshot deltaSnapshot = driftServer.getSnapshot(driftDefinition.getId(), snapshot
.getVersion(), snapshot.getVersion());
- File deltaFile = new File(currentSnapshotFile.getParentFile(), "drift-changeset.txt");
+ File deltaFile = new File(currentSnapshotFile.getParentFile(), DriftDetector.FILE_CHANGESET_DELTA);
Headers deltaHeaders = createHeaders(resource.getId(), driftDefinition);
deltaHeaders.setVersion(snapshot.getVersion());
deltaHeaders.setType(DRIFT);
@@ -546,7 +546,7 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
public void run() {
File currentSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(), schedule
.getDriftDefinition().getName(), COVERAGE);
- File pinnedSnapshot = new File(currentSnapshot.getParentFile(), "snapshot.pinned");
+ File pinnedSnapshot = new File(currentSnapshot.getParentFile(), DriftDetector.FILE_SNAPSHOT_PINNED);
pinnedSnapshot.delete();
if (log.isDebugEnabled()) {
@@ -561,7 +561,7 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
@Override
public void updateDriftDetection(int resourceId, DriftDefinition driftDef, DriftSnapshot driftSnapshot) {
File currentSnapshot = changeSetMgr.findChangeSet(resourceId, driftDef.getName(), COVERAGE);
- File pinnedSnapshot = new File(currentSnapshot.getParentFile(), "snapshot.pinned");
+ File pinnedSnapshot = new File(currentSnapshot.getParentFile(), DriftDetector.FILE_SNAPSHOT_PINNED);
Headers headers = createHeaders(resourceId, driftDef);
try {
@@ -777,8 +777,8 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
writer.write(addedFileEntry(drift.getPath(), drift.getNewDriftFile().getHashId(), -1L, -1L));
break;
case FILE_CHANGED:
- writer.write(changedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId(),
- drift.getNewDriftFile().getHashId(), -1L, -1L));
+ writer.write(changedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId(), drift
+ .getNewDriftFile().getHashId(), -1L, -1L));
break;
default: // FILE_REMOVED
writer.write(removedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId()));
commit 35fcafbd977ca41cb2cbff7be81787543c5224e8
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Dec 12 13:39:37 2011 -0500
[BZ 760263] Adding check to avoid generating empty content zip file
When the server requests drift content from the agent, it is possible
that the requested files may not exist. DriftFilesSender now checks to
make sure that there is actually content before making the request to
zip it up and send it to the server.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java
index d8d2b46..4181472 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java
@@ -1,22 +1,16 @@
package org.rhq.core.pc.drift;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.rhq.common.drift.ChangeSetReader;
import org.rhq.common.drift.FileEntry;
import org.rhq.common.drift.Headers;
import org.rhq.core.domain.drift.DriftFile;
import org.rhq.core.util.stream.StreamUtil;
+import java.io.*;
+import java.util.List;
+
public class DriftFilesSender implements Runnable {
private Log log = LogFactory.getLog(DriftFilesSender.class);
@@ -54,6 +48,10 @@ public class DriftFilesSender implements Runnable {
@Override
public void run() {
try {
+ if (log.isInfoEnabled()) {
+ log.info("Preparing to send content to server for " + defToString());
+ }
+
File changeSet = changeSetMgr.findChangeSet(resourceId, headers.getDriftDefinitionName());
File contentDir = new File(changeSet.getParentFile(), "content");
contentDir.mkdir();
@@ -63,11 +61,25 @@ public class DriftFilesSender implements Runnable {
if (file == null || !file.exists()) {
log.warn("Unable to find file for " + driftFile);
} else {
+ if (log.isDebugEnabled()) {
+ log.debug("Copying " + file.getPath() + " to " + contentDir.getPath());
+ }
StreamUtil.copy(new BufferedInputStream(new FileInputStream(file)), new BufferedOutputStream(
new FileOutputStream(new File(contentDir, driftFile.getHashId()))), true);
}
}
- driftClient.sendChangeSetContentToServer(resourceId, headers.getDriftDefinitionName(), contentDir);
+
+ File[] content = contentDir.listFiles();
+ if (content == null || content.length == 0) {
+ if (log.isDebugEnabled()) {
+ log.debug("Could not find any of the requested content for " + defToString());
+ }
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Sending " + content.length + " files to the server for " + defToString());
+ }
+ driftClient.sendChangeSetContentToServer(resourceId, headers.getDriftDefinitionName(), contentDir);
+ }
} catch (IOException e) {
log.error("Failed to send drift files.", e);
}
@@ -87,4 +99,9 @@ public class DriftFilesSender implements Runnable {
reader.close();
}
}
+
+ private String defToString() {
+ return "[resourceId: " + resourceId + ", driftDefinitionId: " + headers.getDriftDefinitionId() +
+ ", driftDefinitionName: " + headers.getDriftDefinitionName() + "]";
+ }
}
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftClientTestStub.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftClientTestStub.java
index 209ba61..0f0c26a 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftClientTestStub.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftClientTestStub.java
@@ -1,9 +1,9 @@
package org.rhq.core.pc.drift;
-import java.io.File;
-
import org.rhq.core.domain.drift.DriftDefinition;
+import java.io.File;
+
class DriftClientTestStub implements DriftClient {
private File basedir;
@@ -14,6 +14,8 @@ class DriftClientTestStub implements DriftClient {
private int reportMissingBaseDirInvocationCount;
+ private int sendChangeSetContentInvocationCount;
+
@Override
public void sendChangeSetToServer(DriftDetectionSummary detectionSummary) {
++sendChangeSetInvocationCount;
@@ -28,6 +30,11 @@ class DriftClientTestStub implements DriftClient {
@Override
public void sendChangeSetContentToServer(int resourceId, String driftDefinitionName, File contentDir) {
+ ++sendChangeSetContentInvocationCount;
+ }
+
+ public int getSendChangeSetContentInvocationCount() {
+ return sendChangeSetContentInvocationCount;
}
@Override
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
index 5fd6528..77db6b2 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
@@ -19,18 +19,17 @@
package org.rhq.core.pc.drift;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
import org.rhq.common.drift.ChangeSetWriter;
import org.rhq.common.drift.Headers;
import org.rhq.core.domain.drift.DriftChangeSetCategory;
import org.rhq.core.domain.drift.DriftFile;
import org.rhq.core.domain.drift.JPADriftFile;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import static org.rhq.common.drift.FileEntry.addedFileEntry;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
@@ -39,7 +38,7 @@ import static org.testng.Assert.assertTrue;
public class DriftFilesSenderTest extends DriftTest {
- DriftClient driftClient;
+ DriftClientTestStub driftClient;
DriftFilesSender sender;
@@ -161,6 +160,31 @@ public class DriftFilesSenderTest extends DriftTest {
assertFileCopiedToContentDir(contentDir, server2ConfHash);
}
+ @Test
+ public void doNotSendEmptyZipFileToServer() throws Exception {
+ String driftDefName = "empty_content_test";
+
+ File confDir = mkdir(resourceDir, "conf");
+ File serverConf = createRandomFile(confDir, "server.conf");
+
+ String serverConfHash = sha256(serverConf);
+
+ Headers headers = createHeaders(driftDefName, COVERAGE);
+
+ ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
+ writer.write(addedFileEntry("conf/server.conf", serverConfHash));
+ writer.close();
+
+ serverConf.delete();
+
+ sender.setDriftFiles(driftFiles(serverConfHash));
+ sender.setHeaders(headers);
+ sender.run();
+
+ assertEquals(driftClient.getSendChangeSetContentInvocationCount(), 0,
+ "Do not call DriftClient to send content to server when there is no content to send.");
+ }
+
/**
* This method only verifies that a file having a particular hash or SHA-256 has been
* copied to the specified content directory.
commit 48a945ccd90e18205f216f42729c3043dc12189d
Author: Fusayuki Minamoto <fminamot(a)redhat.com>
Date: Mon Dec 12 14:29:22 2011 +0100
Updated Japanese translations.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 71e3530..67d4a7f 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -24,23 +24,22 @@ common_button_create_child = 子を作成
common_button_delete = 削除
common_button_delete_all = すべてを削除
common_button_disable = 無効
-##common_button_dump_sysInfo_to_log = Dump system info to log file
common_button_edit = 編集
common_button_enable = 有効
-##common_button_execute = Execute
+common_button_execute = 実行
common_button_finish = 完了
-##common_button_fixedWidth = Fixed Width
+common_button_fixedWidth = 固定幅
common_button_import = インポート
common_button_new = 新規
common_button_next = 次へ
common_button_ok = OK
common_button_previous = 前へ
-##common_button_purge = Purge
+common_button_purge = パージ
common_button_purgeAll = すべてをパージ
common_button_refresh = リフレッシュ
common_button_reset = リセット
common_button_save = 保存
-##common_button_scaleToFit = Scale To Fit
+common_button_scaleToFit = 適合させるスケール
common_button_schedule = スケジュール
common_button_search = 検索
common_button_set = 設定
@@ -62,8 +61,8 @@ common_label_ago = 前
common_label_all = すべての
common_label_all_resources = すべてのリソース
common_label_day = 日
-##common_label_error = Error
-##common_label_filters = Filters
+common_label_error = エラー
+common_label_filters = フィルター
common_label_hour = 時間
common_label_item = 項目
common_label_items = 項目
@@ -79,20 +78,20 @@ common_label_users = ユーザー
common_label_week = 週
common_label_yesterday = 昨日
common_msg_areYouSure = よろしいですか?
-##common_msg_asyncTimeout = {0}. This occurred because the server is taking a long time to complete this request. Please be aware that the server may still be processing your request and it may complete shortly. You can check the server logs to see if any abnormal errors occurred.
+common_msg_asyncTimeout = {0}. これが発生したのはサーバーがこのリクエストを完了するのに長時間経過したからです。サーバーがそのリクエストをまだ処理中で短時間で完了可能かどうか注意してください。サーバーログを調べることで異常なエラーが発生したかどうかがわかります。
common_msg_changeAutoDetected = 変更が自動検出されました
-common_msg_deleteConfirm = を削除してもよろしいですか # selected {0}?
+common_msg_deleteConfirm = 選択された {0} を削除してもよろしいですか
common_msg_emphasizedNotePrefix = 注意:
common_msg_loading = ロード中...
common_msg_noItemsToShow = 表示する項目はありません
-##common_msg_notYetImplemented = Not Yet Implemented
+common_msg_notYetImplemented = 実装されていません
common_msg_see_more = 詳細...
common_msg_step_x_of_y = ステップ {1} 中 {0} 番め
-##common_severity_debug = Debug
+common_severity_debug = デバッグ
common_severity_error = エラー
-##common_severity_fatal = Fatal
+common_severity_fatal = 致命的
common_severity_info = 情報
-##common_severity_warn = Warn
+common_severity_warn = 警告
common_status_canceled = キャンセル
common_status_deferred = 延期
common_status_failed = 失敗
@@ -103,6 +102,7 @@ common_status_success = 成功
common_status_timedOut = タイムアウト
common_status_unknown = 未知
common_title_add_column = カラム追加
+common_title_add_graph_to_view = モニタービューへのグラフの追加
common_title_add_portlet = ポートレット追加
common_title_address = アドレス
common_title_alerts = アラート
@@ -115,7 +115,7 @@ common_title_background = バックグラウンド
common_title_bundle = バンドル
common_title_bundles = バンドル
common_title_category = カテゴリ
-common_title_change_refresh_time = インターバルのリフレッシュ
+common_title_change_refresh_time = リフレッシュ間隔
common_title_columns = カラム
common_title_compare_metrics = メトリックスの比較
common_title_compatibleGroups = 互換グループ
@@ -124,19 +124,20 @@ common_title_component_errors = コンポーネントエラー
common_title_config_update_status = 更新状態
common_title_configuration = 構成
common_title_count = 数
+common_title_createTime = 作成時刻
common_title_custom = カスタム
common_title_dashboard_name = ダッシュボード名
common_title_dateCreated = 作成日
common_title_dateRange = 日付の範囲
common_title_default = デフォルト
-##common_title_definition = Definition
+common_title_definition = 定義
common_title_definitions = 定義
common_title_description = 説明
common_title_details = 詳細
common_title_display = 表示
common_title_display_name = 表示名
common_title_duration = 期間
-##common_title_edit = Edit?
+common_title_edit = 編集?
common_title_edit_mode = 編集モード
common_title_enabled = 有効?
common_title_end = 終了
@@ -149,9 +150,10 @@ common_title_help = ヘルプ
common_title_host = ホスト
common_title_id = ID
common_title_id_parent = 親のID
+common_title_interval = 間隔
common_title_inventory = インベントリ
common_title_inventorySummary = インベントリサマリ
-##common_title_kind = Kind
+common_title_kind = 種類
common_title_lastUpdated = 最終更新
common_title_lastUpdatedBy = 最終更新（による）
common_title_ldapGroups = LDAPグループ
@@ -170,7 +172,7 @@ common_title_operation = オペレーション
common_title_operation_status = オペレーションの状態
common_title_operations = オペレーション
common_title_operations_range = オペレーションの範囲
-common_title_over = Over
+##common_title_over = Over
common_title_password = パスワード
common_title_path = パス
common_title_permissions = パーミッション
@@ -182,7 +184,7 @@ common_title_providers = プロバイダ
common_title_recent_alerts = 最近のアラート
common_title_recent_bundle_deployments = 最近のバンドルのデプロイ
common_title_recent_configuration_updates = 最近の構成の更新
-##common_title_recent_drifts = Recent Drift
+common_title_recent_drifts = 最近のドリフト
common_title_recent_event_counts = 最近のイベント数
common_title_recent_measurements = 最近の測定
common_title_recent_oob_metrics = 最近の境界外のメトリックス
@@ -390,12 +392,12 @@ view_aboutBox_homepage = ホームページ
view_aboutBox_jbossByRedHat = JBoss by Red Hat
view_aboutBox_title = {0}について
view_aboutBox_version = バージョン:
-##view_adminConfig_agentPlugins = Agent Plugins
-##view_adminConfig_alertDefTemplates = Alert Definition Templates
+view_adminConfig_agentPlugins = エージェントプラグイン
+view_adminConfig_alertDefTemplates = エージェント定義テンプレート
view_adminConfig_downloads = ダウンロード
-##view_adminConfig_driftDefTemplates = Drift Definition Templates
-##view_adminConfig_metricTemplates = Metric Collection Templates
-##view_adminConfig_serverPlugins = Server Plugins
+view_adminConfig_driftDefTemplates = ドリフト定義テンプレート
+view_adminConfig_metricTemplates = メトリック収集テンプレート
+view_adminConfig_serverPlugins = サーバープラグイン
view_adminConfig_systemSettings = システム設定
view_adminContent_contentSources = コンテントソース
view_adminRoles_assignedGroups = 割り当てられたリソースグループ
@@ -423,7 +425,7 @@ view_adminRoles_permissions_permDesc_manageBundles = (誰でも閲覧可能な)
view_adminRoles_permissions_permDesc_manageInventory = すべてのリソースについて、以下に示すように、すべてのリソース権限を持ちます。つまり、グループの作成、更新、削除、そして自動検出された、または手動で検出されたリソースのインポートができます
view_adminRoles_permissions_permDesc_manageRepositories = (自分自身のリポジトリを作成可能な)ユーザーのリポジトリの作成、更新、削除が可能です。
view_adminRoles_permissions_permDesc_manageSecurity = (誰でも閲覧可能な)ユーザーとロールの作成、更新、削除
-##view_adminRoles_permissions_permDesc_manageSettings = RHQサーバー構成の修正と任意のサーバー関連の機能の実行ができます
+## view_adminRoles_permissions_permDesc_manageSettings = RHQサーバー構成の修正と任意のサーバー関連の機能の実行ができます
view_adminRoles_permissions_permReadDesc_configure = リソース構成とリソース構成リビジョン履歴の閲覧
view_adminRoles_permissions_permReadDesc_control = 利用可能オペレーションとオペレーション実行履歴の(暗黙的な)閲覧
view_adminRoles_permissions_permReadDesc_createChildResources = (暗黙的な)子リソースの作成履歴の閲覧
@@ -431,7 +433,7 @@ view_adminRoles_permissions_permReadDesc_deleteChildResources = (暗黙的な)
view_adminRoles_permissions_permReadDesc_inventory = リソースプロパティ(名前、説明、バージョンなど)、コネクション設定、コネクション設定履歴の(暗黙的な)閲覧
view_adminRoles_permissions_permReadDesc_manageAlerts = アラート定義とアラート履歴の(暗黙的な)閲覧
view_adminRoles_permissions_permReadDesc_manageContent = (暗黙的な)インストールされて利用可能なパッケージ。パッケージインストール履歴の閲覧。
-##view_adminRoles_permissions_permReadDesc_manageDrift = (IMPLIED) view drift definitions and drift history
+view_adminRoles_permissions_permReadDesc_manageDrift = (暗黙的な) ドリフト定義とドリフト履歴の閲覧
view_adminRoles_permissions_permReadDesc_manageEvents = (暗黙的な)イベントの閲覧
view_adminRoles_permissions_permReadDesc_manageMeasurements = メトリックデータと収集スケジュールの(暗黙的な)閲覧
view_adminRoles_permissions_permWriteDesc_configure = リソース構成の更新。リソース構成リビジョン履歴の削除。
@@ -441,7 +443,7 @@ view_adminRoles_permissions_permWriteDesc_deleteChildResources = リソースの
view_adminRoles_permissions_permWriteDesc_inventory = リソースの名前、バージョン、説明、コネクション設定の更新。コネクション設定の履歴の削除。
view_adminRoles_permissions_permWriteDesc_manageAlerts = アラート定義の作成、更新、削除。アラート履歴の確認と削除
view_adminRoles_permissions_permWriteDesc_manageContent = コンテントソースへの登録。パッケージのインストールとアンインストール。
-##view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete drift definitions; and manage drift instances
+view_adminRoles_permissions_permWriteDesc_manageDrift = ドリフト定義の作成、更新、削除、そして、ドリフトインスタンスの管理
view_adminRoles_permissions_permWriteDesc_manageEvents = イベントの削除
view_adminRoles_permissions_permWriteDesc_manageMeasurements = メトリック収集スケジュールの更新
view_adminRoles_permissions_perm_configure = 構成
@@ -452,7 +454,7 @@ view_adminRoles_permissions_perm_inventory = インベントリ
view_adminRoles_permissions_perm_manageAlerts = アラートの管理
view_adminRoles_permissions_perm_manageBundles = バンドルの管理
view_adminRoles_permissions_perm_manageContent = コンテント管理
-##view_adminRoles_permissions_perm_manageDrift = Manage Drift
+view_adminRoles_permissions_perm_manageDrift = ドリフト管理
view_adminRoles_permissions_perm_manageEvents = イベント管理
view_adminRoles_permissions_perm_manageInventory = インベントリの管理
view_adminRoles_permissions_perm_manageMeasurements = 測定の管理
@@ -469,20 +471,20 @@ view_adminRoles_roleDeleteFailed = ロール [{0}] の削除に失敗しまし
view_adminRoles_roleDeleted = ロール [{0}] が削除されました
view_adminRoles_roleUpdateFailed = ロール [{0}] の更新に失敗しました.
view_adminRoles_roleUpdated = ロール [{0}] が更新されました
-##view_adminTemplates_definedBy = Defined By
-##view_adminTemplates_disabledTemplates = Disabled Templates
+view_adminTemplates_definedBy = 定義
+view_adminTemplates_disabledTemplates = 無効化されたテンプレート
view_adminTemplates_editAlertTemplate = アラートテンプレートの編集
-##view_adminTemplates_editTemplates = Edit Templates
-##view_adminTemplates_enabledTemplates = Enabled Templates
+view_adminTemplates_editTemplates = テンプレートの編集
+view_adminTemplates_enabledTemplates = 有効化されたテンプレート
view_adminTemplates_platformServices = プラットフォームサービス
view_adminTemplates_platforms = プラットフォーム
-##view_adminTemplates_pluginTemplates = Plugin Templates
+view_adminTemplates_pluginTemplates = プラグインテンプレート
view_adminTemplates_prompt_disabledAlertTemplates = このリソースタイプに関して作成されたけれど無効にされたアラートテンプレートの数
view_adminTemplates_prompt_disabledMetricTemplates = このリソースタイプに関してデフォルトで無効にされたメトリックスケジュールの数
view_adminTemplates_prompt_enabledAlertTemplates = このリソースタイプに関して有効にされたアラートテンプレートの数
view_adminTemplates_prompt_enabledMetricTemplates = このリソースタイプに関してデフォルトで有効にされたメトリックスケジュールの数
view_adminTemplates_servers = サービス
-##view_adminTemplates_userTemplates = User Templates
+view_adminTemplates_userTemplates = ユーザーテンプレート
view_adminTopology_affinityGroups = アフィニティグループ
view_adminTopology_agents = エージェント
view_adminTopology_partitionEvents = イベントの分類
@@ -494,106 +496,102 @@ view_admin_configuration = 構成
view_admin_content = コンテント
view_admin_downloads_agentDownload = エージェントのダウンロード
view_admin_downloads_agent_buildNumber = エージェントビルド
-##view_admin_downloads_agent_help = <p> これはRHQ Agentの更新バイナリJARファイルです。このJARファイルの目的はユーザーがエージェントがまだ存在しないマシン上に新しいエージェントをインストールできるようにすることと、すでにインストール済みのエージェントを更新できるようにするためです。詳細は、このエージェントダウンロードJARで次のように--helpコマンドラインオプションをつけて実行してください。<br/> <b>java -jar <agent-download.jar> --help</b> </p> <h3>エージェントのインストール</h3> <p> <b>java -jar <agent-download.jar> --install[=<新しいエージェントディレクトリ>]</b><br/> このコマンドは新しいエージェントをインストールします。もし新しいディレクトリを指定しなければ、デフォルトは"."となります。</p> <h3>エージェントの更新</h3> <p> <b>java -jar <agent-download.jar> --update[=<古いエージェントディレクトリ>]</b><br/> これはすでにインストールされた既存のエージェントを更新します。もし古い、既存のエージェントがインストールされたディレクトリを指定しなかったなら、"rhq-agent"が仮定されます。</p>
+## view_admin_downloads_agent_help = <p> これはRHQ Agentの更新バイナリJARファイルです。このJARファイルの目的はユーザーがエージェントがまだ存在しないマシン上に新しいエージェントをインストールできるようにすることと、すでにインストール済みのエージェントを更新できるようにするためです。詳細は、このエージェントダウンロードJARで次のように--helpコマンドラインオプションをつけて実行してください。<br/> <b>java -jar <agent-download.jar> --help</b> </p> <h3>エージェントのインストール</h3> <p> <b>java -jar <agent-download.jar> --install[=<新しいエージェントディレクトリ>]</b><br/> このコマンドは新しいエージェントをインストールします。もし新しいディレクトリを指定しなければ、デフォルトは"."となります。</p> <h3>エージェントの更新</h3> <p> <b>java -jar <agent-download.jar> --update[=<古いエージェントディレクトリ>]</b><br/> これはすでにインストールされた既存のエージェントを更新します。もし古い、既存のエージェントがインストールされたディレクトリを指定しなかったなら、"rhq-agent"が仮定されます。</p>
view_admin_downloads_agent_link_label = リンク
view_admin_downloads_agent_link_value = エージェント {0} ({1}) のダウンロード
view_admin_downloads_agent_loadError = エージェントバージョン情報が取得できません
view_admin_downloads_agent_md5 = エージェント MD5
view_admin_downloads_agent_version = エージェントバージョン
view_admin_downloads_bundleDownload = バンドルデプロイヤのダウンロード
-##view_admin_downloads_bundle_help = <p> これはバンドルデプロイヤツールで、開発者とRHQバンドルによって使われます。このスタンドアロンツールを使うとバンドルやコンソールからのレシピをテストできるようにします。</p>
+## view_admin_downloads_bundle_help = <p> これはバンドルデプロイヤツールで、開発者とRHQバンドルによって使われます。このスタンドアロンツールを使うとバンドルやコンソールからのレシピをテストできるようにします。</p>
view_admin_downloads_bundle_link_label = リンク
view_admin_downloads_bundle_link_value = バンドルデプロイヤー {0} をダウンロード
view_admin_downloads_bundle_loadError = バンドルデプロイヤー情報が取得できません
-##view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download
-##view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition.
-##view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download
-##view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download
view_admin_downloads_cliDownload = コマンドラインクライアントのダウンロード
view_admin_downloads_cli_buildNumber = CLIビルド
-##view_admin_downloads_cli_help = <p> これはコマンドラインツールで、CLIとして知られているものです。コンソールから実行するスタンドアロンツールで、RHQサーバーに対してコマンドラインインタフェースを提供します。自動化されたタスクを実行するためにCLIやrunスクリプトを介してコマンドを呼び出すことが可能です。CLIのインストール方法と使い方についての詳細情報はドキュメントをご覧ください。</p>
+## view_admin_downloads_cli_help = <p> これはコマンドラインツールで、CLIとして知られているものです。コンソールから実行するスタンドアロンツールで、RHQサーバーに対してコマンドラインインタフェースを提供します。自動化されたタスクを実行するためにCLIやrunスクリプトを介してコマンドを呼び出すことが可能です。CLIのインストール方法と使い方についての詳細情報はドキュメントをご覧ください。</p>
view_admin_downloads_cli_link_label = リンク
view_admin_downloads_cli_link_value = CLI {0} ({1}) をダウンロード
view_admin_downloads_cli_loadError = CLIバージョン情報が取得できません
view_admin_downloads_cli_md5 = CLI MD5
view_admin_downloads_cli_version = CLIバージョン
view_admin_downloads_connectorsDownload = コネクタのダウンロード
-##view_admin_downloads_connectors_help = コネクターは製品がRHQによって管理可能であるために必要となるソフトウェアです。RHQエージェントが通信できるように、管理製品にコネクターをインストールします。詳細はドキュメントをご覧ください。
+## view_admin_downloads_connectors_help = コネクターは製品がRHQによって管理可能であるために必要となるソフトウェアです。RHQエージェントが通信できるように、管理製品にコネクターをインストールします。詳細はドキュメントをご覧ください。
view_admin_downloads_connectors_loadError = コネクター情報を取得できません
view_admin_downloads_connectors_none = ダウンロードのためのコネクターが見つかりません
-##view_admin_landing = このセクションにおいて、RHQグローバル設定が管理されます。これはセキュリティ構成、プラグイン設定、RHQサーバーとエージェントの管理を含みます。
+## view_admin_landing = このセクションにおいて、RHQグローバル設定が管理されます。これはセキュリティ構成、プラグイン設定、RHQサーバーとエージェントの管理を含みます。
view_admin_measTemplates_updateExisting_title = 既存スケジュールの更新
view_admin_measTemplates_updateExisting_tooltip = このボックスをチェックすると、このタイプのすべてのリソースを対象に選択したメトリックスの収集スケジュールを更新します。もしこれがチェックされていなければ、テンプレートスケジュールが将来的にインベントリに追加されるこのタイプの新規リソースに適用されるだけです。
-##view_admin_plugins_agent = Agent
-##view_admin_plugins_agentDeleteConfirm = <b>Warning!</b><br/>\nThe following agent plugins are about to be deleted:<br/>\n{0}<br/>\nAre you sure you want to delete these?
-##view_admin_plugins_agentDisableConfirm = <b>Warning!</b><br/>\nThe following agent plugins are about to be disabled:<br/>\n{0}<br/>\nAre you sure you want to disable these?
-##view_admin_plugins_deletedAgentPlugins = Deleted agent plugins: {0}
-##view_admin_plugins_deletedAgentPluginsFailure = Failed to delete agent plugins.
-##view_admin_plugins_deployed = Deployed?
-##view_admin_plugins_disabledAgentPlugins = Disabled agent plugins: {0}
-##view_admin_plugins_disabledAgentPluginsFailure = Failed to disable agent plugins.
-##view_admin_plugins_disabledServerPlugins = Disabled server plugins: {0}
-##view_admin_plugins_disabledServerPluginsFailure = Failed to disable server plugins.
-##view_admin_plugins_enabledAgentPlugins = Enabled agent plugins: {0}
-##view_admin_plugins_enabledAgentPluginsFailure = Failed to enable agent plugins.
-##view_admin_plugins_enabledServerPlugins = Enabled server plugins: {0}
-##view_admin_plugins_enabledServerPluginsFailure = Failed to enable server plugins.
-##view_admin_plugins_hideDeleted = Hide Deleted
-##view_admin_plugins_hideUndeployed = Hide Undeployed
-##view_admin_plugins_loadFailure = Failed to load plugin data
-##view_admin_plugins_purgedAgentPlugins = Preparing to purge agent plugins {0}. This may take a few minutes since all type definitions from the plugins must first be purged from the system. The plugins will still be visible on this page until they have been purged. Please note that you must not re-install the plugin while the purge is running, otherwise failures will occur. Therefore, please wait before attempting to re-install the plugin into the system until this purge is complete.
-##view_admin_plugins_purgedAgentPluginsFailure = Failed to purge agent plugins.
-##view_admin_plugins_purgedServerPlugins = Purged server plugins: {0}.
-##view_admin_plugins_purgedServerPluginsFailure = Failed to purge server plugins.
-##view_admin_plugins_restartMasterPC = Restart Master Plugin Container
-##view_admin_plugins_restartMasterPCComplete = Master plugin container has been restarted.
-##view_admin_plugins_restartMasterPCFailure = Failed to restart the master plugin container
-##view_admin_plugins_restartMasterPCStarted = Restarting the master plugin container...
-##view_admin_plugins_scan = Scan For Updates
-##view_admin_plugins_scanComplete = Finished scanning for updated plugins
-##view_admin_plugins_scanFailure = Failed to scan for updated plugins.
+view_admin_plugins_agent = エージェント
+view_admin_plugins_agentDeleteConfirm = <b>警告!</b><br/>\n次のエージェントプラグインは削除されようとしています:<br/>\n{0}<br/>\n本当にこれらを削除してもよろしいですか?
+view_admin_plugins_agentDisableConfirm = <b>警告!</b><br/>\n次のエージェントプラグインは無効にされようとしています:<br/>\n{0}<br/>\n本当にこれらを無効にしてもよろしいですか?
+view_admin_plugins_deletedAgentPlugins = 削除されたエージェントプラグイン: {0}
+view_admin_plugins_deletedAgentPluginsFailure = エージェントプラグインの削除に失敗しました
+view_admin_plugins_deployed = デプロイしましたか?
+view_admin_plugins_disabledAgentPlugins = 無効化されたエージェントプラグイン: {0}
+view_admin_plugins_disabledAgentPluginsFailure = エージェントプラグインを無効化するのに失敗しました
+view_admin_plugins_disabledServerPlugins = 無効化されたサーバープラグイン: {0}
+view_admin_plugins_disabledServerPluginsFailure = サーバープラグインを無効化するのに失敗しました
+view_admin_plugins_enabledAgentPlugins = 有効化されたエージェントプラグイン: {0}
+view_admin_plugins_enabledAgentPluginsFailure = エージェントプラグインを有効化するのに失敗しました
+view_admin_plugins_enabledServerPlugins = 有効化されたサーバープラグイン: {0}
+view_admin_plugins_enabledServerPluginsFailure = サーバープラグインの有効化に失敗しました
+view_admin_plugins_hideDeleted = 削除済みを隠す
+view_admin_plugins_hideUndeployed = アンデプロイを隠す
+view_admin_plugins_loadFailure = プラグインデータをロードするのに失敗しました
+view_admin_plugins_purgedAgentPlugins = エージェントプラグイン {0} をパージするための準備をしています。これは数分かかるかもしれません。なぜなら、そのプラグインからのすべてのタイプ定義は最初にシステムからパージされなければならないからです。それらのプラグインはパージされるまでの間このページで見え続けます。パージが実行中はそのプラグインを再インストールしてはいけないことに留意してください。さもなければ、失敗することでしょう。したがって、このパージが完了するまでシステムへプラグインの再インストールをお待ちください。
+view_admin_plugins_purgedAgentPluginsFailure = エージェントプラグインのパージに失敗しました
+view_admin_plugins_purgedServerPlugins = パージされたサーバープラグイン: {0}.
+view_admin_plugins_purgedServerPluginsFailure = サーバープラグインのパージに失敗しました
+view_admin_plugins_restartMasterPC = マスタープラグインコンテナの再起動
+view_admin_plugins_restartMasterPCComplete = マスタープラグインコンテナが再起動されました
+view_admin_plugins_restartMasterPCFailure = マスタープラグインコンテナの再起動に失敗しました
+view_admin_plugins_restartMasterPCStarted = マスタープラグインコンテナの再起動中...
+view_admin_plugins_scan = 更新のためのスキャン
+view_admin_plugins_scanComplete = 更新されたプラグインのためのスキャンを完了しました
+view_admin_plugins_scanFailure = 更新されたプラグインのためのスキャンが失敗しました
view_admin_plugins_server = サーバー
-##view_admin_plugins_serverConfig = Plugin Configuration
-##view_admin_plugins_serverConfig_badSettings = Please enter valid settings
-##view_admin_plugins_serverConfig_saveFailed = Failed to save the settings
-##view_admin_plugins_serverConfig_settingsSaved = The settings have been saved.
-##view_admin_plugins_serverControls = Controls
-##view_admin_plugins_serverControls_badParams = Please enter valid parameters
-##view_admin_plugins_serverControls_clickForError = Click for the error message
-##view_admin_plugins_serverControls_invokeFailure = Failed to invoke the control
-##view_admin_plugins_serverControls_name = Control
-##view_admin_plugins_serverControls_parameters = Parameters
-##view_admin_plugins_serverControls_results = Results
-##view_admin_plugins_serverDisableConfirm = <b>Warning!</b><br/>\nThe following server plugins are about to be disabled:<br/>\n{0}<br/>\nAre you sure you want to disable these?
-##view_admin_plugins_serverScheduleJobs = Scheduled Jobs
-##view_admin_plugins_serverUndeployConfirm = <b>Warning!</b><br/>\nThe following server plugins are about to be undeployed:<br/>\n{0}<br/>\nAre you sure you want to undeploy these?
-##view_admin_plugins_showDeleted = Show Deleted
-##view_admin_plugins_showUndeployed = Show Undeployed
-##view_admin_plugins_undeploy = Undeploy
-##view_admin_plugins_undeployedServerPlugins = Undeployed server plugins: {0}
-##view_admin_plugins_undeployedServerPluginsFailure = Failed to undeploy server plugins.
-##view_admin_plugins_upload = Upload Plugin
+view_admin_plugins_serverConfig = プラグイン構成
+view_admin_plugins_serverConfig_badSettings = 正しい設定を入力してください
+view_admin_plugins_serverConfig_saveFailed = 設定の保存に失敗しました
+view_admin_plugins_serverConfig_settingsSaved = 設定が保存されました
+view_admin_plugins_serverControls = コントロール
+view_admin_plugins_serverControls_badParams = 正しいパラメーターを入力してください
+view_admin_plugins_serverControls_clickForError = エラーメッセージをクリックしてください
+view_admin_plugins_serverControls_invokeFailure = コントロールの呼び出しに失敗しました
+view_admin_plugins_serverControls_name = コントロール
+view_admin_plugins_serverControls_parameters = パラメーター
+view_admin_plugins_serverControls_results = 結果
+view_admin_plugins_serverDisableConfirm = <b>警告!</b><br/>\n次のサーバープラグインは無効にされようとしています:<br/>\n{0}<br/>\n本当にこれらを無効にしてもよろしいですか?
+view_admin_plugins_serverScheduleJobs = スケジュールされたジョブ
+view_admin_plugins_serverUndeployConfirm = <b>警告!</b><br/>\n次のサーバープラグインはアンデプロイされようとしています:<br/>\n{0}<br/>\n本当にこれらをアンデプロイにしてもよろしいですか?
+view_admin_plugins_showDeleted = 削除済みを表示
+view_admin_plugins_showUndeployed = アンデプロイを表示
+view_admin_plugins_undeploy = アンデプロイ
+view_admin_plugins_undeployedServerPlugins = アンデプロイ済みのサーバープラグイン: {0}
+view_admin_plugins_undeployedServerPluginsFailure = サーバープラグインのアンデプロイに失敗しました
+view_admin_plugins_upload = プラグインのアップロード
view_admin_security = セキュリティ
-##view_admin_systemSettings_ActiveDriftServerPlugin_desc = The drift server plugin that manages the persistence of drift-related entities and content.
-##view_admin_systemSettings_ActiveDriftServerPlugin_name = Active Drift Server Plugin
+view_admin_systemSettings_ActiveDriftServerPlugin_desc = ドリフト関連のエンティティとコンテントの永続性を管理するドリフトサーバープラグイン
+view_admin_systemSettings_ActiveDriftServerPlugin_name = アクティブドリフトサーバープラグイン
view_admin_systemSettings_AgentMaxQuietTimeAllowed_desc = もしエージェントから何も受信しないでこの時間が経過したならば、そのエージェントはダウンしたものと見なされます。この値は分単位で指定されます。
view_admin_systemSettings_AgentMaxQuietTimeAllowed_name = 許容される最大無通信時間
view_admin_systemSettings_AlertPurge_desc = データベースから除去される前のアラートヒストリの保持時間。これは日単位で指定されます。
-view_admin_systemSettings_AlertPurge_name = 次より古いアラートを削除
+view_admin_systemSettings_AlertPurge_name = 古いアラートを削除
view_admin_systemSettings_AvailabilityPurge_desc = データベースから除去される前の可用性データの保持時間。これは日単位で指定されます。
-view_admin_systemSettings_AvailabilityPurge_name = 次より古い可用性データの削除
+view_admin_systemSettings_AvailabilityPurge_name = 古い可用性データの削除
view_admin_systemSettings_BaseURL_desc = サーバーGUIへのURL。主にアラートE-メール通知の使われます。
view_admin_systemSettings_BaseURL_name = GUIコンソールURL
view_admin_systemSettings_BaselineDataSet_desc = ベースラインを決定するために使われる過去の測定データの量。これは日単位で指定されます。
view_admin_systemSettings_BaselineDataSet_name = ベースラインデータセット
-view_admin_systemSettings_BaselineFrequency_desc = ベースラインの自動景作の頻度が計算されます。もし0なら、ベースラインの自動景作は無効にされます。これは日単位で指定されます。
+view_admin_systemSettings_BaselineFrequency_desc = ベースラインの自動計算の頻度が計算されます。もし0なら、ベースラインの自動計算は無効にされます。これは日単位で指定されます。
view_admin_systemSettings_BaselineFrequency_name = ベースライン計算の頻度
view_admin_systemSettings_DataMaintenance_desc = データベースの保守が実行される頻度(例えば、Postgresを使っているのであればであればバキュームなど)。これは時間単位で指定されます。
view_admin_systemSettings_DataMaintenance_name = データベース保守期間
-view_admin_systemSettings_DataReindex_desc = もし有効であれば、データベーステーブルは定期的にインデックスが再生成されます。
-view_admin_systemSettings_DataReindex_name = データテーブルの夜間でのインデックス再生成
-##view_admin_systemSettings_DriftFilePurge_desc = How old unused and orphaned drift files must be before being purged from backend storage. This is specified in days.
-##view_admin_systemSettings_DriftFilePurge_name = Delete Unused Drift Files Older Than
+view_admin_systemSettings_DataReindex_desc = もし有効であれば、データベーステーブルは定期的にインデックスが再作成されます。
+view_admin_systemSettings_DataReindex_name = データテーブルの夜間でのインデックス再作成
+view_admin_systemSettings_DriftFilePurge_desc = バックエンドからパージされる対象となる未使用かつ親がいないドリフトファイルの経過時間。これは日数で指定されます。
+view_admin_systemSettings_DriftFilePurge_name = 未使用ドリフトファイルの削除
view_admin_systemSettings_EnableAgentAutoUpdate_desc = サーバーがエージェントが自動更新することを許すかどうかを決定します。もしこれが無効にされているのであれば、サーバーからエージェントのディストリビューションをダウンロードすることはできません。
view_admin_systemSettings_EnableAgentAutoUpdate_name = エージェントの自動更新を有効にする
view_admin_systemSettings_EnableDebugMode_desc = 有効であれば、サーバーはデバッグモードに入ります
@@ -601,8 +599,8 @@ view_admin_systemSettings_EnableDebugMode_name = デバッグモードを有効
view_admin_systemSettings_EnableExperimentalFeatures_desc = 有効であれば、現在の製品に含まれる任意の実験的機能が利用可能になります
view_admin_systemSettings_EnableExperimentalFeatures_name = 実験的機能を有効にする
view_admin_systemSettings_EventPurge_desc = データベースから除去される前のイベントデータの保持時間。これは日単位で指定されます。
-view_admin_systemSettings_EventPurge_name = 次より古いイベント削除
-view_admin_systemSettings_JAASProvider_desc = ユーザーIDを欠点するのにLDAPが使われるべきですか?
+view_admin_systemSettings_EventPurge_name = 古いイベント削除
+view_admin_systemSettings_JAASProvider_desc = ユーザーIDを決定するのにLDAPが使われるべきですか?
view_admin_systemSettings_JAASProvider_name = LDAPの有効化
view_admin_systemSettings_LDAPBaseDN_desc = ユーザ認証の間にユーザー名とパスワードを検索するディレクトリツリーのベース。例: ou=People,dc=redhat,dc=com
view_admin_systemSettings_LDAPBaseDN_name = サーチベース
@@ -623,17 +621,15 @@ view_admin_systemSettings_LDAPProtocol_name = SSL
view_admin_systemSettings_LDAPUrl_desc = LDAPサーバーへのURL
view_admin_systemSettings_LDAPUrl_name = LDAP URL
view_admin_systemSettings_RtDataPurge_desc = データベースから除去される前の応答時間の保持時間。これは日単位で指定されます。
-view_admin_systemSettings_RtDataPurge_name = 次より古い応答時間の削除
+view_admin_systemSettings_RtDataPurge_name = 古い応答時間の削除
view_admin_systemSettings_TraitPurge_desc = データベースから除去される前の測定トレイトデータの保持時間。これは日単位で指定されます。
-view_admin_systemSettings_TraitPurge_name = 次より古い測定トレイトの削除
+view_admin_systemSettings_TraitPurge_name = 古い測定トレイトの削除
view_admin_systemSettings_cannotLoadServerDetails = サーバー詳細をロードできません
view_admin_systemSettings_cannotLoadSettings = 現在のシステム設定を取得できません
-##view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed
-##view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
view_admin_systemSettings_fixBeforeSaving = 保存前に無効な値を修正してください
view_admin_systemSettings_group_baseline = 自動ベースライン構成プロパティ
view_admin_systemSettings_group_dataMgr = データマネージャー構成プロパティ
-##view_admin_systemSettings_group_drift = Drift Server Configuration Settings
+view_admin_systemSettings_group_drift = ドリフトサーバー構成設定
view_admin_systemSettings_group_general = 全体構成プロパティ
view_admin_systemSettings_group_ldap = LDAP構成プロパティ
view_admin_systemSettings_saveFailure = システム設定の保存に失敗しました
@@ -661,26 +657,26 @@ view_alert_common_tab_conditions_text = 条件
view_alert_common_tab_conditions_type_availability = アベイラビリティの変化
view_alert_common_tab_conditions_type_availability_down = 下降
view_alert_common_tab_conditions_type_availability_up = 上昇
-##view_alert_common_tab_conditions_type_drift = Drift Detection
-##view_alert_common_tab_conditions_type_drift_configpaths = Drift Detection for files that match "{0}" and for drift definition [{1}]
-##view_alert_common_tab_conditions_type_drift_onlyconfig = Drift Detection for drift definition [{0}]
-##view_alert_common_tab_conditions_type_drift_onlypaths = Drift Detection for files that match "{0}"
+view_alert_common_tab_conditions_type_drift = ドリフトの検出
+view_alert_common_tab_conditions_type_drift_configpaths = "{0}" に一致するファイルとドリフト定義 [{1}] のためのドリフトの検出
+view_alert_common_tab_conditions_type_drift_onlyconfig = ドリフト定義 [{0}] のためのドリフト検出
+view_alert_common_tab_conditions_type_drift_onlypaths = "{0}" に一致するファイルのためのドリフト検出
view_alert_common_tab_conditions_type_event = イベントの検出
view_alert_common_tab_conditions_type_event_matching = イベントソースが一致
view_alert_common_tab_conditions_type_metric_baseline = メトリック値のベースライン
view_alert_common_tab_conditions_type_metric_baseline_verb = of
view_alert_common_tab_conditions_type_metric_calltime_change = 呼び出し時間の変化
-view_alert_common_tab_conditions_type_metric_calltime_change_verb = by at least
+##view_alert_common_tab_conditions_type_metric_calltime_change_verb = by at least
view_alert_common_tab_conditions_type_metric_calltime_delta_grows = 上昇
view_alert_common_tab_conditions_type_metric_calltime_delta_other = 変化
view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks = 縮小
view_alert_common_tab_conditions_type_metric_calltime_destination = 呼び出しの宛先が一致
view_alert_common_tab_conditions_type_metric_calltime_threshold = 呼び出し時間の閾値
view_alert_common_tab_conditions_type_metric_change = メトリック値の変換
-##view_alert_common_tab_conditions_type_metric_range_inside_exclusive = Metric Value Range: [{0}] between [{1}] and [{2}], exclusive
-##view_alert_common_tab_conditions_type_metric_range_inside_inclusive = Metric Value Range: [{0}] between [{1}] and [{2}], inclusive
-##view_alert_common_tab_conditions_type_metric_range_outside_exclusive = Metric Value Range: [{0}] outside [{1}] and [{2}], exclusive
-##view_alert_common_tab_conditions_type_metric_range_outside_inclusive = Metric Value Range: [{0}] outside [{1}] and [{2}], inclusive
+view_alert_common_tab_conditions_type_metric_range_inside_exclusive = メトリック値の範囲 [{0}] : [{1}] と [{2}] の間 (境界値を含まない)
+view_alert_common_tab_conditions_type_metric_range_inside_inclusive = メトリック値の範囲 [{0}] : [{1}] と [{2}] の間 (境界値を含む)
+view_alert_common_tab_conditions_type_metric_range_outside_exclusive = メトリック値の範囲 [{0}] : [{1}] と [{2}] の外側(境界値を含まない)
+view_alert_common_tab_conditions_type_metric_range_outside_inclusive = メトリック値の範囲 [{0}] : [{1}] と [{2}] の外側(境界値を含む)
view_alert_common_tab_conditions_type_metric_threshold = メトリック値の閾値
view_alert_common_tab_conditions_type_metric_trait_change = トレイトの変化
view_alert_common_tab_conditions_type_operation = オペレーションの実行
@@ -714,25 +710,25 @@ view_alert_common_tab_notifications_message = メッセージ
view_alert_common_tab_notifications_sender = センダー
view_alert_common_tab_notifications_status = ステータス
view_alert_common_tab_recovery = リカバリ
-view_alert_definition_condition_editor_avilability_option_down = 下降する
-view_alert_definition_condition_editor_avilability_option_up = 上昇する
+view_alert_definition_condition_editor_avilability_option_down = 停止
+view_alert_definition_condition_editor_avilability_option_up = 起動
view_alert_definition_condition_editor_avilability_tooltip = 条件のトリガーとなるアベイラビリティ状態の変化を指定します
view_alert_definition_condition_editor_avilability_value = アベイラビリティ
view_alert_definition_condition_editor_common_avg = 平均
view_alert_definition_condition_editor_common_max = 最大
view_alert_definition_condition_editor_common_min = 最小
view_alert_definition_condition_editor_delete_confirm = 選択されたアラート定義を削除しますか?
-##view_alert_definition_condition_editor_drift_configname_regex = Drift Definition Name
-##view_alert_definition_condition_editor_drift_configname_regex_tooltip = If specified, this is the drift definition name that was responsible for the drift that was detected. This can optionally be a regular expression if you wish to match multiple drift definition names.
-##view_alert_definition_condition_editor_drift_pathname_regex = Pathname Regular Expression
-##view_alert_definition_condition_editor_drift_pathname_regex_tooltip = If specified, this is a regular expression that must match the pathnames of those files that drifted.
-##view_alert_definition_condition_editor_drift_tooltip = This condition is triggered when drift has been detected.
+view_alert_definition_condition_editor_drift_configname_regex = ドリフト定義名
+view_alert_definition_condition_editor_drift_configname_regex_tooltip = もし指定されたなら、これは検出されたドリフトのための責任を持ったドリフト定義名です。これは複数のドリフト定義名に一致させたいのならオプションとして正規表現にすることもできます。
+view_alert_definition_condition_editor_drift_pathname_regex = パス名正規表現
+view_alert_definition_condition_editor_drift_pathname_regex_tooltip = もし指定されたなら、これはドリフトされたファイルのパス名に一致しなければならない正規表現になります。
+view_alert_definition_condition_editor_drift_tooltip = この条件はドリフトが検出されたときがトリガーになります。
view_alert_definition_condition_editor_event_regex = 正規表現
view_alert_definition_condition_editor_event_regex_tooltip = もし指定されたなら、これは正規表現であり、この条件を引き起こすために収集されたイベントメッセージに一致しなければなりません。
view_alert_definition_condition_editor_event_severity = イベント重大度
view_alert_definition_condition_editor_event_tooltip = この条件を引き起こすためにイベントメッセージが報告される必要があるイベント重大度を指定します。もしオプションとなる正規表現を指定したなら、イベントメッセージはその条件が引き起こされるためにイベントメッセージも正規表現に一致しなければなりません。
view_alert_definition_condition_editor_metric_baseline_percentage = ベースラインパーセンテージ
-view_alert_definition_condition_editor_metric_baseline_percentage_tooltip = 選択された比較子(comparator)を使用して選択されたベースライン値のパーセンテージを比較するときに収集されたメトリック値はこの条件を引き起こします。
+view_alert_definition_condition_editor_metric_baseline_percentage_tooltip = 選択された比較演算子を使用して選択されたベースライン値のパーセンテージを比較するときに収集されたメトリック値はこの条件を引き起こします。
view_alert_definition_condition_editor_metric_baseline_tooltip = 条件を引き起こすために違反されることが必要となるベースライン値を指定します。指定する値は、与えられたベースライン値のパーセンテージになります。
view_alert_definition_condition_editor_metric_baseline_value = ベースライン
view_alert_definition_condition_editor_metric_calltime_change_percentage = パーセンテージの変化
@@ -753,19 +749,19 @@ view_alert_definition_condition_editor_metric_calltime_threshold_value = 呼び
view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip = 選択された比較子(comparator)を使って比較するとき条件が引き起こされるメトリックの閾値
view_alert_definition_condition_editor_metric_change_tooltip = 条件を引き起こすために変更しなければならない値を持つメトリックを指定します
view_alert_definition_condition_editor_metric_common_definition_not_found = メトリック定義が見つかるべきです - 何かがおかしいです
-##view_alert_definition_condition_editor_metric_nometrics = When using the ALL conjunction, you cannot use the same metric in multiple conditions and this alert uses all available metrics in currently existing conditions.
-view_alert_definition_condition_editor_metric_range_comparator = コンパレータ
-##view_alert_definition_condition_editor_metric_range_comparator_inside_exclusive = Inside, exclusive
-##view_alert_definition_condition_editor_metric_range_comparator_inside_inclusive = Inside, inclusive
-##view_alert_definition_condition_editor_metric_range_comparator_outside_exclusive = Outside, exclusive
-##view_alert_definition_condition_editor_metric_range_comparator_outside_inclusive = Outside, inclusive
-##view_alert_definition_condition_editor_metric_range_comparator_tooltip = Determines if a metric value should trigger this condition when inside the range or outside of it.
-##view_alert_definition_condition_editor_metric_range_hivalue = High Value
-##view_alert_definition_condition_editor_metric_range_hivalue_tooltip = The high threshold value of the range.
-##view_alert_definition_condition_editor_metric_range_lovalue = Low Value
-##view_alert_definition_condition_editor_metric_range_lovalue_tooltip = The high threshold value of the range.
-##view_alert_definition_condition_editor_metric_range_tooltip = Compares a metric value to a given low-high value range.
-view_alert_definition_condition_editor_metric_threshold_comparator = コンパレータ
+view_alert_definition_condition_editor_metric_nometrics = すべてを連結して使うとき、複数条件内に同じメトリックを使うことはできません。この警告は現在の条件内でのすべての利用可能なメトリックスを使います。
+view_alert_definition_condition_editor_metric_range_comparator = 比較演算子
+view_alert_definition_condition_editor_metric_range_comparator_inside_exclusive = 内部で、境界値を含まない
+view_alert_definition_condition_editor_metric_range_comparator_inside_inclusive = 内部で、境界値を含む
+view_alert_definition_condition_editor_metric_range_comparator_outside_exclusive = 外部で、 境界値を含まない
+view_alert_definition_condition_editor_metric_range_comparator_outside_inclusive = 外部で、 境界値を含む
+view_alert_definition_condition_editor_metric_range_comparator_tooltip = メトリック値が、範囲内か範囲外のとき、この条件のトリガーになるかどうかを決定します。
+view_alert_definition_condition_editor_metric_range_hivalue = 高値
+view_alert_definition_condition_editor_metric_range_hivalue_tooltip = 範囲での高値の閾値
+view_alert_definition_condition_editor_metric_range_lovalue = 低値
+view_alert_definition_condition_editor_metric_range_lovalue_tooltip = 範囲における低値の閾値
+view_alert_definition_condition_editor_metric_range_tooltip = メトリック値と与えられた値の範囲(低値から高値)を比較します。
+view_alert_definition_condition_editor_metric_threshold_comparator = 比較演算子
view_alert_definition_condition_editor_metric_threshold_comparator_equal = 等しい
view_alert_definition_condition_editor_metric_threshold_comparator_greater = より大きい
view_alert_definition_condition_editor_metric_threshold_comparator_less = より少ない
@@ -776,18 +772,18 @@ view_alert_definition_condition_editor_metric_threshold_value = メトリック
view_alert_definition_condition_editor_metric_threshold_value_tooltip = メトリックの閾値は、選択されたコンパレータを使って比較されたときの条件のトリガーになります
view_alert_definition_condition_editor_metric_trait_change_tooltip = 条件を引き起こすために変更しなければならない値を持つトレイとを指定します
view_alert_definition_condition_editor_metric_trait_change_value = トレイト
-##view_alert_definition_condition_editor_metricswarning = You cannot have multiple conditions that use the same metric when using the ALL conjunction. This alert definition has multiple conditions that use the metric [{0}].
+view_alert_definition_condition_editor_metricswarning = すべての連結を使うときは同じメトリックを使う複数の条件を指定することはできません。この警告定義はそのメトリック [{0}] を使う複数の条件を持ちます。
view_alert_definition_condition_editor_operation_status = オペレーションステータス
view_alert_definition_condition_editor_operation_tooltip = 条件を引き起こすために選択されたが実行されるとき発生しなければならない結果を指定します
view_alert_definition_condition_editor_option_availability = アベイラビリティの変化
-##view_alert_definition_condition_editor_option_drift = Drift Detection
+view_alert_definition_condition_editor_option_drift = ドリフトの検出
view_alert_definition_condition_editor_option_event = イベントの検出
view_alert_definition_condition_editor_option_label = 条件タイプ
view_alert_definition_condition_editor_option_metric_baseline = 測定ベースラインの閾値
view_alert_definition_condition_editor_option_metric_calltime_change = 呼び出し時間の変化
view_alert_definition_condition_editor_option_metric_calltime_threshold = 呼び出し時間の閾値
view_alert_definition_condition_editor_option_metric_change = 測定値の変化
-##view_alert_definition_condition_editor_option_metric_range = Measurement Value Range
+view_alert_definition_condition_editor_option_metric_range = 測定値の範囲
view_alert_definition_condition_editor_option_metric_threshold = 測定絶対値の閾値
view_alert_definition_condition_editor_option_metric_trait_change = トレイト値の変化
view_alert_definition_condition_editor_option_operation = オペレーションの実行
@@ -826,7 +822,7 @@ view_alert_definition_notification_operation_editor_mode_this = このリソー
view_alert_definition_notification_operation_editor_mode_title = リソース選択モード
view_alert_definition_notification_operation_editor_mode_unknown = 未知のオプション - これはバグです
view_alert_definition_notification_operation_editor_operations_loadFailed = 利用可能なオペレーションのリストをロードするのに失敗しました
-view_alert_definition_notification_operation_editor_operations_no_parameters = この操作は一つもパラメータを取りません
+view_alert_definition_notification_operation_editor_operations_no_parameters = この操作は一つもパラメーターを取りません
view_alert_definition_notification_operation_editor_relative_ancestor = 検索を開始
view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed = タイプの祖先を取得できません
view_alert_definition_notification_operation_editor_relative_ancestor_root = ルートの祖先タイプ
@@ -914,23 +910,27 @@ view_autoDiscoveryQ_field_inventoryStatus = インベントリステータス
view_autoDiscoveryQ_field_parentId = 親ID
view_autoDiscoveryQ_ignore = 無視
view_autoDiscoveryQ_ignoreFailure = リソースを無視するのに失敗しました
+view_autoDiscoveryQ_ignoreInProgress = 選択されたリソースを無視している途中です...
view_autoDiscoveryQ_ignoreSuccessful = 選択したリソースを無視するのに成功しました
view_autoDiscoveryQ_ignored = 無視済み
view_autoDiscoveryQ_importFailure = リソースのインポートに失敗しました
+view_autoDiscoveryQ_importInProgress = 選択されたリソースをインポート中です...
view_autoDiscoveryQ_importSuccessful = 選択したリソースのインポートに成功しました。
view_autoDiscoveryQ_loadFailure = インベントリディスカバリキューをロードするのに失敗しました
view_autoDiscoveryQ_newAndIgnored = 新規かつ無視済み
view_autoDiscoveryQ_noperm = (自動ディスカバリキューを閲覧する権限がありません)
+view_autoDiscoveryQ_selectAll = すべてを選択
view_autoDiscoveryQ_showStatus = 表示
view_autoDiscoveryQ_title = 自動リカバリキュー
view_autoDiscoveryQ_unignore = 無視解除
view_autoDiscoveryQ_unignoreFailure = リソースを無視解除のに失敗しました
+view_autoDiscoveryQ_unignoreInProgress = 選択されたリソースの無視を解除中です...
view_autoDiscoveryQ_unignoreSuccessful = 選択したリソースの無視解除に成功しました
view_autoDiscoveryQ_uninventoried = インベントリ登録をしない
view_bundleVersion_loadFailure = バンドルバージョンデータをロードするのに失敗しました
view_bundle_bundle = バンドル
-view_bundle_bundleDeployment = バンドルデプロイ
-view_bundle_bundleDeployments = バンドルデプロイ
+view_bundle_bundleDeployment = バンドルデプロイメント
+view_bundle_bundleDeployments = バンドルデプロイメント
view_bundle_bundleDestinations = バンドル宛先
view_bundle_bundleFiles = バンドルファイル
view_bundle_bundleType = バンドルタイプ
@@ -954,7 +954,7 @@ view_bundle_createWizard_noBundleTypesSupported = バンドルタイプは一つ
view_bundle_createWizard_provideBundleDistro = バンドル配布の提供
view_bundle_createWizard_recipeOption = レシピ
view_bundle_createWizard_title = バンドル作成
-view_bundle_createWizard_uploadInProgress = アップロード中です... この操作は大きいファイルの場合には数分かかることもありません
+view_bundle_createWizard_uploadInProgress = アップロード中です... この操作は大きいファイルの場合には数分かかることもあります
view_bundle_createWizard_uploadOption = アップロード
view_bundle_createWizard_uploadStepName = バンドルファイルのアップロード
view_bundle_createWizard_urlOption = URL
@@ -985,12 +985,17 @@ view_bundle_deployWizard_error_6 = デプロイメントの作成に失敗しま
view_bundle_deployWizard_error_7 = デプロイメント名の取得に失敗しました
view_bundle_deployWizard_error_8 = ドロップダウンから正しいリソースグループを選択しなければなりません
view_bundle_deployWizard_error_9 = 次ページでの新しい宛先の削除に失敗しました
+view_bundle_deployWizard_error_noBundleConfig = バンドルターゲット情報の取得に失敗しました。選択したグループはバンドルデプロイメントのターゲットに成り得る正当な互換グループですか?
view_bundle_deployWizard_getConfigSkip = このバンドルバージョンには構成は必要ありません
view_bundle_deployWizard_getConfigStep = デプロイメント構成の設定
view_bundle_deployWizard_getDestStep = 新しい宛先
view_bundle_deployWizard_getDest_deployDir = ルートデプロイディレクトリ (宛先プラットフォーム上での)
+view_bundle_deployWizard_getDest_deployDir_help = そのバンドルがデプロイされるディレクトリ。このディレクトリはすべてのリソースに関するすべてのデプロイ用として同じものが使われますが、宛先の基本ディレクトリの場所に対する相対ディレクトリになります。このことは、異なるターゲットリソースについて基本ディレクトリの配置がどこにあるかということに依存して、その絶対ディレクトリは異なるターゲットリソースによって異なるパスになる可能性があることを意味しています。
view_bundle_deployWizard_getDest_desc = 宛先の説明
+view_bundle_deployWizard_getDest_destBaseDirName = 基本の配置
+view_bundle_deployWizard_getDest_group_help = メンバーがすべてのバンドルデプロイのための宛先ターゲットとなるようなグループ。バンドルデプロイをサポートするリソースを含む互換グループのみが選択可能です。
view_bundle_deployWizard_getDest_name = 宛先名
+view_bundle_deployWizard_getDest_name_help = 宛先名。それはリソースの特定のグループと特定のバンドルのリソースに関する宛先ディレクトリを識別します。
view_bundle_deployWizard_getInfoStep = デプロイ情報の提供
view_bundle_deployWizard_getInfo_clean = クリーンデプロイですか? (宛先プラットフォーム上でのデプロイディレクトリを掃除する)
view_bundle_deployWizard_getInfo_deploymentDesc = デプロイの説明
@@ -1019,6 +1024,7 @@ view_bundle_deploy_loadBundleFailure = バンドルの検索に失敗しまし
view_bundle_deploy_loadDeployFailure = バンドルデプロイのロードに失敗しました
view_bundle_deploy_loadFailure = バンドルデプロイのロードに失敗しました
view_bundle_deploy_name = デプロイ名
+view_bundle_deploy_operatingSystem = オペレーティングシステム
view_bundle_deploy_selectARow = インストールの詳細を表示するために行を選択してください
view_bundle_deploy_tagUpdateFailure = バンドルデプロイタブの更新に失敗しました
view_bundle_deploy_tagUpdateSuccessful = バンドルデプロイタグの更新に成功しました
@@ -1026,6 +1032,7 @@ view_bundle_deploy_time = デプロイ名
view_bundle_deployed = デプロイ
view_bundle_deployments = デプロイ
view_bundle_dest_backToBundle = バンドルへ戻る
+view_bundle_dest_baseDirName = 基本の配置
view_bundle_dest_created = 作成された
view_bundle_dest_deleteConfirm = このバンドル宛先を削除してもよろしいですか? これはデータベースから削除するだけです。つまり、リモートマシンのこの宛先にデプロイされたすべてのバンドルの内容は残り続けます
view_bundle_dest_deleteFailure = バンドル宛先 [{0}] の削除に失敗しました
@@ -1128,7 +1135,7 @@ view_configurationDetails_configNotUpdatedDueToNoChange = 構成は更新され
view_configurationDetails_error_updateFailure = 構成の更新に失敗しました
view_configurationDetails_messageConcise = 構成は更新されました - 現在のバージョンは {0} です
view_configurationDetails_messageDetailed = リソース [{1}] の構成はバージョン {0} へ更新されました
-##view_configurationDetails_noConfigurationFetched = No configuration was retrieved. This means that either the plugin failed to load the configuration or that configuration collection is merely switched off in the connection settings.
+view_configurationDetails_noConfigurationFetched = 構成が取り出せませんでした。これはプラグインが構成をロードできなかったか、または構成コレクションが接続設定において単にスイッチがオフにされているかのいずれかを意味します。
view_configurationDetails_noPermission = このリソースの構成を編集する権限がありません
view_configurationDetails_somePropertiesInvalid = 次の構成プロパティは不正な値： {0} です。この値は構成が保存される前に訂正されなければなりません。
view_configurationHistoryDetails_error_loadFailure = 構成履歴をロードできません
@@ -1151,11 +1158,11 @@ view_connectionSettingsDetails_messageConcise_updateSuccess = コネクション
view_connectionSettingsDetails_messageDetailed_updateSuccess = リソース [{0} のためのコネクション設定が更新されました
view_connectionSettingsDetails_noPermission = このリソースのコネクション設定を編集する権限がありません
view_connectionSettingsDetails_somePropertiesInvalid = 次のコネクション設定は不正な値: {0} です。設定を保存する前に訂正しなければなりません。
-#view_core_loggedInAs = Logged in as {0}
+view_core_loggedInAs = {0} としてログイン
view_core_loggedOut = ログアウト
view_core_noRecentAlerts = レポートすべき最近のアラートは存在しません
view_core_recentAlerts = [{0}] 個の最近のアラートがありました - 最近のアラートレポートへクリックしてください
-##view_core_serverUnreachable = The server is unreachable and may be down
+view_core_serverUnreachable = サーバーに到達できません。ダウンしている可能性があります。
view_core_uncaught = グローバルにキャッチされない例外
view_dashboardManager_deleteFail = ダッシュボードの削除に失敗しました
view_dashboardManager_deleted = ダッシュボード {0} の削除に成功しました
@@ -1164,7 +1171,7 @@ view_dashboardManager_saved = ダッシュボード {0} をサーバーへ保存
view_dashboardManager_success = ダッシュボードを保存しました
view_dashboard_favorites_error1 = 好みのリソースをロードするのに失敗しました
view_dashboardsManager_error1 = 新しいダッシュボードを追加するのに失敗しました
-##view_dashboardsManager_message_title_details = <h1>RHQへようこそ</h1>\n<p>RHQプロジェクトは抽象化されたプラグインベースのシステム管理スイートで、複数のプロダクトやプラットフォームに対してコア機能を横断的に適用できる拡張可能で、統合化されたシステム管理を提供します。このプロジェクトはレイヤ化されたモジュールによって設計されていて、デプロイのための柔軟なアーキテクチャを提供します。それは企業全体に対する監査と履歴の管理を提供するコアとなるユーザーインタフェースを導入します。サーバー/エージェントアーキテクチャはリモートでの管理と特定プロダクトのサポートを実現するプラグインを提供します。 </p>\n <p>このデフォルトのダッシュボードは上の「編集モード」ボタンをすることで編集可能です。</p>
+## view_dashboardsManager_message_title_details = <h1>RHQへようこそ</h1>\n<p>RHQプロジェクトは抽象化されたプラグインベースのシステム管理スイートで、複数のプロダクトやプラットフォームに対してコア機能を横断的に適用できる拡張可能で、統合化されたシステム管理を提供します。このプロジェクトはレイヤ化されたモジュールによって設計されていて、デプロイのための柔軟なアーキテクチャを提供します。それは企業全体に対する監査と履歴の管理を提供するコアとなるユーザーインタフェースを導入します。サーバー/エージェントアーキテクチャはリモートでの管理と特定プロダクトのサポートを実現するプラグインを提供します。 </p>\n <p>このデフォルトのダッシュボードは上の「編集モード」ボタンをすることで編集可能です。</p>
view_dashboards_confirm1 = 削除してもよろしいですか
view_dashboards_portlets_refresh_fail1 = 自動リフレッシュするポートレットのリフレッシュ間隔の更新に失敗しました
view_dashboards_portlets_refresh_fail2 = 自動リフレッシュするポートレットのリロードの無効化に失敗しました
@@ -1174,85 +1181,76 @@ view_dashboards_portlets_refresh_one_min = 1 分
view_dashboards_portlets_refresh_success1 = ポートレットの自動リフレッシュ間隔を更新しました
view_dashboards_portlets_refresh_success2 = 自動リフレッシュするポートレットのリロードを停止しています
view_dashboards_title = ダッシュボード
-##view_drift_button_detectNow = Detect Now
-##view_drift_button_pinToDef = Pin to Definition
-##view_drift_button_pinToDef_confirm = Pinning will set this snapshot as snapshot 0 for the definition. All other existing snapshots will be removed from the definition. The definition will be be marked as pinned and subsequent drift will always be reported against the pinned snapshot. Pin this snapshot to the definition?
-##view_drift_button_pinToTemplate = Pin to Template
-##view_drift_button_pinToTemplate_confirm = After pinning, this snapshot will be set to the initial snapshot for all definitions created using the template. If pinned to an existing template then the template''s existing definitions will be pinned to the new initial snapshot and their existing snapshots will be removed. Continue to template selection?
-##view_drift_carousel_sizeFilterLabel = Snapshot Display Max
-##view_drift_carousel_startFilterLabel = Snapshot Start
-##view_drift_category_fileAdded = File Added
-##view_drift_category_fileChanged = File Changed
-##view_drift_category_fileNew = Newly Detected
-##view_drift_category_fileRemoved = File Removed
-##view_drift_confirm_deleteAllDefs = Delete all drift detection definitions?
-##view_drift_confirm_deleteDefs = Delete the selected drift detection definition(s)?
-##view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
-##view_drift_failure_deleteDefs = Failed to delete some or all drift detection definitions.
-##view_drift_failure_deleteTemplates = Failed to delete some or all of the drift templates
-##view_drift_failure_detectNow = Failed to submit drift detection run request
-##view_drift_failure_load = Failed to fetch drift instances
-##view_drift_failure_pinToDef = Failed to pin snapshot to definition
-##view_drift_success_defUpdated = Drift detection definition updated and will affect the next detection run as applicable.
-##view_drift_success_delete = Successfully deleted {0} drift instances
-##view_drift_success_deleteDefs = Successfully deleted {0} drift detection definitions
-##view_drift_success_deleteTemplate = Successfully deleted {0} drift templates
-##view_drift_success_detectNow = Successfully submitted drift detection run request
-##view_drift_success_pinToDef = Successfully pinned snapshot {0} to drift definition.
-##view_drift_success_templateUpdated = Drift template updated and changes pushed to attached definitions.
-##view_drift_table_attached = Attached?
-##view_drift_table_baseDir = Base Directory
-##view_drift_table_driftHandlingMode = Drift Handling
-##view_drift_table_driftHandlingMode_normal = normal
-##view_drift_table_driftHandlingMode_plannedChanges = planned changes
-##view_drift_table_hover_defNotPinned = The drift definition is not pinned Click to view the initial snapshot.
-##view_drift_table_hover_defPinned = The drift definition is pinned to its initial snapshot. Click to view the initial snapshot.
-##view_drift_table_hover_edit = Click to view or edit the drift definition or template properties.
-##view_drift_table_hover_outOfCompliance_drift = There is drift
-##view_drift_table_hover_outOfCompliance_noBaseDir = The base directory does not exist
-##view_drift_table_hover_templateNotPinned = The drift template is not pinned to a snapshot.
-##view_drift_table_hover_templatePinned = The drift template is pinned to a snapshot. Click to view the pinned snapshot.
-##view_drift_table_newFile = New File
-##view_drift_table_oldFile = Old File
-##view_drift_table_pinned = Pinned?
-##view_drift_table_resourceDef = Resource Drift Detection Definition
-##view_drift_table_resourceHistory = Resource Drift History
-##view_drift_table_snapshot = Snapshot
-##view_drift_table_snapshotTime = Snapshot Time
-##view_drift_table_template = Template
-##view_drift_table_title_initialSnapshot = Initial Snapshot for Definition [{0}] : Pinned = [{1}]
-##view_drift_table_title_snapshot = Snapshot [{0}] for Definition [{1}]
-##view_drift_table_title_templateSnapshot = Pinned Snapshot for Template [{0}]
-##view_drift_wizard_addDef_failure = Failed to add new drift detection definition [{0}]
-##view_drift_wizard_addDef_infoStepHelp = Each drift detection definition describes a set of files for which drift monitoring will be performed. The definition can be enabled and disabled, defines the detection run interval, and specifies a base directory and optional file filters. For each resource type offering drift detection there will be one or more predefined templates to use as a starting definition, which can then be edited.
-##view_drift_wizard_addDef_infoStepName = Select the Template for the new Drift Detection Definition
-##view_drift_wizard_addDef_success = Successfully added new drift detection definition [{0}]. Agent(s) will be updated.
-##view_drift_wizard_addDef_templatePrompt = Drift Definition Templates
-##view_drift_wizard_addDef_title = Add Drift Detection Definition for Resource of Type [{0}]
-##view_drift_wizard_addDef_windowTitle = Add Drift Detection Definition Wizard
-##view_drift_wizard_addTemplate_failure = Failed to add new drift detection template [{0}]
-##view_drift_wizard_addTemplate_infoStepHelp = Each drift template is derived from an existing template. This provides a quick way to build new templates that are similar to existing templates, or originate with plugin defined templates. Like a drift definition, the template describes a set of files for which drift monitoring will be performed. Depending on the situation a definition derived from the template may or may not be allowed to alter the file set, or change other settings. Template names must be unique within a resource type.
-##view_drift_wizard_addTemplate_infoStepName = Select the Starting Template
-##view_drift_wizard_addTemplate_success = Successfully added new drift template [{0}].
-##view_drift_wizard_addTemplate_title = Add Drift Definition Template for Type [{0}]
-##view_drift_wizard_addTemplate_windowTitle = Add Drift Definition Template Wizard
-##view_drift_wizard_pinTemplate_confirmNotPinned = Once pinned each current and future drift definition for the template will have its initial snapshot set to the template''s pinned snapshot. Existing definitions for this template will be reset to the new initial snapshot, and all exsiting snapshots will be removed. Continue pinning the template to the snapshot?
-##view_drift_wizard_pinTemplate_confirmPinned = Warning! This template is already pinned. The template can be re-pinned to this new snapshot. Once re-pinned each current and future drift definition for the template will have its initial snapshot set to the template''s pinned snapshot. Existing definitions for this template will be reset to the new initial snapshot, and all exsiting snapshots will be removed. Continue re-pinning the template with this new snapshot?
-##view_drift_wizard_pinTemplate_duplicate_name_error = Template name must be unique
-##view_drift_wizard_pinTemplate_failure = Failed to pin snapshot to drift template [{0}]
-##view_drift_wizard_pinTemplate_infoStepExistingTemplate = Pin to ExistingTemplate
-##view_drift_wizard_pinTemplate_infoStepHelp = Select the template to pin. Once pinned each current and future drift definition for that template will have its initial snapshot set to the template''s pinned snapshot. And the definition itself will be marked as pinned. This is used to detect drift from an expected file set. Note that existing definitions for this template will be reset to the new initial snapshot, and all exsiting snapshots will be removed.
-##view_drift_wizard_pinTemplate_infoStepName = Select the Template to be Pinned
-##view_drift_wizard_pinTemplate_infoStepNewTemplate = Pin to New Template (derived from the snapshot''s Drift Definition)
-##view_drift_wizard_pinTemplate_infoStepRadioHelp = The snapshot can be pinned to a new or existing drift template. The ''New Template" option allows the user to promote a trusted definition and snapshot, at the resource level, to the type level. The new template can then be applied to members of the type. The new template is initially a copy of the snapshot''s drift definition but can then be edited in the next step. The name should be changed and must be a unique drift template name for the type. The "Existing Template" option allows the user to pin, or re-pin, an existing template with the selected snapshot. To be valid, the existing template must monitor the same directories as the snapshot''s definition. The selection box displays only valid existing templates. If there are no valid existing templates this option can not be selected.
-##view_drift_wizard_pinTemplate_infoStepRadioTitle = Template Selection
-##view_drift_wizard_pinTemplate_infoStepSelectBlocked = There are no existing templates that monitor the same directories as the snapshot''s definition. Select the "New Template" option to continue.
-##view_drift_wizard_pinTemplate_infoStepSelectTitle = Existing Templates
-##view_drift_wizard_pinTemplate_success = Successfully pinned the drift template [{0}].
-##view_drift_wizard_pinTemplate_title = Pin Snapshot [{0}] of Definition [{1}] to a Drift Template for type [{2}]
-##view_drift_wizard_pinTemplate_windowTitle = Pin Drift Definition Template Wizard
+view_drift_button_detectNow = すぐに検出
+view_drift_button_pinToDef = 定義としてピン留め
+view_drift_button_pinToDef_confirm = ピン留めはこのスナップショットを定義のスナップショット 0 として設定します。その他すべてのスナップショットはその定義から削除されます。その定義はピン留めされたとマークされ、以後のドリフトは常にそのピン留めされたスナップショットに対して報告されます。このスナップショットをその定義にピン留めしますか?
+view_drift_button_pinToTemplate = テンプレートとしてピン留め
+view_drift_button_pinToTemplate_confirm = ピン留めした後は、このスナップショットはそのテンプレートを使って作成されたすべての定義のために初期スナップショットに設定されます。もし既存テンプレートにピン留めされるなら、テンプレートの既存の定義は新規の初期スナップショットに対してピン留めされ、それら既存のスナップショットは削除されます。選択したものをテンプレートにするために継続しますか?
+view_drift_carousel_sizeFilterLabel = スナップショットの最大表示数
+view_drift_carousel_startFilterLabel = スナップショット開始
+view_drift_category_fileAdded = 追加ファイル
+view_drift_category_fileChanged = 変更ファイル
+view_drift_category_fileNew = 新規に検出されたファイル
+view_drift_category_fileRemoved = 削除ファイル
+view_drift_delete_defConfirm = 選択されたドリフトの検出定義を削除しますか?
+view_drift_delete_defConfirmAll = すべてのドリフト検出定義を削除しますか?
+view_drift_failure_deleteDefs = いくつか、あるいはすべてのドリフト検出定義の削除に失敗しました
+view_drift_failure_detectNow = ドリフト検出実行リクエストの送信に失敗しました
+view_drift_failure_load = ドリフトインスタンスの取り出しに失敗しました
+view_drift_failure_pinToDef = 定義へのスナップショットのピン留めに失敗しました
+view_drift_success_defUpdated = ドリフト検出定義が更新されました。これは規定通りに次回の検出実行に影響があるでしょう。
+view_drift_success_delete = ドリフトインスタンス {0} の削除が成功しました
+view_drift_success_deleteDefs = ドリフト定義 {0} の削除が成功しました
+view_drift_success_detectNow = ドリフト検出実行リクエストの送信に成功しました
+view_drift_success_pinToDef = ドリフト定義へのスナップショット {0} のピン留めに成功しました
+view_drift_table_baseDir = 基本ディレクトリ
+view_drift_table_driftHandlingMode = ドリフト処理
+view_drift_table_driftHandlingMode_normal = 通常
+view_drift_table_driftHandlingMode_plannedChanges = 計画変更
+view_drift_table_hover_defNotPinned = そのドリフト定義はピン留めされていません。クリックして初期スナップショットを見てください。
+view_drift_table_hover_defPinned = そのドリフト定義は初期スナップショットへピン留めされています。クリックして初期スナップショットを見てください。
+view_drift_table_hover_edit = クリックしてそのドリフト定義またはテンプレートプロパティを閲覧する、または編集してください
+view_drift_table_hover_templateNotPinned = そのドリフトテンプレートはどのスナップショットにもピン留めされていません
+view_drift_table_hover_templatePinned = そのドリフトテンプレートはあるスナップショットにピン留めされています。クリックしてピン留めされたスナップショットを見てください
+view_drift_table_newFile = 新ファイル
+view_drift_table_oldFile = 旧ファイル
+view_drift_table_pinned = ピン留め?
+view_drift_table_resourceDef = リソースドリフト検出定義
+view_drift_table_resourceHistory = リソースドリフト履歴
+view_drift_table_snapshot = スナップショット
+view_drift_table_snapshotTime = スナップショット時間
+view_drift_table_title_initialSnapshot = 定義 [{0}] のための初期スナップショット: ピン留め = [{1}]
+view_drift_table_title_snapshot = 定義 [{1}] のためのスナップショット [{0}]
+view_drift_table_title_templateSnapshot = テンプレート [{0}] のためのピン留めされたスナップショット
+view_drift_wizard_addDef_failure = ドリフト検出定義 [{0}] の新規追加に失敗しました
+view_drift_wizard_addDef_infoStepHelp = 各ドリフト検出定義はドリフトモニタリングが実行される一式のファイルを記述します。その定義は有効または無効にしたり、検出の実行間隔を定義したり、基本ディレクトリとファイルフィルタ(オプション)を指定することができます。ドリフト検出を提供するリソースタイプごとに、開始する定義として使用するための一つ以上の既定のテンプレートが存在します。
+view_drift_wizard_addDef_infoStepName = その新規ドリフト検出定義のテンプレートを選択してください
+view_drift_wizard_addDef_success = 新規ドリフト検出定義 [{0}] の追加に成功しました。エージェントは更新されます。
+view_drift_wizard_addDef_templatePrompt = ドリフト定義テンプレート
+view_drift_wizard_addDef_title = タイプのリソース [{0}] のためのドリフト検出定義を追加してください
+view_drift_wizard_addDef_windowTitle = ドリフト検出定義ウィザードの追加
+view_drift_wizard_addTemplate_failure = 新規ドリフト検出テンプレート [{0}] の追加に失敗しました
+view_drift_wizard_addTemplate_infoStepHelp = 各ドリフトテンプレートは既存のテンプレートから派生して作成できます。これは既存テンプレートに類似したものや、プラグインが定義したテンプレートから新規テンプレートを構築する素早い方法を提供します。ドリフト定義のように、そのテンプレートはドリフトを監視を実行する一式のファイルを記述します。状況によっては、そのテンプレートから導出された定義はそのファイルセットの変更や、他の設定の変更を許したり、許さなかったりします。テンプレート名は一つのリソースタイプ内でユニークでなければなりません。
+view_drift_wizard_addTemplate_infoStepName = 開始テンプレートの選択
+view_drift_wizard_addTemplate_success = 新規ドリフトテンプレート [{0}] の追加に成功しました
+view_drift_wizard_addTemplate_title = タイプ [{0}] のドリフト定義テンプレートを追加してください
+view_drift_wizard_addTemplate_windowTitle = ドリフト定義テンプレート定義テンプレートウィザードの追加
+view_drift_wizard_pinTemplate_confirmNotPinned = そのテンプレートのための現在と将来の各ドリフト定義がいったんピン留めされると、そのテンプレートはその初期スナップショットがテンプレートのピン留めされたスナップショットとして設定されるようにします。このテンプレートの既存の定義は新規の初期スナップショットへリセットされます。このテンプレートの既存定義は新規初期スナップショットへリセットされ、すべての既存スナップショットは削除されます。そのスナップショットへのテンプレートのピン留めを続けますか?
+view_drift_wizard_pinTemplate_confirmPinned = 警告! このテンプレートはすでにピン留めされています。そのテンプレートはこの新規スナップショットに再度ピン留めすることが可能です。そのテンプレートのための現在と将来の各ドリフト定義がいったんピン留めされると、そのテンプレートは初期スナップショットがそのテンプレートが持つピン留めされたスナップショットとして設定されるようにします。このテンプレートの既存定義は新規初期スナップショットへリセットされ、すべての既存スナップショットは削除されます。この新規スナップショットを持つテンプレートのピン留めを続けますか?
+view_drift_wizard_pinTemplate_failure = ドリフトテンプレート [{0}] へのスナップショットをピン留めするのに失敗しました
+view_drift_wizard_pinTemplate_infoStepExistingTemplate = 現在のテンプレートへのピン留め
+view_drift_wizard_pinTemplate_infoStepHelp = ピン留めをするテンプレートを選択してください。そのテンプレートのための現在と将来の各ドリフト定義がいったんピン留めされると、そのテンプレートは初期スナップショットがそのテンプレートが持つピン留めされたスナップショットとして設定された持つようになりまするようにします。そしてその定義自身はピン留めされたものとしてマークされます。これは期待されるファイルセットからドリフトを検出するのに使われます。このテンプレートのための既存定義は新規の初期スナップショットにリセットされ、すべての既存スナップショットは削除されることに注意してください。
+view_drift_wizard_pinTemplate_infoStepName = ピン留めされるテンプレートの選択
+view_drift_wizard_pinTemplate_infoStepNewTemplate = 新規テンプレートへのピン留め (スナップショットのドリフト定義から導出されたもの)
+view_drift_wizard_pinTemplate_infoStepRadioHelp = そのスナップショットは新規または既存のドリフトテンプレートにピン留めすることが可能です。その''新規テンプレート''オプションは、ユーザーの手によって信頼する定義やスナップショットを、リソースレベルやタイプレベルで、テンプレート化できるようにします。その新規テンプレートは、次に、そのタイプのメンバーに対して適用できます。その新規テンプレートは初期時はスナップショットのドリフト定義のコピーですが、次のステップで編集することができます。その名前は変更すべきで、そのタイプのユニークなドリフトテンプレート名でなければなりません。''既存テンプレート''オプションは、ユーザーが選択したスナップショットを持つ既存テンプレートに対して、ピン留めまたは再度ピン留めができるようにします。正しく設定するには、その既存テンプレートは同じディレクトリをそのスナップショット定義として監視できなければなりません。セレクションボックスは正当な既存のテンプレートだけを表示します。もし正当でない既存テンプレートが存在したとしてもこのオプションでは選択されません。
+view_drift_wizard_pinTemplate_infoStepRadioTitle = テンプレートの選択
+view_drift_wizard_pinTemplate_infoStepSelectBlocked = 既存テンプレートでスナップショットの定義と同じディレクトリを監視するものは存在しません。継続するに''新規テンプレート''オプションを選択してください。
+view_drift_wizard_pinTemplate_infoStepSelectTitle = 既存テンプレート
+view_drift_wizard_pinTemplate_success = ドリフトテンプレート [{0}] のピン留めに成功しました
+view_drift_wizard_pinTemplate_title = タイプ [{2}] のドリフトテンプレートへの定義 [{1}] のスナップショット [{0}] をピン留め
+view_drift_wizard_pinTemplate_windowTitle = ドリフト定義テンプレートウィザードのピン留め
view_dynagroup_children = 動的グループの子
-view_dynagroup_compatible = Compatible
+view_dynagroup_compatible = 互換
view_dynagroup_definitionAlreadyExists = すでにこの名前のグループ定義が存在します
view_dynagroup_definitionCreated = グループ定義名 [{0}] の作成に成功しました
view_dynagroup_definitionLoadFailure = グループ定義のロードに失敗しました
@@ -1299,6 +1297,7 @@ view_dynagroup_exprBuilder_resource_greatGreatGrandparent = 曾祖父母の親
view_dynagroup_exprBuilder_resource_parent = 親
view_dynagroup_exprBuilder_resource_resource = リソース
view_dynagroup_exprBuilder_resource_tooltip = リソースのレベルを望みのものに選択してください。例えば、"親"を選択すると、親リソースが式の残りの部分に一致するようなリソースを発見できます。
+view_dynagroup_exprBuilder_savedExpression = 保存された式
view_dynagroup_exprBuilder_title = 式ビルダー
view_dynagroup_exprBuilder_unset = 設定解除
view_dynagroup_exprBuilder_unset_tooltip = 設定解除はデータベース内のnull値を持つ値をのすべてを発見します。これはデータベースストアと問い合わせデータの理由により"="オペレータを使うことは可能ではありません。
@@ -1336,17 +1335,16 @@ view_dynagroup_template_platforms = インベントリ内のプラットフォ
view_dynagroup_template_uniqueResourceTypes = インベントリ内のユニークリソースタイプ
view_groupConfigEdit_member = メンバー
view_groupConfigEdit_noListProps = グループ構成に現在サポートされていないプロパティのリスト
-##view_groupConfigEdit_saveReminder = You changed some settings - do not forget to save those changes or they will be lost.\n
+view_groupConfigEdit_saveReminder = 設定が変更されています - これらの変更を保存するのを忘れないでください。さもないと失われます。
view_groupConfigEdit_setAll = すべての値を設定:
view_groupConfigEdit_tooltip_1 = メンバー値の違い - 編集するためにアイコンをクリックします
view_groupConfigEdit_unset = 設定解除
view_groupConfigEdit_valsDiff = メンバー値の違い
view_groupConfigEdit_valsDiffForProp = プロパティ [{0}] のためのメンバー値
-view_groupCreateWizard_createFailure = リソースグループの作成に失敗しました [{0}] : {1}
+## view_groupCreateWizard_createFailure = リソースグループの作成に失敗しました
view_groupCreateWizard_createStepName = グループ設定
-##view_groupCreateWizard_createStep_group_exists = Group with name [{0}] already exists
view_groupCreateWizard_createStep_recursive = 再帰
-##view_groupCreateWizard_createSuccessful_concise = 新規のリソースグループを作成しました。[{0}]
+## view_groupCreateWizard_createSuccessful_concise = 新規のリソースグループを作成しました。
view_groupCreateWizard_createSuccessful_full = [{2}] メンバーリソースを含む 名前 [{1}] の新規 [{0}] リソースグループを作成しました。
view_groupCreateWizard_membersStepName = メンバーの選択
view_groupCreateWizard_title = グループ作成
@@ -1399,7 +1397,7 @@ view_group_pluginConfig_table_title = グループコネクション設定履歴
view_group_pluginConfig_table_viewMemberHistory = メンバー履歴の閲覧
view_group_pluginConfig_table_viewSettings = 設定の閲覧
view_group_pluginConfig_view_groupProperties = グループプロパティ
-view_group_pluginConfig_view_noperm = コネクション設定を見る権限がありません
+view_group_pluginConfig_view_noperm = コネクション設定の閲覧権限がありません
view_group_resConfig_edit_invalid = 次の構成プロパティは不正な値を含むのでその構成を保存する前に修正されなければなりません: [{0}]
view_group_resConfig_edit_loadFail = [{0}] のためのメンバーリソース構成を取り出すのに失敗しました
view_group_resConfig_edit_noperm = このグループ構成を編集する権限がありません
@@ -1410,7 +1408,7 @@ view_group_resConfig_edit_saveTooltip = すべてのグループメンバーの
view_group_resConfig_edit_valid = すべての構成プロパティは正しい値ですので、その構成は保存可能です
view_group_resConfig_members_fetchFailure = グループ [{0}] のメンバーのためのリソース構成更新履歴の取得に失敗しました
view_group_resConfig_members_fetchFailureConfig = [{0}] のためのメンバーリソース構成設定の取り出しに失敗しました
-view_group_resConfig_members_fetchFailureConfigInProgress = グループリソース構成の更新が現在進行中です。グループ設定を見る前に更新が終了するのをお待ちください
+view_group_resConfig_members_fetchFailureConfigInProgress = グループリソース構成の更新が現在進行中です。グループ設定を閲覧する前に更新が終了するのをお待ちください
view_group_resConfig_members_statusDetails = ステータスの詳細
view_group_resConfig_members_statusFailure = この構成の更新は未知の理由で失敗しました。
view_group_resConfig_members_statusInprogress = この構成の更新はまだ進行中です
@@ -1431,7 +1429,7 @@ view_group_resConfig_table_title = グループリソース構成履歴
view_group_resConfig_table_viewMemberHistory = メンバー履歴の閲覧
view_group_resConfig_table_viewSettings = 閲覧設定
view_group_resConfig_view_groupProperties = グループプロパティ
-view_group_resConfig_view_noperm = リソース構成設定を見るための権限はありません
+view_group_resConfig_view_noperm = リソース構成設定を閲覧するための権限はありません
view_group_summary_compatible = 互換性
view_group_summary_descUpdateFailure = ID [{0}] を持つリソースグループの説明を変更できませんでした
view_group_summary_descUpdateSuccessful = このリソースグループの説明を変更しました
@@ -1475,10 +1473,10 @@ view_inventory_groups_loadFailed = グループ合成データのロードに失
view_inventory_mixed = 混成
view_inventory_platforms = プラットフォーム
view_inventory_problemGroups = 問題グループ
-view_inventory_resource_loadFailed = ID [{0}] をT持つリソースは存在しないか、アクセスできません
+view_inventory_resource_loadFailed = ID [{0}] を持つリソースは存在しないか、アクセスできません
view_inventory_resources_deleteConfirm = 選択されたリソースを削除したいですか?
view_inventory_resources_deleteFailed = 選択されたリソースの削除に失敗しました
-##view_inventory_resources_deleteSuccessful = A request to perform the resource deletion has been submitted successfully to the agent(s).
+view_inventory_resources_deleteSuccessful = そのリソースを削除するリクエストは(複数の)エージェントに正しく送信されました。
view_inventory_resources_loadFailed = リソース合成データのロードに失敗しました
view_inventory_resources_members = メンバーリソース
view_inventory_resources_uninventoryConfirm = 選択したリソースをアンインベントリしてもよろしいですか? もし選択したリソースがまだ存在しているなら、そのエージェントの次回のディスカバリスキャンの間にそれは再発見されます。
@@ -1489,7 +1487,7 @@ view_inventory_servers = サーバー
view_inventory_services = サービス
view_inventory_summary_agent_error1 = エージェント管理リソースIDの発見に失敗しました
view_inventory_summary_agent_error2 = エージェントリソースIDのpingに失敗しました
-view_inventory_summary_agent_error3 = このエージェントのための詳細を見る権限がありません
+view_inventory_summary_agent_error3 = このエージェントのための詳細を閲覧する権限がありません
view_inventory_summary_agent_fullEnpoint = フルエンドポイント
view_inventory_summary_agent_fullEnpoint_err1 = !このリソースに関連するリモートエンドポイントはありません!
view_inventory_summary_agent_last_title = 最後に受信したアベイラビリティリポート
@@ -1507,7 +1505,7 @@ view_login_prompt = ログインしてください
view_login_registerLater = (キャンセル - 登録を後で完成させてください)
view_login_registerLdapSuccess = 新しいLDAPユーザーの登録に成功しました
view_login_registerUser = ユーザの登録
-##view_login_welcomeMsg = RHQへようこそ! <br/><br/> 登録を完成させるために次のフィールドを入力/更新してください。<br/> "OK"をクリックしたら、ログインします。<br/><br/>
+## view_login_welcomeMsg = RHQへようこそ! <br/><br/> 登録を完成させるために次のフィールドを入力/更新してください。<br/> "OK"をクリックしたら、ログインします。<br/><br/>
view_measureRange_last = 時間の範囲 - 直前
view_measureRange_simple = シンプル...
view_measureRange_start = 時間の範囲 - 開始
@@ -1535,7 +1533,7 @@ view_operationHistoryDetails_dateSubmitted = 発行日
view_operationHistoryDetails_error_fetchFailure = オペレーション履歴のロードに失敗
view_operationHistoryDetails_noResults = このオペレーションは値を返しません
view_operationHistoryDetails_operation = オペレーション
-view_operationHistoryDetails_parameters = パラメータ
+view_operationHistoryDetails_parameters = パラメーター
view_operationHistoryDetails_requestor = 要求者
view_operationHistoryDetails_results = 結果
view_operationHistoryDetails_status = ステータス
@@ -1545,11 +1543,11 @@ view_operationHistoryList_notYetStarted = まだ開始していません
view_operationHistoryList_title = オペレーション履歴
view_operationScheduleDetails_enterParametersBelow = 以下にパラメーターを入力してください...
view_operationScheduleDetails_fieldDefault_description = 説明を見るとためオペレーションを選択してください
-view_operationScheduleDetails_fieldDefault_parameters = パラメーターを見るためオペレーションを選択してください
+view_operationScheduleDetails_fieldDefault_parameters = パラメーターを見るためにオペレーションを選択してください
view_operationScheduleDetails_fieldHelp_description = このスケジュールされたオペレーションのための任意の説明 (例、夜間保守のためのアプリサーバー再起動）
-##view_operationScheduleDetails_fieldHelp_timeout = 時間間隔 - もし指定されていて、その間隔がスケジュールされたオペレーション実行が完了する前に経過してしまったならば、RHQサーバーはそのオペレーションをタイムアウトにし、それを失敗させることを検討します。注意：通常はすでに開始させられた根本の管理リソースオペレーションをアボートすることは不可能です。
+## view_operationScheduleDetails_fieldHelp_timeout = 時間間隔 - もし指定されていて、その間隔がスケジュールされたオペレーション実行が完了する前に経過してしまったならば、RHQサーバーはそのオペレーションをタイムアウトにし、それを失敗させることを検討します。注意：通常はすでに開始させられた根本の管理リソースオペレーションをアボートすることは不可能です。
view_operationScheduleDetails_field_description = 説明
-view_operationScheduleDetails_field_parameters = パラメータ
+view_operationScheduleDetails_field_parameters = パラメーター
view_operationScheduleDetails_field_timeout = タイムアウト
view_operationScheduleDetails_noParameters = このオペレーションはパラメーターを取りません
view_operationScheduleDetails_operationSchedule = オペレーションスケジュール
@@ -1668,7 +1666,6 @@ view_reportsTop_title = レポート
view_reports_alertDefinitions = アラート定義
view_reports_alertDefinitions_parentHover = クリックすると親のアラート定義へ行きます
view_reports_alertDefinitions_resTypeLoadError = テンプレートリソースタイプを取得できません - アラートテンプレートの閲覧ができません
-##view_reports_driftCompliance = Drift Compliance
view_reports_inventorySummary_failFetch = インベントリサマリーの取得に失敗しました
view_reports_platforms = プラットフォーム利用率
view_reports_subsystems = サブシステム
@@ -1708,22 +1705,22 @@ view_resource_monitor_graphs_lookupFailed = グラフのためのリソースの
view_resource_monitor_graphs_noneAvailable = 利用できるグラフはありません
view_resource_monitor_schedules_title = リソースメトリック収集スケジュール
view_resource_monitor_table_avg = 平均
-view_resource_monitor_table_last = 最後
+view_resource_monitor_table_last = 最新
view_resource_monitor_table_max = 最大
view_resource_monitor_table_min = 最小
view_resource_title_component_errors_tooltip = 管理コンポーネントエラーの表示。詳細はクリックしてください
view_resource_title_tagUpdateFailed = リソースタグの更新に失敗しました
view_searchBar_defaultPattern = パターンを名前を付けてください
-##view_searchBar_instructional_failSuggest = Failed to generate suggestions, see server log for possible errors
-view_searchBar_instructional_noSuggest = No matches, enter a different pattern
-##view_searchBar_instructional_refresh = Failed to retrieve saved searches, please refresh page
-##view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
-##view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
-##view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
-##view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
-##view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
-##view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
-##view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+view_searchBar_instructional_failSuggest = サジェッションの作成に失敗しました。可能性のあるエラーをサーバーログから調べてください。
+view_searchBar_instructional_noSuggest = 一件も一致しませんでした。異なるパターンを入力してください。
+view_searchBar_instructional_refresh = 保存済みの検索の取り出しに失敗しました。ページをリフレッシュしてください。
+view_searchBar_savedSearch_delete = 保存済みの検索 [{0}] を削除するのに失敗しました
+view_searchBar_savedSearch_failDelete = [{0}]という名前の保存済み検索を削除するのに失敗しました
+view_searchBar_savedSearch_failFind = [{0}]という名前の保存済み検索を検索するのに失敗しました
+view_searchBar_savedSearch_failRename = [{0}]という名前の保存済みの検索の名前を変更するのに失敗しました
+view_searchBar_savedSearch_failSave = [{0}]という名前の保存済みの検索を作成するのに失敗しました
+view_searchBar_savedSearch_rename = 保存済み検索の名前を [{0}] へ変更するのに成功しました
+view_searchBar_savedSearch_save = [{0}] という名前の保存済み検索を作成するのに成功しました
view_searchGUI_loginStatus = ログインステータスが確定できません。サーバーの状態を調べてください
view_selector_assigned = 割り当てられた {0}
view_selector_available = 利用可能な {0}
@@ -1752,6 +1749,7 @@ view_tableSection_error_noId = テーブル [{0}] のレコードがで 'id' 属
view_table_drawFail = テーブル [{0}] の描画に失敗しました.
view_table_matchingRows = 一致した行: {0} (選択済み: {1})
view_table_totalRows = 合計行: {0} (選択済み: {1})
+view_table_totalRowsUnknown = 行の合計: ?
view_tabs_common_activity = アクティビティ
view_tabs_common_agent = エージェント
view_tabs_common_availability = アベイラビリティ
@@ -1764,7 +1762,7 @@ view_tabs_common_content = コンテント
view_tabs_common_current = 現在
view_tabs_common_dashboard = ダッシュボード
view_tabs_common_deployed = デプロイ済み
-##view_tabs_common_drift = Drift
+view_tabs_common_drift = ドリフト
view_tabs_common_events = イベント
view_tabs_common_graphs = グラフ
view_tabs_common_group_members = グループメンバー
@@ -1921,7 +1919,7 @@ widget_resourceFactoryWizard_infoStepName = リソース情報
widget_resourceFactoryWizard_infoStep_loadFail = アーキテクチャーを利用可能にするのに失敗しました
widget_resourceFactoryWizard_namePrompt = 新規リソース名
widget_resourceFactoryWizard_templatePrompt = コネクション設定テンプレート
-##widget_resourceFactoryWizard_timeoutHelp = xxxxxxx
+## widget_resourceFactoryWizard_timeoutHelp = タイムアウト間隔。もし指定されたならば(RHQエージェント上での)子のリソース作成のためのデフォルトタイムアウトを上書きします。大きなアプリケーションのデプロイのような長時間かかる作成アクションに特に有用です。通常、前回の試みのときにタイムアウトの失敗だった場合に使われます。
widget_resourceFactoryWizard_uploadFailure = ファイルアップロードの失敗
widget_resourceFactoryWizard_uploadFileStepName = リソースコンテントファイルのアップロード
widget_resourceFactoryWizard_uploadInProgress = アップロードは処理中です... 大きなファイルを配布するには数分かかることもあります。
commit 1ca18175b45456a6963f706cf1c4c7427384edcb
Merge: 579510c e8db9a1
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Dec 10 12:46:22 2011 -0500
Merge branch 'master' into jsanda/drift
Conflicts:
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
diff --cc modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index c8c3bb0,21341c4..848ae93
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@@ -210,37 -216,42 +216,41 @@@ public class DriftDetector implements R
// If the basedir is still valid we need to do a directory tree scan to look for newly added files
if (basedir.isDirectory()) {
- forEachFile(basedir, new FilterFileVisitor(basedir, schedule.getDriftDefinition().getIncludes(), schedule
- .getDriftDefinition().getExcludes(), new FileVisitor() {
- @Override
- public void visit(File file) {
- try {
- if (processedFiles.contains(file)) {
- return;
- }
+ DriftDefinition driftDef = schedule.getDriftDefinition();
+ List<Filter> includes = driftDef.getIncludes();
+ List<Filter> excludes = driftDef.getExcludes();
+
+ for (File dir : getScanDirectories(basedir, includes)) {
+ forEachFile(dir, new FilterFileVisitor(basedir, includes, excludes, new FileVisitor() {
+ @Override
+ public void visit(File file) {
+ try {
+ if (processedFiles.contains(file)) {
+ return;
+ }
- if (!file.canRead()) {
- if (log.isDebugEnabled()) {
- log.debug("Skipping " + file.getPath() + " since it is not readable.");
+ if (!file.canRead()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Skipping " + file.getPath() + " since it is not readable.");
+ }
return;
}
- }
- if (log.isInfoEnabled()) {
- log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
- }
+ if (log.isInfoEnabled()) {
+ log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
+ }
- FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file));
- deltaEntries.add(newEntry);
- snapshotEntries.add(newEntry);
- } catch (IOException e) {
- log.error("An error occurred while generating a drift change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException("An error occurred while generating a drift change set",
- e);
- }
+ FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file),
+ file.lastModified(), file.length());
+ deltaEntries.add(newEntry);
+ snapshotEntries.add(newEntry);
+ } catch (IOException e) {
+ log.error("An error occurred while generating a drift change set for " + schedule + ": "
+ + e.getMessage());
+ throw new DriftDetectionException("An error occurred while generating a drift change set", e);
}
- }
- }));
+ }));
+ }
}
if (deltaEntries.isEmpty()) {
diff --cc modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index 4241b31,2790f13..1182407
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@@ -758,16 -771,16 +771,16 @@@ public class DriftManager extends Agent
private void writeSnapshotToFile(DriftSnapshot snapshot, File file, Headers headers) throws IOException {
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(file, headers);
try {
- for (Drift drift : snapshot.getDriftInstances()) {
+ for (Drift<?, ?> drift : snapshot.getDriftInstances()) {
switch (drift.getCategory()) {
case FILE_ADDED:
- writer.write(addedFileEntry(drift.getPath(), drift.getNewDriftFile().getHashId()));
+ writer.write(addedFileEntry(drift.getPath(), drift.getNewDriftFile().getHashId(), -1L, -1L));
break;
case FILE_CHANGED:
- writer.write(changedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId(), drift
- .getNewDriftFile().getHashId()));
+ writer.write(changedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId(),
+ drift.getNewDriftFile().getHashId(), -1L, -1L));
break;
- default: // FILE_REMOVED
+ default: // FILE_REMOVED
writer.write(removedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId()));
}
}
commit ca4757776c008f12a053c816d7b9cf8c6a310596
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Sat Dec 10 01:19:40 2011 +0100
Adding EjbAccessTest to make sure the CLI scripts can access the business
layer only through the designated interface. No direct local or remote
EJB access is possible.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
index 894c953..5822d44 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
@@ -20,6 +20,7 @@
package org.rhq.bindings;
import java.io.FilePermission;
+import java.io.SerializablePermission;
import java.lang.reflect.ReflectPermission;
import java.net.SocketPermission;
import java.security.Permission;
@@ -83,6 +84,11 @@ public class StandardScriptPermissions extends PermissionCollection {
add(new PropertyPermission("*", "read"));
add(new ReflectPermission("suppressAccessChecks"));
+
+ //these 2 are required for server-side scripts to be able to
+ //invoke remote EJBs.
+ add(new SerializablePermission("enableSubclassImplementation"));
+ add(new RuntimePermission("reflectionFactoryAccess"));
}
public void add(Permission permission) {
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index b125b3b..6932b60 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -17,9 +17,28 @@
<properties>
<persistence-api.version>1.0</persistence-api.version>
+ <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
+ <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
+
+ <!-- dependency versions -->
+ <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
+
+ <clean.db>true</clean.db>
</properties>
<dependencies>
+
+ <!-- Note, the test deps are intentionally placed above the other scoped deps because of classpath
+ reasons. Maven orders the [test] classpath in the order listed in the pom. We specifically
+ need the embeddable-ejb3 jar above the standard ejb3 jars because we need the embeddble packages
+ loaded when testing. -->
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>${jboss-embeddable-ejb3.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-script-bindings</artifactId>
@@ -48,21 +67,319 @@
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
-
+
+ <!-- Test deps - this insane list of deps is needed to get the embedded JBoss server with RHQ server deployed running -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate-entitymanager</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <!-- The Sun javamail jar isn't available from a public repo due to licensing issues,
+ so use the Geronimo one instead. -->
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz-oracle</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed by the PoolClass annotation used on some
+ of our SLSB's -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbosssx</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbpm</artifactId>
+ <version>3.1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- for the transaction interrupt EJB3 interceptor -->
+ <dependency>
+ <groupId>org.jboss.transaction</groupId>
+ <artifactId>jboss-jta</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>5.5.20</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-jk</artifactId>
+ <version>4.1.31</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Needed by com.jboss.jbossnetwork.apl.actions.xml.XPathProcessor; TODO: Remove once APL has been excised. -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.29</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jettison-provider</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-links</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <version>2.0.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.18</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <!-- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
- -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Everything but the web service tests, this is the standard test execution -->
+ <configuration>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
+ <systemPropertyVariables>
+ <embeddedDeployment>true</embeddedDeployment>
+ <deploymentDirectory>target/test-classes</deploymentDirectory>
+ <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
+ <clean.db>${clean.db}</clean.db>
+ </systemPropertyVariables>
+ <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
+ <additionalClasspathElements>
+ <!-- The below is required for tests to run against Oracle. -->
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
- </plugin>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+
+ <!-- in order to get JMS to work properly in embedded test container, extract jms-rs.rar classes -->
+ <execution>
+ <id>Extract JMS classes from RAR needed for JMS tests</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <unzip src="src/test/resources/jms-ra.rar" dest="target">
+ <patternset>
+ <include name="jms-ra.jar"/>
+ </patternset>
+ </unzip>
+ <unzip src="target/jms-ra.jar" dest="target/test-classes">
+ <patternset>
+ <include name="org/**"/>
+ </patternset>
+ </unzip>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
new file mode 100644
index 0000000..9c9d1bb
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
@@ -0,0 +1,175 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.client.security.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.SerializablePermission;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.security.PermissionCollection;
+import java.util.Collections;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.rhq.bindings.SandboxedScriptEngine;
+import org.rhq.bindings.ScriptEngineFactory;
+import org.rhq.bindings.StandardBindings;
+import org.rhq.bindings.StandardScriptPermissions;
+import org.rhq.bindings.util.PackageFinder;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.client.LocalClient;
+import org.rhq.enterprise.server.security.AllowEjbAccessPermission;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class EjbAccessTest extends AbstractEJB3Test {
+
+ public void testEjbsAccessibleThroughPrivilegedCode() {
+ LookupUtil.getSubjectManager().getOverlord();
+ }
+
+ public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ engine.eval("SubjectManager.getSubjectByName('rhqadmin');");
+ }
+
+ public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "subjectManager = context.lookup('SubjectManagerBean/local');\n"
+ + "subjectManager.getOverlord();");
+
+ Assert.fail("The script shouldn't have been able to call local SLSB method.");
+ } catch (ScriptException e) {
+ assert e.getMessage().contains(AllowEjbAccessPermission.class.getName());
+ }
+ }
+
+ public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval(""
+ + "context = new javax.naming.InitialContext();\n"
+ + "subjectManager = context.lookup('SubjectManagerBean/remote');\n"
+ + "subjectManager.getSubjectByName('rhqadmin');");
+
+ Assert.fail("The script shouldn't have been able to call remote SLSB method directly.");
+ } catch (ScriptException e) {
+ //TODO java.io.IOException: access denied (java.io.SerializablePermission enableSubclassImplementation)
+ assert e.getMessage().contains(AllowEjbAccessPermission.class.getName());
+ }
+ }
+
+ public void testScriptCantUseSessionManager() throws ScriptException, IOException {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval("org.rhq.enterprise.server.auth.SessionManager.getInstance();");
+
+ Assert.fail("The script shouldn't have been able to get instance of SessionManager.");
+ } catch (ScriptException e) {
+ assert e.getMessage().contains(AllowEjbAccessPermission.class.getName());
+ }
+ }
+
+ @SuppressWarnings("unused")
+ public void testScriptCantUseSessionManagerMethods() throws Exception {
+
+ //The code below cannot work in Rhino because as of now, Rhino modifies
+ //the return value of Class.getDeclaredField() to be null when there
+ //is a security manager installed.
+ //This has been filed as a bug at Oracle (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7119959)
+
+ if (true) {
+ return;
+ }
+
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ final ScriptEngine engine = getEngine(overlord);
+
+ class G {
+ private String obtainSessionManagerUsingReflection = ""
+ + "var sessionManagerClass = java.lang.Class.forName(\"org.rhq.enterprise.server.auth.SessionManager\");\n"
+ + "println(sessionManagerClass);\n"
+ + "var managerField = sessionManagerClass.getDeclaredField(\"_manager\");\n"
+ + "println(managerField);\n"
+ + "managerField.setAccessible(true);\n"
+ + "var manager = managerField.get(null);\n"
+ + "println(manager);\n"
+ + "manager.";
+
+ public void testInvoke(String methodCall) throws ScriptException {
+ String code = obtainSessionManagerUsingReflection + methodCall;
+
+ try {
+ engine.eval(code);
+ Assert.fail("The script shouldn't have been able to a method on a SessionManager.");
+ } catch (ScriptException e) {
+ assert e.getMessage().contains(AllowEjbAccessPermission.class.getName());
+ }
+ }
+ };
+ G manager = new G();
+
+ manager.testInvoke("getLastAccess(0);");
+ manager.testInvoke("getOverlord()");
+ manager.testInvoke("getSubject(2);");
+ manager.testInvoke("invalidate(0);");
+ manager.testInvoke("invalidate(\"\");");
+ manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());");
+ manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);");
+ }
+
+ private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
+ StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
+ ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
+
+ PermissionCollection perms = new StandardScriptPermissions();
+ perms.add(new SerializablePermission("enableSubclassImplementation"));
+
+ return new SandboxedScriptEngine(engine, perms);
+ }
+}
diff --git a/modules/enterprise/server/client-api/src/test/resources/META-INF/ejb-jar.xml b/modules/enterprise/server/client-api/src/test/resources/META-INF/ejb-jar.xml
new file mode 100644
index 0000000..caa7513
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/resources/META-INF/ejb-jar.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ version="3.0">
+
+ <description>RHQ</description>
+ <display-name>RHQ</display-name>
+
+ <assembly-descriptor>
+
+ <!-- This interceptor checks that the alert CLI scripts don't try to circumvent our access objects by accessing the local SLSB beans directly. -->
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.rhq.enterprise.server.security.AllowEjbAccessInterceptor</interceptor-class>
+ </interceptor-binding>
+
+ <!-- all our EJB3 SLSBs can define custom @RequiredPermissions annotations for authorization checks-->
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class>
+ </interceptor-binding>
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class>
+ </interceptor-binding>
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class>
+ </interceptor-binding>
+
+ </assembly-descriptor>
+
+</ejb-jar>
diff --git a/modules/enterprise/server/client-api/src/test/resources/META-INF/jboss.xml b/modules/enterprise/server/client-api/src/test/resources/META-INF/jboss.xml
new file mode 100644
index 0000000..b7c5c66
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/resources/META-INF/jboss.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+
+ <enterprise-beans>
+
+ <!--
+ The AlertConditionLogManagerBean, AlertConditionManagerBean, AlertDampeningManagerBean,
+ AlertDefinitionManagerBean, AlertManagerBean, AuthorizationManagerBean, CachedConditionManagerBean, and
+ SubjectManager SLSB's are all invoked, either directly or indirectly, by the AlertConditionConsumerBean MDB.
+ Since MDB invocations are always done in new threads, using the default SLSB pool impl (ThreadlocalPool) would
+ cause a new instance of these SLSB's to be created every time they were invoked by AlertConditionConsumerBean.
+ This would be bad if only because existing instances would
+ not be reused, but it is really bad because the instances would also never get destroyed, causing heap space to
+ gradually leak until the Server eventually ran out of memory. Hence, we must use a StrictMaxPool, which
+ will use a fixed pool of instances of this SLSB, instead of a ThreadlocalPool. Because lots of alert
+ definitions could result in many concurrent calls to AlertConditionConsumerBean, and because most of these
+ SLSB's are also invoked by other callers (i.e. Agents, GUI's, or CLI's), we set the max pool size to 100 to
+ minimize the chances of AlertConditionConsumerBean invocations, which are the most critical, from having to
+ block and potentially getting backed up in the queue. We set the pool timeout extremely high to essentially
+ prevent queued callers from timing out. Note, MDB's are configured in ejb3-interceptors-aop.xml to use a strict
+ max pool with a max of 15 and a timeout of 10000, so AlertConditionConsumerBean might become a bottleneck for
+ systems with a lot of alerts defined. (ips, 05/10/11)
+
+ For more details, see https://bugzilla.redhat.com/show_bug.cgi?id=693232 .
+ -->
+
+ <session>
+ <ejb-name>AlertConditionLogManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>100</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>AlertConditionManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>100</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>AlertDampeningManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>100</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>AlertDefinitionManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>100</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>AlertManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>100</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>AuthorizationManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>100</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>CachedConditionManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>100</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>SubjectManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>100</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+
+ <!--
+ The CacheConsistencyManagerBean, CloudManagerBean, ServerManagerBean, StatusManagerBean, and SystemManagerBean
+ SLSB's are all invoked, either directly or indirectly, by EJB timers. Since EJB timer invocations are always
+ done in new threads, using the default SLSB pool impl (ThreadlocalPool) would cause a new instance of this
+ SLSB to be created every time it was invoked by an EJB timer. This would be bad if only because an existing
+ instance would not be reused, but it is really bad because the instance would also never get destroyed, causing
+ heap space to gradually leak until the Server eventually ran out of memory. Hence, we must use a
+ StrictMaxPool, which will use a fixed pool of instances of this SLSB, instead of a ThreadlocalPool.
+ The timer invocations will only require one or two instances at any given time, but because most of these
+ SLSB's are also invoked by other callers (i.e. Agents, GUI's, or CLI's, we set the max pool size to 30, to
+ minimize the chances of EJB timer invocations, which are the most critical, from having to block and
+ potentially getting backed up in the queue. We set the pool timeout extremely high to essentially prevent
+ queued callers from timing out. (ips, 05/10/11)
+
+ For more details, see https://bugzilla.redhat.com/show_bug.cgi?id=693232 .
+ -->
+
+ <session>
+ <ejb-name>CacheConsistencyManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>30</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>CloudManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>30</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>ServerManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>30</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>StatusManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>30</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ <session>
+ <ejb-name>SystemManagerBean</ejb-name>
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>30</pool-max-size>
+ <pool-timeout>1000000000</pool-timeout>
+ </pool-config>
+ </session>
+
+ </enterprise-beans>
+
+</jboss>
diff --git a/modules/enterprise/server/client-api/src/test/resources/hibernate.properties b/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
new file mode 100644
index 0000000..1951b84
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
@@ -0,0 +1,26 @@
+# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
+# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
+# WORK IN THIS MODULE.
+
+hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+#hibernate.connection.release_mode=after_statement
+#hibernate.transaction.flush_before_completion=false
+#hibernate.transaction.auto_close_session=false
+#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
+#hibernate.hbm2ddl.auto=create-drop
+#hibernate.hbm2ddl.auto=create
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+# Clustered cache with TreeCache
+#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
+#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
+#hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+hibernate.bytecode.use_reflection_optimizer=false
+# I don't think this is honored, but EJB3Deployer uses it
+hibernate.bytecode.provider=javassist
+hibernate.jdbc.use_streams_for_binary=true
+hibernate.show_sql=false
+hibernate.format_sql=true
+hibernate.default_batch_fetch_size=16
+hibernate.jdbc.batch_size=20
diff --git a/modules/enterprise/server/client-api/src/test/resources/jms-ra.rar b/modules/enterprise/server/client-api/src/test/resources/jms-ra.rar
new file mode 100644
index 0000000..c4807c6
Binary files /dev/null and b/modules/enterprise/server/client-api/src/test/resources/jms-ra.rar differ
diff --git a/modules/enterprise/server/client-api/src/test/resources/security.policy b/modules/enterprise/server/client-api/src/test/resources/security.policy
new file mode 100644
index 0000000..8860b47
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/resources/security.policy
@@ -0,0 +1,10 @@
+// We need the SecurityManager installed to enable sandboxing of CLI scripts
+// but we don't define any other security measures on the RHQ server itself.
+//
+// Granting all permissions allows us to run the RHQ server as if no security
+// manager was in place (which is assumed by default by JBoss AS) but be able
+// to use it when we need it for our own purposes.
+
+grant {
+ permission java.security.AllPermission;
+};
commit ef5673fb4482fd08cdec672740afc2f12a3d2b0b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Sat Dec 10 01:17:50 2011 +0100
Making SessionManager behave the same as EJBs wrt the AccessEjbPermission.
It is very security-sensitive so we shouldn't allow scripts to just access
it and cause havoc in user sessions.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
index 39b6076..b4a19b7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
@@ -25,30 +25,42 @@ import java.util.Map;
import java.util.Random;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.server.security.AllowEjbAccessPermission;
import org.rhq.enterprise.server.util.LookupUtil;
/**
* This is the JON Server's own session ID generator. It is outside any container-provided session mechanism. Its sole
* purpose is to provide session IDs to logged in {@link Subject}s. It will timeout those sessions regardless of any
* container-provided session-timeout mechanism.
- *
+ * <p>
+ * Because this is a very security-sensitive class, any public method requires the caller to
+ * have the {@link AllowEjbAccessPermission} as any other calls to the EJB layer. This is so that the
+ * malicious users can't trick the EJB layer into thinking that some users are logged in or log out other
+ * users.
+ * <p>
+ * Also, for security reasons, this class is final so that malicious code can't subclass it and modify its
+ * behavior.
+ *
* <p>This object is a {@link #getInstance() singleton}.</p>
*/
-public class SessionManager {
+public final class SessionManager {
+
+ private static final AllowEjbAccessPermission ACCESS_PERMISSION = new AllowEjbAccessPermission();
+
/**
* Our source for random session IDs.
*/
- private static Random _random = new Random();
+ private static final Random _random = new Random();
/**
* Our session cache that is keyed on the session ID.
*/
- private static Map<Integer, AuthSession> _cache = new HashMap<Integer, AuthSession>();
+ private static final Map<Integer, AuthSession> _cache = new HashMap<Integer, AuthSession>();
/**
* The singleton instance
*/
- private static SessionManager _manager = new SessionManager();
+ private static final SessionManager _manager = new SessionManager();
/**
* The timeout for all user sessions.
@@ -78,7 +90,7 @@ public class SessionManager {
/**
* Return the singleton object.
- *
+ *
* @return the {@link SessionManager}
*/
public static SessionManager getInstance() {
@@ -95,6 +107,7 @@ public class SessionManager {
* sessionId will be assigned.
*/
public Subject put(Subject subject) {
+ checkPermission();
return put(subject, DEFAULT_TIMEOUT);
}
@@ -108,6 +121,7 @@ public class SessionManager {
* that Subject is overlord). The sessionId will be assigned.
*/
public synchronized Subject put(Subject subject, long timeout) {
+ checkPermission();
Integer key;
do {
@@ -141,6 +155,7 @@ public class SessionManager {
* @throws SessionTimeoutException
*/
public synchronized Subject getSubject(int sessionId) throws SessionNotFoundException, SessionTimeoutException {
+ checkPermission();
Integer id = new Integer(sessionId);
AuthSession session = _cache.get(id);
@@ -162,6 +177,7 @@ public class SessionManager {
* @param sessionId session id to invalidate
*/
public synchronized void invalidate(int sessionId) {
+ checkPermission();
_cache.remove(new Integer(sessionId));
// while we are here, let's go through the entire session cache and remove expired sessions
@@ -187,6 +203,7 @@ public class SessionManager {
* @param username username for the sessions to be invalidated
*/
public synchronized void invalidate(String username) {
+ checkPermission();
List<Integer> doomedSessionIds = new ArrayList<Integer>(_cache.size());
for (AuthSession s : _cache.values()) {
if (username.equals(s.getSubject(false).getName())) {
@@ -201,6 +218,7 @@ public class SessionManager {
}
public long getlastAccess(int sessionId) {
+ checkPermission();
AuthSession session = _cache.get(sessionId);
if (session == null) {
return -1;
@@ -209,6 +227,7 @@ public class SessionManager {
}
public Subject getOverlord() {
+ checkPermission();
if (overlordSubject == null) {
overlordSubject = LookupUtil.getSubjectManager().getSubjectById(OVERLORD_SUBJECT_ID);
@@ -256,4 +275,9 @@ public class SessionManager {
return copy;
}
+
+ private static void checkPermission() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) sm.checkPermission(ACCESS_PERMISSION);
+ }
}
\ No newline at end of file
commit 0b0632e5641e91f3549e5addbc2c18bb27132c5a
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Sat Dec 10 01:16:26 2011 +0100
moving the EJB access permission and the interceptor back to the server
jar.
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessInterceptor.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessInterceptor.java
deleted file mode 100644
index d3dcdb2..0000000
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessInterceptor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.client.security;
-
-import java.security.AccessController;
-import java.security.Permission;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AllowEjbAccessInterceptor {
-
- private static final Permission PERM = new AllowEjbAccessPermission();
-
- @AroundInvoke
- public Object intercept(InvocationContext invocationContext) throws Exception {
- //check that the caller has permissions to access the EJBs.
- //normal code does, only alert CLI scripts that try to circumvent our
- //manager proxies don't.
- AccessController.checkPermission(PERM);
- return invocationContext.proceed();
- }
-}
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessPermission.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessPermission.java
deleted file mode 100644
index 19ee165..0000000
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessPermission.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.client.security;
-
-import java.security.BasicPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AllowEjbAccessPermission extends BasicPermission {
-
- private static final long serialVersionUID = 1L;
-
- public AllowEjbAccessPermission() {
- super("rhq.allow.ejb.access");
- }
-}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessInterceptor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessInterceptor.java
new file mode 100644
index 0000000..350453fb
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessInterceptor.java
@@ -0,0 +1,46 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.security;
+
+import java.security.Permission;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AllowEjbAccessInterceptor {
+
+ private static final Permission PERM = new AllowEjbAccessPermission();
+
+ @AroundInvoke
+ public Object intercept(InvocationContext invocationContext) throws Exception {
+ //check that the caller has permissions to access the EJBs.
+ //normal code does, only alert CLI scripts that try to circumvent our
+ //manager proxies don't.
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) sm.checkPermission(PERM);
+
+ return invocationContext.proceed();
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessPermission.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessPermission.java
new file mode 100644
index 0000000..67f418d
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/security/AllowEjbAccessPermission.java
@@ -0,0 +1,36 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.security;
+
+import java.security.BasicPermission;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AllowEjbAccessPermission extends BasicPermission {
+
+ private static final long serialVersionUID = 1L;
+
+ public AllowEjbAccessPermission() {
+ super("rhq.allow.ejb.access");
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
index 2700ae3..caa7513 100644
--- a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
+++ b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
@@ -12,7 +12,7 @@
<!-- This interceptor checks that the alert CLI scripts don't try to circumvent our access objects by accessing the local SLSB beans directly. -->
<interceptor-binding>
<ejb-name>*</ejb-name>
- <interceptor-class>org.rhq.enterprise.client.security.AllowEjbAccessInterceptor</interceptor-class>
+ <interceptor-class>org.rhq.enterprise.server.security.AllowEjbAccessInterceptor</interceptor-class>
</interceptor-binding>
<!-- all our EJB3 SLSBs can define custom @RequiredPermissions annotations for authorization checks-->
commit 248f6d5a2e08b7367490a47b892ccf8080fa1545
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Dec 7 17:50:25 2011 +0100
be paranoid even in the comments ;)
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
index 7fcdac3..e9f1e4d 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
@@ -62,7 +62,9 @@ public class LocalClientProxy extends AbstractRhqFacadeProxy<LocalClient> {
//run this through the privileged block to elevate the privs of the script
//the scripts don't have the AllowEjbAccessPermission but this code has
- //all perms.
+ //all perms (or at least all perms assigned to it by the current context,
+ //which at the time of writing is defined by the rhq-server.policy file
+ //which gives all code all permissions).
return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
@Override
public Object run() throws Exception {
commit 0753aae5cab0a3abd3997d093dad1d4866091619
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Fri Dec 9 16:37:56 2011 -0500
[BZ 754693] ensure load of lazy references and update LDAP role relationship purge.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
index ec3e998..6413b89 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -183,18 +182,27 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote {
for (int roleId : doomedRoleIds) {
Role doomedRole = entityManager.find(Role.class, roleId);
+ //remove attached Subjects
Set<Subject> subjectsToUnhook = new HashSet<Subject>(doomedRole.getSubjects()); // avoid concurrent mod exception
for (Subject doomedSubjectRelationship : subjectsToUnhook) {
doomedRole.removeSubject(doomedSubjectRelationship);
entityManager.merge(doomedSubjectRelationship);
}
+ //remove attached ResourceGroups
Set<ResourceGroup> groupsToUnhook = new HashSet<ResourceGroup>(doomedRole.getResourceGroups()); // avoid concurrent mod exception
for (ResourceGroup doomedResourceGroupRelationship : groupsToUnhook) {
doomedRole.removeResourceGroup(doomedResourceGroupRelationship);
entityManager.merge(doomedResourceGroupRelationship);
}
+ //remove attached LDAP Subjects
+ Set<Subject> ldapSubjectsToUnhook = new HashSet<Subject>(doomedRole.getLdapSubjects()); // avoid concurrent mod exception
+ for (Subject doomedLdapSubjectRelationship : ldapSubjectsToUnhook) {
+ doomedRole.removeLdapSubject(doomedLdapSubjectRelationship);
+ entityManager.merge(doomedLdapSubjectRelationship);
+ }
+
doomedRole = entityManager.merge(doomedRole);
if (doomedRole.getFsystem()) {
@@ -202,7 +210,13 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote {
}
alertNotificationManager.cleanseAlertNotificationByRole(doomedRole.getId());
- entityManager.remove(doomedRole); // there should not be any cascading - this does not touch subjects/groups
+ // Fetch the lazy Sets on the Role to be returned.
+ //[BZ 754693:] we must fetch the lazy sets of LDAP Groups here for correct cascade removal
+ doomedRole.getResourceGroups().size();
+ doomedRole.getSubjects().size();
+ doomedRole.getLdapGroups().size();
+
+ entityManager.remove(doomedRole);
}
}
@@ -432,8 +446,8 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote {
}
for (LdapGroup ldapGroup : newLdapGroups) {
- LdapGroup attachedLdapGroup = (ldapGroup.getId() != 0) ?
- entityManager.find(LdapGroup.class, ldapGroup.getId()) : null;
+ LdapGroup attachedLdapGroup = (ldapGroup.getId() != 0) ? entityManager.find(LdapGroup.class,
+ ldapGroup.getId()) : null;
if (attachedLdapGroup == null) {
ldapGroup.setRole(attachedRole);
entityManager.persist(ldapGroup);
@@ -669,8 +683,8 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote {
+ "], but subject was not found");
}
if (doomedSubject.getFsystem() || (authorizationManager.isSystemSuperuser(doomedSubject))) {
- throw new PermissionException("You cannot remove user[" + doomedSubject.getName()
- + "] from role[" + roleId + "] - roles are fixed for this user");
+ throw new PermissionException("You cannot remove user[" + doomedSubject.getName() + "] from role["
+ + roleId + "] - roles are fixed for this user");
}
role.removeSubject(doomedSubject);
}
@@ -768,7 +782,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
CriteriaQueryRunner<Role> queryRunner = new CriteriaQueryRunner<Role>(criteria, generator, entityManager);
- @SuppressWarnings({"UnnecessaryLocalVariable"})
+ @SuppressWarnings({ "UnnecessaryLocalVariable" })
PageList<Role> roles = queryRunner.execute();
return roles;
commit cfe30b134dd06cca8d22c0eacdc994a6021a73f4
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Dec 9 14:21:28 2011 -0500
[Bug 755580 - Unable to add 2nd file-system drift]
The drift definition name and description are no longer preset to the
template name and description. The user will now need to enter a
name. This should help prevent duplicate names, or mistakenly using the
template's name. Also, the exception thrown on duplicate naming has
been updated to indicate that that may in fact be the problem.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardInfoStep.java
index c7ad7ed..c2139c1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardInfoStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardInfoStep.java
@@ -36,6 +36,7 @@ import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
+import org.rhq.core.domain.drift.DriftConfigurationDefinition;
import org.rhq.core.domain.drift.DriftDefinitionTemplate;
import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep;
import org.rhq.enterprise.gui.coregui.client.util.FormUtility;
@@ -130,7 +131,11 @@ public class DriftAddDefinitionWizardInfoStep extends AbstractWizardStep {
DriftDefinitionTemplate selectedTemplate = templatesMap.get(key);
wizard.setSelectedTemplate(selectedTemplate);
- wizard.setNewStartingConfiguration(selectedTemplate.createConfiguration());
+ Configuration startingConfig = selectedTemplate.createConfiguration();
+ // don't propogate the template name or desc to the def, force the user to enter a name, and optionally, a def
+ startingConfig.remove(DriftConfigurationDefinition.PROP_NAME);
+ startingConfig.remove(DriftConfigurationDefinition.PROP_DESCRIPTION);
+ wizard.setNewStartingConfiguration(startingConfig);
String description = selectedTemplate.getDescription();
description = (null == description) ? MSG.common_val_none() : description;
form.getItem("Description").setValue(description);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index 6af05d9..c06f7a4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -589,12 +589,13 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
}
try {
- AgentClient agent = agentManager.getAgentClient(subjectManager.getOverlord(), driftDef.getResource().getId());
+ AgentClient agent = agentManager.getAgentClient(subjectManager.getOverlord(), driftDef.getResource()
+ .getId());
DriftAgentService driftService = agent.getDriftAgentService();
driftService.pinSnapshot(driftDef.getResource().getId(), driftDef.getName(), snapshot);
} catch (Exception e) {
- log.warn("Unable to notify agent that DriftDefinition[driftDefinitionId: " + driftDefId +
- ", driftDefinitionName: " + driftDef.getName() + "] has been pinned. The agent may be down.", e);
+ log.warn("Unable to notify agent that DriftDefinition[driftDefinitionId: " + driftDefId
+ + ", driftDefinitionName: " + driftDef.getName() + "] has been pinned. The agent may be down.", e);
}
}
@@ -745,7 +746,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
break;
} else {
throw new IllegalArgumentException(
- "You cannot change an existing drift definition's base directory or includes/excludes filters.");
+ "A new definition must have a unique name. An existing definition cannot update it's base directory or includes/excludes filters.");
}
}
}
commit 5938a790c0aeb32865f4b115e721de22220ca100
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Dec 9 14:05:05 2011 -0500
[Bug 765592 - drift diff is different depending on order in which files are selected]
Fixed, the new changes will now always get the "+" prefixes and the older
will get the "-" prefixes.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
index f941c6f..b3de83f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
@@ -267,11 +267,18 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
public void executeAction(Object actionValue) {
- String id1 = selectedRecords.get(0).getAttribute(DriftDataSource.ATTR_ID);
- String id2 = selectedRecords.get(1).getAttribute(DriftDataSource.ATTR_ID);
- final String path = selectedRecords.get(0).getAttribute(DriftDataSource.ATTR_PATH);
-
- GWTServiceLookup.getDriftService().generateUnifiedDiffByIds(id1, id2,
+ Record record1 = selectedRecords.get(0);
+ Record record2 = selectedRecords.get(1);
+ final String path = record1.getAttribute(DriftDataSource.ATTR_PATH);
+ String id1 = record1.getAttribute(DriftDataSource.ATTR_ID);
+ String id2 = record2.getAttribute(DriftDataSource.ATTR_ID);
+ // regardless of selection order, compare the same way, showing newest changes with '+' signs
+ int version1 = record1.getAttributeAsInt(DriftDataSource.ATTR_CHANGESET_VERSION);
+ int version2 = record2.getAttributeAsInt(DriftDataSource.ATTR_CHANGESET_VERSION);
+ String diffOldId = (version1 < version2) ? id1 : id2;
+ String diffNewId = (version1 < version2) ? id2 : id1;
+
+ GWTServiceLookup.getDriftService().generateUnifiedDiffByIds(diffOldId, diffNewId,
new AsyncCallback<FileDiffReport>() {
@Override
public void onFailure(Throwable caught) {
commit 84c83f8760f6f37f7b7eed1b5e27346691901c11
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Dec 9 14:03:21 2011 -0500
[Bug 755673 - Adding new drift: includes/excludes - Path property required?]
It's now optional. It will be set to "." by default in the GUI. But even
if omitted will again get set to "." at the lower levels.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java
index 9829480..2b21f03 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java
@@ -519,8 +519,8 @@ public class DriftConfigurationDefinition implements Serializable {
private static PropertyDefinitionSimple createIncludePath(boolean readOnly) {
String name = PROP_PATH;
- String description = "A file system path that can be a directory or a file. The path is assumed to be relative to the base directory of the drift definition.";
- boolean required = true;
+ String description = "A file system directory path that is relative to (a sub-directory of) the base directory of the drift definition. The default is '.', the base directory itself.";
+ boolean required = false;
PropertySimpleType type = PropertySimpleType.STRING;
PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type);
@@ -529,6 +529,7 @@ public class DriftConfigurationDefinition implements Serializable {
pd.setSummary(true);
pd.setOrder(0);
pd.setAllowCustomEnumeratedValue(false);
+ pd.setDefaultValue(".");
RegexConstraint constraint = new RegexConstraint();
constraint.setDetails(PROP_FILTER_PATH_REGEX_PATTERN);
@@ -539,7 +540,7 @@ public class DriftConfigurationDefinition implements Serializable {
private static PropertyDefinitionSimple createIncludePattern(boolean readOnly) {
String name = PROP_PATTERN;
- String description = "Pathname pattern that must match for the items in the directory path to be included. '*' matches zero or more characters, '?' matches one character. For example, '*.txt' (no quotes) will match text files in the filter's path directory. '**/*.txt' will match text files in any subdirectory below the filter's path directory";
+ String description = "Pathname pattern that must match for the items in the directory path to be included. '*' matches zero or more characters, '?' matches one character. For example, '*.txt' (no quotes) will match text files in the filter's path directory. '**/*.txt' will match text files in any subdirectory below the filter's path directory.";
boolean required = false;
PropertySimpleType type = PropertySimpleType.STRING;
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java
index a104843..92015ab 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java
@@ -149,7 +149,7 @@ public class DriftDefinition implements Serializable {
name = (null != name) ? name.trim() : name;
if (null == name || "".equals(name)) {
- throw new IllegalArgumentException("Drift congig name can not be null or empty");
+ throw new IllegalArgumentException("Drift definition name can not be null or empty");
}
this.name = name;
@@ -534,7 +534,7 @@ public class DriftDefinition implements Serializable {
List<Filter> filters = new ArrayList<Filter>();
for (Property property : filtersListProperty.getList()) {
PropertyMap filter = (PropertyMap) property;
- filters.add(new Filter(filter.getSimpleValue(DriftConfigurationDefinition.PROP_PATH, ""), filter
+ filters.add(new Filter(filter.getSimpleValue(DriftConfigurationDefinition.PROP_PATH, "."), filter
.getSimpleValue(DriftConfigurationDefinition.PROP_PATTERN, "")));
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/Filter.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/Filter.java
index 96797ca..b57eb32 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/Filter.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/Filter.java
@@ -42,7 +42,7 @@ public class Filter implements Serializable {
public void setPath(String path) {
if (path == null) {
- this.path = "";
+ this.path = ".";
} else {
this.path = path;
}
commit e8db9a190cdf7a1e070bbc077a4d025e30835a24
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 8 16:02:39 2011 -0500
Add 2.117 to remove an obsolete drift table that may exist after upgrades.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 85a5526..3350cdd 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -15,7 +15,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.116</db.schema.version>
+ <db.schema.version>2.117</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
<rhq.ds.connection-url>${rhq.test.ds.connection-url}</rhq.ds.connection-url>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 92ebef7..9e3bbd6 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3823,7 +3823,12 @@
</schemaSpec>
<!-- JON 3.0 RELEASE uses DB Schema 2.116 -->
-
+
+ <schemaSpec version="2.117">
+ <!-- Remove an obsolete drift table that may be hanging around -->
+ <schema-dropTable table="RHQ_DRIFT_TEMPLATE_MAP" />
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
commit dedfe6ad8738d1be1c5a411943e4e48d4410ffd2
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 8 15:28:14 2011 -0500
[Bug 753866 - DB Upgrade needs more work for existing drift records]
More work to support 4.1 and 4.2 upgrades for drift.
- In the java template map upgrade task
- add logic to generate the rhq_drift_def_template records
- add logic to generate rhq_drift_set records for each initial changeset
- Move some logic from 2.115 to 2.116 to make 2.115 match the
schema produced by a 4.2 dbsetup (fresh db). Note that prior to
an upgrade 4.2 databases must (for now at least) be manually set
to schema version 2.115. They are errantly set to 2.114 in the 4.2
release.
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
index d060a2a..95d9ef7 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
@@ -20,6 +20,7 @@ package org.rhq.core.db.upgrade;
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.List;
import mazz.i18n.Logger;
@@ -39,6 +40,8 @@ public class DriftTemplateMapDatabaseUpgradeTask implements DatabaseUpgradeTask
public void execute(DatabaseType databaseType, Connection connection) throws SQLException {
+ // First generate a drift def template for each of the existing mappings
+
String sql = "" //
+ " insert into RHQ_DRIFT_DEF_TEMPLATE (" //
+ " ID," //
@@ -61,5 +64,53 @@ public class DriftTemplateMapDatabaseUpgradeTask implements DatabaseUpgradeTask
LOG.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, sql);
databaseType.executeSql(connection, sql);
+
+ // Second, assign one of the new templates to each of the existing definitions. Note that in the
+ // upgrade scenario we are guaranteed to only have 1 template for the given resource type so the
+ // select below is safe to return a single value.
+ sql = "" //
+ + " update RHQ_DRIFT_DEFINITION dd set DRIFT_DEF_TEMPLATE_ID =" //
+ + " ( select dt.ID" //
+ + " from RHQ_DRIFT_DEF_TEMPLATE dt" //
+ + " join RHQ_RESOURCE_TYPE rt on dt.RESOURCE_TYPE_ID = rt.ID" //
+ + " join RHQ_RESOURCE res on rt.ID = res.RESOURCE_TYPE_ID" //
+ + " and dd.RESOURCE_ID = res.ID" //
+ + " )" //
+ + " where dd.DRIFT_DEF_TEMPLATE_ID is null";
+
+ LOG.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, sql);
+
+ databaseType.executeSql(connection, sql);
+
+ // third, for each initial snapshot, create the newly required rhq_drift_set and map the drift to it
+ sql = "select cs.ID from RHQ_DRIFT_CHANGE_SET cs where cs.VERSION = 0";
+ LOG.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, sql);
+
+ List<Object[]> rows = databaseType.executeSelectSql(connection, sql);
+
+ sql = "insert into RHQ_DRIFT_SET ( ID ) values ( "
+ + databaseType.getSequenceInsertValue(connection, "RHQ_DRIFT_SET_ID_SEQ") + " )";
+
+ for (Object[] row : rows) {
+ int csId = ((Number) row[0]).intValue();
+
+ // insert the new drift set row
+ LOG.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, sql);
+
+ databaseType.executeSql(connection, sql);
+ int setId = databaseType.getSequenceValue(connection, "RHQ_DRIFT_SET", "ID");
+
+ // update the drift records for the initial change set to refer to the drift set
+ String updateSql = "update RHQ_DRIFT set DRIFT_SET_ID = " + setId + " where DRIFT_CHANGE_SET_ID = " + csId;
+ LOG.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, updateSql);
+
+ databaseType.executeSql(connection, updateSql);
+
+ // update the change set to refer to the drift set
+ updateSql = "update RHQ_DRIFT_CHANGE_SET set DRIFT_SET_ID = " + setId + " where ID = " + csId;
+ LOG.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, updateSql);
+
+ databaseType.executeSql(connection, updateSql);
+ }
}
}
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 8f10a3b..92ebef7 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3629,7 +3629,9 @@
<!-- RHQ 4.1 RELEASE uses DB Schema 2.114 -->
<!-- RHQ 4.2 RELEASE uses DB Schema 2.114
- Note, the 4.1 to 4.2 upgrade is broken because most ofthe changes in 2.115 should have gone into 4.2.
+ Note, the 4.1 to 4.2 upgrade is broken because a 4.2 dbsetup actually creates a 2.115 schema. So,
+ for 4.2 dbs to upgrade to 4.3 the schema version must first be corrected and set the schema
+ version to 2.115.
-->
<schemaSpec version="2.115">
@@ -3686,22 +3688,15 @@
</statement>
</schema-directSQL>
- <!-- increase size from 128 to 512 -->
- <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="NAME" columnType="VARCHAR2" precision="512" />
-
<!-- add new columns -->
<schema-addColumn table="RHQ_DRIFT_DEFINITION" column="DESCRIPTION" columnType="VARCHAR2" precision="512" />
<schema-addColumn table="RHQ_DRIFT_DEFINITION" column="DRIFT_HANDLING_MODE" columnType="VARCHAR2" precision="20" />
<schema-addColumn table="RHQ_DRIFT_DEFINITION" column="IS_PINNED" columnType="BOOLEAN"/>
<schema-addColumn table="RHQ_DRIFT_DEFINITION" column="IS_ATTACHED" columnType="BOOLEAN"/>
- <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" columnType="INTEGER"/>
<schema-addColumn table="RHQ_DRIFT_DEFINITION" column="DRIFT_DEF_TEMPLATE_ID" columnType="INTEGER"/>
<!-- initialize new required columns -->
<schema-directSQL>
- <statement desc="RHQ_DRIFT_DEFINITION: set compliance_status column (in compliance)">
- UPDATE RHQ_DRIFT_DEFINITION SET COMPLIANCE_STATUS = 0
- </statement>
<statement targetDBVendor="postgresql" desc="RHQ_DRIFT_DEFINITION: set is_pinned column (false)">
UPDATE RHQ_DRIFT_DEFINITION SET IS_PINNED = FALSE
</statement>
@@ -3719,8 +3714,7 @@
</statement>
</schema-directSQL>
<schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="IS_PINNED" nullable="FALSE"/>
- <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="IS_ATTACHED" nullable="FALSE"/>
- <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" nullable="FALSE"/>
+ <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="IS_ATTACHED" nullable="FALSE"/>
<schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="DRIFT_HANDLING_MODE" nullable="FALSE" />
<!-- add new FK -->
@@ -3771,8 +3765,8 @@
<!-- Add new drift_handling_mode column -->
<schema-addColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_HANDLING_MODE" columnType="VARCHAR2" precision="20" />
<schema-directSQL>
- <statement desc="RHQ_DRIFT_DEFINITION: set drift_handling_mode column (normal)">
- UPDATE RHQ_DRIFT_DEFINITION SET DRIFT_HANDLING_MODE = 'normal'
+ <statement desc="RHQ_DRIFT_CHANGE_SET: set drift_handling_mode column (normal)">
+ UPDATE RHQ_DRIFT_CHANGE_SET SET DRIFT_HANDLING_MODE = 'normal'
</statement>
</schema-directSQL>
<schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_HANDLING_MODE" nullable="FALSE" />
@@ -3805,11 +3799,31 @@
</schemaSpec>
+<!-- RHQ 4.2 RELEASE uses DB Schema 2.114, which is incorrect, it should have been 2.115. So, for the
+ upgrade to work for an RHQ 4.2 install the schema version must be set to 2.115 prior to the upgrade.
+
+ The 4.2 upgrade should start with 2.116.
+-->
<schemaSpec version="2.116">
+ <!-- RHQ_DRIFT_DEFINITION changes -->
+ <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" columnType="INTEGER"/>
+ <schema-directSQL>
+ <statement desc="RHQ_DRIFT_DEFINITION: set compliance_status column (in compliance)">
+ UPDATE RHQ_DRIFT_DEFINITION SET COMPLIANCE_STATUS = 0
+ </statement>
+ </schema-directSQL>
+ <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" nullable="FALSE"/>
+
+ <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="NAME" columnType="VARCHAR2" precision="512" />
+
+
+ <!-- RHQ_PRD_VER changes -->
<!-- Increase the max length of a product version from 50 to 100. -->
<schema-alterColumn table="RHQ_PRD_VER" column="VERSION" columnType="VARCHAR2" precision="100" />
</schemaSpec>
+<!-- JON 3.0 RELEASE uses DB Schema 2.116 -->
+
</dbupgrade>
</target>
</project>
commit 37acc1c7cc76cc8a069936d66f0182640ffb569d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 8 15:22:04 2011 -0500
Change the getSequenceValue() method for postgres db type so that it
actually works.
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java
index 53555ed..4d376f3 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java
@@ -64,7 +64,7 @@ public abstract class PostgresqlDatabaseType extends DatabaseType {
* @see DatabaseType#getSequenceValue(Connection, String, String)
*/
public int getSequenceValue(Connection conn, String table, String key) throws SQLException {
- String query = "SELECT last_value FROM " + table + "_" + key + "_seq";
+ String query = "SELECT currval('" + table + "_" + key + "_seq')";
PreparedStatement selectPS = null;
ResultSet rs = null;
commit 518ccccdc4ad05353de809068c289c1fc64a5384
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Dec 8 13:39:47 2011 -0500
[BZ 761320] Only update the detection schedule if drift detection runs
With this commit we no longer update the detection schedule's next scan
time if detection does not run. Drift detection might not run for a few
different reasons - the definition could be disabled, it it earlier than
the next scheduled run, or the server has not acknowledged the previous
change set sent by the agent.
Some additional debug logging has also been added to output when the
next scheduled run is supposed to happen.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 71ddf44..21341c4 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -19,26 +19,8 @@
package org.rhq.core.pc.drift;
-import static org.rhq.common.drift.FileEntry.addedFileEntry;
-import static org.rhq.common.drift.FileEntry.changedFileEntry;
-import static org.rhq.common.drift.FileEntry.removedFileEntry;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
-import static org.rhq.core.util.file.FileUtil.copyFile;
-import static org.rhq.core.util.file.FileUtil.forEachFile;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.rhq.common.drift.ChangeSetReader;
import org.rhq.common.drift.ChangeSetWriter;
import org.rhq.common.drift.FileEntry;
@@ -49,6 +31,17 @@ import org.rhq.core.domain.drift.Filter;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.file.FileVisitor;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.*;
+
+import static org.rhq.common.drift.FileEntry.*;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
+import static org.rhq.core.util.file.FileUtil.copyFile;
+import static org.rhq.core.util.file.FileUtil.forEachFile;
+
public class DriftDetector implements Runnable {
private Log log = LogFactory.getLog(DriftDetector.class);
@@ -76,14 +69,17 @@ public class DriftDetector implements Runnable {
public void run() {
log.debug("Starting drift detection...");
long startTime = System.currentTimeMillis();
+ boolean updateSchedule = true;
+ DriftDetectionSchedule schedule = null;
try {
if (log.isDebugEnabled()) {
log.debug("Fetching next schedule from " + scheduleQueue);
}
- DriftDetectionSchedule schedule = scheduleQueue.getNextSchedule();
+ schedule = scheduleQueue.getNextSchedule();
if (schedule == null) {
log.debug("No schedules are in the queue.");
+ updateSchedule = false;
return;
}
@@ -93,17 +89,26 @@ public class DriftDetector implements Runnable {
}
if (schedule.getNextScan() > (System.currentTimeMillis() + 100L)) {
- log.debug("Skipping " + schedule + " because it is too early to do the next detection.");
+ if (log.isDebugEnabled()) {
+ log.debug("Skipping " + schedule + " because it is too early to do the next detection.");
+ }
+ updateSchedule = false;
return;
}
if (!schedule.getDriftDefinition().isEnabled()) {
- log.debug("Skipping " + schedule + " because the drift definition is disabled.");
+ if (log.isDebugEnabled()) {
+ log.debug("Skipping " + schedule + " because the drift definition is disabled.");
+ }
+ updateSchedule = false;
return;
}
if (previousSnapshotExists(schedule)) {
- log.debug("Skipping " + schedule + " because server has not yet acked previous change set");
+ if (log.isDebugEnabled()) {
+ log.debug("Skipping " + schedule + " because server has not yet acked previous change set");
+ }
+ updateSchedule = false;
return;
}
@@ -140,7 +145,7 @@ public class DriftDetector implements Runnable {
} finally {
try {
- scheduleQueue.deactivateSchedule();
+ scheduleQueue.deactivateSchedule(updateSchedule);
long endTime = System.currentTimeMillis();
log.debug("Finished drift detection in " + (endTime - startTime) + " ms");
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueue.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueue.java
index 35960ad..13f078d 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueue.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueue.java
@@ -35,7 +35,7 @@ public interface ScheduleQueue {
* at the head of the queue to become active. If there is no active schedule this
* method simply does nothing and returns.
*/
- void deactivateSchedule();
+ void deactivateSchedule(boolean updateSchedule);
/**
* Adds a schedule to the queue for processing by the drift detector
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueueImpl.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueueImpl.java
index cbc50b8..d008f36 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueueImpl.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueueImpl.java
@@ -1,15 +1,14 @@
package org.rhq.core.pc.drift;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.PriorityQueue;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.drift.DriftDefinition;
import org.rhq.core.domain.drift.DriftDefinitionComparator;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
public class ScheduleQueueImpl implements ScheduleQueue {
private static final Runnable NO_OP = new Runnable() {
@@ -26,6 +25,8 @@ public class ScheduleQueueImpl implements ScheduleQueue {
private Runnable deactivationTask;
+ private Log log = LogFactory.getLog(ScheduleQueueImpl.class);
+
@Override
public DriftDetectionSchedule getNextSchedule() {
try {
@@ -66,16 +67,28 @@ public class ScheduleQueueImpl implements ScheduleQueue {
}
@Override
- public void deactivateSchedule() {
+ public void deactivateSchedule(boolean updateSchedule) {
try {
lock.writeLock().lock();
if (deactivationTask != null) {
deactivationTask.run();
}
+
if (activeSchedule == null) {
return;
}
- activeSchedule.updateShedule();
+
+ if (updateSchedule) {
+ activeSchedule.updateShedule();
+ }
+
+ if (log.isDebugEnabled()) {
+ SimpleDateFormat formatter = new SimpleDateFormat();
+ formatter.applyPattern("hh:mm:ss:SSS a");
+ log.debug("The next drift detection run for " + activeSchedule + " is set for " +
+ formatter.format(new Date(activeSchedule.getNextScan())));
+ }
+
queue.offer(activeSchedule);
activeSchedule = null;
} finally {
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
index 4a2b333..08373ec 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
@@ -19,22 +19,12 @@
package org.rhq.core.pc.drift;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static org.apache.commons.io.FileUtils.copyFile;
-import static org.apache.commons.io.FileUtils.deleteDirectory;
-import static org.apache.commons.io.FileUtils.touch;
-import static org.rhq.common.drift.FileEntry.addedFileEntry;
-import static org.rhq.common.drift.FileEntry.changedFileEntry;
-import static org.rhq.common.drift.FileEntry.removedFileEntry;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
-import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
-import static org.rhq.test.AssertUtils.assertPropertiesMatch;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import org.rhq.common.drift.*;
+import org.rhq.core.domain.drift.DriftDefinition;
+import org.rhq.core.system.OperatingSystemType;
+import org.rhq.core.system.SystemInfoFactory;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
import java.io.BufferedReader;
import java.io.File;
@@ -43,18 +33,15 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import org.rhq.common.drift.ChangeSetReader;
-import org.rhq.common.drift.ChangeSetReaderImpl;
-import org.rhq.common.drift.ChangeSetWriter;
-import org.rhq.common.drift.ChangeSetWriterImpl;
-import org.rhq.common.drift.FileEntry;
-import org.rhq.common.drift.Headers;
-import org.rhq.core.domain.drift.DriftDefinition;
-import org.rhq.core.system.OperatingSystemType;
-import org.rhq.core.system.SystemInfoFactory;
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static org.apache.commons.io.FileUtils.*;
+import static org.rhq.common.drift.FileEntry.*;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
+import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
+import static org.rhq.test.AssertUtils.assertPropertiesMatch;
+import static org.testng.Assert.*;
public class DriftDetectorTest extends DriftTest {
@@ -168,6 +155,30 @@ public class DriftDetectorTest extends DriftTest {
changeSet);
}
+ @Test
+ public void updateScheduleAfterGeneratingCoverageChangeSet() throws Exception {
+ DriftDefinition driftDef = driftDefinition("update-schedule-after-coverage-changeset",
+ resourceDir.getAbsolutePath());
+ DriftDetectionSchedule schedule = new DriftDetectionSchedule(resourceId(), driftDef);
+
+ File confDir = mkdir(resourceDir, "conf");
+ File serverConf = createRandomFile(confDir, "server.conf");
+
+ long currentTime = System.currentTimeMillis();
+
+ scheduleQueue.addSchedule(schedule);
+ detector.run();
+
+ assertTrue(schedule.getNextScan() >= (currentTime + driftDef.getInterval()),
+ "Failed to update schedule. next scan is " + schedule.getNextScan() + " and should be greater than " +
+ (currentTime + driftDef.getInterval()));
+ }
+
+ @Test
+ public void updateScheduleAfterGeneratingDriftChangeSet() throws Exception {
+
+ }
+
@SuppressWarnings("unchecked")
@Test
public void doNotUpdateSnapshotOrGenerateDriftChangeSetIfNothingChanges() throws Exception {
@@ -219,12 +230,37 @@ public class DriftDetectorTest extends DriftTest {
DriftDefinition def = driftDefinition("disabled-config-test", resourceDir.getAbsolutePath());
def.setEnabled(false);
+ DriftDetectionSchedule schedule = new DriftDetectionSchedule(resourceId(), def);
+ long nextScan = schedule.getNextScan();
+
File confDir = mkdir(resourceDir, "conf");
File server1Conf = new File(confDir, "server-1.conf");
touch(server1Conf);
- scheduleQueue.addSchedule(new DriftDetectionSchedule(resourceId(), def));
+ scheduleQueue.addSchedule(schedule);
+ detector.run();
+
+ // make sure that the next scan time is not updated
+ assertEquals(schedule.getNextScan(), nextScan, "The next scan time for the drift detection schedule should " +
+ " not get updated if drift detection does not actually run for the definition.");
+ }
+
+ @Test
+ public void doNotUpdateScheduleIfItIsTooEarlyToRunDetection() throws Exception {
+ DriftDefinition driftDef = driftDefinition("schedule-not-ready-test", resourceDir.getAbsolutePath());
+ DriftDetectionSchedule schedule = new DriftDetectionSchedule(resourceId(), driftDef);
+
+ File confDir = mkdir(resourceDir, "conf");
+ File server1Conf = new File(confDir, "server.conf");
+
+ scheduleQueue.addSchedule(schedule);
detector.run();
+
+ long nextScan = schedule.getNextScan();
+ detector.run();
+
+ assertEquals(schedule.getNextScan(), nextScan, "The next scan time for the drift detection schedule should " +
+ " not get updated if drift detection does not actually run for the definition.");
}
@Test
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java
index 518e8e4..c3e28f5 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java
@@ -260,7 +260,7 @@ public class DriftManagerTest extends DriftTest {
assertTrue(changeSetDir.exists(), "The change set directory should not be deleted while the schedule is "
+ "still active.");
- driftMgr.getSchedulesQueue().deactivateSchedule();
+ driftMgr.getSchedulesQueue().deactivateSchedule(false);
assertFalse(changeSetDir.exists(), "The change set directory should have been deleted after the schedule is "
+ "deactivated.");
}
commit d7ef96e848f139f231a8c875f8bce655fc463812
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Dec 7 16:22:57 2011 -0500
make sure we can support schema versions that we put inbetween existing versions.
for example, if we have db schema 2.115 and 2.116 and we want something in between, make sure
2.115.1 does what we think.
diff --git a/modules/core/dbutils/src/test/java/org/rhq/core/db/ant/dbupdate/SchemaVersionTest.java b/modules/core/dbutils/src/test/java/org/rhq/core/db/ant/dbupdate/SchemaVersionTest.java
index 393a293..4fdf435 100644
--- a/modules/core/dbutils/src/test/java/org/rhq/core/db/ant/dbupdate/SchemaVersionTest.java
+++ b/modules/core/dbutils/src/test/java/org/rhq/core/db/ant/dbupdate/SchemaVersionTest.java
@@ -19,6 +19,7 @@
package org.rhq.core.db.ant.dbupdate;
import org.testng.annotations.Test;
+
import org.rhq.core.db.ant.dbupgrade.SchemaVersion;
/**
@@ -50,6 +51,7 @@ public class SchemaVersionTest {
* Tests checking between versions.
*/
public void testBetween() {
+ assert new SchemaVersion("2.115.1").between(new SchemaVersion("2.115"), new SchemaVersion("2.116"));
assert new SchemaVersion("2").between(new SchemaVersion("1"), new SchemaVersion("3"));
assert new SchemaVersion("222").between(new SchemaVersion("111"), new SchemaVersion("333"));
assert new SchemaVersion("1.0.2").between(new SchemaVersion("1.0.0"), new SchemaVersion("1.0.3"));
commit 74d3e194811007373811bc1cdc8766b68f23de54
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Dec 7 14:27:05 2011 -0500
[BZ 760721] fix bug where negative values would always get incorrectly normalized to "-" (https://bugzilla.redhat.com/show_bug.cgi?id=760721)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/IsLongValidator.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/IsLongValidator.java
index cb61cab..2b25e73 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/IsLongValidator.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/IsLongValidator.java
@@ -62,11 +62,16 @@ public class IsLongValidator extends CustomValidator {
}
String baseStringValue = stripOffNegativeSignAndLeadingZeroes(stringValue, isNegative);
- updateInputValue((isNegative) ? "-" : "" + baseStringValue);
+ String normalizedValue;
+ if (isNegative) {
+ normalizedValue = "-" + baseStringValue;
+ } else {
+ normalizedValue = baseStringValue;
+ }
+ updateInputValue(normalizedValue);
// all zeroes, optionally prefixed with negative sign, is valid
- if (baseStringValue.length() == 0) {
- updateInputValue("0");
+ if (baseStringValue.equals("0")) {
return true;
}
@@ -107,7 +112,7 @@ public class IsLongValidator extends CustomValidator {
charsToSkip++;
}
- for (int i = charsToSkip; i < stringValue.length(); i++) {
+ for (int i = charsToSkip; i < stringValue.length() - 1; i++) {
if (stringValue.charAt(i) == '0') {
charsToSkip++;
} else {
commit 6245b0d8756929ada716e3c3c70d2089fc1d5a48
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Dec 7 13:58:12 2011 -0500
[BZ 751418] Finish button is now disabled / grayed out on final step of resource import/create wizards until the config editor reports the config as being valid; note, to achieve this a new method isNextButtonEnabled() was added to the WizardStep interface and a new method updateButtonEnablement() was added to the WizardView class (https://bugzilla.redhat.com/show_bug.cgi?id=751418); also added javadoc to the WizardStep interface
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizard.java
index 1b9fa0c..2e75a05 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizard.java
@@ -77,4 +77,6 @@ public abstract class AbstractWizard implements Wizard {
public WizardView getView() {
return view;
}
+
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java
index 299d0f2..d0aabaf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java
@@ -28,6 +28,10 @@ public abstract class AbstractWizardStep implements WizardStep {
abstract public String getName();
+ public boolean isNextButtonEnabled() {
+ return true;
+ }
+
public boolean nextPage() {
return true;
}
@@ -35,4 +39,5 @@ public abstract class AbstractWizardStep implements WizardStep {
public boolean previousPage() {
return true;
}
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java
index 8b38b39..ff4dd08 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java
@@ -46,4 +46,5 @@ public interface Wizard {
* This is called when the cancel button or the wizard window's "X" close button is clicked.
*/
void cancel();
+
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java
index f5005c0..16c7ba0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -25,17 +25,53 @@ import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
/**
+ * A step in a {@link Wizard wizard}.
+ *
* @author Greg Hinkle
*/
public interface WizardStep {
Messages MSG = CoreGUI.getMessages();
+ /**
+ * Returns the canvas containing this step's widget content. This method should <b>not</b> add the canvas to the
+ * parent canvas - the wizard framework will take care of that.
+ *
+ * @param parent the parent canvas to which the returned canvas will be added -
+ *
+ * @return the canvas containing this step's widget content
+ */
Canvas getCanvas(Locatable parent);
+ /**
+ * Returns true if this step's Next or Finish button should be enabled, or false if it should be disabled.
+ *
+ * @return true if this step's Next or Finish button should be enabled, or false if it should be disabled
+ */
+ boolean isNextButtonEnabled();
+
+ /**
+ * Called when the user clicks this step's Next or Finish button. If all required data has been entered for the
+ * step and is valid, true should be returned, and the wizard will advance to the next step, otherwise false
+ * should be returned, and the wizard will not advance.
+ *
+ * @return true if all required data has been entered for the step and is valid, or false otherwise
+ */
boolean nextPage();
+ /**
+ * Called when the user clicks this step's Previous button. Should return true if the wizard should go to the
+ * previous step, or false if it should not.
+ *
+ * @return true if the wizard should go to the previous step, or false if it should not.
+ */
boolean previousPage();
+ /**
+ * Returns the title of this step, to be displayed in the wizard modal's title bar.
+ *
+ * @return the title of this step, to be displayed in the wizard modal's title bar
+ */
String getName();
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
index d5fe441..34291f0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
@@ -48,6 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
* @author Greg Hinkle
*/
public class WizardView extends LocatableVLayout {
+
static private final Messages MSG = CoreGUI.getMessages();
static private final String CANCEL = MSG.common_button_cancel();
@@ -229,7 +230,7 @@ public class WizardView extends LocatableVLayout {
.size())));
stepLabel.setWrap(false);
- WizardStep step = wizardSteps.get(currentStep);
+ final WizardStep step = wizardSteps.get(currentStep);
stepTitleLabel.setContents(step.getName());
@@ -255,7 +256,7 @@ public class WizardView extends LocatableVLayout {
}
currentCanvas = wizardSteps.get(currentStep).getCanvas(this);
- // if null advance to the next step by automatically "clicking" the Next button
+ // if null, advance to the next step by automatically "clicking" the Next button
if (null == currentCanvas) {
if (step.nextPage()) {
wizardSteps.get(currentStep).nextPage();
@@ -282,7 +283,7 @@ public class WizardView extends LocatableVLayout {
cancelButton.setDisabled(false);
previousButton.setDisabled(stepIndex == 0);
- nextButton.setDisabled(false);
+ nextButton.setDisabled(!step.isNextButtonEnabled());
for (IButton button : customButtons) {
button.setDisabled(false);
@@ -356,4 +357,10 @@ public class WizardView extends LocatableVLayout {
public void decrementStep() {
setStep(currentStep - 1);
}
+
+ public void updateButtonEnablement() {
+ WizardStep step = wizard.getSteps().get(currentStep);
+ getNextButton().setDisabled(!step.isNextButtonEnabled());
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java
index 932f197..538aa7f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java
@@ -29,6 +29,8 @@ import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeEvent;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeListener;
import org.rhq.enterprise.gui.coregui.client.components.form.DurationItem;
import org.rhq.enterprise.gui.coregui.client.components.form.TimeUnit;
import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep;
@@ -44,14 +46,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Jay Shaughnessy
* @author Greg Hinkle
*/
-public class ResourceFactoryConfigurationStep extends AbstractWizardStep {
+public class ResourceFactoryConfigurationStep extends AbstractWizardStep implements PropertyValueChangeListener {
- private boolean noConfigurationNeeded = false; // if true, it has been determined the user doesn't have to set any config
private LocatableVLayout vLayout;
private ConfigurationEditor editor;
private Configuration startingConfig;
private DurationItem timeoutItem;
- AbstractResourceFactoryWizard wizard;
+ private AbstractResourceFactoryWizard wizard;
public ResourceFactoryConfigurationStep(AbstractResourceFactoryWizard wizard) {
this.wizard = wizard;
@@ -102,17 +103,19 @@ public class ResourceFactoryConfigurationStep extends AbstractWizardStep {
ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
configurationService.getOptionValuesForConfigDefinition(def,
new AsyncCallback<ConfigurationDefinition>() {
+ public void onSuccess(ConfigurationDefinition result) {
+ createAndAddConfigurationEditor(result);
+ }
public void onFailure(Throwable throwable) {
- editor = new ConfigurationEditor(vLayout.extendLocatorId("Editor"), def, startingConfig);
- editor.setAllPropertiesWritable(true);
- vLayout.addMember(editor, 0);
-
+ createAndAddConfigurationEditor(def);
}
- public void onSuccess(ConfigurationDefinition result) {
- editor = new ConfigurationEditor(vLayout.extendLocatorId("Editor"), result, startingConfig);
+ private void createAndAddConfigurationEditor(ConfigurationDefinition def) {
+ editor = new ConfigurationEditor(vLayout.extendLocatorId("Editor"), def, startingConfig);
editor.setAllPropertiesWritable(true);
+ editor.addPropertyValueChangeListener(ResourceFactoryConfigurationStep.this);
+ wizard.getView().updateButtonEnablement();
vLayout.addMember(editor, 0);
}
});
@@ -122,9 +125,15 @@ public class ResourceFactoryConfigurationStep extends AbstractWizardStep {
return vLayout;
}
+ @Override
+ public boolean isNextButtonEnabled() {
+ return (editor != null) && editor.isValid();
+ }
+
public boolean nextPage() {
- if (noConfigurationNeeded == true || (editor != null && editor.validate())) {
- wizard.setNewResourceConfiguration((noConfigurationNeeded) ? null : editor.getConfiguration());
+ // Finish.
+ if ((editor != null) && editor.isValid()) {
+ wizard.setNewResourceConfiguration(editor.getConfiguration());
wizard.setNewResourceCreateTimeout(timeoutItem.getValueAsInteger());
wizard.execute();
return true;
@@ -136,4 +145,10 @@ public class ResourceFactoryConfigurationStep extends AbstractWizardStep {
public String getName() {
return MSG.widget_resourceFactoryWizard_editConfigStepName();
}
+
+ @Override
+ public void propertyValueChanged(PropertyValueChangeEvent event) {
+ wizard.getView().updateButtonEnablement();
+ }
+
}
\ No newline at end of file
commit b967a205193b3dbb70f507f7a3df74f0474cb06b
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Dec 7 13:50:58 2011 -0500
minor - remove manual boxing
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java
index 9fa7dd2..b1364b0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java
@@ -64,7 +64,7 @@ public class BundleUploadDataStep extends AbstractWizardStep {
mainLayout = new LocatableVLayout("BundleCreateUploadData");
}
- mainLayout.setMargin(Integer.valueOf(20));
+ mainLayout.setMargin(20);
mainLayout.setWidth100();
mainLayout.setHeight(10);
commit f736fd47d4d07204a9f9b8b0f98f8f74bc0fe9f2
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Dec 7 13:49:40 2011 -0500
don't prepend RHQ Server resource name with "AS "; include JNP port in RHQ Server resource name; refactor formatServerName() to use a StringBuilder and be more readable
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java
index 185ecff..62b39b6 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java
@@ -66,7 +66,7 @@ import org.rhq.plugins.jbossas.util.JnpConfig;
import org.rhq.plugins.jmx.JMXDiscoveryComponent;
/**
- * Discovers JBossAS 3.2.x and 4.x server instances.
+ * Discovers instances of JBoss AS 3.2.3 through 4.2.x, and JBoss EAP and SOA-P 4.x.
*
* @author John Mazzitelli
* @author Ian Springer
@@ -296,8 +296,8 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
final JBossProductType productType = installInfo.getProductType();
String description = productType.DESCRIPTION + " " + installInfo.getMajorVersion();
- boolean isInServer = isRhqServer(absoluteConfigPath);
- if (isInServer) {
+ boolean isRhqServer = isRhqServer(absoluteConfigPath);
+ if (isRhqServer) {
description += " hosting the RHQ Server";
// RHQ-633 : We know this is an RHQ Server. Let's auto-configure for tracking its log file, which is not in
@@ -324,13 +324,13 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
}
}
}
- final String PRODUCT_PREFIX = productType.name() + " ";
- String name = PRODUCT_PREFIX
- + formatServerName(bindingAddress, namingPort, discoveryContext.getSystemInformation().getHostname(),
- absoluteConfigPath.getName(), isInServer);
-
- return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, PRODUCT_PREFIX
- + installInfo.getVersion(), description, pluginConfiguration, processInfo);
+
+ String name = formatServerName(bindingAddress, namingPort, discoveryContext.getSystemInformation().getHostname(),
+ absoluteConfigPath.getName(), productType, isRhqServer);
+ String version = productType.name() + " " + installInfo.getVersion();
+
+ return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, version, description,
+ pluginConfiguration, processInfo);
}
/**
@@ -379,7 +379,8 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
try {
installInfo = new JBossInstallationInfo(homeDir);
} catch (IOException e) {
- throw new IllegalStateException(e);
+ throw new IllegalStateException("Failed to determine installation info for JBoss home dir ["
+ + homeDir + "].", e);
}
File configDir = (File) server.getAttribute(configObjectName, "ServerHomeDir");
@@ -405,51 +406,70 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
// Now set default values on any props that are still not set.
setPluginConfigurationDefaults(pluginConfiguration);
- String resourceName = formatServerName(bindAddress, jnpPort, context.getSystemInformation()
- .getHostname(), configName, isRhqServer(configDir));
+ JBossProductType productType = installInfo.getProductType();
+ String name = formatServerName(bindAddress, jnpPort, context.getSystemInformation().getHostname(),
+ configName, productType, isRhqServer(configDir));
+ String description = productType.NAME +
+ " server that the RHQ Plugin Container is running within";
DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(),
- configDir.getAbsolutePath(), resourceName, version,
- "JBoss AS server that the RHQ Plugin Container is running within", pluginConfiguration, null);
+ configDir.getAbsolutePath(), name, version, description, pluginConfiguration, null);
return resource;
}
} catch (Exception e) {
- /* JBoss MBean doesn't exist - not a JBoss server. */
- if (log.isDebugEnabled())
- log.debug("Not detected to be embedded in a JBoss AS Server", e);
+ // JBoss MBean doesn't exist - not a JBoss server.
+ log.debug("Not detected to be embedded in a JBoss AS Server", e);
}
return null;
}
public String formatServerName(String bindingAddress, String jnpPort, String hostname, String configurationName,
- boolean isRhq) {
+ JBossProductType productType, boolean isRhq) {
+ StringBuilder serverName = new StringBuilder();
+
+ if (!isRhq) {
+ // prefix w/ product name (e.g. "AS" or "EAP")
+ serverName.append(productType.name()).append(' ');
+ }
+
+ String bindingHostname = getBindingHostname(bindingAddress);
+ if (bindingHostname != null) {
+ serverName.append(bindingHostname);
+ } else {
+ serverName.append(hostname);
+ }
+
+ if (jnpPort != null && !jnpPort.equals(CHANGE_ME)) {
+ serverName.append(':').append(jnpPort);
+ }
+ serverName.append(' ');
if (isRhq) {
- return hostname + " RHQ Server";
+ serverName.append("RHQ Server");
} else {
- String hostnameToUse = hostname;
+ serverName.append(configurationName);
+ }
- if (bindingAddress != null) {
- try {
- InetAddress bindAddr = InetAddress.getByName(bindingAddress);
- if (!bindAddr.isAnyLocalAddress()) {
- //if the binding address != 0.0.0.0
- hostnameToUse = bindAddr.getHostName();
- }
- } catch (UnknownHostException e) {
- //this should not happen?
- log.warn("Unknown hostname passed in as the binding address for JBoss AS server discovery: "
- + bindingAddress);
- }
- }
+ return serverName.toString();
+ }
- if (jnpPort != null && !jnpPort.equals(CHANGE_ME)) {
- hostnameToUse += ":" + jnpPort;
+ private String getBindingHostname(String bindingAddress) {
+ String bindingHostname = null;
+ if (bindingAddress != null) {
+ try {
+ InetAddress bindAddr = InetAddress.getByName(bindingAddress);
+ if (!bindAddr.isAnyLocalAddress()) {
+ //if the binding address != 0.0.0.0
+ bindingHostname = bindAddr.getHostName();
+ }
+ } catch (UnknownHostException e) {
+ //this should not happen?
+ log.warn("Unknown hostname passed in as the binding address for JBoss AS instance: "
+ + bindingAddress);
}
-
- return hostnameToUse + " " + configurationName;
}
+ return bindingHostname;
}
private static String getJnpURL(JBossInstanceInfo cmdLine, File installHome, File configDir) {
commit 664dc6e66fc82257d60c51837c495d60f873505f
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Dec 7 13:46:44 2011 -0500
change log messages from INFO to DEBUG to be consistent w/ other plugins
diff --git a/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java b/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java
index 0faecf2..bef2731 100644
--- a/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java
+++ b/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java
@@ -64,7 +64,7 @@ public class AgentDiscoveryComponent implements ResourceDiscoveryComponent, Reso
* @see ResourceDiscoveryComponent#discoverResources(ResourceDiscoveryContext)
*/
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) {
- log.info("Discovering RHQ Agent...");
+ log.debug("Discovering RHQ Agent...");
HashSet<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>();
diff --git a/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java b/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java
index eb58227..8cbd84e 100644
--- a/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java
+++ b/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java
@@ -52,7 +52,7 @@ public class ScriptDiscoveryComponent implements ResourceDiscoveryComponent, Man
private final Log log = LogFactory.getLog(ScriptDiscoveryComponent.class);
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) {
- log.info("Processing discovered management script resources");
+ log.debug("Processing discovered management script resources...");
HashSet<DiscoveredResourceDetails> details = new HashSet<DiscoveredResourceDetails>();
commit 30e90184edd8660d613fe9feffc94368e4c832f5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Dec 7 15:55:20 2011 +0100
Don't put @Stateless on the (abstract) super class.
Fix some fallout from refactoring the creation of the aggregate.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
index ce4dd43..ea901d1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
@@ -33,7 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Stateless;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
@@ -63,7 +62,6 @@ import org.rhq.enterprise.server.rest.domain.ResourceWithType;
* For the cache and its evicion policies see rhq-cache-service.xml
* @author Heiko W. Rupp
*/
-@Stateless
@javax.annotation.Resource(name="cache",type= TreeCacheMBean.class,mappedName = "RhqCache")
public class AbstractRestBean {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index 5934dbe..99dd6fe 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -133,7 +133,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
res.setMaxTimeStamp(maxTime);
res.setMinTimeStamp(minTime);
*/
- res = fill(list,scheduleId,hideEmpty);
+ fill(res, list,scheduleId,hideEmpty);
}
CacheControl cc = new CacheControl();
@@ -156,10 +156,10 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
return builder.build();
}
- private MetricAggregate fill(List<MeasurementDataNumericHighLowComposite> list,int scheduleId , boolean hideEmpty) {
+ private MetricAggregate fill(MetricAggregate res, List<MeasurementDataNumericHighLowComposite> list, int scheduleId,
+ boolean hideEmpty) {
long minTime=Long.MAX_VALUE;
long maxTime=0;
- MetricAggregate res = new MetricAggregate();
res.setScheduleId(scheduleId);
for (MeasurementDataNumericHighLowComposite c : list) {
@@ -214,8 +214,9 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
dataManager.findDataForContext(caller, EntityContext.forResource(sched.getResource().getId()),definitionId,startTime,endTime,dataPoints);
if (!listList.isEmpty()) {
List<MeasurementDataNumericHighLowComposite> list = listList.get(0);
- MetricAggregate ma = fill(list,scheduleId,hideEmpty);
- resList.add(ma);
+ MetricAggregate res = new MetricAggregate();
+ fill(res, list,scheduleId,hideEmpty);
+ resList.add(res);
}
else
throw new StuffNotFoundException("Metrics for schedule " + scheduleId);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
index 7e908ad..6631ef4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
@@ -22,6 +22,7 @@ import java.util.List;
import javax.ejb.Local;
import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -54,7 +55,7 @@ public interface MetricHandlerLocal {
Response getMetricData(@PathParam("scheduleId") int scheduleId,
@QueryParam("startTime") long startTime,
@QueryParam("endTime") long endTime,
- @QueryParam("dataPoints") int dataPoints,
+ @QueryParam("dataPoints") @DefaultValue("60") int dataPoints,
@QueryParam("hideEmpty") boolean hideEmpty,
@Context Request request,
@Context HttpHeaders headers);
commit 84f032252328434e01ac68d40bec34d102533d81
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Dec 7 13:54:34 2011 +0100
Use a custom java permission and an EJB interceptor to disallow server-side CLI scripts from accessing the EJBs directly.
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index e777e21..b125b3b 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -26,6 +26,7 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -40,6 +41,14 @@
section. -->
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
</dependencies>
<build>
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
index 5f3ff90..7fcdac3 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
@@ -20,6 +20,8 @@
package org.rhq.enterprise.client;
import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
import org.apache.commons.logging.Log;
@@ -54,11 +56,19 @@ public class LocalClientProxy extends AbstractRhqFacadeProxy<LocalClient> {
}
}
- protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, Object[] args) throws Throwable {
+ protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, final Object[] args) throws Throwable {
try {
- Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes);
-
- return realMethod.invoke(localSLSB, args);
+ final Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes);
+
+ //run this through the privileged block to elevate the privs of the script
+ //the scripts don't have the AllowEjbAccessPermission but this code has
+ //all perms.
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+ @Override
+ public Object run() throws Exception {
+ return realMethod.invoke(localSLSB, args);
+ }
+ });
} catch (NoSuchMethodException e) {
throw new IllegalArgumentException("Method [" + originalMethod + "] does not have a desimplified counterpart with arguments " + Arrays.asList(argTypes) + ".", e);
}
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessInterceptor.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessInterceptor.java
new file mode 100644
index 0000000..d3dcdb2
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessInterceptor.java
@@ -0,0 +1,45 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.client.security;
+
+import java.security.AccessController;
+import java.security.Permission;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AllowEjbAccessInterceptor {
+
+ private static final Permission PERM = new AllowEjbAccessPermission();
+
+ @AroundInvoke
+ public Object intercept(InvocationContext invocationContext) throws Exception {
+ //check that the caller has permissions to access the EJBs.
+ //normal code does, only alert CLI scripts that try to circumvent our
+ //manager proxies don't.
+ AccessController.checkPermission(PERM);
+ return invocationContext.proceed();
+ }
+}
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessPermission.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessPermission.java
new file mode 100644
index 0000000..19ee165
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/security/AllowEjbAccessPermission.java
@@ -0,0 +1,36 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.client.security;
+
+import java.security.BasicPermission;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AllowEjbAccessPermission extends BasicPermission {
+
+ private static final long serialVersionUID = 1L;
+
+ public AllowEjbAccessPermission() {
+ super("rhq.allow.ejb.access");
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
index 8222948..2700ae3 100644
--- a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
+++ b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml
@@ -9,6 +9,12 @@
<assembly-descriptor>
+ <!-- This interceptor checks that the alert CLI scripts don't try to circumvent our access objects by accessing the local SLSB beans directly. -->
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.rhq.enterprise.client.security.AllowEjbAccessInterceptor</interceptor-class>
+ </interceptor-binding>
+
<!-- all our EJB3 SLSBs can define custom @RequiredPermissions annotations for authorization checks-->
<interceptor-binding>
<ejb-name>*</ejb-name>
commit 95a713e15f42a5be3d800b800012482b8ee555c2
Merge: f74b119 bf5446c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Dec 7 12:04:38 2011 +0100
Merge remote-tracking branch 'origin/master' into feature/rest
commit bf5446c876c5d799a6fb58cf3c6a2e050a0c6390
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 6 17:03:30 2011 -0500
[BZ 755019] sort the deployment table
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
index 4f78a16..a1f2c13 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.types.SortDirection;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.grid.CellFormatter;
@@ -44,6 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFor
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
/**
* @author Greg Hinkle
@@ -60,6 +62,14 @@ public class BundleDeploymentListView extends Table<BundleDeploymentDataSource>
}
@Override
+ protected LocatableListGrid createListGrid(String locatorId) {
+ LocatableListGrid grid = super.createListGrid(locatorId);
+ grid.setSortField(BundleDeploymentDataSource.FIELD_DEPLOY_TIME);
+ grid.setSortDirection(SortDirection.DESCENDING);
+ return grid;
+ }
+
+ @Override
protected void configureTable() {
ListGridField idField = new ListGridField(BundleDeploymentDataSource.FIELD_ID, MSG.common_title_id());
ListGridField nameField = new ListGridField(BundleDeploymentDataSource.FIELD_NAME, MSG
commit 8a2f8f8caf0c10cfc279dc49a8526da44bb7702b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 6 16:23:05 2011 -0500
[BZ 755019] sort the deployment audit trail
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
index 749b042..63a10d7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
@@ -32,6 +32,7 @@ import com.smartgwt.client.types.DateDisplayFormat;
import com.smartgwt.client.types.ExpansionMode;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.types.SortDirection;
import com.smartgwt.client.types.VerticalAlignment;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
@@ -92,6 +93,8 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout {
grid.setCanExpandRecords(true);
grid.setExpansionMode(ExpansionMode.DETAIL_FIELD);
grid.setDetailField("message");
+ grid.setSortField("timestamp");
+ grid.setSortDirection(SortDirection.ASCENDING);
ListGridField action = new ListGridField("action", MSG.view_bundle_deploy_action());
action.setAutoFitWidth(true);
commit 64c7032453ec453246ffb3a9a2bcb664903be88e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 6 16:11:42 2011 -0500
[Bug 753866 - DB Upgrade needs more work for existing drift records]
This is to support RHQ 4.1 and 4.2 drift upgrades to 4.3. It adds
two Java upgrade tasks and puts them into the existing 2.115 step. (JON
note, JON3.0 already places the db at 2.116 and the previous
version of 2.115 was already sufficient for JON3.0 purposes. We *do not*
want these new changes applied to JON3.0 upgrades and so I did not
create a new schema task for this, on purpose.)
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java
index 27fee40..eb2f6a7 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java
@@ -560,6 +560,20 @@ public abstract class DatabaseType {
public abstract int getNextSequenceValue(Connection conn, String table, String key) throws SQLException;
/**
+ * A utility that returns the string for sequence use in an Insert statement
+ *
+ * @param conn The connection to use to get the sequence value.
+ * @param sequenceName The sequence name for the table.
+ *
+ * @return the sequence generating string
+ *
+ * @throws SQLException
+ */
+ public String getSequenceInsertValue(Connection conn, String sequenceName) {
+ return "nextval('" + sequenceName + "')";
+ }
+
+ /**
* Creates a sequence with the given name. Its initial value is specified along with its increment (both are
* specified as Strings).
*
@@ -570,13 +584,15 @@ public abstract class DatabaseType {
* @param seqIdCacheSize
* @throws SQLException
*/
- public void createSequence(Connection conn, String name, String initial, String increment, String seqIdCacheSize) throws SQLException {
+ public void createSequence(Connection conn, String name, String initial, String increment, String seqIdCacheSize)
+ throws SQLException {
CreateSequenceExprBuilder builder = CreateSequenceExprBuilder.getBuilder(this);
HashMap<String, Object> terms = new HashMap<String, Object>();
terms.put(CreateSequenceExprBuilder.KEY_SEQ_NAME, name);
terms.put(CreateSequenceExprBuilder.KEY_SEQ_START, initial);
terms.put(CreateSequenceExprBuilder.KEY_SEQ_INCREMENT, increment);
- terms.put(CreateSequenceExprBuilder.KEY_SEQ_CACHE_SIZE, CreateSequenceExprBuilder.getSafeSequenceCacheSize(builder, seqIdCacheSize));
+ terms.put(CreateSequenceExprBuilder.KEY_SEQ_CACHE_SIZE, CreateSequenceExprBuilder.getSafeSequenceCacheSize(
+ builder, seqIdCacheSize));
executeSql(conn, builder.build(terms));
}
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
index abf73a3..b4ea5e9 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
@@ -95,6 +95,10 @@ public abstract class OracleDatabaseType extends DatabaseType {
}
}
+ public String getSequenceInsertValue(Connection conn, String sequenceName) {
+ return sequenceName + ".NEXTVAL";
+ }
+
/**
* @see DatabaseType#getNextSequenceValue(Connection, String, String)
*/
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftPathDirectoryDatabaseUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftPathDirectoryDatabaseUpgradeTask.java
new file mode 100644
index 0000000..6b87331
--- /dev/null
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftPathDirectoryDatabaseUpgradeTask.java
@@ -0,0 +1,71 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.db.upgrade;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import mazz.i18n.Logger;
+
+import org.rhq.core.db.DatabaseType;
+import org.rhq.core.db.DbUtilsI18NFactory;
+import org.rhq.core.db.DbUtilsI18NResourceKeys;
+
+/**
+ * Database upgrade task 2.115 adds rhq_drift.path_directory column to store the directory portion of the path
+ * column. This code sets the value appropriately.
+ *
+ * @author Jay Shaughnessy
+ */
+public class DriftPathDirectoryDatabaseUpgradeTask implements DatabaseUpgradeTask {
+
+ private static final Logger LOG = DbUtilsI18NFactory.getLogger(DriftPathDirectoryDatabaseUpgradeTask.class);
+
+ public void execute(DatabaseType databaseType, Connection connection) throws SQLException {
+
+ Statement s = null;
+
+ try {
+ String sql = "select d.ID, d.PATH, d.PATH_DIRECTORY from RHQ_DRIFT d";
+ LOG.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, sql);
+
+ s = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
+ ResultSet rs = s.executeQuery(sql);
+
+ while (rs.next()) {
+ // note, this is guaranteed to be non-null and valid
+ String path = rs.getString(2);
+ String dir = getDir(path);
+ rs.updateString(3, dir);
+ rs.updateRow();
+ }
+ } finally {
+ databaseType.closeStatement(s);
+ }
+ }
+
+ private String getDir(String path) {
+ int i = path.lastIndexOf("/");
+ String result = (i != -1) ? path.substring(0, i) : "./";
+
+ return result;
+ }
+}
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
new file mode 100644
index 0000000..d060a2a
--- /dev/null
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
@@ -0,0 +1,65 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.db.upgrade;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import mazz.i18n.Logger;
+
+import org.rhq.core.db.DatabaseType;
+import org.rhq.core.db.DbUtilsI18NFactory;
+import org.rhq.core.db.DbUtilsI18NResourceKeys;
+
+/**
+ * Database upgrade task 2.115 adds the rhq_drift_def_template table. The table is initially populated here
+ * by using data in the to-be-removed rhq_drift_template_map table.
+ *
+ * @author Jay Shaughnessy
+ */
+public class DriftTemplateMapDatabaseUpgradeTask implements DatabaseUpgradeTask {
+
+ private static final Logger LOG = DbUtilsI18NFactory.getLogger(DriftPathDirectoryDatabaseUpgradeTask.class);
+
+ public void execute(DatabaseType databaseType, Connection connection) throws SQLException {
+
+ String sql = "" //
+ + " insert into RHQ_DRIFT_DEF_TEMPLATE (" //
+ + " ID," //
+ + " RESOURCE_TYPE_ID," //
+ + " CONFIG_ID," //
+ + " NAME," //
+ + " DESCRIPTION," //
+ + " IS_USER_DEFINED," //
+ + " CTIME )" //
+ + " select " + databaseType.getSequenceInsertValue(connection, "RHQ_DRIFT_DEF_TEMPLATE_ID_SEQ") + "," //
+ + " tm.RESOURCE_TYPE_ID, " //
+ + " ct.CONFIG_ID, " //
+ + " ct.NAME, " //
+ + " ct.DESCRIPTION, " //
+ + " " + databaseType.getBooleanValue(false) + "," //
+ + " " + System.currentTimeMillis() //
+ + " from RHQ_DRIFT_TEMPLATE_MAP tm " //
+ + " join RHQ_RESOURCE_TYPE rt on tm.RESOURCE_TYPE_ID = rt.ID" //
+ + " join RHQ_CONFIG_TEMPLATE ct on tm.CONFIG_TEMPLATE_ID = ct.ID";
+ LOG.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, sql);
+
+ databaseType.executeSql(connection, sql);
+ }
+}
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index fb2ed85..8f10a3b 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3781,12 +3781,11 @@
<!-- RHQ_DRIFT -->
<!-- Add new path_directory column -->
<schema-addColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" columnType="VARCHAR2" precision="1024" />
- <!-- TODO: This needs to be a java update step! -->
- <schema-directSQL>
- <statement desc="RHQ_DRIFT_DEFINITION: set drift_handling_mode column (normal)">
- UPDATE RHQ_DRIFT SET PATH_DIRECTORY = PATH
- </statement>
- </schema-directSQL>
+
+ <!-- Set the new path_directory column using the current path column values -->
+ <schema-javaTask className="DriftPathDirectoryDatabaseUpgradeTask" />
+
+ <!-- Now it is safe to set the new path_directory column not null -->
<schema-alterColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" nullable="FALSE" />
<!-- add new drift_set_id column and FK -->
@@ -3800,8 +3799,10 @@
</statement>
</schema-directSQL>
- <!-- TODO For RHQ 4.3: Java upgrade step to set path_directory from path in rhq_drift -->
- <!-- TODO For RHQ 4.3: Java upgrade step for rhq_drift_template_map conversion and removal -->
+ <!-- Morph rhq_drift_template_map rows into rhq_drift_def_template rows. The rhq_drift_template_map
+ table is obsolete. -->
+ <schema-javaTask className="DriftTemplateMapDatabaseUpgradeTask" />
+
</schemaSpec>
<schemaSpec version="2.116">
commit 16823b9934ea91e81e0b7102bd464a57875fe033
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 6 14:16:32 2011 -0500
[BZ 752550] remove old downloaded bundle files to help clean out the tmp directory
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java
index d240606..561e4a1 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java
@@ -23,6 +23,7 @@
package org.rhq.core.pc.bundle;
import java.io.File;
+import java.io.FileFilter;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.util.HashMap;
@@ -47,10 +48,10 @@ import org.rhq.core.domain.bundle.BundleDeploymentStatus;
import org.rhq.core.domain.bundle.BundleDestination;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory;
+import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory.Status;
import org.rhq.core.domain.bundle.BundleType;
import org.rhq.core.domain.bundle.BundleVersion;
import org.rhq.core.domain.bundle.ResourceTypeBundleConfiguration;
-import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory.Status;
import org.rhq.core.domain.bundle.ResourceTypeBundleConfiguration.BundleDestinationBaseDirectory;
import org.rhq.core.domain.content.PackageVersion;
import org.rhq.core.domain.resource.Resource;
@@ -72,6 +73,7 @@ import org.rhq.core.pluginapi.bundle.BundleManagerProvider;
import org.rhq.core.pluginapi.bundle.BundlePurgeResult;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.exception.ThrowableUtil;
+import org.rhq.core.util.file.FileUtil;
/**
* Manages the bundle subsystem, which allows bundles of content to be installed.
@@ -172,6 +174,12 @@ public class BundleManager extends AgentService implements BundleAgentService, B
File bundleFilesDir = new File(pluginTmpDir, "bundle-versions/"
+ bundleDeployment.getBundleVersion().getId());
bundleFilesDir.mkdirs();
+
+ // clean up any old downloads we may have retrieved before. This helps clean out
+ // our temp directory so we don't unnecessarily fill up our file system with obsolete files
+ removeOldDownloadedBundleFiles(bundleFilesDir);
+
+ // now download the bundle files we need for the current deployment
Map<PackageVersion, File> downloadedFiles = downloadBundleFiles(resourceDeployment,
bundleFilesDir);
@@ -311,6 +319,35 @@ public class BundleManager extends AgentService implements BundleAgentService, B
}
/**
+ * Given a directory where the current deployment's bundle files will reside, this method will clear out
+ * any other files located in other peer directories. In other words, the given directory and all its
+ * subdirectories and child files are left untouched, but all files and directories found in peer
+ * directories are wiped. This helps clean out our temp directory so we don't fill up the file system
+ * with old downloaded files that we don't need anymore. See BZ 752550.
+ *
+ * @param currentBundleVersionFilesDir
+ */
+ private void removeOldDownloadedBundleFiles(final File currentBundleVersionFilesDir) {
+ File parent = null;
+ try {
+ parent = currentBundleVersionFilesDir.getParentFile();
+ File[] doomedFiles = parent.listFiles(new FileFilter() {
+ public boolean accept(File child) {
+ return !currentBundleVersionFilesDir.equals(child);
+ }
+ });
+ for (File doomedFile : doomedFiles) {
+ FileUtil.purge(doomedFile, true);
+ }
+ } catch (Exception e) {
+ log.warn("Failed to clean up old downloaded bundle files in ["
+ + parent
+ + "]. You can ignore this but if the agent is asked to deploy a lot of bundles, the file system may fill up."
+ + " Cause: " + e);
+ }
+ }
+
+ /**
* Downloads the bundle's files into the bundle plugin's tmp directory and returns that tmp directory.
*
* @param resourceDeployment access to deployment information, including what bundle files need to be downloaded
commit 32e06f0466e3a6a440518c4bd72e21c012bd6afa
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 6 12:08:35 2011 -0500
[Bug 760209 - Drift Carousel not filtering the drift entries]
I think this broke when initial criteria handling changed in the
underlying Table implementation. The initial criteria was set correctly
but that was no longer applied directly to the grid, instead we now
manually perform the initial fetch. But that led to an overriden method
getting called to return the current criteria, which had yet to be
determined (it was thought to be needed on refresh only). So, the fix was
to immediately set the current criteria to the initial criteria in the
subclass.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java
index 47b5d3d..991ec84 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java
@@ -71,6 +71,7 @@ public class DriftCarouselMemberView extends DriftHistoryView implements Carouse
super(locatorId, null, context, hasWriteAccess, initialCriteria);
+ this.carouselCriteria = initialCriteria;
this.changeSet = driftChangeSet;
((DriftCarouselDataSource) getDataSource()).setChangeSetId(this.changeSet.getId());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
index 6ccbb17..f941c6f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
@@ -242,7 +242,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
}
changeSetCriteria.addFilterStartVersion(String.valueOf(startVersion));
- // apply the drift-level carousel filters in order to filter out changesets that have no applicab;e drift
+ // apply the drift-level carousel filters in order to filter out changesets that have no applicable drift
Criteria criteria = getCurrentCriteria();
DriftCategory[] driftCategoriesFilter = RPCDataSource.getArrayFilter(criteria,
DriftDataSource.FILTER_CATEGORIES, DriftCategory.class);
commit 83197699d41880beb6266fc47d38cbf201bce7a4
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 5 15:55:31 2011 -0500
[Bug 760145 - Drift snapshot displays wrong directory name on windows]
This is fairly bad as the paths get corrupted for all drift entries when
the basedir is a windows file system root (e.g. c:/ or d:/). There is
no workaround other than not using the file system root as the basedir.
I'm not sure, this may also happen using the a linux root "/" basedir.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 0ba5795..71ddf44 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -538,7 +538,13 @@ public class DriftDetector implements Runnable {
if (basedir.equals(file)) {
return ".";
}
- return file.getAbsolutePath().substring(basedir.getAbsolutePath().length() + 1);
+ String filePath = file.getAbsolutePath();
+ String basedirPath = basedir.getAbsolutePath();
+ int basedirLen = basedirPath.length();
+ if (!basedirPath.endsWith(File.separator)) {
+ ++basedirLen;
+ }
+ return filePath.substring(basedirLen);
}
private String sha256(File file) throws IOException {
commit 6f3d99d160c4910bffe16ada89b625fe251bea44
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 5 15:51:07 2011 -0500
[Bug 760289 - Excessive file scanning in drift detection when using includes filters]
Now, when using includes file paths limit the directory scanning to only
those included directories.
Note that using a "." as an includes path basically translates to using
the base directory, in which case the scan will be as it is now.
A future enhancement may be to analyze the pattern and decide
whether a recursive scan is necessary. Currently. So, using includes
patterns to just look for certain files in the base directory will
expose you to the full scan.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 3f32f1f..0ba5795 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -45,6 +45,7 @@ import org.rhq.common.drift.FileEntry;
import org.rhq.common.drift.Headers;
import org.rhq.core.domain.drift.DriftChangeSetCategory;
import org.rhq.core.domain.drift.DriftDefinition;
+import org.rhq.core.domain.drift.Filter;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.file.FileVisitor;
@@ -167,13 +168,12 @@ public class DriftDetector implements Runnable {
log.debug("Generating drift change set for " + schedule);
- File currentSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(),
- schedule.getDriftDefinition().getName(), COVERAGE);
+ File currentSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(), schedule.getDriftDefinition()
+ .getName(), COVERAGE);
File snapshotFile = currentSnapshot;
if (schedule.getDriftDefinition().isPinned()) {
snapshotFile = new File(snapshotFile.getParentFile(), "snapshot.pinned");
-
}
final File basedir = new File(basedir(schedule.getResourceId(), schedule.getDriftDefinition()));
@@ -203,43 +203,50 @@ public class DriftDetector implements Runnable {
}
// First look for files that have either been modified or deleted
- scanForModifiedOrDeletedFiles(schedule, basedir, processedFiles, snapshotEntries, deltaEntries, coverageReader);
+ scanForModifiedOrDeletedFiles(schedule, basedir, processedFiles, snapshotEntries, deltaEntries,
+ coverageReader);
} finally {
coverageReader.close();
}
// If the basedir is still valid we need to do a directory tree scan to look for newly added files
if (basedir.isDirectory()) {
- forEachFile(basedir, new FilterFileVisitor(basedir, schedule.getDriftDefinition().getIncludes(), schedule
- .getDriftDefinition().getExcludes(), new FileVisitor() {
- @Override
- public void visit(File file) {
- try {
- if (processedFiles.contains(file)) {
- return;
- }
+ DriftDefinition driftDef = schedule.getDriftDefinition();
+ List<Filter> includes = driftDef.getIncludes();
+ List<Filter> excludes = driftDef.getExcludes();
+
+ for (File dir : getScanDirectories(basedir, includes)) {
+ forEachFile(dir, new FilterFileVisitor(basedir, includes, excludes, new FileVisitor() {
+ @Override
+ public void visit(File file) {
+ try {
+ if (processedFiles.contains(file)) {
+ return;
+ }
- if (!file.canRead()) {
- if (log.isDebugEnabled()) {
- log.debug("Skipping " + file.getPath() + " since it is not readable.");
+ if (!file.canRead()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Skipping " + file.getPath() + " since it is not readable.");
+ }
+ return;
}
- return;
- }
- if (log.isInfoEnabled()) {
- log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
- }
+ if (log.isInfoEnabled()) {
+ log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
+ }
- FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file));
- deltaEntries.add(newEntry);
- snapshotEntries.add(newEntry);
- } catch (IOException e) {
- log.error("An error occurred while generating a drift change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException("An error occurred while generating a drift change set", e);
+ FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file));
+ deltaEntries.add(newEntry);
+ snapshotEntries.add(newEntry);
+ } catch (IOException e) {
+ log.error("An error occurred while generating a drift change set for " + schedule + ": "
+ + e.getMessage());
+ throw new DriftDetectionException("An error occurred while generating a drift change set",
+ e);
+ }
}
- }
- }));
+ }));
+ }
}
if (deltaEntries.isEmpty()) {
@@ -250,8 +257,8 @@ public class DriftDetector implements Runnable {
// the current snapshot to match the pinned snapshot. Note though
// that we increment the snapshot version in order to let the server
// know about the state change.
- if (schedule.getDriftDefinition().isPinned() && newVersion > 1 && !isPreviousChangeSetEmpty(
- schedule.getResourceId(), schedule.getDriftDefinition())) {
+ if (schedule.getDriftDefinition().isPinned() && newVersion > 1
+ && !isPreviousChangeSetEmpty(schedule.getResourceId(), schedule.getDriftDefinition())) {
currentSnapshot.delete();
File newSnapshot = updateCurrentSnapshot(schedule, snapshotEntries, newVersion);
@@ -259,8 +266,8 @@ public class DriftDetector implements Runnable {
// TODO report back to the server that we are back in compliance
}
} else {
- if (schedule.getDriftDefinition().isPinned() && newVersion > 1 &&
- isSameAsPreviousChangeSet(deltaEntries, currentSnapshot)) {
+ if (schedule.getDriftDefinition().isPinned() && newVersion > 1
+ && isSameAsPreviousChangeSet(deltaEntries, currentSnapshot)) {
// if we are still out of compliance just report, we report a
// repeat change set to indicate no changes but also still out
// of compliance.
@@ -276,6 +283,26 @@ public class DriftDetector implements Runnable {
}
}
+ private Set<File> getScanDirectories(final File basedir, List<Filter> includes) {
+
+ Set<File> directories = new HashSet<File>();
+
+ if (null == includes || includes.isEmpty()) {
+ directories.add(basedir);
+ } else {
+ for (Filter filter : includes) {
+ String path = filter.getPath();
+ if (".".equals(path)) {
+ directories.add(basedir);
+ } else {
+ directories.add(new File(basedir, path));
+ }
+ }
+ }
+
+ return directories;
+ }
+
private void scanForModifiedOrDeletedFiles(DriftDetectionSchedule schedule, File basedir, Set<File> processedFiles,
List<FileEntry> snapshotEntries, List<FileEntry> deltaEntries, ChangeSetReader coverageReader)
throws IOException {
@@ -312,6 +339,7 @@ public class DriftDetector implements Runnable {
}
}
+ @SuppressWarnings("unused")
private boolean isPreviousChangeSetEmpty(int resourceId, DriftDefinition definition) throws IOException {
File changeSet = changeSetMgr.findChangeSet(resourceId, definition.getName(), DRIFT);
if (!changeSet.exists()) {
@@ -337,15 +365,14 @@ public class DriftDetector implements Runnable {
}
private void updateDeltaSnapshot(DriftDetectionSummary summary, DriftDetectionSchedule schedule,
- List<FileEntry> deltaEntries, int newVersion, File oldSnapshot, File newSnapshot)
- throws IOException {
+ List<FileEntry> deltaEntries, int newVersion, File oldSnapshot, File newSnapshot) throws IOException {
ChangeSetWriter deltaWriter = null;
try {
Headers deltaHeaders = createHeaders(schedule, DRIFT, newVersion);
- File driftChangeSet = changeSetMgr.findChangeSet(schedule.getResourceId(),
- schedule.getDriftDefinition().getName(), DRIFT);
+ File driftChangeSet = changeSetMgr.findChangeSet(schedule.getResourceId(), schedule.getDriftDefinition()
+ .getName(), DRIFT);
deltaWriter = changeSetMgr.getChangeSetWriter(driftChangeSet, deltaHeaders);
summary.setDriftChangeSet(driftChangeSet);
@@ -376,10 +403,9 @@ public class DriftDetector implements Runnable {
try {
Headers snapshotHeaders = createHeaders(schedule, COVERAGE, newVersion);
- File newSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(),
- schedule.getDriftDefinition().getName(), COVERAGE);
- newSnapshotWriter = changeSetMgr.getChangeSetWriter(schedule.getResourceId(),
- snapshotHeaders);
+ File newSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(), schedule.getDriftDefinition()
+ .getName(), COVERAGE);
+ newSnapshotWriter = changeSetMgr.getChangeSetWriter(schedule.getResourceId(), snapshotHeaders);
for (FileEntry entry : snapshotEntries) {
newSnapshotWriter.write(entry);
@@ -411,19 +437,19 @@ public class DriftDetector implements Runnable {
return false;
}
switch (entry.getType()) {
- case FILE_ADDED:
- if (!entry.getNewSHA().equals(newEntry.getNewSHA())) {
- return false;
- }
- case FILE_CHANGED:
- if (!entry.getNewSHA().equals(newEntry.getNewSHA()) ||
- !entry.getOldSHA().equals(newEntry.getOldSHA())) {
- return false;
- }
- default: // FILE_REMOVED
- if (!entry.getOldSHA().equals(newEntry.getOldSHA())) {
- return false;
- }
+ case FILE_ADDED:
+ if (!entry.getNewSHA().equals(newEntry.getNewSHA())) {
+ return false;
+ }
+ case FILE_CHANGED:
+ if (!entry.getNewSHA().equals(newEntry.getNewSHA())
+ || !entry.getOldSHA().equals(newEntry.getOldSHA())) {
+ return false;
+ }
+ default: // FILE_REMOVED
+ if (!entry.getOldSHA().equals(newEntry.getOldSHA())) {
+ return false;
+ }
}
numEntries++;
}
@@ -443,9 +469,9 @@ public class DriftDetector implements Runnable {
if (!basedir.exists()) {
if (log.isWarnEnabled()) {
- log.warn("The base directory [" + basedir.getAbsolutePath() + "] for " + schedule + " does not " +
- "exist. You may want review the drift definition and verify that the value of the base " +
- "directory is in fact correct.");
+ log.warn("The base directory [" + basedir.getAbsolutePath() + "] for " + schedule + " does not "
+ + "exist. You may want review the drift definition and verify that the value of the base "
+ + "directory is in fact correct.");
}
summary.setBaseDirExists(false);
return;
@@ -477,9 +503,13 @@ public class DriftDetector implements Runnable {
}
private void doDirectoryScan(final DriftDetectionSchedule schedule, DriftDefinition driftDef, final File basedir,
- final ChangeSetWriter writer) {
- forEachFile(basedir, new FilterFileVisitor(basedir, driftDef.getIncludes(), driftDef.getExcludes(),
- new FileVisitor() {
+ final ChangeSetWriter writer) {
+
+ List<Filter> includes = driftDef.getIncludes();
+ List<Filter> excludes = driftDef.getExcludes();
+
+ for (File dir : getScanDirectories(basedir, includes)) {
+ forEachFile(dir, new FilterFileVisitor(basedir, includes, excludes, new FileVisitor() {
@Override
public void visit(File file) {
try {
@@ -501,6 +531,7 @@ public class DriftDetector implements Runnable {
}
}
}));
+ }
}
private String relativePath(File basedir, File file) {
commit be9d41a3a6e8be965b5d016bea666c38af29b31c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 5 11:08:25 2011 -0500
[Bug 760105 - Drift: Unchecking the 'File Changed' option in 'Category' drop-down in the carousel view displays Globally uncaught exception]
This had to do with the filtering leaving no eligible snapshots.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
index 544ef81..6ccbb17 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
@@ -167,7 +167,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
break;
}
}
- if (null == maxSnapshotVersion || maxSnapshotVersion < carouselStart) {
+ if (null == maxSnapshotVersion || null == carouselStart || maxSnapshotVersion < carouselStart) {
maxSnapshotVersion = carouselStart;
setCarouselStartFilterMax(maxSnapshotVersion);
}
commit bfb46035204786e3e1297a41cdb1eede7e901e77
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Dec 5 16:43:27 2011 +0100
[BZ 760148] - Use the unprivileged method introduced by the commit
0589b9ee8488bd1 for BZ 694892 for obtaining the version info upon
the CLI login.
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
index 3ce9598..2f4c640 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
@@ -115,7 +115,7 @@ public class LoginCommand implements ClientCommand {
Subject subject = remoteClient.login(username, password);
- ProductInfo info = remoteClient.getSystemManager().getServerDetails(subject).getProductInfo();
+ ProductInfo info = remoteClient.getSystemManager().getProductInfo(subject);
String version = info.getVersion()
+ " (" + info.getBuildNumber() + ")";
client.getPrintWriter().println("Remote server version is: " + version);
commit 69e2b1d81dc42b0bfc12ee8e32b08d7b2beba38d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Dec 2 13:52:59 2011 -0500
[Bug 759485 - Error viewing live data in the resource metric graph portlet]
- Fixed the live graph code to throw out metric requests returning no values
- Fixed CpuComponent to return valid data on a live metric request, instead
of null.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
index 01284cc..5076804 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
import java.util.Date;
+import java.util.Iterator;
import java.util.Set;
import ca.nanometrics.gflot.client.Axis;
@@ -81,6 +82,7 @@ public class LiveGraphView extends LocatableVLayout {
private SimplePlot plot;
private Timer dataLoader;
+ @SuppressWarnings("unused")
private long min, max;
public LiveGraphView(String locatorId) {
@@ -231,7 +233,12 @@ public class LiveGraphView extends LocatableVLayout {
}
public void onSuccess(Set<MeasurementData> result) {
- MeasurementDataNumeric d = (MeasurementDataNumeric) result.iterator().next();
+ Iterator<MeasurementData> i = result.iterator();
+ if (!i.hasNext()) {
+ return;
+ }
+
+ MeasurementDataNumeric d = (MeasurementDataNumeric) i.next();
handler.add(new DataPoint(d.getTimestamp(), d.getValue()));
plot.redraw();
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java
index d5bc264..f045126 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java
@@ -124,14 +124,15 @@ public class CpuComponent implements ResourceComponent<PlatformComponent>, Measu
CpuEntry previousCpu = cpuCache.put(property, currentCpu);
previousCpu = (null == previousCpu) ? startCpuEntry : previousCpu;
- // if for some reason the delta time is excessive then toss
- // the metric, since it depends on a reasonable interval between
- // prev and curr. This can happen due to avail down or a newly
- // activated metric. Allow up to twice the metric interval.
+ // if for some reason the delta time is excessive then toss the metric, since it depends
+ // on a reasonable interval between prev and curr. This can happen due to avail down or a newly
+ // activated metric. Allow up to twice the metric interval. If the metric interval is
+ // 0 (for a live data request) then just use a 10 minute interval.
Number num = null;
long deltaTime = currentCpu.getTimestamp() - previousCpu.getTimestamp();
+ long metricInterval = (0 < request.getInterval()) ? request.getInterval() : 600000L;
- if (deltaTime <= (2 * request.getInterval())) {
+ if (deltaTime <= (2 * metricInterval)) {
// Use the same calculation that SIGAR uses to generate the percentages. The difference is that
// we use a safe "previous" cpu record.
num = getPercentage(previousCpu.getCpu(), cpu, property);
commit 024946c9b0969f316428740a780180e1dfd322ed
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Dec 2 12:31:33 2011 -0500
Utility that examines jar files and/or directories and will print out
packages that are found in more than one jar file. To use it:
java -cp test-utils.jar org.rhq.test.DuplicatePackagesDetector <list of jar files or directories>
You can optionally set the system prop in -Drhq.verbose for extra messages.
If you do not pass in any arguments, it will default to your local maven
repo. Specifically, it will default to "$HOME/.m2/repository/orq/rhq".
diff --git a/modules/test-utils/src/main/java/org/rhq/test/DuplicatePackagesDetector.java b/modules/test-utils/src/main/java/org/rhq/test/DuplicatePackagesDetector.java
new file mode 100644
index 0000000..ec6820a
--- /dev/null
+++ b/modules/test-utils/src/main/java/org/rhq/test/DuplicatePackagesDetector.java
@@ -0,0 +1,194 @@
+package org.rhq.test;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+/**
+ * This will walk a set of jar files and directories and print out
+ * packages that are found in more than one jar file.
+ *
+ * @author John Mazzitelli
+ */
+public class DuplicatePackagesDetector {
+
+ static Visitor visitor;
+
+ static boolean verbose = Boolean.getBoolean("rhq.verbose");
+
+ private static void debug(String msg) {
+ if (verbose) {
+ System.out.println(msg);
+ }
+ }
+
+ /**
+ * Each argument is the name of a .jar file or a directory that will
+ * be walked looking for jar files.
+ */
+ public static void main(String[] args) {
+ visitor = new Visitor();
+
+ if (args.length == 0) {
+ // no arguments given, try to use the user's local maven repo of all the RHQ libraries
+ String homeEnv = System.getenv("HOME");
+ if (homeEnv != null && homeEnv.length() > 0) {
+ String s = File.separator;
+ args = new String[] { homeEnv + s + ".m2" + s + "repository" + s + "org" + s + "rhq" };
+ }
+ }
+
+ for (String arg : args) {
+ File file = new File(arg);
+ debug("Processing [" + file.getAbsolutePath() + "]...");
+ if (file.exists()) {
+ if (file.isDirectory()) {
+ processDirectory(file);
+ } else {
+ processFile(file);
+ }
+ } else {
+ System.err.println("File does not exist: " + arg);
+ }
+
+ }
+
+ // print out what we've found
+ System.out.println("======================================================================");
+ Map<String, Set<String>> map = visitor.getMap(); // key=dir (pkg) name; value=list of jars where dir is
+ for (Entry<String, Set<String>> entry : map.entrySet()) {
+ String packageName = entry.getKey();
+ Set<String> jarFiles = entry.getValue();
+ if (jarFiles.size() > 1 || verbose) {
+ System.out.println(packageName);
+ for (String jarFile : jarFiles) {
+ System.out.println("\t" + jarFile);
+ }
+ }
+ }
+ }
+
+ public static void processDirectory(File dir) {
+ File[] dirEntries = dir.listFiles();
+ if (dirEntries != null) {
+ for (File dirEntry : dirEntries) {
+ if (dirEntry.isDirectory()) {
+ processDirectory(dirEntry);
+ } else {
+ processFile(dirEntry);
+ }
+ }
+ }
+ }
+
+ public static void processFile(File file) {
+ // if its not a .jar file, ignore it
+ if (!file.getName().endsWith(".jar")) {
+ debug("Not a jar file, skipping [" + file.getAbsolutePath() + "]");
+ return;
+ }
+
+ try {
+ walkZipFile(file, visitor);
+ } catch (Exception e) {
+ System.err.println("Cannot process jar file [" + file + "]:" + e.toString());
+ }
+ }
+
+ /**
+ * Walks the entries of a zip file, allowing a listener to "visit" each node and perform tasks on
+ * the zip entry.
+ *
+ * @param zipFile the zip file to walk
+ * @param visitor the object that will be notified for each entry in the zip file
+ *
+ * @throws Exception if any errors occur during the reading or visiting
+ */
+ public static void walkZipFile(File zipFile, Visitor visitor) throws Exception {
+ FileInputStream fis = new FileInputStream(zipFile);
+ try {
+ InputStream zipContent = new BufferedInputStream(fis);
+ try {
+ ZipInputStream zis = new ZipInputStream(zipContent);
+
+ ZipEntry e;
+ while ((e = zis.getNextEntry()) != null) {
+ boolean keepGoing = visitor
+ .visit(e, zis, (verbose) ? zipFile.getAbsolutePath() : zipFile.getName());
+ if (!keepGoing) {
+ break; // visitor told us to stop
+ }
+ }
+ } finally {
+ zipContent.close();
+ }
+ } finally {
+ fis.close();
+ }
+ }
+
+ public static class Visitor {
+ // keyed on directory name - the value is all the jar files that had that directory in it
+ private Map<String, Set<String>> map = new HashMap<String, Set<String>>();
+
+ public Map<String, Set<String>> getMap() {
+ return map;
+ }
+
+ /**
+ * Visits a specific zip file entry. Implementations can read the entry content from the given stream but
+ * must <b>not</b> close the stream - the caller of this method will handle the lifecycle of the stream.
+ *
+ * @param entry the entry being visited
+ * @param stream the stream containing the zip content
+ * @param zipFilePath the actual zip file that is being walked
+ * @return the visitor should return <code>true</code> if everything is OK and processing of the zip content
+ * should continue; returning <code>false</code> will tell the walker to abort further traversing
+ * of the zip content.
+ * @throws Exception if the visitation failed for some reason - this will abort further walking of the zip content
+ */
+ public boolean visit(ZipEntry entry, ZipInputStream stream, String zipFilePath) throws Exception {
+ if (!entry.isDirectory()) {
+ String[] dirAndName = splitPathName(entry.getName());
+ if (dirAndName != null) {
+ String dirName = dirAndName[0];
+ Set<String> zipFilePaths = map.get(dirName);
+ if (zipFilePaths == null) {
+ zipFilePaths = new HashSet<String>();
+ map.put(dirName, zipFilePaths);
+ }
+ zipFilePaths.add(zipFilePath);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Splits the path from the filename and returns as a 2-dimension array.
+ * If the full name does NOT end with .class, <code>null</code> is returned.
+ * Thus, this only processes Java classes.
+ * @param fullname the name to split
+ * @return first element is the path, second element is the filename
+ */
+ private String[] splitPathName(String fullname) {
+ if (fullname.endsWith(".class")) {
+ int lastSlash = fullname.lastIndexOf('/');
+ if (lastSlash >= 0) {
+ return new String[] { fullname.substring(0, lastSlash), fullname.substring(lastSlash + 1) };
+ } else {
+ return new String[] { "", fullname };
+ }
+ } else {
+ return null;
+ }
+ }
+ }
+}
commit 2b26d4412f3fbc28f4131efa7732f3f5e31e4955
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 1 18:04:18 2011 -0500
[BZ 759173] rename package name so we don't have the same package in different signed jars
diff --git a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java
index 9b18acb..74f7ab8 100644
--- a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java
+++ b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java
@@ -7,7 +7,7 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.client.RemoteClient;
+import org.rhq.enterprise.clientapi.RemoteClient;
import org.rhq.enterprise.server.resource.ResourceManagerRemote;
/**
diff --git a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java
index 9f91c88..77d8f24 100644
--- a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java
+++ b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java
@@ -12,7 +12,7 @@ import org.jboss.seam.annotations.web.RequestParameter;
import org.jboss.seam.core.Conversation;
import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.client.RemoteClient;
+import org.rhq.enterprise.clientapi.RemoteClient;
import org.rhq.enterprise.server.auth.SubjectManagerRemote;
/**
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
index 27af798..191c537 100755
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -46,6 +46,7 @@ import mazz.i18n.Msg;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.client.commands.ClientCommand;
import org.rhq.enterprise.client.commands.ScriptCommand;
+import org.rhq.enterprise.clientapi.RemoteClient;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java
index abbc496..f51e148 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java
@@ -44,6 +44,7 @@ import jline.ConsoleReader;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.client.utility.ReflectionUtility;
+import org.rhq.enterprise.clientapi.RemoteClientProxy;
/**
* A Contextual JavaScript interactive completor. Not perfect, but
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
index cac73a2..3ce9598 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
@@ -30,7 +30,7 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.core.domain.common.ServerDetails;
import org.rhq.enterprise.client.ClientMain;
-import org.rhq.enterprise.client.RemoteClient;
+import org.rhq.enterprise.clientapi.RemoteClient;
import org.rhq.enterprise.server.system.ServerVersion;
/**
diff --git a/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java b/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
index 815629d..4120f2d 100644
--- a/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
+++ b/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
@@ -11,8 +11,8 @@ import java.util.ArrayList;
import org.testng.annotations.Test;
import org.rhq.enterprise.client.ClientMain;
-import org.rhq.enterprise.client.RemoteClient;
import org.rhq.enterprise.client.commands.ScriptCommand;
+import org.rhq.enterprise.clientapi.RemoteClient;
import org.rhq.enterprise.server.alert.AlertManagerRemote;
import org.rhq.enterprise.server.alert.AlertDefinitionManagerRemote;
import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote;
diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java
deleted file mode 100644
index bb0205b..0000000
--- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.client;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.jboss.remoting.Client;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.security.SSLSocketBuilder;
-import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker;
-
-import org.rhq.bindings.client.RhqFacade;
-import org.rhq.bindings.client.RhqManagers;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.communications.util.SecurityUtil;
-import org.rhq.enterprise.server.alert.AlertDefinitionManagerRemote;
-import org.rhq.enterprise.server.alert.AlertManagerRemote;
-import org.rhq.enterprise.server.auth.SubjectManagerRemote;
-import org.rhq.enterprise.server.authz.RoleManagerRemote;
-import org.rhq.enterprise.server.bundle.BundleManagerRemote;
-import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote;
-import org.rhq.enterprise.server.content.ContentManagerRemote;
-import org.rhq.enterprise.server.content.RepoManagerRemote;
-import org.rhq.enterprise.server.discovery.DiscoveryBossRemote;
-import org.rhq.enterprise.server.drift.DriftManagerRemote;
-import org.rhq.enterprise.server.drift.DriftTemplateManagerRemote;
-import org.rhq.enterprise.server.event.EventManagerRemote;
-import org.rhq.enterprise.server.install.remote.RemoteInstallManagerRemote;
-import org.rhq.enterprise.server.measurement.AvailabilityManagerRemote;
-import org.rhq.enterprise.server.measurement.CallTimeDataManagerRemote;
-import org.rhq.enterprise.server.measurement.MeasurementBaselineManagerRemote;
-import org.rhq.enterprise.server.measurement.MeasurementDataManagerRemote;
-import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerRemote;
-import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerRemote;
-import org.rhq.enterprise.server.operation.OperationManagerRemote;
-import org.rhq.enterprise.server.report.DataAccessManagerRemote;
-import org.rhq.enterprise.server.resource.ResourceFactoryManagerRemote;
-import org.rhq.enterprise.server.resource.ResourceManagerRemote;
-import org.rhq.enterprise.server.resource.ResourceTypeManagerRemote;
-import org.rhq.enterprise.server.resource.group.ResourceGroupManagerRemote;
-import org.rhq.enterprise.server.search.SavedSearchManagerRemote;
-import org.rhq.enterprise.server.support.SupportManagerRemote;
-import org.rhq.enterprise.server.sync.SynchronizationManagerRemote;
-import org.rhq.enterprise.server.system.SystemManagerRemote;
-import org.rhq.enterprise.server.tagging.TagManagerRemote;
-
-/**
- * A remote access client that provides transparent servlet-based proxies to an RHQ Server.
- *
- * @author Greg Hinkle
- * @author Simeon Pinder
- * @author Jay Shaughnessy
- * @author John Mazzitelli
- */
-public class RemoteClient implements RhqFacade {
-
- private static final Log LOG = LogFactory.getLog(RemoteClient.class);
-
- public static final String NONSECURE_TRANSPORT = "servlet";
- public static final String SECURE_TRANSPORT = "sslservlet";
-
- private String transport;
- private final String host;
- private final int port;
- private boolean loggedIn;
- private boolean connected;
- private Map<String, Object> managers;
- private Subject subject;
- private Client remotingClient;
- private String subsystem = null;
-
- /**
- * Creates a client that will communicate with the server running on the given host
- * listening on the given port. This constructor will not attempt to connect or login
- * to the remote server - use {@link #login(String, String)} for that.
- *
- * @param host
- * @param port
- */
- public RemoteClient(String host, int port) {
- this(null, host, port);
- }
-
- /**
- * Creates a client that will communicate with the server running on the given host
- * listening on the given port over the given transport.
- * This constructor will not attempt to connect or login
- * to the remote server - use {@link #login(String, String)} for that.
- *
- * @param transport valid values are "servlet" and "sslservlet" - if <code>null</code>,
- * sslservlet will be used for ports that end with "443", servlet otherwise
- * @param host
- * @param port
- */
- public RemoteClient(String transport, String host, int port) {
- this(transport, host, port, null);
- }
-
- public RemoteClient(String transport, String host, int port, String subsystem) {
- this.transport = (transport != null) ? transport : guessTransport(port);
- this.host = host;
- this.port = port;
- this.subsystem = subsystem;
- }
-
- /**
- * Connects to the remote server and logs in with the given credentials.
- * After successfully executing this, {@link #isLoggedIn()} will be <code>true</code>
- * and {@link #getSubject()} will return the subject that this method returns.
- *
- * @param user
- * @param password
- *
- * @return the logged in user
- *
- * @throws Exception if failed to connect to the server or log in
- */
- public Subject login(String user, String password) throws Exception {
-
- logout();
- doConnect();
-
- this.subject = getSubjectManager().login(user, password);
- this.loggedIn = true;
-
- return this.subject;
- }
-
- /**
- * Logs out from the server and disconnects this client.
- */
- public void logout() {
- try {
- if (this.loggedIn && this.subject != null) {
- getSubjectManager().logout(this.subject);
- }
- } catch (Exception e) {
- // just keep going so we can disconnect this client
- }
-
- doDisconnect();
-
- this.subject = null;
- this.loggedIn = false;
- }
-
- /**
- * Connects to the remote server but does not establish a user session. This can be used
- * with the limited API that does not require a Subject.
- *
- * After successfully executing this, {@link #isConnected()} will be <code>true</code>
- * and {@link #getSubject()} will return the subject that this method returns.
- * @throws Exception if failed to connect to the server or log in
- */
- public void connect() throws Exception {
- if (this.loggedIn) {
- String name = (null == this.subject) ? "" : this.subject.getName();
- throw new IllegalStateException("User " + name + " must log out before connection can be established.");
- }
-
- doDisconnect();
- doConnect();
- this.connected = true;
- }
-
- /**
- * Disconnect from the server.
- */
- public void disconnect() {
- if (this.loggedIn) {
- String name = (null == this.subject) ? "" : this.subject.getName();
- throw new IllegalStateException("User " + name + " is logged in. Call logout() instead of disconnect().");
- }
-
- doDisconnect();
- this.connected = false;
- }
-
- /**
- * Returns <code>true</code> if and only if this client successfully connected
- * to the remote server and the user successfully logged in.
- *
- * @return if the user was able to connect and log into the server
- */
- public boolean isLoggedIn() {
- return this.loggedIn;
- }
-
- /**
- * Returns <code>true</code> if and only if this client successfully connected
- * to the remote server.
- *
- * @return if the user was able to connect and log into the server
- */
- public boolean isConnected() {
- return this.connected;
- }
-
- /**
- * Returns the information on the user that is logged in.
- * May be <code>null</code> if the user never logged in successfully.
- *
- * @return user information or <code>null</code>
- */
- public Subject getSubject() {
- return this.subject;
- }
-
- public String getHost() {
- return this.host;
- }
-
- public int getPort() {
- return this.port;
- }
-
- public String getTransport() {
- return transport;
- }
-
- protected String guessTransport(int port) {
- return String.valueOf(port).endsWith("443") ? SECURE_TRANSPORT : NONSECURE_TRANSPORT;
- }
-
- /**
- * Sets the underlying transport to use to communicate with the server.
- * Available transports are "servlet" and "sslservlet".
- * If you set it to <code>null</code>, then the transport to be used will
- * be set appropriately for the {@link #getPort()} (e.g. a secure transport
- * will be used for ports that end with 443, a non-secure transport will be
- * used for all other ports).
- *
- * @param transport
- */
- public void setTransport(String transport) {
- this.transport = transport;
- }
-
- public AlertManagerRemote getAlertManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.AlertManager);
- }
-
- public AlertDefinitionManagerRemote getAlertDefinitionManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.AlertDefinitionManager);
- }
-
- public AvailabilityManagerRemote getAvailabilityManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.AvailabilityManager);
- }
-
- public BundleManagerRemote getBundleManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.BundleManager);
- }
-
- public CallTimeDataManagerRemote getCallTimeDataManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.CallTimeDataManager);
- }
-
- public DriftManagerRemote getDriftManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.DriftManager);
- }
-
- public DriftTemplateManagerRemote getDriftTemplateManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.DriftTemplateManager);
- }
-
- public RepoManagerRemote getRepoManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.RepoManager);
- }
-
- public ConfigurationManagerRemote getConfigurationManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.ConfigurationManager);
- }
-
- public ContentManagerRemote getContentManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.ContentManager);
- }
-
- public DataAccessManagerRemote getDataAccessManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.DataAccessManager);
- }
-
- public DiscoveryBossRemote getDiscoveryBoss() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.DiscoveryBoss);
- }
-
- public EventManagerRemote getEventManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.EventManager);
- }
-
- public MeasurementBaselineManagerRemote getMeasurementBaselineManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.MeasurementBaselineManager);
- }
-
- public MeasurementDataManagerRemote getMeasurementDataManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.MeasurementDataManager);
- }
-
- public MeasurementDefinitionManagerRemote getMeasurementDefinitionManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.MeasurementDefinitionManager);
- }
-
- public MeasurementScheduleManagerRemote getMeasurementScheduleManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.MeasurementScheduleManager);
- }
-
- public OperationManagerRemote getOperationManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.OperationManager);
- }
-
- public ResourceManagerRemote getResourceManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.ResourceManager);
- }
-
- public ResourceFactoryManagerRemote getResourceFactoryManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.ResourceFactoryManager);
- }
-
- public ResourceGroupManagerRemote getResourceGroupManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.ResourceGroupManager);
- }
-
- public ResourceTypeManagerRemote getResourceTypeManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.ResourceTypeManager);
- }
-
- public RoleManagerRemote getRoleManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.RoleManager);
- }
-
- public SavedSearchManagerRemote getSavedSearchManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.SavedSearchManager);
- }
-
- public SubjectManagerRemote getSubjectManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.SubjectManager);
- }
-
- public SupportManagerRemote getSupportManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.SupportManager);
- }
-
- public SystemManagerRemote getSystemManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.SystemManager);
- }
-
- public RemoteInstallManagerRemote getRemoteInstallManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.RemoteInstallManager);
- }
-
- public TagManagerRemote getTagManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.TagManager);
- }
-
- public SynchronizationManagerRemote getSynchronizationManager() {
- return RemoteClientProxy.getProcessor(this, RhqManagers.SynchronizationManager);
- }
-
- /**
- * Returns the map of all remote managers running in the server that this
- * client can talk to.
- *
- * @return Map K=manager name V=remote proxy
- */
- public Map<String, Object> getManagers() {
- if (this.managers == null) {
-
- this.managers = new HashMap<String, Object>();
-
- for (RhqManagers manager : RhqManagers.values()) {
- try {
- Method m = this.getClass().getMethod("get" + manager.name());
- if (manager.enabled()) {
- this.managers.put(manager.name(), m.invoke(this));
- }
- } catch (Throwable e) {
- LOG.error("Failed to load manager " + manager + " due to missing class.", e);
- }
- }
- }
-
- return this.managers;
- }
-
- @Override
- public String toString() {
- return this.getClass().getSimpleName() + "[" + "transport=" + transport + ", host=" + host + ", port=" + port
- + ", subsystem=" + subsystem + ", connected=" + connected + ", loggedIn=" + loggedIn + ", subject="
- + subject + ']';
- }
-
- /**
- * Returns the internal JBoss/Remoting client used to perform the low-level
- * comm with the server.
- *
- * This is package-scoped so the proxy can use it.
- *
- * @return remoting client used to talk to the server
- */
- Client getRemotingClient() {
- return this.remotingClient;
- }
-
- private void doDisconnect() {
- try {
- if (this.remotingClient != null && this.remotingClient.isConnected()) {
- this.remotingClient.disconnect();
- }
- } catch (Exception e) {
- LOG.warn(e); // TODO what to do here?
- } finally {
- this.remotingClient = null;
- }
- }
-
- private void doConnect() throws Exception {
- String locatorURI = this.transport + "://" + this.host + ":" + this.port
- + "/jboss-remoting-servlet-invoker/ServerInvokerServlet";
- InvokerLocator locator = new InvokerLocator(locatorURI);
-
- String subsystem = "REMOTEAPI";
- if ((this.subsystem != null) && (this.subsystem.trim().equalsIgnoreCase("WSREMOTEAPI"))) {
- subsystem = "WSREMOTEAPI";
- }
- Map<String, String> remotingConfig = buildRemotingConfig(locatorURI);
- this.remotingClient = new Client(locator, subsystem, remotingConfig);
- this.remotingClient.connect();
- }
-
- private Map<String, String> buildRemotingConfig(String locatorURI) {
- Map<String, String> config = new HashMap<String, String>();
- if (SecurityUtil.isTransportSecure(locatorURI)) {
- setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH, "data/keystore.dat");
- setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_STORE_ALGORITHM, "SunX509");
- setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_STORE_TYPE, "JKS");
- setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD, "password");
- setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_PASSWORD, "password");
- setConfigProp(config, SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH, null);
- setConfigProp(config, SSLSocketBuilder.REMOTING_TRUST_STORE_ALGORITHM, null);
- setConfigProp(config, SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE, null);
- setConfigProp(config, SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD, null);
- setConfigProp(config, SSLSocketBuilder.REMOTING_SSL_PROTOCOL, null);
- setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_ALIAS, "self");
- setConfigProp(config, SSLSocketBuilder.REMOTING_SERVER_AUTH_MODE, "false");
- config.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
-
- // since we do not know the server's client-auth mode, assume we need a keystore and let's make sure we have one
- SSLSocketBuilder dummy_sslbuilder = new SSLSocketBuilder(); // just so we can test finding our keystore
- try {
- // this allows the configured keystore file to be a URL, file path or a resource relative to our classloader
- dummy_sslbuilder.setKeyStoreURL(config.get(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH));
- } catch (Exception e) {
- // this probably is due to the fact that the keystore doesn't exist yet - let's prepare one now
- SecurityUtil.createKeyStore(config.get(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH),
- config.get(SSLSocketBuilder.REMOTING_KEY_ALIAS), "CN=RHQ, OU=RedHat, O=redhat.com, C=US",
- config.get(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD),
- config.get(SSLSocketBuilder.REMOTING_KEY_PASSWORD), "DSA", 36500);
-
- // now try to set it again, if an exception is still thrown, it's an unrecoverable error
- dummy_sslbuilder.setKeyStoreURL(config.get(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH));
- }
-
- // in case the transport floats over https - we want to make sure a hostname verifier is installed and allows all hosts
- config.put(HTTPSClientInvoker.IGNORE_HTTPS_HOST, "true");
- }
- return config;
- }
-
- /**
- * Looks up the prop name in system properties and puts the value in the map. If the property
- * isn't set, the given default is used. If the given default is null and the property isn't
- * set, then the map is not populated.
- *
- * @param configMap
- * @param propName
- * @param defaultValue
- */
- private void setConfigProp(Map<String, String> configMap, String propName, String defaultValue) {
- String propValue = System.getProperty(propName, defaultValue);
- if (propValue != null) {
- configMap.put(propName, propValue);
- }
- return;
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java
deleted file mode 100644
index 38dec8b..0000000
--- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.client;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.jboss.remoting.invocation.NameBasedInvocation;
-
-import org.rhq.bindings.client.AbstractRhqFacadeProxy;
-import org.rhq.bindings.client.RhqManagers;
-import org.rhq.bindings.util.InterfaceSimplifier;
-import org.rhq.core.server.ExternalizableStrategy;
-
-/**
- * This class acts as a local SLSB proxy to make remote invocations
- * to SLSB Remotes over a remoting invoker.
- *
- * @author Greg Hinkle
- * @author Lukas Krejci
- */
-public class RemoteClientProxy extends AbstractRhqFacadeProxy<RemoteClient> {
-
- private static final Log LOG = LogFactory.getLog(RemoteClientProxy.class);
-
- public RemoteClientProxy(RemoteClient client, RhqManagers manager) {
- super(client, manager);
- }
-
- public Class<?> getRemoteInterface() {
- return this.getManager().remote();
- }
-
- @SuppressWarnings("unchecked")
- public static <T> T getProcessor(RemoteClient remoteClient, RhqManagers manager) {
- try {
- RemoteClientProxy gpc = new RemoteClientProxy(remoteClient, manager);
-
- Class<?> intf = InterfaceSimplifier.simplify(manager.remote());
-
- return (T) Proxy
- .newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[] { intf }, gpc);
- } catch (Exception e) {
- throw new RuntimeException("Failed to get remote connection proxy", e);
- }
- }
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- try {
- return super.invoke(proxy, method, args);
- } catch (Throwable t) {
- LOG.debug(t);
- throw t;
- }
- }
-
- protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, Object[] args) throws Throwable {
- ExternalizableStrategy.setStrategy(ExternalizableStrategy.Subsystem.REFLECTIVE_SERIALIZATION);
-
- String methodName = getManager().beanName() + ":" + originalMethod.getName();
-
- String[] paramSig = createParamSignature(argTypes);
-
- NameBasedInvocation request = new NameBasedInvocation(methodName, args, paramSig);
-
- Object response = getRhqFacade().getRemotingClient().invoke(request);
-
- if (response instanceof Throwable) {
- throw (Throwable) response;
- }
-
- return response;
- }
-
- private String[] createParamSignature(Class<?>[] types) {
- String[] paramSig = new String[types.length];
- for (int x = 0; x < types.length; x++) {
- paramSig[x] = types[x].getName();
- }
- return paramSig;
- }
-}
diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
new file mode 100644
index 0000000..0ec565e
--- /dev/null
+++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
@@ -0,0 +1,506 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.clientapi;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.security.SSLSocketBuilder;
+import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker;
+
+import org.rhq.bindings.client.RhqFacade;
+import org.rhq.bindings.client.RhqManagers;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.communications.util.SecurityUtil;
+import org.rhq.enterprise.server.alert.AlertDefinitionManagerRemote;
+import org.rhq.enterprise.server.alert.AlertManagerRemote;
+import org.rhq.enterprise.server.auth.SubjectManagerRemote;
+import org.rhq.enterprise.server.authz.RoleManagerRemote;
+import org.rhq.enterprise.server.bundle.BundleManagerRemote;
+import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote;
+import org.rhq.enterprise.server.content.ContentManagerRemote;
+import org.rhq.enterprise.server.content.RepoManagerRemote;
+import org.rhq.enterprise.server.discovery.DiscoveryBossRemote;
+import org.rhq.enterprise.server.drift.DriftManagerRemote;
+import org.rhq.enterprise.server.drift.DriftTemplateManagerRemote;
+import org.rhq.enterprise.server.event.EventManagerRemote;
+import org.rhq.enterprise.server.install.remote.RemoteInstallManagerRemote;
+import org.rhq.enterprise.server.measurement.AvailabilityManagerRemote;
+import org.rhq.enterprise.server.measurement.CallTimeDataManagerRemote;
+import org.rhq.enterprise.server.measurement.MeasurementBaselineManagerRemote;
+import org.rhq.enterprise.server.measurement.MeasurementDataManagerRemote;
+import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerRemote;
+import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerRemote;
+import org.rhq.enterprise.server.operation.OperationManagerRemote;
+import org.rhq.enterprise.server.report.DataAccessManagerRemote;
+import org.rhq.enterprise.server.resource.ResourceFactoryManagerRemote;
+import org.rhq.enterprise.server.resource.ResourceManagerRemote;
+import org.rhq.enterprise.server.resource.ResourceTypeManagerRemote;
+import org.rhq.enterprise.server.resource.group.ResourceGroupManagerRemote;
+import org.rhq.enterprise.server.search.SavedSearchManagerRemote;
+import org.rhq.enterprise.server.support.SupportManagerRemote;
+import org.rhq.enterprise.server.sync.SynchronizationManagerRemote;
+import org.rhq.enterprise.server.system.SystemManagerRemote;
+import org.rhq.enterprise.server.tagging.TagManagerRemote;
+
+/**
+ * A remote access client that provides transparent servlet-based proxies to an RHQ Server.
+ *
+ * @author Greg Hinkle
+ * @author Simeon Pinder
+ * @author Jay Shaughnessy
+ * @author John Mazzitelli
+ */
+public class RemoteClient implements RhqFacade {
+
+ private static final Log LOG = LogFactory.getLog(RemoteClient.class);
+
+ public static final String NONSECURE_TRANSPORT = "servlet";
+ public static final String SECURE_TRANSPORT = "sslservlet";
+
+ private String transport;
+ private final String host;
+ private final int port;
+ private boolean loggedIn;
+ private boolean connected;
+ private Map<String, Object> managers;
+ private Subject subject;
+ private Client remotingClient;
+ private String subsystem = null;
+
+ /**
+ * Creates a client that will communicate with the server running on the given host
+ * listening on the given port. This constructor will not attempt to connect or login
+ * to the remote server - use {@link #login(String, String)} for that.
+ *
+ * @param host
+ * @param port
+ */
+ public RemoteClient(String host, int port) {
+ this(null, host, port);
+ }
+
+ /**
+ * Creates a client that will communicate with the server running on the given host
+ * listening on the given port over the given transport.
+ * This constructor will not attempt to connect or login
+ * to the remote server - use {@link #login(String, String)} for that.
+ *
+ * @param transport valid values are "servlet" and "sslservlet" - if <code>null</code>,
+ * sslservlet will be used for ports that end with "443", servlet otherwise
+ * @param host
+ * @param port
+ */
+ public RemoteClient(String transport, String host, int port) {
+ this(transport, host, port, null);
+ }
+
+ public RemoteClient(String transport, String host, int port, String subsystem) {
+ this.transport = (transport != null) ? transport : guessTransport(port);
+ this.host = host;
+ this.port = port;
+ this.subsystem = subsystem;
+ }
+
+ /**
+ * Connects to the remote server and logs in with the given credentials.
+ * After successfully executing this, {@link #isLoggedIn()} will be <code>true</code>
+ * and {@link #getSubject()} will return the subject that this method returns.
+ *
+ * @param user
+ * @param password
+ *
+ * @return the logged in user
+ *
+ * @throws Exception if failed to connect to the server or log in
+ */
+ public Subject login(String user, String password) throws Exception {
+
+ logout();
+ doConnect();
+
+ this.subject = getSubjectManager().login(user, password);
+ this.loggedIn = true;
+
+ return this.subject;
+ }
+
+ /**
+ * Logs out from the server and disconnects this client.
+ */
+ public void logout() {
+ try {
+ if (this.loggedIn && this.subject != null) {
+ getSubjectManager().logout(this.subject);
+ }
+ } catch (Exception e) {
+ // just keep going so we can disconnect this client
+ }
+
+ doDisconnect();
+
+ this.subject = null;
+ this.loggedIn = false;
+ }
+
+ /**
+ * Connects to the remote server but does not establish a user session. This can be used
+ * with the limited API that does not require a Subject.
+ *
+ * After successfully executing this, {@link #isConnected()} will be <code>true</code>
+ * and {@link #getSubject()} will return the subject that this method returns.
+ * @throws Exception if failed to connect to the server or log in
+ */
+ public void connect() throws Exception {
+ if (this.loggedIn) {
+ String name = (null == this.subject) ? "" : this.subject.getName();
+ throw new IllegalStateException("User " + name + " must log out before connection can be established.");
+ }
+
+ doDisconnect();
+ doConnect();
+ this.connected = true;
+ }
+
+ /**
+ * Disconnect from the server.
+ */
+ public void disconnect() {
+ if (this.loggedIn) {
+ String name = (null == this.subject) ? "" : this.subject.getName();
+ throw new IllegalStateException("User " + name + " is logged in. Call logout() instead of disconnect().");
+ }
+
+ doDisconnect();
+ this.connected = false;
+ }
+
+ /**
+ * Returns <code>true</code> if and only if this client successfully connected
+ * to the remote server and the user successfully logged in.
+ *
+ * @return if the user was able to connect and log into the server
+ */
+ public boolean isLoggedIn() {
+ return this.loggedIn;
+ }
+
+ /**
+ * Returns <code>true</code> if and only if this client successfully connected
+ * to the remote server.
+ *
+ * @return if the user was able to connect and log into the server
+ */
+ public boolean isConnected() {
+ return this.connected;
+ }
+
+ /**
+ * Returns the information on the user that is logged in.
+ * May be <code>null</code> if the user never logged in successfully.
+ *
+ * @return user information or <code>null</code>
+ */
+ public Subject getSubject() {
+ return this.subject;
+ }
+
+ public String getHost() {
+ return this.host;
+ }
+
+ public int getPort() {
+ return this.port;
+ }
+
+ public String getTransport() {
+ return transport;
+ }
+
+ protected String guessTransport(int port) {
+ return String.valueOf(port).endsWith("443") ? SECURE_TRANSPORT : NONSECURE_TRANSPORT;
+ }
+
+ /**
+ * Sets the underlying transport to use to communicate with the server.
+ * Available transports are "servlet" and "sslservlet".
+ * If you set it to <code>null</code>, then the transport to be used will
+ * be set appropriately for the {@link #getPort()} (e.g. a secure transport
+ * will be used for ports that end with 443, a non-secure transport will be
+ * used for all other ports).
+ *
+ * @param transport
+ */
+ public void setTransport(String transport) {
+ this.transport = transport;
+ }
+
+ public AlertManagerRemote getAlertManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.AlertManager);
+ }
+
+ public AlertDefinitionManagerRemote getAlertDefinitionManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.AlertDefinitionManager);
+ }
+
+ public AvailabilityManagerRemote getAvailabilityManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.AvailabilityManager);
+ }
+
+ public BundleManagerRemote getBundleManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.BundleManager);
+ }
+
+ public CallTimeDataManagerRemote getCallTimeDataManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.CallTimeDataManager);
+ }
+
+ public DriftManagerRemote getDriftManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.DriftManager);
+ }
+
+ public DriftTemplateManagerRemote getDriftTemplateManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.DriftTemplateManager);
+ }
+
+ public RepoManagerRemote getRepoManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.RepoManager);
+ }
+
+ public ConfigurationManagerRemote getConfigurationManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.ConfigurationManager);
+ }
+
+ public ContentManagerRemote getContentManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.ContentManager);
+ }
+
+ public DataAccessManagerRemote getDataAccessManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.DataAccessManager);
+ }
+
+ public DiscoveryBossRemote getDiscoveryBoss() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.DiscoveryBoss);
+ }
+
+ public EventManagerRemote getEventManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.EventManager);
+ }
+
+ public MeasurementBaselineManagerRemote getMeasurementBaselineManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.MeasurementBaselineManager);
+ }
+
+ public MeasurementDataManagerRemote getMeasurementDataManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.MeasurementDataManager);
+ }
+
+ public MeasurementDefinitionManagerRemote getMeasurementDefinitionManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.MeasurementDefinitionManager);
+ }
+
+ public MeasurementScheduleManagerRemote getMeasurementScheduleManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.MeasurementScheduleManager);
+ }
+
+ public OperationManagerRemote getOperationManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.OperationManager);
+ }
+
+ public ResourceManagerRemote getResourceManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.ResourceManager);
+ }
+
+ public ResourceFactoryManagerRemote getResourceFactoryManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.ResourceFactoryManager);
+ }
+
+ public ResourceGroupManagerRemote getResourceGroupManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.ResourceGroupManager);
+ }
+
+ public ResourceTypeManagerRemote getResourceTypeManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.ResourceTypeManager);
+ }
+
+ public RoleManagerRemote getRoleManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.RoleManager);
+ }
+
+ public SavedSearchManagerRemote getSavedSearchManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.SavedSearchManager);
+ }
+
+ public SubjectManagerRemote getSubjectManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.SubjectManager);
+ }
+
+ public SupportManagerRemote getSupportManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.SupportManager);
+ }
+
+ public SystemManagerRemote getSystemManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.SystemManager);
+ }
+
+ public RemoteInstallManagerRemote getRemoteInstallManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.RemoteInstallManager);
+ }
+
+ public TagManagerRemote getTagManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.TagManager);
+ }
+
+ public SynchronizationManagerRemote getSynchronizationManager() {
+ return RemoteClientProxy.getProcessor(this, RhqManagers.SynchronizationManager);
+ }
+
+ /**
+ * Returns the map of all remote managers running in the server that this
+ * client can talk to.
+ *
+ * @return Map K=manager name V=remote proxy
+ */
+ public Map<String, Object> getManagers() {
+ if (this.managers == null) {
+
+ this.managers = new HashMap<String, Object>();
+
+ for (RhqManagers manager : RhqManagers.values()) {
+ try {
+ Method m = this.getClass().getMethod("get" + manager.name());
+ if (manager.enabled()) {
+ this.managers.put(manager.name(), m.invoke(this));
+ }
+ } catch (Throwable e) {
+ LOG.error("Failed to load manager " + manager + " due to missing class.", e);
+ }
+ }
+ }
+
+ return this.managers;
+ }
+
+ @Override
+ public String toString() {
+ return this.getClass().getSimpleName() + "[" + "transport=" + transport + ", host=" + host + ", port=" + port
+ + ", subsystem=" + subsystem + ", connected=" + connected + ", loggedIn=" + loggedIn + ", subject="
+ + subject + ']';
+ }
+
+ /**
+ * Returns the internal JBoss/Remoting client used to perform the low-level
+ * comm with the server.
+ *
+ * This is package-scoped so the proxy can use it.
+ *
+ * @return remoting client used to talk to the server
+ */
+ Client getRemotingClient() {
+ return this.remotingClient;
+ }
+
+ private void doDisconnect() {
+ try {
+ if (this.remotingClient != null && this.remotingClient.isConnected()) {
+ this.remotingClient.disconnect();
+ }
+ } catch (Exception e) {
+ LOG.warn(e); // TODO what to do here?
+ } finally {
+ this.remotingClient = null;
+ }
+ }
+
+ private void doConnect() throws Exception {
+ String locatorURI = this.transport + "://" + this.host + ":" + this.port
+ + "/jboss-remoting-servlet-invoker/ServerInvokerServlet";
+ InvokerLocator locator = new InvokerLocator(locatorURI);
+
+ String subsystem = "REMOTEAPI";
+ if ((this.subsystem != null) && (this.subsystem.trim().equalsIgnoreCase("WSREMOTEAPI"))) {
+ subsystem = "WSREMOTEAPI";
+ }
+ Map<String, String> remotingConfig = buildRemotingConfig(locatorURI);
+ this.remotingClient = new Client(locator, subsystem, remotingConfig);
+ this.remotingClient.connect();
+ }
+
+ private Map<String, String> buildRemotingConfig(String locatorURI) {
+ Map<String, String> config = new HashMap<String, String>();
+ if (SecurityUtil.isTransportSecure(locatorURI)) {
+ setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH, "data/keystore.dat");
+ setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_STORE_ALGORITHM, "SunX509");
+ setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_STORE_TYPE, "JKS");
+ setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD, "password");
+ setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_PASSWORD, "password");
+ setConfigProp(config, SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH, null);
+ setConfigProp(config, SSLSocketBuilder.REMOTING_TRUST_STORE_ALGORITHM, null);
+ setConfigProp(config, SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE, null);
+ setConfigProp(config, SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD, null);
+ setConfigProp(config, SSLSocketBuilder.REMOTING_SSL_PROTOCOL, null);
+ setConfigProp(config, SSLSocketBuilder.REMOTING_KEY_ALIAS, "self");
+ setConfigProp(config, SSLSocketBuilder.REMOTING_SERVER_AUTH_MODE, "false");
+ config.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
+
+ // since we do not know the server's client-auth mode, assume we need a keystore and let's make sure we have one
+ SSLSocketBuilder dummy_sslbuilder = new SSLSocketBuilder(); // just so we can test finding our keystore
+ try {
+ // this allows the configured keystore file to be a URL, file path or a resource relative to our classloader
+ dummy_sslbuilder.setKeyStoreURL(config.get(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH));
+ } catch (Exception e) {
+ // this probably is due to the fact that the keystore doesn't exist yet - let's prepare one now
+ SecurityUtil.createKeyStore(config.get(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH),
+ config.get(SSLSocketBuilder.REMOTING_KEY_ALIAS), "CN=RHQ, OU=RedHat, O=redhat.com, C=US",
+ config.get(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD),
+ config.get(SSLSocketBuilder.REMOTING_KEY_PASSWORD), "DSA", 36500);
+
+ // now try to set it again, if an exception is still thrown, it's an unrecoverable error
+ dummy_sslbuilder.setKeyStoreURL(config.get(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH));
+ }
+
+ // in case the transport floats over https - we want to make sure a hostname verifier is installed and allows all hosts
+ config.put(HTTPSClientInvoker.IGNORE_HTTPS_HOST, "true");
+ }
+ return config;
+ }
+
+ /**
+ * Looks up the prop name in system properties and puts the value in the map. If the property
+ * isn't set, the given default is used. If the given default is null and the property isn't
+ * set, then the map is not populated.
+ *
+ * @param configMap
+ * @param propName
+ * @param defaultValue
+ */
+ private void setConfigProp(Map<String, String> configMap, String propName, String defaultValue) {
+ String propValue = System.getProperty(propName, defaultValue);
+ if (propValue != null) {
+ configMap.put(propName, propValue);
+ }
+ return;
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClientProxy.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClientProxy.java
new file mode 100644
index 0000000..a3daeb7
--- /dev/null
+++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClientProxy.java
@@ -0,0 +1,101 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.clientapi;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.jboss.remoting.invocation.NameBasedInvocation;
+
+import org.rhq.bindings.client.AbstractRhqFacadeProxy;
+import org.rhq.bindings.client.RhqManagers;
+import org.rhq.bindings.util.InterfaceSimplifier;
+import org.rhq.core.server.ExternalizableStrategy;
+
+/**
+ * This class acts as a local SLSB proxy to make remote invocations
+ * to SLSB Remotes over a remoting invoker.
+ *
+ * @author Greg Hinkle
+ * @author Lukas Krejci
+ */
+public class RemoteClientProxy extends AbstractRhqFacadeProxy<RemoteClient> {
+
+ private static final Log LOG = LogFactory.getLog(RemoteClientProxy.class);
+
+ public RemoteClientProxy(RemoteClient client, RhqManagers manager) {
+ super(client, manager);
+ }
+
+ public Class<?> getRemoteInterface() {
+ return this.getManager().remote();
+ }
+
+ @SuppressWarnings("unchecked")
+ public static <T> T getProcessor(RemoteClient remoteClient, RhqManagers manager) {
+ try {
+ RemoteClientProxy gpc = new RemoteClientProxy(remoteClient, manager);
+
+ Class<?> intf = InterfaceSimplifier.simplify(manager.remote());
+
+ return (T) Proxy
+ .newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[] { intf }, gpc);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to get remote connection proxy", e);
+ }
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ try {
+ return super.invoke(proxy, method, args);
+ } catch (Throwable t) {
+ LOG.debug(t);
+ throw t;
+ }
+ }
+
+ protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, Object[] args) throws Throwable {
+ ExternalizableStrategy.setStrategy(ExternalizableStrategy.Subsystem.REFLECTIVE_SERIALIZATION);
+
+ String methodName = getManager().beanName() + ":" + originalMethod.getName();
+
+ String[] paramSig = createParamSignature(argTypes);
+
+ NameBasedInvocation request = new NameBasedInvocation(methodName, args, paramSig);
+
+ Object response = getRhqFacade().getRemotingClient().invoke(request);
+
+ if (response instanceof Throwable) {
+ throw (Throwable) response;
+ }
+
+ return response;
+ }
+
+ private String[] createParamSignature(Class<?>[] types) {
+ String[] paramSig = new String[types.length];
+ for (int x = 0; x < types.length; x++) {
+ paramSig[x] = types[x].getName();
+ }
+ return paramSig;
+ }
+}
commit 81960e013533ee848aacc7716bf4bc254df93b2d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 1 12:17:43 2011 -0500
[Bug 759167 - Client side exception generated when viewing empty compatible group]
This turns out to be something of a happy accident. The offending code
made an assumption that the group would not be empty. But looking more
closely it seems to me that the entire code block is unnecessary. Moreover,
it added a round trip to the DB when displaying the group level dashboard.
It was trying to determine whether to render the bundle deployment
portlet. From what I can see, this can be determined already by looking
at the type's facets. And in fact the code was already in place. So,
- removing unnecessary db round-trip code (was even being done for mixed groups)
- keeping the existing facet-based code, which seems to do the right thing
- fixing a secondary problem that displayed the bundle deployment portlet for mixed groups.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
index ec71b3f..a50cea5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
@@ -246,8 +246,8 @@ public class DashboardView extends LocatableVLayout {
} else {
// TODO: i18n
Message message = new Message("There is already a dashboard named '" + trimmedName
- + "'. Please specify a name that is not already in use.", Message.Severity.Error,
- EnumSet.of(Message.Option.Transient));
+ + "'. Please specify a name that is not already in use.", Message.Severity.Error, EnumSet
+ .of(Message.Option.Transient));
CoreGUI.getMessageCenter().notify(message);
nameItem.setValue(storedDashboard.getName());
}
@@ -299,8 +299,6 @@ public class DashboardView extends LocatableVLayout {
}
});
-
-
// build the menu of valid portlets for this context, sorted by portlet name
final Menu addPortletMenu = new LocatableMenu(editForm.extendLocatorId("PortletMenu"));
LinkedHashMap<String, String> valueMap;
@@ -512,6 +510,7 @@ public class DashboardView extends LocatableVLayout {
groupMenuMap.remove(GroupOobsPortlet.KEY);
groupMenuMap.remove(GroupPkgHistoryPortlet.KEY);
groupMenuMap.remove(GroupConfigurationUpdatesPortlet.KEY);
+ groupMenuMap.remove(GroupBundleDeploymentsPortlet.KEY);
} else {
// for compatible may still need to do some pruning.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
index 09abe9d..991098e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
@@ -18,11 +18,9 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.summary;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.util.BooleanCallback;
import com.smartgwt.client.util.SC;
@@ -36,16 +34,11 @@ import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.criteria.DashboardCriteria;
-import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.dashboard.Dashboard;
import org.rhq.core.domain.dashboard.DashboardCategory;
import org.rhq.core.domain.dashboard.DashboardPortlet;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.resource.ResourceCategory;
-import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
-import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.InitializableView;
@@ -55,7 +48,6 @@ import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardContainer;
import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardView;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet;
-import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupBundleDeploymentsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigurationUpdatesPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupMetricsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupOperationsPortlet;
@@ -212,44 +204,6 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
//figure out which portlets to display and how
Map<String, String> groupKeyNameMap = DashboardView.processPortletNameMapForGroup(groupComposite);
- //initiate asynch call to execute and then update the dashboard with bundle deployment portlet if necessary
- ResourceGroupCriteria criteria = new ResourceGroupCriteria();
- criteria.addFilterId(group.getId());
- criteria.fetchExplicitResources(true);
- criteria.setPageControl(new PageControl(0, 1));
- GWTServiceLookup.getResourceGroupService().findResourceGroupsByCriteria(criteria,
- new AsyncCallback<PageList<ResourceGroup>>() {
- @Override
- public void onSuccess(PageList<ResourceGroup> results) {
- if (!results.isEmpty()) {
- ResourceGroup grp = results.get(0);
- Set<Resource> explicitMembers = grp.getExplicitResources();
- Resource[] currentResources = new Resource[explicitMembers.size()];
- explicitMembers.toArray(currentResources);
- Map<String, String> portletToAdd = new HashMap<String, String>();
- //membership dynamically determined if all platforms then will be compatible.
- if (group.getGroupCategory().equals(GroupCategory.COMPATIBLE)) {
- if (currentResources[0].getResourceType().getCategory().equals(ResourceCategory.PLATFORM)) {
- //this portlet allowed to add bundle portlet monitoring
- portletToAdd.put(GroupBundleDeploymentsPortlet.KEY, GroupBundleDeploymentsPortlet.NAME);
- }
- if (!portletToAdd.isEmpty()) {
- //update dashboard with that portlet and reload
- updateDashboardWithPortlets(portletToAdd, dashboard, 100);
- //request reload of dashboard widget
- setDashboard(dashboard);
- markForRedraw();
- }
- }
- }
- }
-
- @Override
- public void onFailure(Throwable caught) {
- Log.debug("Error retrieving information for group [" + group.getId() + "]:" + caught.getMessage());
- }
- });
-
//reset positioning parameters
colLeft = 0;
colRight = 1;
commit 4ef245611000d6b7f72d2e6ed27b8211315d427b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Dec 1 14:50:06 2011 +0100
[BZ 751248] - Make the sample CLI alert scripts downloadable from the server's /download/cli-alert-scripts location and from the Downloads section of the GUI.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
index 122ccb6..114f335 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
@@ -60,6 +60,7 @@ public class DownloadsView extends LocatableVLayout {
private SectionStackSection cliSection;
private SectionStackSection bundleSection;
private SectionStackSection connectorsSection;
+ private SectionStackSection cliAlertScriptsSection;
private ProductInfo productInfo;
public DownloadsView(String locatorId) {
@@ -83,17 +84,20 @@ public class DownloadsView extends LocatableVLayout {
cliSection = new SectionStackSection(MSG.view_admin_downloads_cliDownload());
bundleSection = new SectionStackSection(MSG.view_admin_downloads_bundleDownload());
connectorsSection = new SectionStackSection(MSG.view_admin_downloads_connectorsDownload());
-
+ cliAlertScriptsSection = new SectionStackSection(MSG.view_admin_downloads_cliAlertScriptsDownload());
+
agentSection.setExpanded(false);
cliSection.setExpanded(false);
bundleSection.setExpanded(false);
connectorsSection.setExpanded(false);
-
+ cliAlertScriptsSection.setExpanded(false);
+
sectionStack.addSection(agentSection);
sectionStack.addSection(cliSection);
sectionStack.addSection(bundleSection);
sectionStack.addSection(connectorsSection);
-
+ sectionStack.addSection(cliAlertScriptsSection);
+
addMember(sectionStack);
}
@@ -105,6 +109,7 @@ public class DownloadsView extends LocatableVLayout {
prepareCLISection();
prepareBundleSection();
prepareConnectorsSection();
+ prepareCliAlertScriptsSection();
}
private void prepareAgentSection() {
@@ -299,4 +304,54 @@ public class DownloadsView extends LocatableVLayout {
}
});
}
+
+ private void prepareCliAlertScriptsSection() {
+ systemManager.getCliAlertScriptDownloads(new AsyncCallback<HashMap<String, String>>() {
+
+ @Override
+ public void onSuccess(HashMap<String, String> result) {
+ LocatableDynamicForm form = new LocatableDynamicForm(extendLocatorId("cliAlertScripts"));
+ form.setMargin(10);
+ form.setWidth100();
+
+ if (result != null && !result.isEmpty()) {
+ int i = 0;
+ FormItem[] items = new FormItem[result.size() + 1];
+
+ StaticTextItem helpText = new StaticTextItem("cliAlertScriptsHelp");
+ helpText.setColSpan(2);
+ helpText.setShowTitle(false);
+ helpText.setValue(MSG.view_admin_downloads_cliAlertScripts_help());
+ items[i] = helpText;
+ i++;
+
+ for (Map.Entry<String, String> entry : result.entrySet()) {
+ LinkItem linkItem = new LinkItem("cliAlertScriptLink" + i);
+ linkItem.setColSpan(2);
+ linkItem.setShowTitle(false);
+ linkItem.setLinkTitle(entry.getKey());
+ linkItem.setValue(entry.getValue());
+ items[i] = linkItem;
+ i++;
+ }
+ form.setItems(items);
+ } else {
+ StaticTextItem item = new StaticTextItem("noCliAlertScripts");
+ item.setColSpan(2);
+ item.setShowTitle(false);
+ item.setValue(MSG.view_admin_downloads_cliAlertScripts_none());
+ form.setItems(item);
+ }
+
+ cliAlertScriptsSection.setItems(form);
+ cliAlertScriptsSection.setExpanded(true);
+ sectionStack.markForRedraw();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_admin_downloads_cliAlertScripts_loadError(), caught);
+ }
+ });
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java
index 33573d1..a9fd575 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java
@@ -57,6 +57,17 @@ public interface SystemGWTService extends RemoteService {
HashMap<String, String> getConnectorDownloads() throws RuntimeException;
/**
+ * Returns the name and download URL (key and value respectively) of all CLI alert scripts
+ * that are available on the server for download. These are just scripts that users can
+ * then use to create actual cli scripts for alert notifications. These scripts will usually
+ * require some tweaking to be usable as alert scripts.
+ *
+ * @return info about the available CLI alert scripts
+ * @throws RuntimeException
+ */
+ HashMap<String, String> getCliAlertScriptDownloads() throws RuntimeException;
+
+ /**
* @return metadata properties about the CLI download available on the server.
*/
HashMap<String, String> getClientVersionProperties() throws RuntimeException;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java
index cf3848e..d4624ef 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java
@@ -130,6 +130,26 @@ public class SystemGWTServiceImpl extends AbstractGWTServiceImpl implements Syst
}
@Override
+ public HashMap<String, String> getCliAlertScriptDownloads() throws RuntimeException {
+ try {
+ File downloadsDir = getCliAlertScriptDownloadsDir();
+ List<File> files = getFiles(downloadsDir);
+ if (files == null) {
+ return new HashMap<String, String>(0);
+ } else {
+ HashMap<String, String> ret = new HashMap<String, String>(files.size());
+
+ for(File file : files) {
+ ret.put(file.getName(), "/downloads/cli-alert-scripts/" + file.getName());
+ }
+ return ret;
+ }
+ } catch (Throwable t) {
+ throw getExceptionToThrowToClient(t);
+ }
+ }
+
+ @Override
public HashMap<String, String> getClientVersionProperties() throws RuntimeException {
File versionFile = new File(getClientDownloadDir(), "rhq-client-version.properties");
try {
@@ -182,6 +202,15 @@ public class SystemGWTServiceImpl extends AbstractGWTServiceImpl implements Syst
return downloadDir;
}
+ private File getCliAlertScriptDownloadsDir() {
+ File serverHomeDir = getServerHomeDir();
+ File downloadDir = new File(serverHomeDir, "deploy/rhq.ear/rhq-downloads/cli-alert-scripts");
+ if (!downloadDir.exists()) {
+ throw new RuntimeException("Server is missing connectors download directory at [" + downloadDir + "]");
+ }
+ return downloadDir;
+ }
+
private File getClientDownloadDir() {
File serverHomeDir = getServerHomeDir();
File downloadDir = new File(serverHomeDir, "deploy/rhq.ear/rhq-downloads/rhq-client");
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index c8df668..e96c012 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -506,6 +506,10 @@ view_admin_downloads_bundle_help = <p> This is the Bundle Deployer tool. It is f
view_admin_downloads_bundle_link_label = Link
view_admin_downloads_bundle_link_value = Download Bundle Deployer {0}
view_admin_downloads_bundle_loadError = Cannot get bundle deployer info
+view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download
+view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition.
+view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download
+view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download
view_admin_downloads_cliDownload = Command Line Client Download
view_admin_downloads_cli_buildNumber = CLI Build
view_admin_downloads_cli_help = <p> This is the Command Line Client tool, otherwise known as the CLI. It is a standalone tool that runs from within a console and provides a command line interface to the {0} Server. You can invoke commands via the CLI as well as run scripts to perform automated tasks. See the documentation for more information on how to install and use the CLI. </p>
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 76bbf6a..a42707d 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -466,6 +466,10 @@ view_admin_content = Inhalte
view_admin_downloads_agent_buildNumber = Build-Nummer des Agents
view_admin_downloads_agent_md5 = MD5 Prüfsumme des Agents
view_admin_downloads_agent_version = Version des Agents
+##view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download
+##view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used as templates for creating actual scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition.
+##view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download
+##view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download
view_admin_downloads_cli_md5 = MD5 Prüfsumme des CLI
view_admin_downloads_cli_version = Version des CLI
##view_admin_landing = In dieser Sektion können die globalen Einstellungen für RHQ verwaltet werden. Dies schließt Sicherheitseinstellungen und Plugins ein, sowie die Verwaltung der RHQ Server- und Agentplugins.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 1242729..71e3530 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -505,6 +505,10 @@ view_admin_downloads_bundleDownload = バンドルデプロイヤのダウンロ
view_admin_downloads_bundle_link_label = リンク
view_admin_downloads_bundle_link_value = バンドルデプロイヤー {0} をダウンロード
view_admin_downloads_bundle_loadError = バンドルデプロイヤー情報が取得できません
+##view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download
+##view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition.
+##view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download
+##view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download
view_admin_downloads_cliDownload = コマンドラインクライアントのダウンロード
view_admin_downloads_cli_buildNumber = CLIビルド
##view_admin_downloads_cli_help = <p> これはコマンドラインツールで、CLIとして知られているものです。コンソールから実行するスタンドアロンツールで、RHQサーバーに対してコマンドラインインタフェースを提供します。自動化されたタスクを実行するためにCLIやrunスクリプトを介してコマンドを呼び出すことが可能です。CLIのインストール方法と使い方についての詳細情報はドキュメントをご覧ください。</p>
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 6acfd8a..3a60da7 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -514,6 +514,10 @@ view_admin_downloads_bundleDownload = Bundle Deployer Download
##view_admin_downloads_bundle_help = <p> view_admin_downloads_bundle_link_label = Link
view_admin_downloads_bundle_link_value = Download Bundle Deployer {0}
view_admin_downloads_bundle_loadError = Cannot get bundle deployer info
+##view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download
+##view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition.
+##view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download
+##view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download
view_admin_downloads_cliDownload = Command Line Client Download
view_admin_downloads_cli_buildNumber = CLI Build
##view_admin_downloads_cli_help = <p> view_admin_downloads_cli_link_label = Link
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index 89b23e8..7e4da98 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -503,6 +503,10 @@ view_admin_downloads_bundleDownload = Bundle\u90e8\u7f72\u5668\u4e0b\u8f7d
view_admin_downloads_bundle_link_label = \u94fe\u63a5
view_admin_downloads_bundle_link_value = Download Bundle Deployer {0}
view_admin_downloads_bundle_loadError = Cannot get bundle deployer info
+##view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download
+##view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition.
+##view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download
+##view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download
view_admin_downloads_cliDownload = \u547d\u4ee4\u884c\u5ba2\u6237\u7aef\u4e0b\u8f7d
view_admin_downloads_cli_buildNumber = CLI Build
##view_admin_downloads_cli_help = <p> This is the Command Line Client tool, otherwise known as the CLI. It is a standalone tool that runs from within a console and provides a command line interface to the RHQ Server. You can invoke commands via the CLI as well as run scripts to perform automated tasks. See the documentation for more information on how to install and use the CLI. </p>
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js b/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
new file mode 100644
index 0000000..bc38983
--- /dev/null
+++ b/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
@@ -0,0 +1,467 @@
+/**
+ * Using this script one can automatically reset a bundle deployment to a specified version.
+ *
+ * This script consists of several utility methods originally included in standalone files
+ * in the samples of the CLI distribution, which have been included in this file so that it
+ * is usable on its own even in the server environment.
+ *
+ * The configuration of the bundle and its version to reset to is located at the top of this file.
+ * Please provide the values to the variables as instructed to make this script work in
+ * a concrete situation.
+ */
+
+//----------------------------- script configuration
+
+/**
+ * Replace the "null" with the ID of the bundle destination you want to reset.
+ *
+ * The ID of the destination can be determined from the URL. If you navigate to
+ * some destination of a bundle, the destination ID is the number at the very
+ * end of the URL in the address bar of your browser.
+ *
+ * It can also be determined programmatically using the remote API of the RHQ
+ * server but that is beyond the scope of this comment.
+ */
+var destinationId = null;
+
+/**
+ * Replace the "null" with the ID of the bundle version the deployment should be reset to.
+ *
+ * As with the destinations, the ID of a bundle version can be determined in the GUI by
+ * examining the URL. If you navigate to some version of a bundle, the bundle version ID is
+ * the very last number in the URL in the address bar of the browser.
+ */
+var bundleVersionId = null;
+
+/**
+ * A deployment of the bundle version may require configuration. Normally, this can be
+ * provided as a simple javascript object (using the curly braces notation). Please see
+ * the documentation of the <code>asConfiguration</code> function further down to understand
+ * the limitations of this approach. Should the simple format using the javascript object
+ * be not possible, you have to build up a full org.rhq.core.domain.configuration.Configuration
+ * object.
+ */
+var deploymentConfig = null;
+
+/**
+ * The description of the deployment that will be performed.
+ */
+var description = "redeploy due to drift";
+
+// DO NOT TOUCH THIS UNLESS YOU FULLY UNDERSTAND WHAT YOU ARE DOING.
+// NOTE: It's essential that isCleanDeployment=true, otherwise files that have drifted will not be replaced with their
+// original versions from the bundle.
+var isCleanDeployment = true;
+
+//-------------------- util.js
+
+/**
+ * If obj is a JS array or a java.util.Collection, each element is passed to
+ * the callback function. If obj is a java.util.Map, each map entry is passed
+ * to the callback function as a key/value pair. If obj is none of the
+ * aforementioned types, it is treated as a generic object and each of its
+ * properties is passed to the callback function as a name/value pair.
+ */
+function foreach(obj, fn) {
+ if (obj instanceof Array) {
+ for (i in obj) {
+ fn(obj[i]);
+ }
+ }
+ else if (obj instanceof java.util.Collection) {
+ var iterator = obj.iterator();
+ while (iterator.hasNext()) {
+ fn(iterator.next());
+ }
+ }
+ else if (obj instanceof java.util.Map) {
+ var iterator = obj.entrySet().iterator()
+ while (iterator.hasNext()) {
+ var entry = iterator.next();
+ fn(entry.key, entry.value);
+ }
+ }
+ else { // assume we have a generic object
+ for (i in obj) {
+ fn(i, obj[i]);
+ }
+ }
+}
+
+/**
+ * Iterates over obj similar to foreach. fn should be a predicate that evaluates
+ * to true or false. The first match that is found is returned.
+ */
+function find(obj, fn) {
+ if (obj instanceof Array) {
+ for (i in obj) {
+ if (fn(obj[i])) {
+ return obj[i]
+ }
+ }
+ }
+ else if (obj instanceof java.util.Collection) {
+ var iterator = obj.iterator();
+ while (iterator.hasNext()) {
+ var next = iterator.next();
+ if (fn(next)) {
+ return next;
+ }
+ }
+ }
+ else if (obj instanceof java.util.Map) {
+ var iterator = obj.entrySet().iterator();
+ while (iterator.hasNext()) {
+ var entry = iterator.next();
+ if (fn(entry.key, entry.value)) {
+ return {key: entry.key, value: entry.value};
+ }
+ }
+ }
+ else {
+ for (i in obj) {
+ if (fn(i, obj[i])) {
+ return {key: i, value: obj[i]};
+ }
+ }
+ }
+ return null;
+}
+
+/**
+ * Iterates over obj similar to foreach. fn should be a predicate that evaluates
+ * to true or false. All of the matches are returned in a java.util.List.
+ */
+function findAll(obj, fn) {
+ var matches = java.util.ArrayList();
+ if ((obj instanceof Array) || (obj instanceof java.util.Collection)) {
+ foreach(obj, function(element) {
+ if (fn(element)) {
+ matches.add(element);
+ }
+ });
+ }
+ else {
+ foreach(obj, function(key, value) {
+ if (fn(theKey, theValue)) {
+ matches.add({key: theKey, value: theValue});
+ }
+ });
+ }
+ return matches;
+}
+
+/**
+ * A convenience function to convert javascript hashes into RHQ's configuration
+ * objects.
+ * <p>
+ * The conversion of individual keys in the hash follows these rules:
+ * <ol>
+ * <li> if a value of a key is a javascript array, it is interpreted as PropertyList
+ * <li> if a value is a hash, it is interpreted as a PropertyMap
+ * <li> otherwise it is interpreted as a PropertySimple
+ * <li> a null or undefined value is ignored
+ * </ol>
+ * <p>
+ * Note that the conversion isn't perfect, because the hash does not contain enough
+ * information to restore the names of the list members.
+ * <p>
+ * Example: <br/>
+ * <pre><code>
+ * {
+ * simple : "value",
+ * list : [ "value1", "value2"],
+ * listOfMaps : [ { k1 : "value", k2 : "value" }, { k1 : "value2", k2 : "value2" } ]
+ * }
+ * </code></pre>
+ * gets converted to a configuration object:
+ * Configuration:
+ * <ul>
+ * <li> PropertySimple(name = "simple", value = "value")
+ * <li> PropertyList(name = "list")
+ * <ol>
+ * <li>PropertySimple(name = "list", value = "value1")
+ * <li>PropertySimple(name = "list", value = "value2")
+ * </ol>
+ * <li> PropertyList(name = "listOfMaps")
+ * <ol>
+ * <li> PropertyMap(name = "listOfMaps")
+ * <ul>
+ * <li>PropertySimple(name = "k1", value = "value")
+ * <li>PropertySimple(name = "k2", value = "value")
+ * </ul>
+ * <li> PropertyMap(name = "listOfMaps")
+ * <ul>
+ * <li>PropertySimple(name = "k1", value = "value2")
+ * <li>PropertySimple(name = "k2", value = "value2")
+ * </ul>
+ * </ol>
+ * </ul>
+ * Notice that the members of the list have the same name as the list itself
+ * which generally is not the case.
+ */
+function asConfiguration(hash) {
+
+ config = new Configuration;
+
+ for(key in hash) {
+ value = hash[key];
+
+ if (value == null) {
+ continue;
+ }
+
+ (function(parent, key, value) {
+ function isArray(obj) {
+ return typeof(obj) == 'object' && (obj instanceof Array);
+ }
+
+ function isHash(obj) {
+ return typeof(obj) == 'object' && !(obj instanceof Array);
+ }
+
+ function isPrimitive(obj) {
+ return typeof(obj) != 'object';
+ }
+
+ //this is an anonymous function, so the only way it can call itself
+ //is by getting its reference via argument.callee. Let's just assign
+ //a shorter name for it.
+ var me = arguments.callee;
+
+ var prop = null;
+
+ if (isPrimitive(value)) {
+ prop = new PropertySimple(key, new java.lang.String(value));
+ } else if (isArray(value)) {
+ prop = new PropertyList(key);
+ for(var i = 0; i < value.length; ++i) {
+ var v = value[i];
+ if (v != null) {
+ me(prop, key, v);
+ }
+ }
+ } else if (isHash(value)) {
+ prop = new PropertyMap(key);
+ for(var i in value) {
+ var v = value[i];
+ if (value != null) {
+ me(prop, i, v);
+ }
+ }
+ }
+
+ if (parent instanceof PropertyList) {
+ parent.add(prop);
+ } else {
+ parent.put(prop);
+ }
+ })(config, key, value);
+ }
+
+ return config;
+}
+
+/**
+ * Opposite of <code>asConfiguration</code>. Converts an RHQ's configuration object
+ * into a javascript hash.
+ *
+ * @param configuration
+ */
+function asHash(configuration) {
+ ret = {}
+
+ iterator = configuration.getMap().values().iterator();
+ while(iterator.hasNext()) {
+ prop = iterator.next();
+
+ (function(parent, prop) {
+ function isArray(obj) {
+ return typeof(obj) == 'object' && (obj instanceof Array);
+ }
+
+ function isHash(obj) {
+ return typeof(obj) == 'object' && !(obj instanceof Array);
+ }
+
+ var me = arguments.callee;
+
+ var representation = null;
+
+ if (prop instanceof PropertySimple) {
+ representation = prop.stringValue;
+ } else if (prop instanceof PropertyList) {
+ representation = [];
+
+ for(var i = 0; i < prop.list.size(); ++i) {
+ var child = prop.list.get(i);
+ me(representation, child);
+ }
+ } else if (prop instanceof PropertyMap) {
+ representation = {};
+
+ var childIterator = prop.getMap().values().iterator();
+ while(childIterator.hasNext()) {
+ var child = childIterator.next();
+
+ me(representation, child);
+ }
+ }
+
+ if (isArray(parent)) {
+ parent.push(representation);
+ } else if (isHash(parent)) {
+ parent[prop.name] = representation;
+ }
+ })(ret, prop);
+ }
+ (function(parent) {
+
+ })(configuration);
+
+ return ret;
+}
+
+//------------------------------ bundles.js
+
+/**
+ * A simple function to create a new bundle version from a zip file containing
+ * the bundle.
+ *
+ * @param pathToBundleZipFile the path to the bundle on the local file system
+ *
+ * @return an instance of BundleVersion class describing what's been created on
+ * the RHQ server.
+ */
+function createBundleVersion(pathToBundleZipFile) {
+ var bytes = getFileBytes(pathToBundleZipFile)
+ return BundleManager.createBundleVersionViaByteArray(bytes)
+}
+
+/**
+ * This is a helper function that one can use to find out what base directories
+ * given resource type defines.
+ * <p>
+ * These base directories then can be used when specifying bundle destinations.
+ *
+ * @param resourceTypeId
+ * @returns a java.util.Set of ResourceTypeBundleConfiguration objects
+ */
+function getAllBaseDirectories(resourceTypeId) {
+ var crit = new ResourceTypeCriteria;
+ crit.addFilterId(resourceTypeId);
+ crit.fetchBundleConfiguration(true);
+
+ var types = ResourceTypeManager.findResourceTypesByCriteria(crit);
+
+ if (types.size() == 0) {
+ throw "Could not find a resource type with id " + resourceTypeId;
+ } else if (types.size() > 1) {
+ throw "More than one resource type found with id " + resourceTypeId + "! How did that happen!";
+ }
+
+ var type = types.get(0);
+
+ return type.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories();
+}
+
+/**
+ * Creates a new destination for given bundle. Once a destination exists,
+ * actual bundle versions can be deployed to it.
+ * <p>
+ * Note that this only differs from the <code>BundleManager.createBundleDestination</code>
+ * method in the fact that one can provide bundle and resource group names instead of their
+ * ids.
+ *
+ * @param destinationName the name of the destination to be created
+ * @param description the description for the destination
+ * @param bundleName the name of the bundle to create the destination for
+ * @param groupName name of a group of resources that the destination will handle
+ * @param baseDirName the name of the basedir definition that represents where inside the
+ * deployment of the individual resources the bundle will get deployed
+ * @param deployDir the specific sub directory of the base dir where the bundles will get deployed
+ *
+ * @return BundleDestination object
+ */
+function createBundleDestination(destinationName, description, bundleName, groupName, baseDirName, deployDir) {
+ var groupCrit = new ResourceGroupCriteria;
+ groupCrit.addFilterName(groupName);
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(groupCrit);
+
+ if (groups.empty) {
+ throw "No group called '" + groupName + "' found.";
+ }
+
+ var group = groups.get(0);
+
+ var bundleCrit = new BundleCriteria;
+ bundleCrit.addFilterName(bundleName);
+ var bundles = BundleManager.findBundlesByCriteria(bundleCrit);
+
+ if (bundles.empty) {
+ throw "No bundle called '" + bundleName + "' found.";
+ }
+
+ var bundle = bundles.get(0);
+
+ return BundleManager.createBundleDestination(bundle.id, destinationName, description, baseDirName, deployDir, group.id);
+}
+
+/**
+ * Tries to deploy given bundle version to provided destination using given configuration.
+ * <p>
+ * This method blocks while waiting for the deployment to complete or fail.
+ *
+ * @param destination the bundle destination (or id thereof)
+ * @param bundleVersion the bundle version to deploy (or id thereof)
+ * @param deploymentConfiguration the deployment configuration. This can be an ordinary
+ * javascript object (hash) or an instance of RHQ's Configuration. If it is the former,
+ * it is converted to a Configuration instance using the <code>asConfiguration</code>
+ * function from <code>util.js</code>. Please consult the documentation of that method
+ * to understand the limitations of that approach.
+ * @param description the deployment description
+ * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false,
+ * perform as an upgrade to the existing deployment, if any
+ *
+ * @return the BundleDeployment instance describing the deployment
+ */
+function deployBundle(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) {
+ var destinationId = destination;
+ if (typeof(destination) == 'object') {
+ destinationId = destination.id;
+ }
+
+ var bundleVersionId = bundleVersion;
+ if (typeof(bundleVersion) == 'object') {
+ bundleVersionId = bundleVersion.id;
+ }
+
+ var deploymentConfig = deploymentConfiguration;
+ if (!(deploymentConfiguration instanceof Configuration)) {
+ deploymentConfig = asConfiguration(deploymentConfiguration);
+ }
+
+ var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig);
+
+ deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment);
+
+ var crit = new BundleDeploymentCriteria;
+ crit.addFilterId(deployment.id);
+
+ while (deployment.status == BundleDeploymentStatus.PENDING || deployment.status == BundleDeploymentStatus.IN_PROGRESS) {
+ java.lang.Thread.currentThread().sleep(1000);
+ var dps = BundleManager.findBundleDeploymentsByCriteria(crit);
+ if (dps.empty) {
+ throw "The deployment disappeared while we were waiting for it to complete.";
+ }
+
+ deployment = dps.get(0);
+ }
+
+ return deployment;
+}
+
+//------------------- script body
+
+deployBundle(destinationId, bundleVersionId, deploymentConfig, description, isCleanDeployment);
+
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index d920ff9..9416b30 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -360,7 +360,18 @@
<fileset dir="${jboss.home}" includes="*.*" />
</delete>
- <!-- make sure our downloads directories exist -->
+ <!-- make sure the top level downloads directory exists -->
+ <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads" />
+
+ <!-- deploy all the static downloadable content -->
+ <echo>Deploying static downloadable content</echo>
+ <copy todir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads"
+ verbose="true"
+ failonerror="false">
+ <fileset dir="${basedir}/src/main/downloadable-resources" />
+ </copy>
+
+ <!-- make sure our downloads directories exist -->
<mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-agent" />
<mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-client" />
<mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-plugins" />
commit c7aa8dbb5e387dadc03fb6c7d615857e82d645f4
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Nov 30 16:37:49 2011 -0500
Adding itests module to build
I discovered earlier today that the itests module is not getting built
in integration builds. It is declared in the list of modules of the
server pom, but the server module itself is not listed in
enterprise/pom.xml.
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 22a7c7e..e119090 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -46,6 +46,7 @@
<module>server/ear</module>
<module>binding</module>
<module>server/client-api</module>
+ <module>server/itests</module>
</modules>
</profile>
commit ca50dc7aef3203af9d88227e216d96febbfbe57d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 15:22:50 2011 -0500
Fix some minor issues in the server itests.
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
index 08c5b4d..895cf9b 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
@@ -59,7 +59,6 @@ import org.rhq.core.domain.drift.JPADrift;
import org.rhq.core.domain.drift.JPADriftChangeSet;
import org.rhq.core.domain.drift.JPADriftFile;
import org.rhq.core.domain.drift.JPADriftSet;
-import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
@@ -68,12 +67,13 @@ import org.rhq.test.TransactionCallback;
public class DriftTemplateManagerBeanTest extends DriftServerTest {
+ private static final String TEST_CREATE_TEMPLATE = "test-createTemplateForNegativeUpdateTests";
+ private static final String TEST_PIN_TEMPLATE = "test-pinTemplate";
+
private DriftTemplateManagerLocal templateMgr;
private DriftManagerLocal driftMgr;
- private List<Resource> resources = new LinkedList<Resource>();
-
private JPADrift drift1;
private JPADrift drift2;
private JPADriftFile driftFile1;
@@ -117,7 +117,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
public void createNewTemplate() {
final DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test::createNewTemplate");
+ definition.setName("test-createNewTemplate");
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
definition.setInterval(2400L);
@@ -148,7 +148,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
public void createTemplateForNegativeUpdateTests() {
DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test::createTemplateForNegativeUpdateTests");
+ definition.setName(TEST_CREATE_TEMPLATE);
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
definition.setInterval(2400L);
@@ -159,48 +159,40 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
assertNotNull("Failed to load template", loadTemplate(definition.getName()));
}
- @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*base directory.*cannot be modified")
+ @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*base directory.*cannot be modified")
@InitDB(false)
public void doNotAllowBaseDirToBeUpdated() {
- DriftDefinitionTemplate template = loadTemplate("test::createTemplateForNegativeUpdateTests");
+ DriftDefinitionTemplate template = loadTemplate(TEST_CREATE_TEMPLATE);
DriftDefinition definition = template.getTemplateDefinition();
definition.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/TEST"));
templateMgr.updateTemplate(getOverlord(), template);
}
- @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*filters.*cannot be modified")
+ @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*filters.*cannot be modified")
@InitDB(false)
public void doNotAllowFiltersToBeUpdated() {
- DriftDefinitionTemplate template = loadTemplate("test::createTemplateForNegativeUpdateTests");
+ DriftDefinitionTemplate template = loadTemplate(TEST_CREATE_TEMPLATE);
DriftDefinition definition = template.getTemplateDefinition();
definition.addExclude(new Filter("/foo/bar/TEST/conf", "*.xml"));
templateMgr.updateTemplate(getOverlord(), template);
}
- @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*name.*cannot be modified")
+ @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*name.*cannot be modified")
@InitDB(false)
public void doNotAllowTemplateNameToBeUpdated() {
- DriftDefinitionTemplate template = loadTemplate("test::createTemplateForNegativeUpdateTests");
+ DriftDefinitionTemplate template = loadTemplate(TEST_CREATE_TEMPLATE);
template.setName("A new name");
templateMgr.updateTemplate(getOverlord(), template);
}
- @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*template name must be unique.*")
+ @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*template name must be unique.*")
@InitDB(false)
public void doNotAllowDuplicateTemplateNames() {
DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test::createTemplateForNegativeUpdateTests");
+ definition.setName(TEST_CREATE_TEMPLATE);
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
definition.setInterval(2400L);
@@ -212,7 +204,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
public void createAndUpdateTemplate() {
// create the template
DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test::updateTemplate");
+ definition.setName("test-updateTemplate");
definition.setDescription("update template test");
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
@@ -252,12 +244,11 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
String msg = "Failed to propagate update to attached definition " + toString(updatedDef) + " - ";
DriftDefinition updatedTemplateDef = updatedTemplate.getTemplateDefinition();
- assertEquals(msg + "enabled property not updated", updatedTemplateDef.isEnabled(),
- updatedDef.isEnabled());
- assertEquals(msg + "driftHandlingMode property not updated",
- updatedTemplateDef.getDriftHandlingMode(), updatedDef.getDriftHandlingMode());
- assertEquals(msg + "interval property not updated", updatedTemplateDef.getInterval(),
- updatedDef.getInterval());
+ assertEquals(msg + "enabled property not updated", updatedTemplateDef.isEnabled(), updatedDef.isEnabled());
+ assertEquals(msg + "driftHandlingMode property not updated", updatedTemplateDef.getDriftHandlingMode(),
+ updatedDef.getDriftHandlingMode());
+ assertEquals(msg + "interval property not updated", updatedTemplateDef.getInterval(), updatedDef
+ .getInterval());
}
// verify that the detached definitions have not been updated.
@@ -266,25 +257,23 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
String msg = "Detached definition " + toString(def) + " should not get updated - ";
assertEquals(msg + "enabled property was modified", def.isEnabled(), defAfterUpdate.isEnabled());
- assertEquals(msg + "driftHandlingMode property was modified", def.getDriftHandlingMode(),
- defAfterUpdate.getDriftHandlingMode());
+ assertEquals(msg + "driftHandlingMode property was modified", def.getDriftHandlingMode(), defAfterUpdate
+ .getDriftHandlingMode());
assertEquals(msg + "interval property was modified", def.getInterval(), defAfterUpdate.getInterval());
}
}
-
- @SuppressWarnings("unchecked")
public void pinTemplate() throws Exception {
// First create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test::pinTemplate");
+ templateDef.setName(TEST_PIN_TEMPLATE);
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
templateDef.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
- final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(),
- resourceType.getId(), true, templateDef);
+ final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(), resourceType.getId(), true,
+ templateDef);
// next create some resource level definitions
final DriftDefinition attachedDef1 = createDefinition(template, "attachedDef1", true);
@@ -338,10 +327,11 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
assertTrue("Template should be marked pinned", updatedTemplate.isPinned());
}
+ @SuppressWarnings("unchecked")
@Test(dependsOnMethods = "pinTemplate")
@InitDB(false)
public void persistChangeSetWhenTemplateGetsPinned() throws Exception {
- DriftDefinitionTemplate template = loadTemplate("test::pinTemplate");
+ DriftDefinitionTemplate template = loadTemplate(TEST_PIN_TEMPLATE);
GenericDriftChangeSetCriteria criteria = new GenericDriftChangeSetCriteria();
criteria.addFilterId(template.getChangeSetId());
@@ -352,9 +342,8 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
assertEquals("Expected to find change set for pinned template", 1, changeSets.size());
JPADriftChangeSet expectedChangeSet = new JPADriftChangeSet(resource, 1, COVERAGE, null);
- List<? extends Drift> expectedDrifts = asList(
- new JPADrift(expectedChangeSet, "drift.1", FILE_ADDED, null, driftFile1),
- new JPADrift(expectedChangeSet, drift2.getPath(), FILE_ADDED, null, driftFile2));
+ List<? extends Drift> expectedDrifts = asList(new JPADrift(expectedChangeSet, "drift.1", FILE_ADDED, null,
+ driftFile1), new JPADrift(expectedChangeSet, drift2.getPath(), FILE_ADDED, null, driftFile2));
DriftChangeSet<?> actualChangeSet = changeSets.get(0);
List<? extends Drift> actualDrifts = new ArrayList(actualChangeSet.getDrifts());
@@ -375,7 +364,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
@Test(dependsOnMethods = "pinTemplate")
@InitDB(false)
public void updateAttachedDefinitionsWhenTemplateGetsPinned() throws Exception {
- DriftDefinitionTemplate template = loadTemplate("test::pinTemplate");
+ DriftDefinitionTemplate template = loadTemplate(TEST_PIN_TEMPLATE);
// get the attached definitions
List<DriftDefinition> attachedDefs = new LinkedList<DriftDefinition>();
@@ -392,7 +381,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
@Test(dependsOnMethods = "pinTemplate")
@InitDB(false)
public void doNotUpdateDetachedDefinitionsWhenTemplateGetsPinned() throws Exception {
- DriftDefinitionTemplate template = loadTemplate("test::pinTemplate");
+ DriftDefinitionTemplate template = loadTemplate(TEST_PIN_TEMPLATE);
// get the detached definitions
List<DriftDefinition> detachedDefs = new LinkedList<DriftDefinition>();
@@ -409,14 +398,14 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
public void deleteTemplate() throws Exception {
// first create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test::pinTemplate");
+ templateDef.setName(TEST_PIN_TEMPLATE);
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
templateDef.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
- final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(),
- resourceType.getId(), true, templateDef);
+ final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(), resourceType.getId(), true,
+ templateDef);
// next create some resource level definitions
final DriftDefinition attachedDef1 = createDefinition(template, "attachedDef1", true);
@@ -472,22 +461,23 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
// verify that attached definitions along with their change sets have
// been deleted
assertNull("Change sets belonging to attached definitions should be deleted", loadChangeSet(changeSet0.getId()));
- assertNull("Attached definition " + toString(attachedDef1) + " should be deleted",
- loadDefinition(attachedDef1.getId()));
- assertNull("Attached definition " + toString(attachedDef2) + " should be deleted",
- loadDefinition(attachedDef2.getId()));
+ assertNull("Attached definition " + toString(attachedDef1) + " should be deleted", loadDefinition(attachedDef1
+ .getId()));
+ assertNull("Attached definition " + toString(attachedDef2) + " should be deleted", loadDefinition(attachedDef2
+ .getId()));
// verify that detached definitions along with their change sets have not been deleted
- assertNotNull("Change sets belonging to detached definitions should not be deleted",
- loadChangeSet(changeSet1.getId()));
+ assertNotNull("Change sets belonging to detached definitions should not be deleted", loadChangeSet(changeSet1
+ .getId()));
assertDetachedDefinitionNotDeleted(detachedDef1.getId());
assertDetachedDefinitionNotDeleted(detachedDef2.getId());
// verify that the template itself has been deleted
- assertNull("The template " + toString(template) + " should have been deleted",
- loadTemplate(template.getName(), false));
+ assertNull("The template " + toString(template) + " should have been deleted", loadTemplate(template.getName(),
+ false));
}
+ @SuppressWarnings("unchecked")
private void assertDefinitionIsPinned(DriftDefinition definition) throws Exception {
// verify that the definition is marked as pinned
assertTrue("Expected " + toString(definition) + " to be pinned", definition.isPinned());
@@ -503,9 +493,8 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
assertEquals("Expected to find one change set", 1, changeSets.size());
JPADriftChangeSet expectedChangeSet = new JPADriftChangeSet(resource, 1, COVERAGE, null);
- List<? extends Drift> expectedDrifts = asList(
- new JPADrift(expectedChangeSet, drift1.getPath(), FILE_ADDED, null, driftFile1),
- new JPADrift(expectedChangeSet, drift2.getPath(), FILE_ADDED, null, driftFile2));
+ List<? extends Drift> expectedDrifts = asList(new JPADrift(expectedChangeSet, drift1.getPath(), FILE_ADDED,
+ null, driftFile1), new JPADrift(expectedChangeSet, drift2.getPath(), FILE_ADDED, null, driftFile2));
DriftChangeSet<?> actualChangeSet = changeSets.get(0);
List<? extends Drift> actualDrifts = new ArrayList(actualChangeSet.getDrifts());
@@ -519,8 +508,8 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
criteria.addFilterStartVersion(1);
criteria.addFilterDriftDefinitionId(definition.getId());
- assertEquals("There should not be any drift change sets", 0,
- driftMgr.findDriftChangeSetsByCriteria(getOverlord(), criteria).size());
+ assertEquals("There should not be any drift change sets", 0, driftMgr.findDriftChangeSetsByCriteria(
+ getOverlord(), criteria).size());
}
private void assertDefinitionIsNotPinned(DriftDefinition definition) throws Exception {
@@ -534,15 +523,14 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
PageList<? extends DriftChangeSet<?>> changeSets = driftMgr.findDriftChangeSetsByCriteria(getOverlord(),
criteria);
- assertEquals("Did not expect to find any change sets for " + toString(definition) + ". Note that this " +
- "assertion method assumes that the definition you are testing is not supposed to have any change sets.",
+ assertEquals("Did not expect to find any change sets for " + toString(definition) + ". Note that this "
+ + "assertion method assumes that the definition you are testing is not supposed to have any change sets.",
0, changeSets.size());
}
private void assertDriftTemplateEquals(String msg, DriftDefinitionTemplate expected, DriftDefinitionTemplate actual) {
- AssertUtils
- .assertPropertiesMatch(msg + ": basic drift definition template properties do not match", expected, actual,
- "id", "resourceType", "ctime", "templateDefinition");
+ AssertUtils.assertPropertiesMatch(msg + ": basic drift definition template properties do not match", expected,
+ actual, "id", "resourceType", "ctime", "templateDefinition");
assertDriftDefEquals(msg + ": template definitions do not match", expected.getTemplateDefinition(), actual
.getTemplateDefinition());
}
commit e705478deae5e5c6e11cb0ca6a54af228d207102
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 14:57:54 2011 -0500
Fix dep group for javassist
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index d9d8677..f269e77 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -104,7 +104,7 @@
<!-- NOTE: The remaining test deps correspond to the classes contained in hibernate-all.jar and thirdparty-all.jar. -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>
commit b31e3a66a1e75dcad0070b5b78bbd3f8e9005533
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 14:40:55 2011 -0500
[Bug 758724 - Transaction timing can prevent drift file content from being persisted]
Resolves a timing issue where it was possible for the agent to submit
DriftFile content before the DriftFile entity was committed to the
database, thus generating exceptions due to the missing entity, and
a failure to store the required content.
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java b/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
index fb13e94..a567b75 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
@@ -128,4 +128,10 @@ public class Headers implements Serializable {
this.version = version;
}
+ @Override
+ public String toString() {
+ return "Headers [driftDefinitionName=" + driftDefinitionName + ", resourceId=" + resourceId + ", version="
+ + version + "]";
+ }
+
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
index 6633c22..c985c1e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
@@ -19,6 +19,7 @@
*/
package org.rhq.enterprise.server.drift;
+import static javax.ejb.TransactionAttributeType.NOT_SUPPORTED;
import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
import static org.rhq.core.domain.drift.DriftFileStatus.LOADED;
@@ -300,10 +301,38 @@ public class JPADriftServerBean implements JPADriftServerLocal {
df.setStatus(LOADED);
}
+ // This facade does not start, or participate in, a transaction so that it can execute its work
+ // in two new transactions. The first transaction ensures all new entities are committed to the
+ // database. The second transaction can then safely ackknowledge that the changeset is persisted
+ // and request drift file content, if necessary.
@Override
- @TransactionAttribute(REQUIRES_NEW)
+ @TransactionAttribute(NOT_SUPPORTED)
public DriftChangeSetSummary storeChangeSet(Subject subject, final int resourceId, final File changeSetZip)
throws Exception {
+
+ // a List to be populated by storeChangeSetInNewTransaction for use in ackChangeSetInNewTransaction
+ List<JPADriftFile> driftFilesToRequest = new ArrayList<JPADriftFile>();
+ // a 1 element array so storeChangeSetInNewTransaction can return the Headers for use in ackChangeSetInNewTransaction
+ Headers[] headers = new Headers[1];
+
+ DriftChangeSetSummary result = JPADriftServer.storeChangeSetInNewTransaction(subject, resourceId, changeSetZip,
+ driftFilesToRequest, headers);
+
+ if (null == result) {
+ return result;
+ }
+
+ JPADriftServer.ackChangeSetInNewTransaction(subject, resourceId, headers[0], driftFilesToRequest);
+
+ return result;
+ }
+
+ @Override
+ @TransactionAttribute(REQUIRES_NEW)
+ public DriftChangeSetSummary storeChangeSetInNewTransaction(Subject subject, final int resourceId,
+ final File changeSetZip, final List<JPADriftFile> driftFilesToRequest, final Headers[] headers)
+ throws Exception {
+
final Resource resource = getResource(resourceId);
final DriftChangeSetSummary summary = new DriftChangeSetSummary();
final boolean storeBinaryContent = isBinaryContentStorageEnabled();
@@ -313,105 +342,82 @@ public class JPADriftServerBean implements JPADriftServerLocal {
@Override
public boolean visit(ZipEntry zipEntry, ZipInputStream stream) throws Exception {
- List<JPADriftFile> emptyDriftFiles = new ArrayList<JPADriftFile>();
+
JPADriftChangeSet driftChangeSet = null;
- try {
- ChangeSetReader reader = new ChangeSetReaderImpl(new BufferedReader(new InputStreamReader(
- stream)), false);
+ ChangeSetReader reader = new ChangeSetReaderImpl(new BufferedReader(new InputStreamReader(stream)),
+ false);
- // store the new change set info (not the actual blob)
- DriftDefinition driftDef = findDriftDefinition(resource, reader.getHeaders());
- if (driftDef == null) {
- log.error("Unable to locate DriftDefinition for Resource [" + resource
- + "]. Change set cannot be saved.");
- return false;
- }
- // TODO: Commenting out the following line for now. We want to set the
- // version to the value specified in the headers, but we may want to also
- // validate it against the latest version we have in the database so that
- // we can make sure that the agent is in sync with the server.
- //
- //int version = getChangeSetVersion(resource, config);
- int version = reader.getHeaders().getVersion();
-
- DriftChangeSetCategory category = reader.getHeaders().getType();
- driftChangeSet = new JPADriftChangeSet(resource, version, category, driftDef);
- entityManager.persist(driftChangeSet);
-
- summary.setCategory(category);
- summary.setResourceId(resourceId);
- summary.setDriftDefinitionName(reader.getHeaders().getDriftDefinitionName());
- summary.setDriftHandlingMode(driftDef.getDriftHandlingMode());
- summary.setCreatedTime(driftChangeSet.getCtime());
-
- if (version > 0) {
- for (FileEntry entry : reader) {
- boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
- JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), emptyDriftFiles, addToList);
- JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
-
- // TODO Figure out an efficient way to save coverage change sets.
- // The initial/coverage change set could contain hundreds or even thousands
- // of entries. We probably want to consider doing some kind of batch insert
- //
- // jsanda
-
- // use a path with only forward slashing to ensure consistent paths across reports
- String path = FileUtil.useForwardSlash(entry.getFile());
- JPADrift drift = new JPADrift(driftChangeSet, path, entry.getType(), oldDriftFile,
- newDriftFile);
- entityManager.persist(drift);
-
- // we are taking advantage of the fact that we know the summary is only used by the server
- // if the change set is a DRIFT report. If its a coverage report, it is not used (we do
- // not alert on coverage reports) - so don't waste memory by collecting all the paths
- // when we know they aren't going to be used anyway.
- if (category == DriftChangeSetCategory.DRIFT) {
- summary.addDriftPathname(path);
- }
- }
- } else {
- summary.setInitialChangeSet(true);
- JPADriftSet driftSet = new JPADriftSet();
- for (FileEntry entry : reader) {
- boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
- JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
- String path = FileUtil.useForwardSlash(entry.getFile());
- // A Drift always has a changeSet. Note that in this code section the changeset is
- // always going to be set to a DriftDefinition's changeSet. But that is not always the
- // case, it could also be set to a DriftDefinitionTemplate's changeSet.
- driftSet.addDrift(new JPADrift(driftChangeSet, path, entry.getType(), null,
- newDriftFile));
+ // store the new change set info (not the actual blob)
+ DriftDefinition driftDef = findDriftDefinition(resource, reader.getHeaders());
+ if (driftDef == null) {
+ log.error("Unable to locate DriftDefinition for Resource [" + resource
+ + "]. Change set cannot be saved.");
+ return false;
+ }
+ // TODO: Commenting out the following line for now. We want to set the
+ // version to the value specified in the headers, but we may want to also
+ // validate it against the latest version we have in the database so that
+ // we can make sure that the agent is in sync with the server.
+ //
+ //int version = getChangeSetVersion(resource, config);
+ int version = reader.getHeaders().getVersion();
+
+ DriftChangeSetCategory category = reader.getHeaders().getType();
+ driftChangeSet = new JPADriftChangeSet(resource, version, category, driftDef);
+ entityManager.persist(driftChangeSet);
+
+ summary.setCategory(category);
+ summary.setResourceId(resourceId);
+ summary.setDriftDefinitionName(reader.getHeaders().getDriftDefinitionName());
+ summary.setDriftHandlingMode(driftDef.getDriftHandlingMode());
+ summary.setCreatedTime(driftChangeSet.getCtime());
+
+ if (version > 0) {
+ for (FileEntry entry : reader) {
+ boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
+ JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), driftFilesToRequest, addToList);
+ JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), driftFilesToRequest, addToList);
+
+ // TODO Figure out an efficient way to save coverage change sets.
+ // The initial/coverage change set could contain hundreds or even thousands
+ // of entries. We probably want to consider doing some kind of batch insert
+ //
+ // jsanda
+
+ // use a path with only forward slashing to ensure consistent paths across reports
+ String path = FileUtil.useForwardSlash(entry.getFile());
+ JPADrift drift = new JPADrift(driftChangeSet, path, entry.getType(), oldDriftFile,
+ newDriftFile);
+ entityManager.persist(drift);
+
+ // we are taking advantage of the fact that we know the summary is only used by the server
+ // if the change set is a DRIFT report. If its a coverage report, it is not used (we do
+ // not alert on coverage reports) - so don't waste memory by collecting all the paths
+ // when we know they aren't going to be used anyway.
+ if (category == DriftChangeSetCategory.DRIFT) {
+ summary.addDriftPathname(path);
}
- entityManager.persist(driftSet);
- driftChangeSet.setInitialDriftSet(driftSet);
- entityManager.merge(driftChangeSet);
}
-
- AgentClient agentClient = agentManager.getAgentClient(subjectManager.getOverlord(), resourceId);
- DriftAgentService service = agentClient.getDriftAgentService();
-
- service.ackChangeSet(resourceId, reader.getHeaders().getDriftDefinitionName());
-
- // send a message to the agent requesting the empty JPADriftFile content
- if (!emptyDriftFiles.isEmpty()) {
- try {
- if (service.requestDriftFiles(resourceId, reader.getHeaders(), emptyDriftFiles)) {
- for (DriftFile driftFile : emptyDriftFiles) {
- driftFile.setStatus(DriftFileStatus.REQUESTED);
- }
- }
- } catch (Exception e) {
- log.warn(" Unable to inform agent of drift file request [" + emptyDriftFiles + "]", e);
- }
+ } else {
+ summary.setInitialChangeSet(true);
+ JPADriftSet driftSet = new JPADriftSet();
+ for (FileEntry entry : reader) {
+ boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
+ JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), driftFilesToRequest, addToList);
+ String path = FileUtil.useForwardSlash(entry.getFile());
+ // A Drift always has a changeSet. Note that in this code section the changeset is
+ // always going to be set to a DriftDefinition's changeSet. But that is not always the
+ // case, it could also be set to a DriftDefinitionTemplate's changeSet.
+ driftSet.addDrift(new JPADrift(driftChangeSet, path, entry.getType(), null, newDriftFile));
}
- } catch (Exception e) {
- String msg = "Failed to store drift changeset [" + driftChangeSet + "]";
- log.error(msg, e);
- return false;
+ entityManager.persist(driftSet);
+ driftChangeSet.setInitialDriftSet(driftSet);
+ entityManager.merge(driftChangeSet);
}
+ headers[0] = reader.getHeaders();
+
return true;
}
});
@@ -423,16 +429,43 @@ public class JPADriftServerBean implements JPADriftServerLocal {
if (null != resource) {
msg += resource;
} else {
- msg += ("resourceId " + resourceId);
+ msg += ("resourceId [" + resourceId + "]");
}
log.error(msg, e);
return null;
+
} finally {
// delete the changeSetFile?
}
}
+ @Override
+ @TransactionAttribute(REQUIRES_NEW)
+ public void ackChangeSetInNewTransaction(Subject subject, final int resourceId, final Headers headers,
+ final List<JPADriftFile> driftFilesToRequest) throws Exception {
+
+ try {
+ AgentClient agentClient = agentManager.getAgentClient(subjectManager.getOverlord(), resourceId);
+ DriftAgentService service = agentClient.getDriftAgentService();
+
+ service.ackChangeSet(resourceId, headers.getDriftDefinitionName());
+
+ // send a message to the agent requesting the necessary JPADriftFile content. Note that the
+ // driftFile status has been set to REQUESTED outside of this call.
+ if (!driftFilesToRequest.isEmpty()) {
+ try {
+ service.requestDriftFiles(resourceId, headers, driftFilesToRequest);
+
+ } catch (Exception e) {
+ log.warn("Unable to inform agent of drift file request [" + driftFilesToRequest + "]", e);
+ }
+ }
+ } catch (Exception e) {
+ log.warn("Unable to acknowledge changeSet storage with agent for " + headers, e);
+ }
+ }
+
private boolean isBinaryContentStorageEnabled() {
String binaryContent = System.getProperty("rhq.server.drift.store-binary-content", "false");
return binaryContent.equals("true");
@@ -446,9 +479,15 @@ public class JPADriftServerBean implements JPADriftServerLocal {
}
result = entityManager.find(JPADriftFile.class, sha256);
- // if the JPADriftFile is not yet in the db, then it needs to be fetched from the agent
+ // if the JPADriftFile is not yet in the db then persist it, and mark it requested if content is to be fetched
+ // note - by immediately setting the initial status to REQUESTED we avoid a future update and a
+ // potential deadlock scenario where the REQUESTED and LOADED status updates can happen simultaneously
if (null == result) {
- result = persistDriftFile(new JPADriftFile(sha256));
+ JPADriftFile driftFile = new JPADriftFile(sha256);
+ if (addToList) {
+ driftFile.setStatus(DriftFileStatus.REQUESTED);
+ }
+ result = persistDriftFile(driftFile);
if (addToList) {
emptyDriftFiles.add(result);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
index 0cd1e78..940a54b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
@@ -21,9 +21,11 @@ package org.rhq.enterprise.server.drift;
import java.io.File;
import java.io.InputStream;
+import java.util.List;
import javax.ejb.Local;
+import org.rhq.common.drift.Headers;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.DriftChangeSetCriteria;
import org.rhq.core.domain.criteria.DriftCriteria;
@@ -103,6 +105,18 @@ public interface JPADriftServerLocal {
DriftChangeSetSummary storeChangeSet(Subject subject, int resourceId, File changeSetZip) throws Exception;
/**
+ * For transactioning purposes only, part of storeChangeSet impl. Not to be exposed outside of local interface.
+ */
+ DriftChangeSetSummary storeChangeSetInNewTransaction(Subject subject, int resourceId, File changeSetZip,
+ List<JPADriftFile> driftFilesToRequest, Headers[] headers) throws Exception;
+
+ /**
+ * For transactioning purposes only, part of storeChangeSet impl. Not to be exposed outside of local interface.
+ */
+ void ackChangeSetInNewTransaction(Subject subject, int resourceId, Headers headers,
+ List<JPADriftFile> driftFilesToRequest) throws Exception;
+
+ /**
* This method stores the provided drift files. The files should correspond to requested drift files.
* The unzipped files will have their sha256 generated. Those not corresponding to needed content will
* be logged and ignored.
commit 663c3c65527a5aacbcafead08614e4b416d52fa6
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:43:54 2011 -0500
[Bug 758565 - Add drift templates to JBAS WAR/EAR resources]
After reverting the changes to support EAR/WAR/Embedded WAR
types for AS-4 and AS-5 plugins, this now adds back drift
templates for EAR and WAR types. The Embedded WAR support will
be added back in later, when the repo is open for the plugin
code changes required to offer that support.
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 32aca99..2729d31 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -2313,6 +2313,15 @@
&deploymentContentConfigProps;
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
<service name="Web Application (WAR)"
@@ -2364,6 +2373,15 @@
&deploymentContentConfigProps;
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index db4b8e5..d4d0874 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -259,8 +259,9 @@
</configuration>
</content>
- <drift-definition name="Template-Base Files"
- description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
+ <drift-definition
+ name="Template-Base Files"
+ description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
<basedir>
<value-context>pluginConfiguration</value-context>
<value-name>jbossHomeDir</value-name>
@@ -2267,6 +2268,15 @@
</configuration>
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Embedded Web Application (WAR)"
class="org.rhq.plugins.jbossas.WarComponent"
discovery="org.rhq.plugins.jbossas.EmbeddedWarDiscoveryComponent"
@@ -2460,55 +2470,55 @@
dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL"
description="the minimum, maximum, and average response times for HTTP requests serviced by this webapp"/>
- <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
+ <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
units="milliseconds"
description="Minimum response time of a servlet"/>
- <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
+ <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
units="milliseconds"
description="Average response time of a servlet"/>
- <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
+ <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
units="milliseconds"
description="Maximum response time of a servlet"/>
- <metric property="Servlet.TotalTime" displayName="Total processing time"
+ <metric property="Servlet.TotalTime" displayName="Total processing time"
units="milliseconds"
description="Total processing time of the webapp" measurementType="trendsup"/>
- <metric property="Servlet.NumRequests" displayName="Requests served"
+ <metric property="Servlet.NumRequests" displayName="Requests served"
units="none" description="Number of requests served by servlets"
measurementType="trendsup" displayType="summary"/>
- <metric property="Servlet.NumErrors" displayName="Errors while processing"
+ <metric property="Servlet.NumErrors" displayName="Errors while processing"
units="none" description="Number of errors while processing"
measurementType="trendsup" displayType="summary"/>
- <metric property="Session.activeSessions" displayName="Currently Active Sessions"
+ <metric property="Session.activeSessions" displayName="Currently Active Sessions"
units="none" description="Number active sessions for the webapp right now" />
- <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
+ <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
units="none" description="Maximum number of active sessions for the webapp" />
- <metric property="Session.sessionCounter" displayName="Sessions created"
+ <metric property="Session.sessionCounter" displayName="Sessions created"
units="none" description="Number of sessions created for the webapp"
measurementType="trendsup" />
- <metric property="Session.expiredSessions" displayName="Expired Sessions"
+ <metric property="Session.expiredSessions" displayName="Expired Sessions"
units="none" description="Number of expired sessions for the webapp"
measurementType="trendsup" />
- <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
+ <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
units="none" description="Number of sessions rejected for the webapp"
measurementType="trendsup" />
- <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
+ <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
units="seconds" description="Average alive time of a Sessions" />
- <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
+ <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
units="seconds" description="Maximum alive time of a Sessions" />
- <metric property="Vhost.name" displayName="Vhost" dataType="trait"
+ <metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
<content name="file" displayName="WAR File" category="deployable" isCreationType="true">
@@ -2524,6 +2534,15 @@
</configuration>
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
<service name="EJB3 Entity Tree Cache"
commit 42c78796a8b115058f4f87f2d9f61f1cdec11428
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:38:16 2011 -0500
Revert "Fix issue in AS-4 plugin such that for embedded WAR resources the"
This reverts commit 8c6dcd3817195f9a0f0d9855b3f7b648bd1ada5d.
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
index 9ad2fbd..18a6b38 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
@@ -65,7 +65,7 @@ public class EmbeddedWarDiscoveryComponent extends MBeanResourceDiscoveryCompone
// Once we've finished making sure the plugin configurations have the data we need:
// 1) First the stuff generic to all WARs...
- JBossASServerComponent<?> grandparentJBossASComponent = parentEarComponent.getParentResourceComponent();
+ JBossASServerComponent grandparentJBossASComponent = parentEarComponent.getParentResourceComponent();
resourceDetails = WarDiscoveryHelper.initPluginConfigurations(grandparentJBossASComponent, resourceDetails,
parentEarComponent);
@@ -74,7 +74,7 @@ public class EmbeddedWarDiscoveryComponent extends MBeanResourceDiscoveryCompone
for (DiscoveredResourceDetails resource : resourceDetails) {
Configuration pluginConfiguration = resource.getPluginConfiguration();
pluginConfiguration.put(new PropertySimple(WarComponent.FILE_NAME, parentEarFullFileName
- + pluginConfiguration.getSimpleValue(WarComponent.NAME_CONFIG_PROP, "")));
+ + resource.getResourceName()));
}
return resourceDetails;
commit a481dd1c53a035f9a633551ea982bc70d9e0188b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:37:50 2011 -0500
Revert "Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin"
This reverts commit 0ad22b15a3f6d5b700bfec506db74f6a20633f21.
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index b5d4bd1..db4b8e5 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -259,9 +259,8 @@
</configuration>
</content>
- <drift-definition
- name="Template-Base Files"
- description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
+ <drift-definition name="Template-Base Files"
+ description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
<basedir>
<value-context>pluginConfiguration</value-context>
<value-name>jbossHomeDir</value-name>
@@ -2268,15 +2267,6 @@
</configuration>
</content>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>filename</value-name>
- </basedir>
- </drift-definition>
-
<service name="Embedded Web Application (WAR)"
class="org.rhq.plugins.jbossas.WarComponent"
discovery="org.rhq.plugins.jbossas.EmbeddedWarDiscoveryComponent"
@@ -2394,15 +2384,6 @@
<metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the embedded web application archive (WAR). Use filters for more fine-grained monitoring.">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>filename</value-name>
- </basedir>
- </drift-definition>
-
</service>
</service>
@@ -2479,55 +2460,55 @@
dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL"
description="the minimum, maximum, and average response times for HTTP requests serviced by this webapp"/>
- <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
+ <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
units="milliseconds"
description="Minimum response time of a servlet"/>
- <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
+ <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
units="milliseconds"
description="Average response time of a servlet"/>
- <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
+ <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
units="milliseconds"
description="Maximum response time of a servlet"/>
- <metric property="Servlet.TotalTime" displayName="Total processing time"
+ <metric property="Servlet.TotalTime" displayName="Total processing time"
units="milliseconds"
description="Total processing time of the webapp" measurementType="trendsup"/>
- <metric property="Servlet.NumRequests" displayName="Requests served"
+ <metric property="Servlet.NumRequests" displayName="Requests served"
units="none" description="Number of requests served by servlets"
measurementType="trendsup" displayType="summary"/>
- <metric property="Servlet.NumErrors" displayName="Errors while processing"
+ <metric property="Servlet.NumErrors" displayName="Errors while processing"
units="none" description="Number of errors while processing"
measurementType="trendsup" displayType="summary"/>
- <metric property="Session.activeSessions" displayName="Currently Active Sessions"
+ <metric property="Session.activeSessions" displayName="Currently Active Sessions"
units="none" description="Number active sessions for the webapp right now" />
- <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
+ <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
units="none" description="Maximum number of active sessions for the webapp" />
- <metric property="Session.sessionCounter" displayName="Sessions created"
+ <metric property="Session.sessionCounter" displayName="Sessions created"
units="none" description="Number of sessions created for the webapp"
measurementType="trendsup" />
- <metric property="Session.expiredSessions" displayName="Expired Sessions"
+ <metric property="Session.expiredSessions" displayName="Expired Sessions"
units="none" description="Number of expired sessions for the webapp"
measurementType="trendsup" />
- <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
+ <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
units="none" description="Number of sessions rejected for the webapp"
measurementType="trendsup" />
- <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
+ <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
units="seconds" description="Average alive time of a Sessions" />
- <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
+ <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
units="seconds" description="Maximum alive time of a Sessions" />
- <metric property="Vhost.name" displayName="Vhost" dataType="trait"
+ <metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
<content name="file" displayName="WAR File" category="deployable" isCreationType="true">
@@ -2543,15 +2524,6 @@
</configuration>
</content>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>filename</value-name>
- </basedir>
- </drift-definition>
-
</service>
<service name="EJB3 Entity Tree Cache"
commit aa79d1e533ca7a3e216719c933493d8ffef64b6b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:36:24 2011 -0500
Revert "Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin"
This reverts commit 72d6aa5c440900dacaf8f97914ea2e17dea07112.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
index ea8d467..2ed3159 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
@@ -33,28 +33,28 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
/**
* @author Ian Springer
*/
-public class EmbeddedManagedDeploymentComponent extends AbstractManagedDeploymentComponent implements MeasurementFacet {
+public class EmbeddedManagedDeploymentComponent extends AbstractManagedDeploymentComponent
+ implements MeasurementFacet
+{
private static final String CUSTOM_PARENT_TRAIT = "custom.parent";
- private static final String CUSTOM_PATH_TRAIT = "custom.path";
// ------------ MeasurementFacet Implementation ------------
- public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
- Set<MeasurementScheduleRequest> remainingRequests = new HashSet<MeasurementScheduleRequest>();
- for (MeasurementScheduleRequest request : requests) {
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests)
+ throws Exception
+ {
+ Set<MeasurementScheduleRequest> remainingRequests = new HashSet();
+ for (MeasurementScheduleRequest request : requests)
+ {
String metricName = request.getName();
- if (metricName.equals(CUSTOM_PARENT_TRAIT)) {
+ if (metricName.equals(CUSTOM_PARENT_TRAIT))
+ {
String parentDeploymentName = getManagedDeployment().getParent().getName();
MeasurementDataTrait trait = new MeasurementDataTrait(request, parentDeploymentName);
report.addData(trait);
-
- } else if (metricName.equals(CUSTOM_PATH_TRAIT)) {
- boolean exploded = this.deploymentFile.isDirectory();
- if (exploded) {
- MeasurementDataTrait trait = new MeasurementDataTrait(request, this.deploymentFile.getPath());
- report.addData(trait);
- }
- } else {
+ }
+ else
+ {
remainingRequests.add(request);
}
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 470b0f6..32aca99 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -2313,15 +2313,6 @@
&deploymentContentConfigProps;
</content>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
- <basedir>
- <value-context>measurementTrait</value-context>
- <value-name>custom.path</value-name>
- </basedir>
- </drift-definition>
-
</service>
<service name="Web Application (WAR)"
@@ -2373,15 +2364,6 @@
&deploymentContentConfigProps;
</content>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
- <basedir>
- <value-context>measurementTrait</value-context>
- <value-name>custom.path</value-name>
- </basedir>
- </drift-definition>
-
<service name="Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
@@ -2444,21 +2426,9 @@
<metric property="custom.parent" displayName="Parent"
dataType="trait" displayType="summary"
description="the name of this WAR's parent deployment"/>
- <metric property="custom.path" displayName="Path"
- dataType="trait" displayType="summary"
- description="the absolute path of this WAR directory (not supported for WAR's embedded in non-exploded EARs)"/>
&webApplicationMetrics;
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the embedded web application archive (WAR). Use filters for more fine-grained monitoring.">
- <basedir>
- <value-context>measurementTrait</value-context>
- <value-name>custom.path</value-name>
- </basedir>
- </drift-definition>
-
<service name="Embedded Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
commit 72d6aa5c440900dacaf8f97914ea2e17dea07112
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Nov 29 17:54:29 2011 -0500
Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin
- To support this, add new Path trait (via Ian) for embedded war resources
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
index 2ed3159..ea8d467 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
@@ -33,28 +33,28 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
/**
* @author Ian Springer
*/
-public class EmbeddedManagedDeploymentComponent extends AbstractManagedDeploymentComponent
- implements MeasurementFacet
-{
+public class EmbeddedManagedDeploymentComponent extends AbstractManagedDeploymentComponent implements MeasurementFacet {
private static final String CUSTOM_PARENT_TRAIT = "custom.parent";
+ private static final String CUSTOM_PATH_TRAIT = "custom.path";
// ------------ MeasurementFacet Implementation ------------
- public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests)
- throws Exception
- {
- Set<MeasurementScheduleRequest> remainingRequests = new HashSet();
- for (MeasurementScheduleRequest request : requests)
- {
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
+ Set<MeasurementScheduleRequest> remainingRequests = new HashSet<MeasurementScheduleRequest>();
+ for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
- if (metricName.equals(CUSTOM_PARENT_TRAIT))
- {
+ if (metricName.equals(CUSTOM_PARENT_TRAIT)) {
String parentDeploymentName = getManagedDeployment().getParent().getName();
MeasurementDataTrait trait = new MeasurementDataTrait(request, parentDeploymentName);
report.addData(trait);
- }
- else
- {
+
+ } else if (metricName.equals(CUSTOM_PATH_TRAIT)) {
+ boolean exploded = this.deploymentFile.isDirectory();
+ if (exploded) {
+ MeasurementDataTrait trait = new MeasurementDataTrait(request, this.deploymentFile.getPath());
+ report.addData(trait);
+ }
+ } else {
remainingRequests.add(request);
}
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 32aca99..470b0f6 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -2313,6 +2313,15 @@
&deploymentContentConfigProps;
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
<service name="Web Application (WAR)"
@@ -2364,6 +2373,15 @@
&deploymentContentConfigProps;
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
@@ -2426,9 +2444,21 @@
<metric property="custom.parent" displayName="Parent"
dataType="trait" displayType="summary"
description="the name of this WAR's parent deployment"/>
+ <metric property="custom.path" displayName="Path"
+ dataType="trait" displayType="summary"
+ description="the absolute path of this WAR directory (not supported for WAR's embedded in non-exploded EARs)"/>
&webApplicationMetrics;
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the embedded web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Embedded Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
commit 0ad22b15a3f6d5b700bfec506db74f6a20633f21
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Nov 29 17:53:32 2011 -0500
Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index db4b8e5..b5d4bd1 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -259,8 +259,9 @@
</configuration>
</content>
- <drift-definition name="Template-Base Files"
- description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
+ <drift-definition
+ name="Template-Base Files"
+ description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
<basedir>
<value-context>pluginConfiguration</value-context>
<value-name>jbossHomeDir</value-name>
@@ -2267,6 +2268,15 @@
</configuration>
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Embedded Web Application (WAR)"
class="org.rhq.plugins.jbossas.WarComponent"
discovery="org.rhq.plugins.jbossas.EmbeddedWarDiscoveryComponent"
@@ -2384,6 +2394,15 @@
<metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the embedded web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
</service>
@@ -2460,55 +2479,55 @@
dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL"
description="the minimum, maximum, and average response times for HTTP requests serviced by this webapp"/>
- <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
+ <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
units="milliseconds"
description="Minimum response time of a servlet"/>
- <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
+ <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
units="milliseconds"
description="Average response time of a servlet"/>
- <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
+ <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
units="milliseconds"
description="Maximum response time of a servlet"/>
- <metric property="Servlet.TotalTime" displayName="Total processing time"
+ <metric property="Servlet.TotalTime" displayName="Total processing time"
units="milliseconds"
description="Total processing time of the webapp" measurementType="trendsup"/>
- <metric property="Servlet.NumRequests" displayName="Requests served"
+ <metric property="Servlet.NumRequests" displayName="Requests served"
units="none" description="Number of requests served by servlets"
measurementType="trendsup" displayType="summary"/>
- <metric property="Servlet.NumErrors" displayName="Errors while processing"
+ <metric property="Servlet.NumErrors" displayName="Errors while processing"
units="none" description="Number of errors while processing"
measurementType="trendsup" displayType="summary"/>
- <metric property="Session.activeSessions" displayName="Currently Active Sessions"
+ <metric property="Session.activeSessions" displayName="Currently Active Sessions"
units="none" description="Number active sessions for the webapp right now" />
- <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
+ <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
units="none" description="Maximum number of active sessions for the webapp" />
- <metric property="Session.sessionCounter" displayName="Sessions created"
+ <metric property="Session.sessionCounter" displayName="Sessions created"
units="none" description="Number of sessions created for the webapp"
measurementType="trendsup" />
- <metric property="Session.expiredSessions" displayName="Expired Sessions"
+ <metric property="Session.expiredSessions" displayName="Expired Sessions"
units="none" description="Number of expired sessions for the webapp"
measurementType="trendsup" />
- <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
+ <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
units="none" description="Number of sessions rejected for the webapp"
measurementType="trendsup" />
- <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
+ <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
units="seconds" description="Average alive time of a Sessions" />
- <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
+ <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
units="seconds" description="Maximum alive time of a Sessions" />
- <metric property="Vhost.name" displayName="Vhost" dataType="trait"
+ <metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
<content name="file" displayName="WAR File" category="deployable" isCreationType="true">
@@ -2524,6 +2543,15 @@
</configuration>
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
<service name="EJB3 Entity Tree Cache"
commit 8c6dcd3817195f9a0f0d9855b3f7b648bd1ada5d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Nov 29 17:50:22 2011 -0500
Fix issue in AS-4 plugin such that for embedded WAR resources the
"filename" plugin config prop and the "Path" trait are set to an actual
path (do not use the resource name when constructing the value)
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
index 18a6b38..9ad2fbd 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
@@ -65,7 +65,7 @@ public class EmbeddedWarDiscoveryComponent extends MBeanResourceDiscoveryCompone
// Once we've finished making sure the plugin configurations have the data we need:
// 1) First the stuff generic to all WARs...
- JBossASServerComponent grandparentJBossASComponent = parentEarComponent.getParentResourceComponent();
+ JBossASServerComponent<?> grandparentJBossASComponent = parentEarComponent.getParentResourceComponent();
resourceDetails = WarDiscoveryHelper.initPluginConfigurations(grandparentJBossASComponent, resourceDetails,
parentEarComponent);
@@ -74,7 +74,7 @@ public class EmbeddedWarDiscoveryComponent extends MBeanResourceDiscoveryCompone
for (DiscoveredResourceDetails resource : resourceDetails) {
Configuration pluginConfiguration = resource.getPluginConfiguration();
pluginConfiguration.put(new PropertySimple(WarComponent.FILE_NAME, parentEarFullFileName
- + resource.getResourceName()));
+ + pluginConfiguration.getSimpleValue(WarComponent.NAME_CONFIG_PROP, "")));
}
return resourceDetails;
commit 8939b50bf8bee6f4b0037885026abdcd2f79946a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Nov 29 12:18:17 2011 -0500
[Bug 758261 - A bad drift definition can prevent agent startup]
Add more aggressive catching (Throwable) because it's better to skip
detection for a problematic definition than it is to prevent agent
startup.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index c713297..2790f13 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@ -152,9 +152,11 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
try {
syncWithServer(r, d);
schedulesQueue.addSchedule(new DriftDetectionSchedule(r.getId(), d));
- } catch (IOException e) {
+
+ } catch (Throwable t) {
+ // catch throwable, don't prevent agent startup just due to a bad definition
log.error("Failed to sync with server for " + toString(r.getId(), d) + ". Drift detection will not be "
- + "scheduled.", e);
+ + "scheduled.", t);
}
}
@@ -691,7 +693,8 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
// find out the type of base location that is specified by the drift def
DriftDefinition.BaseDirectory baseDir = driftDefinition.getBasedir();
if (baseDir == null) {
- throw new IllegalArgumentException("Missing basedir in drift definition");
+ throw new IllegalArgumentException("Base directory is null for drift definition ["
+ + driftDefinition.getName() + "]");
}
// based on the type of base location, determine the root base directory
commit f80179210e18065e5d32850726f9b79826dd669b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 29 17:18:02 2011 -0500
[BZ 756086] allow CLI to support printing of arrays (primitive and object). This only supports single-dimension arrays but none of our APIs return multi-dim arrays AFAIK
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
index 382ce8c..6ead45c 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
@@ -79,6 +79,8 @@ public class TabularWriter {
static {
SIMPLE_TYPES.add(Byte.class);
SIMPLE_TYPES.add(Byte.TYPE);
+ SIMPLE_TYPES.add(Character.class);
+ SIMPLE_TYPES.add(Character.TYPE);
SIMPLE_TYPES.add(Short.class);
SIMPLE_TYPES.add(Short.TYPE);
SIMPLE_TYPES.add(Integer.class);
@@ -130,7 +132,48 @@ public class TabularWriter {
}
if (object != null && object.getClass().isArray()) {
- print((Object[]) object);
+ if (!object.getClass().getComponentType().isPrimitive()) {
+ print((Object[]) object);
+ } else {
+ Class<?> oClass = object.getClass();
+ // note: we assume single-dimension arrays!
+ out.println("Array of " + (oClass.getComponentType().getName()));
+ if (oClass == byte[].class) {
+ for (byte i : (byte[]) object) {
+ this.out.println(i);
+ }
+ } else if (oClass == short[].class) {
+ for (short i : (short[]) object) {
+ this.out.println(i);
+ }
+ } else if (oClass == int[].class) {
+ for (int i : (int[]) object) {
+ this.out.println(i);
+ }
+ } else if (oClass == long[].class) {
+ for (long i : (long[]) object) {
+ this.out.println(i);
+ }
+ } else if (oClass == char[].class) {
+ for (char i : (char[]) object) {
+ this.out.println(i);
+ }
+ } else if (oClass == float[].class) {
+ for (float i : (float[]) object) {
+ this.out.println(i);
+ }
+ } else if (oClass == double[].class) {
+ for (double i : (double[]) object) {
+ this.out.println(i);
+ }
+ } else if (oClass == boolean[].class) {
+ for (boolean i : (boolean[]) object) {
+ this.out.println(i);
+ }
+ } else {
+ this.out.println("*Printing of this data type is not supported*");
+ }
+ }
return;
}
@@ -285,7 +328,7 @@ public class TabularWriter {
for (Object object : list) {
data[i++][0] = (String) object;
}
-
+ this.print(data);
} else {
if (consistentMaps(list)) {
@@ -318,30 +361,33 @@ public class TabularWriter {
}
}
- headers = new String[pdList.size()];
- data = new String[list.size()][pdList.size()];
+ if (pdList.isEmpty()) {
+ printStrings(list);
+ } else {
+ headers = new String[pdList.size()];
+ data = new String[list.size()][pdList.size()];
- for (PropertyDescriptor pd : pdList) {
- headers[i++] = pd.getName();
- }
- i = 0;
- for (Object row : list) {
- int j = 0;
for (PropertyDescriptor pd : pdList) {
-
- Object val = "?";
- val = invoke(row, pd.getReadMethod());
- if (val == null) {
- data[i][j++] = "";
- } else {
- data[i][j++] = shortVersion(val);
+ headers[i++] = pd.getName();
+ }
+ i = 0;
+ for (Object row : list) {
+ int j = 0;
+ for (PropertyDescriptor pd : pdList) {
+
+ Object val = "?";
+ val = invoke(row, pd.getReadMethod());
+ if (val == null) {
+ data[i][j++] = "";
+ } else {
+ data[i][j++] = shortVersion(val);
+ }
}
+ i++;
}
- i++;
- }
-
- this.print(data);
+ this.print(data);
+ }
}
}
} catch (Exception e) {
@@ -530,13 +576,11 @@ public class TabularWriter {
for (Integer col : columns) {
actualColumnWidths[col] = maxColumnWidth;
}
- }
- else if (columns.size() == 0) {
+ } else if (columns.size() == 0) {
// If the columns list is empty then that means that there is enough available
// space for each column so we are done.
return;
- }
- else if (extraSpace > 0) {
+ } else if (extraSpace > 0) {
// Since we have extra space, we will go ahead and recalculate the widths for
// those columns still needing space
int newMaxColumnWidth = (maxColumnWidth + extraSpace) / columns.size();
diff --git a/modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java b/modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java
index a80d2c2..a69f7bf 100644
--- a/modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java
+++ b/modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java
@@ -23,6 +23,8 @@
package org.rhq.bindings;
+import static org.testng.Assert.assertEquals;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
@@ -42,8 +44,6 @@ import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.shared.ResourceBuilder;
-import static org.testng.Assert.*;
-
public class TabularWriterTest {
StringWriter stringWriter;
@@ -57,6 +57,60 @@ public class TabularWriterTest {
}
@Test
+ public void testPrintEntityArray() {
+ User[] users = new User[] { new User(1, "rhqadmin", "rhqadmin"), new User(222, "name", "pw") };
+
+ writer.print(users);
+
+ assertLineEquals(1, "id password username", "Cannot print entity array header");
+ // skip line 2 - its the separator "--------------"
+ assertLineEquals(3, "1 rhqadmin rhqadmin", "Cannot print first entity array item");
+ assertLineEquals(4, "222 pw name ", "Cannot print second entity array item");
+ }
+
+ /**
+ * This tests printing String arrays via the print(Object) API
+ */
+ @Test
+ public void testPrintStringArray() {
+ String[] objArray = new String[] { new String("first string"), new String("second string") };
+ Object obj = objArray;
+ writer.print(obj);
+
+ // first two lines are the header and "----" separator
+ assertLineEquals(3, "first string ", "Cannot print first string array item");
+ assertLineEquals(4, "second string", "Cannot print first string array item");
+ }
+
+ /**
+ * This tests printing "primitive object" arrays via the print(Object) API
+ */
+ @Test
+ public void testPrintObjectArray() {
+ Integer[] objArray = new Integer[] { new Integer("123"), new Integer("789") };
+ Object obj = objArray;
+ writer.print(obj);
+
+ String expected = "Array of java.lang.Integer\n123\n789\n";
+ String actual = stringWriter.toString();
+ assertEquals(actual, expected, "Could not print an object Integer array");
+ }
+
+ /**
+ * This tests printing primitive arrays via the print(Object) API
+ */
+ @Test
+ public void testPrintPrimaryArray() {
+ byte[] primitiveArray = "abc".getBytes();
+ Object obj = primitiveArray;
+ writer.print(obj);
+
+ String expected = "Array of byte\n" + (int) 'a' + '\n' + (int) 'b' + '\n' + (int) 'c' + '\n';
+ String actual = stringWriter.toString();
+ assertEquals(actual, expected, "Could not print a primitive byte array");
+ }
+
+ @Test
public void aByteShouldPrintUnchanged() {
byte value = 1;
commit 4a30174e4cb99e7290b7f8d7b21be19572ed57e6
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 29 17:15:48 2011 -0500
add bindings test module to eclipse classpath
diff --git a/.classpath b/.classpath
index 29ff1d4..24fb54d 100644
--- a/.classpath
+++ b/.classpath
@@ -167,6 +167,7 @@
<classpathentry kind="src" path="modules/enterprise/server/jar/src/main/filtered-sources/java"/>
<classpathentry kind="src" path="modules/enterprise/server/jar/target/generated-sources/antlr3"/>
<classpathentry kind="src" path="modules/enterprise/binding/src/main/java"/>
+ <classpathentry kind="src" path="modules/enterprise/binding/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/gui/coregui/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/gui/coregui/target/generated-sources/gwt"/>
<classpathentry kind="src" path="modules/enterprise/gui/portal-war/src/main/java"/>
commit 96fb4fd93fa197a0487674eea9b083db198cd632
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Nov 29 14:03:51 2011 -0500
minor - fix javadoc typos
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java
index b77c025..ee0a1f6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java
@@ -39,8 +39,9 @@ import org.rhq.enterprise.server.system.ServerVersion;
public interface DiscoveryBossRemote {
/**
- * Analogous to the GUI feature Import Resources in the auto discovery queue. Note, to query for
- * Resources with a specific InnventryStatus see {@link ResourceManagerRemote.findResourcesByCriteria(ResourceCriteria)}
+ * Analogous to the GUI feature Import Resources in the auto discovery queue.
+ * Note, to query for Resources with a specific InventoryStatus, see
+ * {@link org.rhq.enterprise.server.resource.ResourceManagerRemote#findResourcesByCriteria}.
*
* @param subject
* @param resourceIds
@@ -50,8 +51,9 @@ public interface DiscoveryBossRemote {
@WebParam(name = "resourceIds") int[] resourceIds);
/**
- * Analogous to the GUI feature Ignore Resources in the auto discovery queue. Note, to query for
- * Resources with a specific InnventryStatus see {@link ResourceManagerRemote.findResourcesByCriteria(ResourceCriteria)}
+ * Analogous to the GUI feature Ignore Resources in the auto discovery queue.
+ * Note, to query for Resources with a specific InventoryStatus, see
+ * {@link org.rhq.enterprise.server.resource.ResourceManagerRemote#findResourcesByCriteria}.
*
* @param subject
* @param resourceIds
@@ -61,8 +63,9 @@ public interface DiscoveryBossRemote {
@WebParam(name = "resourceIds") int[] resourceIds);
/**
- * Analogous to the GUI feature Unignore Resources in the auto discovery queue. Note, to query for
- * Resources with a specific InnventryStatus see {@link ResourceManagerRemote.findResourcesByCriteria(ResourceCriteria)}
+ * Analogous to the GUI feature Unignore Resources in the auto discovery queue.
+ * Note, to query for Resources with a specific InventoryStatus, see
+ * {@link org.rhq.enterprise.server.resource.ResourceManagerRemote#findResourcesByCriteria}.
*
* @param subject
* @param resourceIds
commit 6f563d3e58bc41f2a97ac42619acd912abf49521
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 29 12:20:51 2011 -0500
[BZ 756205] installer should go to /coregui explicitly
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
index 54a35be..673b018 100644
--- a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
+++ b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
@@ -63,7 +63,7 @@
{
linkText = "${bundle.alreadyInstalledStartedLink}";
document.getElementById('pleasewait-image').src="/images/finished.gif";
- document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/">' + linkText + '<\/a>';
+ document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/coregui">' + linkText + '<\/a>';
// this will immediately forward to the start page, uncomment if we want that functionality
// window.location.replace( startPage );
}
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html
index 9778784..5da4047 100644
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html
+++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>Welcome to RHQ!</title>
+<title>The Server Is Installed!</title>
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="-1" />
@@ -11,7 +11,7 @@
</head>
<body>
<p> </p>
- <h1 align="center">RHQ Is Installed!</h1>
- <p align="center"><a href="/">Click here to get started!</a></p>
+ <h1 align="center">The Server Is Installed!</h1>
+ <p align="center"><a href="/coregui">Click here to get started!</a></p>
</body>
</html>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf
index 4ce54a0..4e5a220 100644
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf
+++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf
@@ -8,6 +8,6 @@
<body>
<p> </p>
<h1 align="center">The Server Is Installed!</h1>
- <p align="center"><a href="/">Click here to get started!</a></p>
+ <p align="center"><a href="/coregui">Click here to get started!</a></p>
</body>
</html>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf
index 4ce54a0..4e5a220 100644
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf
+++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf
@@ -8,6 +8,6 @@
<body>
<p> </p>
<h1 align="center">The Server Is Installed!</h1>
- <p align="center"><a href="/">Click here to get started!</a></p>
+ <p align="center"><a href="/coregui">Click here to get started!</a></p>
</body>
</html>
commit cc717fc0ac9b891306738842910b026d3a485085
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Nov 29 11:01:13 2011 -0500
[BZ 757958] updating script to work with current APIs
diff --git a/modules/enterprise/remoting/cli/src/main/samples/drift.js b/modules/enterprise/remoting/cli/src/main/samples/drift.js
index ff7c31a..132d5bf 100644
--- a/modules/enterprise/remoting/cli/src/main/samples/drift.js
+++ b/modules/enterprise/remoting/cli/src/main/samples/drift.js
@@ -21,7 +21,7 @@
/**
* description: Generates a snapshot of changes sets belonging to a particular
- * drift configuration of a specific resource. By default all change sets are
+ * drift definition of a specific resource. By default all change sets are
* included in the snapshot. An optional third argument can be specified to
* limit or control the number of change sets included in the snapshot.
*
@@ -32,10 +32,11 @@
* arguments:
* rid: A resource id, expected to be an integer
*
- * cname: The drift configuration name as a string
+ * defName: The drift definition name as a string
*
- * filters: (optional) A map or JS object that limits the number of
- * change sets included in the snapshot
+ * filter: (optional) A map or JS object that limits the number of
+ * change sets included in the snapshot. It should specify two
+ * properties - startVersion and endVersion.
*
* return: A org.rhq.core.domamin.drift.DriftSnapshot object
*
@@ -44,48 +45,33 @@
* // mydrift drift configuration.
* createSnapshot(123, 'mydrift')
*
- * // generates a snapshot starting a change set version 3 and including
- * // everything more recent than it.
- * createSnapshot(123, 'mydrift', {"startVersion": 3})
- *
* // generates a snapshot that includes change sets 3 through 5 inclusive.
- * createSnapshot(123, 'mydrift', {"startVersion": 3, "endVersion": 5})
- *
- * // generates a snaphot that includes everything after the specified
- * // timestamp. Note that the timestamp should be specified in milliseconds.
- * createSnapshot(123, 'mydrift', {"createdAfter": 1314811734365})
- *
- * // generates a snapshot that includes all change sets that were created
- * // between the two timestamps.
- * createSnapshot(123, 'mydrift', {"createdAfter": 1314811734365, "createdBefore": 9994811734365})
+ * createSnapshot(123, 'mydrift', {startVersion: 3, endVersion: 5})
*/
-function createSnapshot(rid, cname) {
- var config = findDriftConfig(rid, function(c) { return cname.equals(c.name) });
-
- var criteria = GenericDriftChangeSetCriteria();
- criteria.addFilterResourceId(rid);
- criteria.addFilterDriftConfigurationId(config.id);
+function createSnapshot(rid, defName) {
+ var driftDef = findDriftDefinition(rid, function(d) { return defName.equals(d.name) });
+ var snapshotRequest;
if (arguments.length > 2) {
var filters = arguments[2];
- for (key in filters) {
- criteria['addFilter' + key[0].toUpperCase() + key.substring(1)](filters[key]);
- }
+ snapshotRequest = DriftSnapshotRequest(driftDef.id, filters.startVersion, filters.endVersion);
+ } else {
+ snapshotRequest = DriftSnapshotRequest(driftDef.id);
}
- return DriftManager.createSnapshot(criteria);
+ return DriftManager.getSnapshot(snapshotRequest);
}
-function findDriftConfig(rid, filter) {
+function findDriftDefinition(rid, filter) {
var criteria = ResourceCriteria();
criteria.addFilterId(rid);
- criteria.fetchDriftConfigurations(true);
+ criteria.fetchDriftDefinitions(true);
var resources = ResourceManager.findResourcesByCriteria(criteria);
var resource = resources.get(0);
- return find(resource.driftConfigurations, function(config) {
- return filter(DriftConfiguration(config));
+ return find(resource.driftDefinitions, function(config) {
+ return filter(DriftDefinition(config));
});
}
@@ -111,7 +97,7 @@ function findDriftConfig(rid, filter) {
* s2.
*
* return: This function does not return a useful value. It may be an empty
- * string or it could be null. Instead of returns its results, the function
+ * string or it could be null. Instead of returning its results, the function
* prints them to the CLI console. As such, this function is intended for
* use from the interactive CLI shell.
*
@@ -137,8 +123,8 @@ function diff(s1, s2) {
}
var pathFilter = function(entry) { return entry.path == path; };
- var e1 = find(s1.entries, pathFilter);
- var e2 = find(s2.entries, pathFilter);
+ var e1 = find(s1.driftInstances, pathFilter);
+ var e2 = find(s2.driftInstances, pathFilter);
var fileDiff = DriftManager.generateUnifiedDiff(e1, e2);
foreach(fileDiff.diff, println);
@@ -190,7 +176,7 @@ function diff(s1, s2) {
* $ history.view(1) // returns the full contents of version 1 of the file
* $ history.compare(1, 2) // generates and prints a unified diff of versions 1 and 2
*/
-function fetchHistory(rid, configName, path) {
+function fetchHistory(rid, driftDefName, path) {
function History() {
var entries = [];
@@ -210,7 +196,7 @@ function fetchHistory(rid, configName, path) {
var drifts = DriftManager.findDriftsByCriteria(criteria);
foreach(drifts, function(drift) {
- if (drift.changeSet.driftConfiguration.name == configName &&
+ if (drift.changeSet.driftDefinition.name == driftDefName &&
drift.path == path) {
entries.push(drift);
}
@@ -234,7 +220,7 @@ function fetchHistory(rid, configName, path) {
if (drift == null) {
return "Could not find version " + version;
}
- return DriftManager.getDriftFileBits(drift.newDriftFile.hashId);
+ return java.lang.String(DriftManager.getDriftFileAsByteArray(drift.newDriftFile.hashId));
}
this.compare = function(v1, v2) {
commit 127ba9e50f4a75d67cf021d0f688c2a064dc3824
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Nov 29 09:04:50 2011 -0500
Make forEachFile() more efficient.
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java
index c4ac737..14ed3af 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java
@@ -353,8 +353,9 @@ public class FileUtil {
while (!directories.isEmpty()) {
File dir = directories.pop();
- if (dir.listFiles()!=null) {
- for (File file : dir.listFiles()) {
+ File[] files = dir.listFiles();
+ if (files != null) {
+ for (File file : files) {
if (file.isDirectory()) {
directories.push(file);
} else {
commit 4a6ec5f97390cc5b6a1956b0b904162ea7b2b319
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Nov 28 15:05:53 2011 -0500
[Bug 757201 - NPE in Server with drift report processing]
Not so much a fix as this was not reproducible, but some added
null protection and logging to try and ensure that a failure in
the "Ack" call does not cause a server-side failure. And to
capture more information if this happens again.
- note, some formatting changes were applied. the real changes are
lines 635-648.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index c70b546..c713297 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@ -166,8 +166,8 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
private void syncWithServer(Resource resource, DriftDefinition driftDefinition) throws IOException {
Headers headers = createHeaders(resource.getId(), driftDefinition);
if (!changeSetMgr.changeSetExists(resource.getId(), headers)) {
- log.info("No snapshot found for " + toString(resource.getId(), driftDefinition) +
- ". Downloading snapshot from server");
+ log.info("No snapshot found for " + toString(resource.getId(), driftDefinition)
+ + ". Downloading snapshot from server");
DriftServerService driftServer = pluginContainerConfiguration.getServerServices().getDriftServerService();
DriftSnapshot snapshot = driftServer.getCurrentSnapshot(driftDefinition.getId());
@@ -179,18 +179,18 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
// this point we just return and allow the agent to generate the
// initial snapshot file.
if (log.isDebugEnabled()) {
- log.debug("The server does not have any change sets for " + toString(resource.getId(), driftDefinition)
- + ". An initial snapshot needs to be generated.");
+ log.debug("The server does not have any change sets for "
+ + toString(resource.getId(), driftDefinition) + ". An initial snapshot needs to be generated.");
}
return;
}
headers.setVersion(snapshot.getVersion());
- log.info("Preparing to write snapshot at version " + snapshot.getVersion() + " to disk for " +
- toString(resource.getId(), driftDefinition));
- File currentSnapshotFile = changeSetMgr.findChangeSet(resource.getId(), driftDefinition.getName(),
- COVERAGE);
+ log.info("Preparing to write snapshot at version " + snapshot.getVersion() + " to disk for "
+ + toString(resource.getId(), driftDefinition));
+ File currentSnapshotFile = changeSetMgr
+ .findChangeSet(resource.getId(), driftDefinition.getName(), COVERAGE);
writeSnapshotToFile(snapshot, currentSnapshotFile, headers);
if (driftDefinition.isPinned()) {
@@ -200,15 +200,16 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
DriftSnapshot pinnedSnapshot = driftServer.getSnapshot(driftDefinition.getId(), 0, 0);
Headers pinnedHeaders = createHeaders(resource.getId(), driftDefinition);
File pinnedSnapshotFile = new File(currentSnapshotFile.getParent(), "snapshot.pinned");
- log.info("Preparing to write pinned snapshot to disk for " + toString(resource.getId(), driftDefinition));
+ log.info("Preparing to write pinned snapshot to disk for "
+ + toString(resource.getId(), driftDefinition));
writeSnapshotToFile(pinnedSnapshot, pinnedSnapshotFile, pinnedHeaders);
if (snapshot.getVersion() > 0) {
// Drift was previously reported. We will fetch a snapshot of the
// latest change set and write that to disk so that we avoid reporting
// drift that has already been reported to the server.
- DriftSnapshot deltaSnapshot = driftServer.getSnapshot(driftDefinition.getId(),
- snapshot.getVersion(), snapshot.getVersion());
+ DriftSnapshot deltaSnapshot = driftServer.getSnapshot(driftDefinition.getId(), snapshot
+ .getVersion(), snapshot.getVersion());
File deltaFile = new File(currentSnapshotFile.getParentFile(), "drift-changeset.txt");
Headers deltaHeaders = createHeaders(resource.getId(), driftDefinition);
deltaHeaders.setVersion(snapshot.getVersion());
@@ -317,14 +318,14 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
} catch (IOException e) {
zipFile.delete();
throw new DriftDetectionException("Failed to create change set zip file " + zipFile.getPath(), e);
-// } finally {
-// try {
-// if (stream != null) {
-// stream.close();
-// }
-// } catch (IOException e) {
-// log.warn("An error occurred while trying to close change set zip file output stream", e);
-// }
+ // } finally {
+ // try {
+ // if (stream != null) {
+ // stream.close();
+ // }
+ // } catch (IOException e) {
+ // log.warn("An error occurred while trying to close change set zip file output stream", e);
+ // }
}
try {
@@ -541,8 +542,8 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
schedulesQueue.removeAndExecute(schedule.getResourceId(), schedule.getDriftDefinition(), new Runnable() {
@Override
public void run() {
- File currentSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(),
- schedule.getDriftDefinition().getName(), COVERAGE);
+ File currentSnapshot = changeSetMgr.findChangeSet(schedule.getResourceId(), schedule
+ .getDriftDefinition().getName(), COVERAGE);
File pinnedSnapshot = new File(currentSnapshot.getParentFile(), "snapshot.pinned");
pinnedSnapshot.delete();
@@ -557,8 +558,7 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
@Override
public void updateDriftDetection(int resourceId, DriftDefinition driftDef, DriftSnapshot driftSnapshot) {
- File currentSnapshot = changeSetMgr.findChangeSet(resourceId, driftDef.getName(),
- COVERAGE);
+ File currentSnapshot = changeSetMgr.findChangeSet(resourceId, driftDef.getName(), COVERAGE);
File pinnedSnapshot = new File(currentSnapshot.getParentFile(), "snapshot.pinned");
Headers headers = createHeaders(resourceId, driftDef);
@@ -606,8 +606,8 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
final DriftDetectionSchedule schedule = schedulesQueue.find(resourceId, defName);
if (schedule == null) {
if (log.isDebugEnabled()) {
- log.debug("Unable to pin snapshot for " + toString(resourceId, defName) + " - no detection schedule " +
- "found.");
+ log.debug("Unable to pin snapshot for " + toString(resourceId, defName) + " - no detection schedule "
+ + "found.");
}
return;
}
@@ -619,8 +619,9 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
@Override
public void ackChangeSet(int resourceId, String defName) {
- log.info("Received server change set ack for [resourceId: " + resourceId + ", driftDefinition:" +
- defName + "]");
+ log
+ .info("Received server change set ack for [resourceId: " + resourceId + ", driftDefinition:" + defName
+ + "]");
File resourceDir = new File(changeSetsDir, Integer.toString(resourceId));
File changeSetDir = new File(resourceDir, defName);
@@ -631,11 +632,20 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
return;
}
- File snapshot = changeSetMgr.findChangeSet(resourceId, defName, COVERAGE);
- File previousSnapshot = new File(snapshot.getParentFile(), snapshot.getName() + ".previous");
+ try {
+ File snapshot = changeSetMgr.findChangeSet(resourceId, defName, COVERAGE);
+ if (null == snapshot) {
+ log.warn("Cannot complete acknowledgement. Could not find coverage changeset for [" + resourceId + ","
+ + defName + "].");
+ return;
+ }
- previousSnapshot.delete();
- deleteZipFiles(changeSetDir, "changeset_");
+ File previousSnapshot = new File(snapshot.getParentFile(), snapshot.getName() + ".previous");
+ previousSnapshot.delete();
+
+ } finally {
+ deleteZipFiles(changeSetDir, "changeset_");
+ }
}
@Override
@@ -758,16 +768,16 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
private void writeSnapshotToFile(DriftSnapshot snapshot, File file, Headers headers) throws IOException {
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(file, headers);
try {
- for (Drift drift : snapshot.getDriftInstances()) {
+ for (Drift<?, ?> drift : snapshot.getDriftInstances()) {
switch (drift.getCategory()) {
case FILE_ADDED:
writer.write(addedFileEntry(drift.getPath(), drift.getNewDriftFile().getHashId()));
break;
case FILE_CHANGED:
- writer.write(changedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId(),
- drift.getNewDriftFile().getHashId()));
+ writer.write(changedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId(), drift
+ .getNewDriftFile().getHashId()));
break;
- default: // FILE_REMOVED
+ default: // FILE_REMOVED
writer.write(removedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId()));
}
}
commit f6eba2a3f0d31a45918664109034182de01ec970
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Nov 28 14:58:12 2011 -0500
Convert back to unix line terminators
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java
index f4e62d5..b284dcc 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java
@@ -1,87 +1,87 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.clientapi.server.core;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-import org.rhq.core.domain.cloud.composite.FailoverListComposite;
-import org.rhq.core.domain.cloud.composite.FailoverListComposite.ServerEntry;
-
-/**
- * These are the results of a successful agent registration. After the agent has been registered by the server, this
- * object will contain the identification information assigned to the agent by the server. It will also contain the
- * list of servers this agent can fail over to in a high availability setup.
- *
- * @author John Mazzitelli
- */
-public class AgentRegistrationResults implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String agentToken;
- private FailoverListComposite failoverList;
-
- /**
- * The agent token that the agent must use in order to communicate with the server in the future.
- *
- * @return the agent's token assigned to it by the server
- */
- public String getAgentToken() {
- return agentToken;
- }
-
- /**
- * See {@link #getAgentToken()}.
- *
- * @param token
- */
- public void setAgentToken(String token) {
- agentToken = token;
- }
-
- /**
- * The FailoverListComposite that the agent must use in order to communicate with the server in the future.
- *
- * @return the FailoverListComposite assigned to it by the server (will not be <code>null</code> but may be empty)
- */
- public FailoverListComposite getFailoverList() {
- return failoverList != null ? failoverList : new FailoverListComposite(new ArrayList<ServerEntry>());
- }
-
- /**
- * See {@link #getFailoverList()}.
- *
- * @param failoverList
- */
- public void setFailoverList(FailoverListComposite failoverList) {
- this.failoverList = failoverList;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "AgentRegistrationResults: [agent-token=" + this.agentToken + "]";
- }
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.clientapi.server.core;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+import org.rhq.core.domain.cloud.composite.FailoverListComposite;
+import org.rhq.core.domain.cloud.composite.FailoverListComposite.ServerEntry;
+
+/**
+ * These are the results of a successful agent registration. After the agent has been registered by the server, this
+ * object will contain the identification information assigned to the agent by the server. It will also contain the
+ * list of servers this agent can fail over to in a high availability setup.
+ *
+ * @author John Mazzitelli
+ */
+public class AgentRegistrationResults implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String agentToken;
+ private FailoverListComposite failoverList;
+
+ /**
+ * The agent token that the agent must use in order to communicate with the server in the future.
+ *
+ * @return the agent's token assigned to it by the server
+ */
+ public String getAgentToken() {
+ return agentToken;
+ }
+
+ /**
+ * See {@link #getAgentToken()}.
+ *
+ * @param token
+ */
+ public void setAgentToken(String token) {
+ agentToken = token;
+ }
+
+ /**
+ * The FailoverListComposite that the agent must use in order to communicate with the server in the future.
+ *
+ * @return the FailoverListComposite assigned to it by the server (will not be <code>null</code> but may be empty)
+ */
+ public FailoverListComposite getFailoverList() {
+ return failoverList != null ? failoverList : new FailoverListComposite(new ArrayList<ServerEntry>());
+ }
+
+ /**
+ * See {@link #getFailoverList()}.
+ *
+ * @param failoverList
+ */
+ public void setFailoverList(FailoverListComposite failoverList) {
+ this.failoverList = failoverList;
+ }
+
+ /**
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "AgentRegistrationResults: [agent-token=" + this.agentToken + "]";
+ }
}
\ No newline at end of file
commit 99803343b9014aa9399ef2444cc214061bf0bdb9
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 28 14:10:55 2011 -0500
[BZ 755073] Do not display the view link for binary files
We were displaying the view link for a drift entry where the type of
drift was a file change. The logic has been modified so that the view
link is not displayed.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
index 1dcf23b..0cd08a1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
@@ -145,8 +145,7 @@ public class DriftDetailsView extends LocatableVLayout {
case FILE_CHANGED:
category.setValue(DriftDataSource.CATEGORY_ICON_CHANGE);
oldFile.setValue(driftDetails.getDrift().getOldDriftFile().getHashId());
- oldFileLink = createViewFileLink(driftDetails.getDrift().getOldDriftFile().getHashId(), driftDetails
- .getDrift().getPath(), driftDetails.getPreviousChangeSet().getVersion());
+ oldFileLink = spacer;
newFile.setValue(driftDetails.getDrift().getNewDriftFile().getHashId());
newFileLink = spacer;
break;
commit 4443f017ce764353f41e4c4ca17d334af5742234
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Nov 28 13:50:13 2011 -0500
[Bug 754197 - When agent runs on loopback address, the advisory text is incorrect. Administration > High Availability does not exist]
- Trivial - Fix the text
- Also, fix some jdoc text in AgentRegistrationResults (reformatted as well). No code changes.
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java
index f1d58f3..f4e62d5 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java
@@ -1,87 +1,87 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.clientapi.server.core;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-import org.rhq.core.domain.cloud.composite.FailoverListComposite;
-import org.rhq.core.domain.cloud.composite.FailoverListComposite.ServerEntry;
-
-/**
- * These are the results of a successful agent registration. After the agent has been registered by the server, this
- * object will contain the identification information assigned to the agent by the server. It will also contain the
- * list of servers this agent can fail over to an in high availability setup.
- *
- * @author John Mazzitelli
- */
-public class AgentRegistrationResults implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String agentToken;
- private FailoverListComposite failoverList;
-
- /**
- * The agent token that the agent must use in order to communicate with the server in the future.
- *
- * @return the agent's token assigned to it by the server
- */
- public String getAgentToken() {
- return agentToken;
- }
-
- /**
- * See {@link #getAgentToken()}.
- *
- * @param token
- */
- public void setAgentToken(String token) {
- agentToken = token;
- }
-
- /**
- * The FailoverListComposite that the agent must use in order to communicate with the server in the future.
- *
- * @return the FailoverListComposite assigned to it by the server (will not be <code>null</code> but may be empty)
- */
- public FailoverListComposite getFailoverList() {
- return failoverList != null ? failoverList : new FailoverListComposite(new ArrayList<ServerEntry>());
- }
-
- /**
- * See {@link #getFailoverList()}.
- *
- * @param failoverList
- */
- public void setFailoverList(FailoverListComposite failoverList) {
- this.failoverList = failoverList;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "AgentRegistrationResults: [agent-token=" + this.agentToken + "]";
- }
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.clientapi.server.core;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+import org.rhq.core.domain.cloud.composite.FailoverListComposite;
+import org.rhq.core.domain.cloud.composite.FailoverListComposite.ServerEntry;
+
+/**
+ * These are the results of a successful agent registration. After the agent has been registered by the server, this
+ * object will contain the identification information assigned to the agent by the server. It will also contain the
+ * list of servers this agent can fail over to in a high availability setup.
+ *
+ * @author John Mazzitelli
+ */
+public class AgentRegistrationResults implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String agentToken;
+ private FailoverListComposite failoverList;
+
+ /**
+ * The agent token that the agent must use in order to communicate with the server in the future.
+ *
+ * @return the agent's token assigned to it by the server
+ */
+ public String getAgentToken() {
+ return agentToken;
+ }
+
+ /**
+ * See {@link #getAgentToken()}.
+ *
+ * @param token
+ */
+ public void setAgentToken(String token) {
+ agentToken = token;
+ }
+
+ /**
+ * The FailoverListComposite that the agent must use in order to communicate with the server in the future.
+ *
+ * @return the FailoverListComposite assigned to it by the server (will not be <code>null</code> but may be empty)
+ */
+ public FailoverListComposite getFailoverList() {
+ return failoverList != null ? failoverList : new FailoverListComposite(new ArrayList<ServerEntry>());
+ }
+
+ /**
+ * See {@link #getFailoverList()}.
+ *
+ * @param failoverList
+ */
+ public void setFailoverList(FailoverListComposite failoverList) {
+ this.failoverList = failoverList;
+ }
+
+ /**
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "AgentRegistrationResults: [agent-token=" + this.agentToken + "]";
+ }
}
\ No newline at end of file
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
index b0608c2..59702fc 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
@@ -212,7 +212,7 @@ public interface AgentI18NResourceKeys {
@I18NMessage("!!! A server has registered under a loopback address [{0}] - this should only be done for testing and demo purposes. "
+ "Only agents running on the same machine as that server will be able to interact with that server successfully. "
+ "Please double check that you really want your server to have a public endpoint of [{0}]. "
- + "See the Administration > High Availability > Servers menu in the server GUI to change the public endpoint of the server.")
+ + "See the Administration (Topology) > Servers menu in the server GUI to change the public endpoint of the server.")
String FAILOVER_LIST_HAS_LOCALHOST = "AgentMain.failover-list-has-localhost";
@I18NMessage("The server failover list has been loaded from [{0}] - there are [{1}] servers in the list")
@@ -249,7 +249,7 @@ public interface AgentI18NResourceKeys {
+ "Please double check all public endpoints of your servers and ensure\\n\\\n"
+ "they are all reachable by this agent. The failed server endpoints are:\\n\\\n" //
+ "{1}\\n\\\n" //
- + "See the Administration > High Availability > Servers in the server GUI\\n\\\n"
+ + "See the Administration (Topology) > Servers in the server GUI\\n\\\n"
+ "to change the public endpoint of a server.\\n\\\n"
+ "THIS AGENT WILL WAIT UNTIL ONE OF ITS SERVERS BECOMES REACHABLE!")
String FAILOVER_LIST_CHECK_FAILED = "AgentMain.failover-list-check-failed";
commit 1495d03f65e30eef1f533d90ee4c8b434282f790
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 28 12:03:06 2011 -0500
[BZ 757758] make property name/values consistent with other server properties
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index 3a18691..d920ff9 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -22,7 +22,7 @@
<property name="rhq.sync.endpoint-address" value="false"/>
- <property name="default.rhq.server.drift.binary.content" value="0"/>
+ <property name="default.rhq.server.drift.binary.content" value="false"/>
<target name="set-predeploy-prop">
<condition property="predeploy" value="true">
@@ -48,6 +48,7 @@
<property name="rhq.server.quartz.driverDelegateClass" value="${rhq.dev.quartz.driverDelegateClass}" />
<property name="rhq.server.quartz.selectWithLockSQL" value="${rhq.dev.quartz.selectWithLockSQL}" />
<property name="rhq.server.quartz.lockHandlerClass" value="${rhq.dev.quartz.lockHandlerClass}" />
+ <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/>
</target>
<target name="set-default-server-props" unless="predeploy">
@@ -65,6 +66,7 @@
<property name="rhq.server.quartz.driverDelegateClass" value="${default.rhq.server.quartz.driverDelegateClass}" />
<property name="rhq.server.quartz.selectWithLockSQL" value="${default.rhq.server.quartz.selectWithLockSQL}" />
<property name="rhq.server.quartz.lockHandlerClass" value="${default.rhq.server.quartz.lockHandlerClass}" />
+ <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/>
</target>
<target name="initialize" depends="set-predeploy-prop, set-dev-server-props, set-default-server-props">
@@ -610,12 +612,13 @@ rhq.server.plugin-scan-period-ms=${rhq.server.plugin-scan-period-ms}
# you have to deal with IP address changes.
rhq.sync.endpoint-address=false
-# Enabling this property has two effects. First, it will cause the server to
-# request that agents send binary content for files being monitored for drift.
-# Secondly, the server will persist that binary content. The property is
-# enabled when it is to set a value of 1. Any other value will cause this
-# feature to be disabled.
-# default.rhq.server.drift.binary.content=0
+# When this is enabled, the server will request that agents send content for
+# for binary files that are being monitored for drift. The content for those
+# files will then be persisted on the server. By default, the server does not
+# persist content for well known binary file types like .ear, .war, .zip, .so,
+# etc. The server does however persist content for text files or any other
+# files that are not known binary types.
+# rhq.server.drift.store-binary-content=${rhq.server.drift.store-binary-content}
# Auto-Install Pre-Configuration Settings
# If you wish to circumvent the installer webapp and auto-install the server
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
index ddcdace..6633c22 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
@@ -306,6 +306,7 @@ public class JPADriftServerBean implements JPADriftServerLocal {
throws Exception {
final Resource resource = getResource(resourceId);
final DriftChangeSetSummary summary = new DriftChangeSetSummary();
+ final boolean storeBinaryContent = isBinaryContentStorageEnabled();
try {
ZipUtil.walkZipFile(changeSetZip, new ChangeSetFileVisitor() {
@@ -346,8 +347,7 @@ public class JPADriftServerBean implements JPADriftServerLocal {
if (version > 0) {
for (FileEntry entry : reader) {
- boolean addToList =
- isBinaryContentStorageEnabled() || !DriftUtil.isBinaryFile(entry.getFile());
+ boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), emptyDriftFiles, addToList);
JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
@@ -375,8 +375,7 @@ public class JPADriftServerBean implements JPADriftServerLocal {
summary.setInitialChangeSet(true);
JPADriftSet driftSet = new JPADriftSet();
for (FileEntry entry : reader) {
- boolean addToList =
- isBinaryContentStorageEnabled() || !DriftUtil.isBinaryFile(entry.getFile());
+ boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
String path = FileUtil.useForwardSlash(entry.getFile());
// A Drift always has a changeSet. Note that in this code section the changeset is
@@ -435,8 +434,8 @@ public class JPADriftServerBean implements JPADriftServerLocal {
}
private boolean isBinaryContentStorageEnabled() {
- String binaryContent = System.getProperty("default.rhq.server.drift.binary.content", "0");
- return binaryContent.equals("1");
+ String binaryContent = System.getProperty("rhq.server.drift.store-binary-content", "false");
+ return binaryContent.equals("true");
}
private JPADriftFile getDriftFile(String sha256, List<JPADriftFile> emptyDriftFiles, boolean addToList) {
commit 12766f0f87c4922faa8d59b2a962beabd6933c09
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 28 11:08:19 2011 -0500
[BZ 757758] Adding logic to filter out binary content
By default, the server will not store content for binary files that are
being monitored for drift. It can be enabled by setting the system
property default.rhq.server.drift.binary.content to a value of 1. The
property can be set in rhq-server.properties.
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index 9dbae53..3a18691 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -22,6 +22,8 @@
<property name="rhq.sync.endpoint-address" value="false"/>
+ <property name="default.rhq.server.drift.binary.content" value="0"/>
+
<target name="set-predeploy-prop">
<condition property="predeploy" value="true">
<or>
@@ -608,6 +610,13 @@ rhq.server.plugin-scan-period-ms=${rhq.server.plugin-scan-period-ms}
# you have to deal with IP address changes.
rhq.sync.endpoint-address=false
+# Enabling this property has two effects. First, it will cause the server to
+# request that agents send binary content for files being monitored for drift.
+# Secondly, the server will persist that binary content. The property is
+# enabled when it is to set a value of 1. Any other value will cause this
+# feature to be disabled.
+# default.rhq.server.drift.binary.content=0
+
# Auto-Install Pre-Configuration Settings
# If you wish to circumvent the installer webapp and auto-install the server
# immediately upon first startup, make sure all of the settings above are
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index 7c1d3e1..6af05d9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -119,48 +119,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
@Stateless
public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
- private static Set<String> binaryFileTypes = new HashSet<String>();
-
- static {
- binaryFileTypes.add("jar");
- binaryFileTypes.add("war");
- binaryFileTypes.add("ear");
- binaryFileTypes.add("sar"); // jboss service
- binaryFileTypes.add("har"); // hibernate archive
- binaryFileTypes.add("rar"); // resource adapter
- binaryFileTypes.add("wsr"); // jboss web service archive
- binaryFileTypes.add("zip");
- binaryFileTypes.add("tar");
- binaryFileTypes.add("bz2");
- binaryFileTypes.add("gz");
- binaryFileTypes.add("rpm");
- binaryFileTypes.add("so");
- binaryFileTypes.add("dll");
- binaryFileTypes.add("exe");
- binaryFileTypes.add("jpg");
- binaryFileTypes.add("png");
- binaryFileTypes.add("jpeg");
- binaryFileTypes.add("gif");
- binaryFileTypes.add("pdf");
- binaryFileTypes.add("swf");
- binaryFileTypes.add("bpm");
- binaryFileTypes.add("tiff");
- binaryFileTypes.add("svg");
- binaryFileTypes.add("doc");
- binaryFileTypes.add("mp3");
- binaryFileTypes.add("wav");
- binaryFileTypes.add("m4a");
- binaryFileTypes.add("mov");
- binaryFileTypes.add("mpeg");
- binaryFileTypes.add("avi");
- binaryFileTypes.add("mp4");
- binaryFileTypes.add("wmv");
- binaryFileTypes.add("deb");
- binaryFileTypes.add("sit");
- binaryFileTypes.add("iso");
- binaryFileTypes.add("dmg");
- }
-
// TODO Should security checks be handled here instead of delegating to the drift plugin?
// Currently any security checks that need to be performed are delegated to the plugin.
// This is fine *so far* since the only plugin is the default which is our existing SLSB
@@ -869,14 +827,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@Override
public boolean isBinaryFile(Subject subject, Drift<?, ?> drift) {
- String path = drift.getPath();
- int index = path.lastIndexOf('.');
-
- if (index == -1 || index == path.length() - 1) {
- return false;
- }
-
- return binaryFileTypes.contains(path.substring(index + 1, path.length()));
+ return DriftUtil.isBinaryFile(drift);
}
@Override
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUtil.java
index 16cb479..34a3c69 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUtil.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUtil.java
@@ -21,9 +21,12 @@ package org.rhq.enterprise.server.drift;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.commons.logging.LogFactory;
+import org.rhq.core.domain.drift.Drift;
import org.rhq.enterprise.communications.ServiceContainer;
import org.rhq.enterprise.communications.command.client.ClientCommandSender;
import org.rhq.enterprise.communications.command.client.ClientCommandSenderConfiguration;
@@ -36,6 +39,62 @@ import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceUtil;
*/
public class DriftUtil {
+ private static Set<String> binaryFileTypes = new HashSet<String>();
+
+ static {
+ binaryFileTypes.add("jar");
+ binaryFileTypes.add("war");
+ binaryFileTypes.add("ear");
+ binaryFileTypes.add("sar"); // jboss service
+ binaryFileTypes.add("har"); // hibernate archive
+ binaryFileTypes.add("rar"); // resource adapter
+ binaryFileTypes.add("wsr"); // jboss web service archive
+ binaryFileTypes.add("zip");
+ binaryFileTypes.add("tar");
+ binaryFileTypes.add("bz2");
+ binaryFileTypes.add("gz");
+ binaryFileTypes.add("rpm");
+ binaryFileTypes.add("so");
+ binaryFileTypes.add("dll");
+ binaryFileTypes.add("exe");
+ binaryFileTypes.add("jpg");
+ binaryFileTypes.add("png");
+ binaryFileTypes.add("jpeg");
+ binaryFileTypes.add("gif");
+ binaryFileTypes.add("pdf");
+ binaryFileTypes.add("swf");
+ binaryFileTypes.add("bpm");
+ binaryFileTypes.add("tiff");
+ binaryFileTypes.add("svg");
+ binaryFileTypes.add("doc");
+ binaryFileTypes.add("mp3");
+ binaryFileTypes.add("wav");
+ binaryFileTypes.add("m4a");
+ binaryFileTypes.add("mov");
+ binaryFileTypes.add("mpeg");
+ binaryFileTypes.add("avi");
+ binaryFileTypes.add("mp4");
+ binaryFileTypes.add("wmv");
+ binaryFileTypes.add("deb");
+ binaryFileTypes.add("sit");
+ binaryFileTypes.add("iso");
+ binaryFileTypes.add("dmg");
+ }
+
+ static boolean isBinaryFile(Drift<?, ?> drift) {
+ return isBinaryFile(drift.getPath());
+ }
+
+ static boolean isBinaryFile(String path) {
+ int index = path.lastIndexOf('.');
+
+ if (index == -1 || index == path.length() - 1) {
+ return false;
+ }
+
+ return binaryFileTypes.contains(path.substring(index + 1, path.length()));
+ }
+
static InputStream remoteStream(InputStream stream) {
RemoteInputStream remoteStream = (RemoteInputStream) stream;
ServiceContainer serviceContainer = ServerCommunicationsServiceUtil.getService().getServiceContainer();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
index 142e959..ddcdace 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
@@ -346,8 +346,10 @@ public class JPADriftServerBean implements JPADriftServerLocal {
if (version > 0) {
for (FileEntry entry : reader) {
- JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), emptyDriftFiles);
- JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles);
+ boolean addToList =
+ isBinaryContentStorageEnabled() || !DriftUtil.isBinaryFile(entry.getFile());
+ JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), emptyDriftFiles, addToList);
+ JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
// TODO Figure out an efficient way to save coverage change sets.
// The initial/coverage change set could contain hundreds or even thousands
@@ -373,7 +375,9 @@ public class JPADriftServerBean implements JPADriftServerLocal {
summary.setInitialChangeSet(true);
JPADriftSet driftSet = new JPADriftSet();
for (FileEntry entry : reader) {
- JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles);
+ boolean addToList =
+ isBinaryContentStorageEnabled() || !DriftUtil.isBinaryFile(entry.getFile());
+ JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
String path = FileUtil.useForwardSlash(entry.getFile());
// A Drift always has a changeSet. Note that in this code section the changeset is
// always going to be set to a DriftDefinition's changeSet. But that is not always the
@@ -430,7 +434,12 @@ public class JPADriftServerBean implements JPADriftServerLocal {
}
}
- private JPADriftFile getDriftFile(String sha256, List<JPADriftFile> emptyDriftFiles) {
+ private boolean isBinaryContentStorageEnabled() {
+ String binaryContent = System.getProperty("default.rhq.server.drift.binary.content", "0");
+ return binaryContent.equals("1");
+ }
+
+ private JPADriftFile getDriftFile(String sha256, List<JPADriftFile> emptyDriftFiles, boolean addToList) {
JPADriftFile result = null;
if (null == sha256 || "0".equals(sha256)) {
@@ -441,7 +450,9 @@ public class JPADriftServerBean implements JPADriftServerLocal {
// if the JPADriftFile is not yet in the db, then it needs to be fetched from the agent
if (null == result) {
result = persistDriftFile(new JPADriftFile(sha256));
- emptyDriftFiles.add(result);
+ if (addToList) {
+ emptyDriftFiles.add(result);
+ }
}
return result;
commit f1475dbbc68e537e73727b38a717837c57ce05b7
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Nov 22 16:59:23 2011 -0500
[BZ 620603] turn log level down from WARN to ERROR for org.hibernate.hql.ast.QueryTranslatorImpl
to suppress "firstResult/maxResults specified with collection fetch; applying in memory!"
warning messages (https://bugzilla.redhat.com/show_bug.cgi?id=620603)
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml
index 16b0384..936c5b9 100644
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml
+++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml
@@ -315,6 +315,12 @@
<priority value="OFF"/>
</category>
+ <!-- Suppress "firstResult/maxResults specified with collection fetch; applying in memory!" WARN messages
+ (see https://bugzilla.redhat.com/show_bug.cgi?id=620603). -->
+ <category name="org.hibernate.hql.ast.QueryTranslatorImpl">
+ <priority value="ERROR"/>
+ </category>
+
<!-- log SQL statements -->
<!--
<category name="org.hibernate.SQL">
commit 579510cd6bb0e810f551b06a5fa9a0d777a2e50c
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Nov 22 11:59:44 2011 -0500
[BZ 756100] Use file timestamp and size during drift detection
This commit introduces an enhancement to drift detection by reducing the
amount of digest calculation that is performed. Digest calculation is
CPU-intensive.
The change set parser code has been updated to read/write file timestamp
and size. DriftDetector looks at the addition file info now to determine
if there has been a change. If the timestamp and size have not changed,
DriftDetector will skip recalculating the SHA. This results in a
significant speed up in drift detection.
Since the additional fields are not persisted on the server, there may
be times when the file timestamp and size are not available. This can
happen for example when the agent is restarted and the data directory is
purged. The agent has to download snapshots from the server at that
point, and they will not have the file modification time or size.
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetReaderImpl.java b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetReaderImpl.java
index 5da6078..f0dd8ac 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetReaderImpl.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetReaderImpl.java
@@ -19,6 +19,10 @@
package org.rhq.common.drift;
+import static org.rhq.common.drift.FileEntry.addedFileEntry;
+import static org.rhq.common.drift.FileEntry.changedFileEntry;
+import static org.rhq.common.drift.FileEntry.removedFileEntry;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -31,10 +35,6 @@ import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.drift.DriftChangeSetCategory;
-import static org.rhq.common.drift.FileEntry.addedFileEntry;
-import static org.rhq.common.drift.FileEntry.changedFileEntry;
-import static org.rhq.common.drift.FileEntry.removedFileEntry;
-
/**
* Note that this implementation does not do any validation for the most part. It assumes
* that entries in the change set file contain valid, 64 character SHA-256 hashes. It
@@ -121,19 +121,30 @@ public class ChangeSetReaderImpl implements ChangeSetReader {
}
if (line.charAt(0) == 'A') { // file added
- String sha = line.substring(2, 66);
- String fileName = line.substring(69);
- return addedFileEntry(fileName, sha);
+ int fileSizeEndIndex = line.indexOf(' ', 2);
+ long size = Long.parseLong(line.substring(2, fileSizeEndIndex));
+ int lastModifiedEndIndex = line.indexOf(' ', fileSizeEndIndex + 1);
+ long lastModified = Long.parseLong(line.substring(fileSizeEndIndex + 1, lastModifiedEndIndex));
+ int shaEndIndex = lastModifiedEndIndex + 65;
+ String sha = line.substring(lastModifiedEndIndex + 1, shaEndIndex);
+ String fileName = line.substring(shaEndIndex + 3);
+ return addedFileEntry(fileName, sha, lastModified, size);
}
if (line.charAt(0) == 'C') { // file modified
- String newSha = line.substring(2, 66);
- String oldSha = line.substring(67, 131);
- String fileName = line.substring(132);
- return changedFileEntry(fileName, oldSha, newSha);
+ int fileSizeEndIndex = line.indexOf(' ', 2);
+ long size = Long.parseLong(line.substring(2, fileSizeEndIndex));
+ int lastModifiedEndIndex = line.indexOf(' ', fileSizeEndIndex + 1);
+ long lastModified = Long.parseLong(line.substring(fileSizeEndIndex + 1, lastModifiedEndIndex));
+ int newShaIndex = lastModifiedEndIndex + 65;
+ String newSha = line.substring(lastModifiedEndIndex + 1, newShaIndex);
+ int oldShaIndex = newShaIndex + 65;
+ String oldSha = line.substring(newShaIndex + 1, oldShaIndex);
+ String fileName = line.substring(oldShaIndex + 1);
+ return changedFileEntry(fileName, oldSha, newSha, lastModified, size);
}
if (line.charAt(0) == 'R') { // file deleted
- String sha = line.substring(4, 68);
- String fileName = line.substring(69);
+ String sha = line.substring(10, 74);
+ String fileName = line.substring(75);
return removedFileEntry(fileName, sha);
}
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java
index 5e9c6ed..9631490 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java
@@ -46,7 +46,15 @@ import java.io.IOException;
* </ul>
* <br/>
* <br/>
- * FILE_ENTRY has four, space-delimited fields - type, new_sha, old_sha, file_name.<br/>
+ * FILE_ENTRY has six, space-delimited fields:
+ * <ul>
+ * <li>type</li>
+ * <li>file_size</li>
+ * <li>timestamp</li>
+ * <li>new_sha</li>
+ * <li>old_sha</li>
+ * <li>file_name</li>
+ * </ul>
* Here is an example change set:
*
* <pre>
@@ -54,17 +62,19 @@ import java.io.IOException;
* 2345
* Core Server JARs
* /var/lib/myserver
- * C 1706b5c18e4358041b463995efc30f8f721766fab0e018d50d85978b46df013c 1536b5c18e4358041b463995efc30f8f721766fab0e018d50d85978b46df013c lib/foo.jar
- * A 2706b5c18e4358041b463995efc30f8f721766fab0e018d50d85978b46df013a 0 lib/bar.jar
- * R 0 2206b5af8e4358041b463995efc30f8f721766fab0e018d50d85978b46df013a conf/foo.conf
+ * C 1024 1321975943000 1706b5c18e4358041b463995efc30f8f721766fab0e018d50d85978b46df013c 1536b5c18e4358041b463995efc30f8f721766fab0e018d50d85978b46df013c lib/foo.jar
+ * A 512 1121975943000 2706b5c18e4358041b463995efc30f8f721766fab0e018d50d85978b46df013a 0 lib/bar.jar
+ * R -1 -1 0 2206b5af8e4358041b463995efc30f8f721766fab0e018d50d85978b46df013a conf/foo.conf
* </pre>
*
* Note that the file paths in each entry are relative to the path in the base directory
- * header. For the entry with a path of lib/bar.jar notice that the old_sha field has a
- * value of 0. This is because it is a new file, and there is no previous SHA-256 hash for
- * the file. For the entry with conf/foo.conf as its path, notices that the new_sha field
- * has a value of 0 for foo.conf. This is because the file has been deleted and so there is
- * no new SHA-256 hash.
+ * header. The timestamp field is the last modification time of the file. For the entry
+ * with a path of lib/bar.jar notice that the old_sha field has a value of 0. This is
+ * because it is a new file, and there is no previous SHA-256 hash for the file. For the
+ * entry with conf/foo.conf as its path, notices that the new_sha field has a value of 0 for foo.conf.
+ * This is because the file has been deleted and so there is no new SHA-256 hash. Also
+ * note that this entry has a value of -1 for its file size and timestamp fields. This
+ * denotes that those values are no longer available since the file was removed.
* <p/>
* Lastly and importantly, the format of this file is still subject to change. Additional
* headers may be added, maybe allowing for optional headers. The format of the file entry
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java
index c0fdf50..57a9c1a 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java
@@ -57,14 +57,31 @@ public class ChangeSetWriterImpl implements ChangeSetWriter {
public void write(FileEntry entry) throws IOException {
switch (entry.getType()) {
case FILE_ADDED:
- writer.write(entry.getType().code() + " " + entry.getNewSHA() + " 0 " + entry.getFile() + "\n");
+ writer.write(
+ entry.getType().code() + " " +
+ entry.getSize() + " " +
+ entry.getLastModified() + " " +
+ entry.getNewSHA() +
+ " 0 " +
+ entry.getFile() + "\n");
break;
case FILE_CHANGED:
- writer.write(entry.getType().code() + " " + entry.getNewSHA() + " " + entry.getOldSHA() + " " +
+ writer.write(
+ entry.getType().code() + " " +
+ entry.getSize() + " " +
+ entry.getLastModified() + " " +
+ entry.getNewSHA() + " " +
+ entry.getOldSHA() + " " +
entry.getFile() + "\n");
break;
case FILE_REMOVED:
- writer.write(entry.getType().code() + " 0 " + entry.getOldSHA() + " " + entry.getFile() + "\n");
+ writer.write(
+ entry.getType().code() + " " +
+ "-1 " +
+ "-1 " +
+ "0 " +
+ entry.getOldSHA() + " " +
+ entry.getFile() + "\n");
break;
}
}
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java b/modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java
index bafd297..e1766a3 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java
@@ -24,6 +24,7 @@ import static org.rhq.core.domain.drift.DriftCategory.FILE_CHANGED;
import static org.rhq.core.domain.drift.DriftCategory.FILE_REMOVED;
import java.io.Serializable;
+import java.util.Date;
import org.rhq.core.domain.drift.DriftCategory;
import org.rhq.core.util.file.FileUtil;
@@ -38,26 +39,32 @@ public class FileEntry implements Serializable {
entry.oldSHA = sha;
entry.newSHA = "0";
entry.type = FILE_REMOVED;
+ entry.lastModified = -1L;
+ entry.size = -1L;
return entry;
}
- public static FileEntry addedFileEntry(String file, String sha) {
+ public static FileEntry addedFileEntry(String file, String sha, Long lastModified, Long size) {
FileEntry entry = new FileEntry();
entry.file = FileUtil.useForwardSlash(file);
entry.oldSHA = "0";
entry.newSHA = sha;
entry.type = FILE_ADDED;
+ entry.lastModified = lastModified;
+ entry.size = size;
return entry;
}
- public static FileEntry changedFileEntry(String file, String oldSHA, String newSHA) {
+ public static FileEntry changedFileEntry(String file, String oldSHA, String newSHA, Long lastModified, Long size) {
FileEntry entry = new FileEntry();
entry.file = FileUtil.useForwardSlash(file);
entry.oldSHA = oldSHA;
entry.newSHA = newSHA;
entry.type = FILE_CHANGED;
+ entry.lastModified = lastModified;
+ entry.size = size;
return entry;
}
@@ -70,14 +77,20 @@ public class FileEntry implements Serializable {
private DriftCategory type;
+ private Long lastModified;
+
+ private Long size;
+
private FileEntry() {
}
- public FileEntry(String newSHA, String oldSHA, String file, String type) {
+ public FileEntry(String newSHA, String oldSHA, String file, String type, Long lastModified, Long size) {
this.newSHA = newSHA;
this.oldSHA = oldSHA;
this.file = file;
this.type = DriftCategory.fromCode(type);
+ this.lastModified = lastModified;
+ this.size = size;
}
public String getFile() {
@@ -96,9 +109,17 @@ public class FileEntry implements Serializable {
return type;
}
+ public Long getLastModified() {
+ return lastModified;
+ }
+
+ public Long getSize() {
+ return size;
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "[newSHA: " + newSHA + ", oldSHA: " + oldSHA + ", file: " + file
- + ", type: " + type.code() + "]";
+ + ", type: " + type.code() + ", lastModified: " + new Date(lastModified) + ", size: " + size + "]";
}
}
diff --git a/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetReaderImplTest.java b/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetReaderImplTest.java
index 1a6f5dd..e8b1cd6 100644
--- a/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetReaderImplTest.java
+++ b/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetReaderImplTest.java
@@ -1,15 +1,16 @@
package org.rhq.common.drift;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.test.AssertUtils.assertPropertiesMatch;
+import static org.testng.Assert.assertEquals;
+
import java.io.StringReader;
+import java.util.Date;
import org.testng.annotations.Test;
import org.rhq.core.util.MessageDigestGenerator;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.test.AssertUtils.assertPropertiesMatch;
-import static org.testng.Assert.assertEquals;
-
public class ChangeSetReaderImplTest {
MessageDigestGenerator digestGenerator = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
@@ -18,13 +19,14 @@ public class ChangeSetReaderImplTest {
@SuppressWarnings("unchecked")
public void readFileAddedEntry() throws Exception {
String sha = sha256("myconf.conf");
+ long timestamp = new Date().getTime();
String changeset = "1\n" +
"1\n" +
"file-added-test\n" +
"myresource\n" +
"C\n" +
"1\n" +
- "A " + sha + " 0 conf/myconf.conf";
+ "A 1024 " + timestamp + " " + sha + " 0 conf/myconf.conf";
ChangeSetReaderImpl reader = new ChangeSetReaderImpl(new StringReader(changeset));
@@ -39,7 +41,7 @@ public class ChangeSetReaderImplTest {
assertHeadersEquals(actualHeaders, expectedHeaders);
- FileEntry expectedFileEntry = new FileEntry(sha, "0", "conf/myconf.conf", "A");
+ FileEntry expectedFileEntry = new FileEntry(sha, "0", "conf/myconf.conf", "A", timestamp, 1024L);
FileEntry actualFileEntry = reader.read();
reader.close();
@@ -56,7 +58,7 @@ public class ChangeSetReaderImplTest {
"myresource\n" +
"C\n" +
"1\n" +
- "R 0 " + sha + " conf/myconf.conf";
+ "R -1 -1 0 " + sha + " conf/myconf.conf";
ChangeSetReaderImpl reader = new ChangeSetReaderImpl(new StringReader(changeset));
@@ -71,7 +73,7 @@ public class ChangeSetReaderImplTest {
assertHeadersEquals(actualHeaders, expectedHeaders);
- FileEntry expectedFileEntry = new FileEntry("0", sha, "conf/myconf.conf", "R");
+ FileEntry expectedFileEntry = new FileEntry("0", sha, "conf/myconf.conf", "R", -1L, -1L);
FileEntry actualFileEntry = reader.read();
reader.close();
@@ -83,13 +85,14 @@ public class ChangeSetReaderImplTest {
public void readChangedFileEntry() throws Exception {
String oldSha = sha256("myconf.conf.old");
String newSha = sha256("myconf.conf.new");
+ long timestamp = new Date().getTime();
String changeset = "1\n" +
"1\n" +
"file-changed-test\n" +
"myresource\n" +
"C\n" +
"1\n" +
- "C " + newSha + " " + oldSha + " conf/myconf.conf";
+ "C 1024 " + timestamp + " " + newSha + " " + oldSha + " conf/myconf.conf";
ChangeSetReaderImpl reader = new ChangeSetReaderImpl(new StringReader(changeset));
@@ -104,7 +107,7 @@ public class ChangeSetReaderImplTest {
assertHeadersEquals(actualHeaders, expectedHeaders);
- FileEntry expectedFileEntry = new FileEntry(newSha, oldSha, "conf/myconf.conf", "C");
+ FileEntry expectedFileEntry = new FileEntry(newSha, oldSha, "conf/myconf.conf", "C", timestamp, 1024L);
FileEntry actualFileEntry = reader.read();
reader.close();
@@ -115,13 +118,14 @@ public class ChangeSetReaderImplTest {
@SuppressWarnings("unchecked")
public void readFileEntryWithSpacesInPath() throws Exception {
String sha = sha256("file with spaces.conf");
+ long timestamp = new Date().getTime();
String changeset = "1\n" +
"1\n" +
"file-name-test\n" +
"myresource\n" +
"C\n" +
"1\n" +
- "A " + sha + " 0 conf/file with spaces.conf";
+ "A 1024 " + timestamp + " " + sha + " 0 conf/file with spaces.conf";
ChangeSetReaderImpl reader = new ChangeSetReaderImpl(new StringReader(changeset));
@@ -136,7 +140,7 @@ public class ChangeSetReaderImplTest {
assertHeadersEquals(actualHeaders, expectedHeaders);
- FileEntry expectedFileEntry = new FileEntry(sha, "0", "conf/file with spaces.conf", "A");
+ FileEntry expectedFileEntry = new FileEntry(sha, "0", "conf/file with spaces.conf", "A", timestamp, 1024L);
FileEntry actualFileEntry = reader.read();
reader.close();
@@ -162,8 +166,8 @@ public class ChangeSetReaderImplTest {
"myresource\n" +
"C\n" +
"1\n" +
- "A " + sha256("resource.conf") + " 0 conf/resource.conf\n" +
- "A " + sha256("resource.jar") + " 0 lib/resource.jar";
+ "A 1024 5678 " + sha256("resource.conf") + " 0 conf/resource.conf\n" +
+ "A 1024 5678 " + sha256("resource.jar") + " 0 lib/resource.jar";
ChangeSetReaderImpl reader = new ChangeSetReaderImpl(new StringReader(changeset));
int numEntries = 0;
@@ -185,7 +189,7 @@ public class ChangeSetReaderImplTest {
"myresource\n" +
"C\n" +
"1\n" +
- "A " + sha + " 0 conf/resource.conf\n";
+ "A 1024 5678 " + sha + " 0 conf/resource.conf\n";
ChangeSetReaderImpl reader = new ChangeSetReaderImpl(new StringReader(changeset));
int numEntries = 0;
@@ -227,9 +231,12 @@ public class ChangeSetReaderImplTest {
void assertFileEntryEquals(FileEntry actual, FileEntry expected) {
assertEquals(actual.getType(), expected.getType(), "The first column, the entry type, is wrong");
- assertEquals(actual.getNewSHA(), expected.getNewSHA(), "The second column, the new SHA-256, is wrong");
- assertEquals(actual.getOldSHA (), expected.getOldSHA(), "The third column, the old SHA-256, is wrong");
- assertEquals(actual.getFile(), expected.getFile(), "The fourth column, the file name, is wrong");
+ assertEquals(actual.getSize(), expected.getSize(), "The second column, the file size, is wrong");
+ assertEquals(actual.getLastModified(), expected.getLastModified(), "The third column, the last modification " +
+ "time, is wrong");
+ assertEquals(actual.getNewSHA(), expected.getNewSHA(), "The fourth column, the new SHA-256, is wrong");
+ assertEquals(actual.getOldSHA (), expected.getOldSHA(), "The fifth column, the old SHA-256, is wrong");
+ assertEquals(actual.getFile(), expected.getFile(), "The sixth column, the file name, is wrong");
}
String sha256(String s) throws Exception {
diff --git a/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java b/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java
index e782cda..73d8d16 100644
--- a/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java
+++ b/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java
@@ -19,13 +19,6 @@
package org.rhq.common.drift;
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.List;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
import static org.apache.commons.io.FileUtils.deleteDirectory;
import static org.apache.commons.io.IOUtils.readLines;
import static org.rhq.common.drift.FileEntry.addedFileEntry;
@@ -34,6 +27,14 @@ import static org.rhq.common.drift.FileEntry.removedFileEntry;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
import static org.testng.Assert.assertEquals;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Date;
+import java.util.List;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
public class ChangeSetWriterImplTest {
File changeSetsDir;
@@ -69,9 +70,10 @@ public class ChangeSetWriterImplTest {
headers.setType(COVERAGE);
headers.setVersion(1);
+ long timestamp = new Date().getTime();
ChangeSetWriterImpl writer = new ChangeSetWriterImpl(changeSetFile, headers);
- writer.write(addedFileEntry("conf/myconf.conf", "a34ef6"));
+ writer.write(addedFileEntry("conf/myconf.conf", "a34ef6", timestamp, 1024L));
writer.close();
File metaDataFile = writer.getChangeSetFile();
@@ -80,7 +82,7 @@ public class ChangeSetWriterImplTest {
assertEquals(lines.size(), 7, "Expected to find seven lines in " + metaDataFile.getPath()
+ " - six for the header followed by one file entry.");
assertHeadersEquals(lines, headers);
- assertFileEntryEquals(lines.get(6), "A a34ef6 0 conf/myconf.conf");
+ assertFileEntryEquals(lines.get(6), "A 1024 " + timestamp + " a34ef6 0 conf/myconf.conf");
}
@Test
@@ -108,7 +110,7 @@ public class ChangeSetWriterImplTest {
assertEquals(lines.size(), 7, "Expected to find seven lines in " + metaDataFile.getPath()
+ " - six for the header followed by one file entry.");
assertHeadersEquals(lines, headers);
- assertFileEntryEquals(lines.get(6), "R 0 a34ef6 conf/myconf.conf");
+ assertFileEntryEquals(lines.get(6), "R -1 -1 0 a34ef6 conf/myconf.conf");
}
@Test
@@ -127,7 +129,8 @@ public class ChangeSetWriterImplTest {
ChangeSetWriterImpl writer = new ChangeSetWriterImpl(changeSetFile, headers);
- writer.write(changedFileEntry("conf/myconf.conf", "a34ef6", "c2d55f"));
+ long timestamp = new Date().getTime();
+ writer.write(changedFileEntry("conf/myconf.conf", "a34ef6", "c2d55f", timestamp, 1024L));
writer.close();
File metaDataFile = writer.getChangeSetFile();
@@ -136,7 +139,7 @@ public class ChangeSetWriterImplTest {
assertEquals(lines.size(), 7, "Expected to find seven lines in " + metaDataFile.getPath()
+ " - six for the header followed by one file entry.");
assertHeadersEquals(lines, headers);
- assertFileEntryEquals(lines.get(6), "C c2d55f a34ef6 conf/myconf.conf");
+ assertFileEntryEquals(lines.get(6), "C 1024 " + timestamp + " c2d55f a34ef6 conf/myconf.conf");
}
/**
@@ -173,13 +176,15 @@ public class ChangeSetWriterImplTest {
String[] expectedFields = expected.split(" ");
String[] actualFields = actual.split(" ");
- assertEquals(expectedFields.length, 4, "<" + expected + "> should contain 4 fields");
- assertEquals(actualFields.length, 4, "<" + actual + "> should contain 4 fields");
+ assertEquals(expectedFields.length, 6, "<" + expected + "> should contain 6 fields");
+ assertEquals(actualFields.length, 6, "<" + actual + "> should contain 6 fields");
- assertEquals(actualFields[0], expectedFields[0], "The first column, the SHA-256, is wrong");
- assertEquals(actualFields[1], expectedFields[1], "The second column, the old SHA-256, is wrong");
- assertEquals(actualFields[2], expectedFields[2], "The third column, the file name, is wrong");
- assertEquals(actualFields[3], expectedFields[3], "The fourth column, the type, is wrong");
+ assertEquals(actualFields[0], expectedFields[0], "The first column, the type, is wrong");
+ assertEquals(actualFields[1], expectedFields[1], "The second column, the file size, is wrong");
+ assertEquals(actualFields[2], expectedFields[2], "The third column, the last modification time, is wrong");
+ assertEquals(actualFields[3], expectedFields[3], "The fourth column, the SHA-256, is wrong");
+ assertEquals(actualFields[4], expectedFields[4], "The fifth column, the old SHA-256, is wrong");
+ assertEquals(actualFields[5], expectedFields[5], "The sixth column, the file name, is wrong");
}
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index e0f7509..c8c3bb0 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -230,7 +230,8 @@ public class DriftDetector implements Runnable {
log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
}
- FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file));
+ FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file),
+ file.lastModified(), file.length());
deltaEntries.add(newEntry);
snapshotEntries.add(newEntry);
} catch (IOException e) {
@@ -296,12 +297,27 @@ public class DriftDetector implements Runnable {
deltaEntries.add(removedFileEntry(entry.getFile(), entry.getNewSHA()));
} else {
processedFiles.add(file);
- String currentSHA = sha256(file);
- if (!currentSHA.equals(entry.getNewSHA())) {
+ // if we do not have the last modification time and the file size, then we
+ // have to compare SHAs. We can wind up without a timestamp of a file size
+ // when the agent is restarted and the data directory is purged. The server
+ // sends snapshots down to the agent and since the server does not store the
+ // file modification time or size, the fields will get initialized to -1.
+ if (entry.getLastModified() == -1 && entry.getSize() == -1) {
+ String currentSHA = sha256(file);
+ if (!entry.getNewSHA().equals(currentSHA)) {
+ FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA,
+ file.lastModified(), file.length());
+ deltaEntries.add(modifiedEntry);
+ snapshotEntries.add(modifiedEntry);
+ }
+ } else if (entry.getLastModified() != -1 && entry.getSize() != -1 &&
+ (entry.getLastModified() != file.lastModified() || entry.getSize() != file.length())) {
if (log.isDebugEnabled()) {
log.debug("Detected modified file for " + schedule + " --> " + file.getAbsolutePath());
}
- FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA);
+ String currentSHA = sha256(file);
+ FileEntry modifiedEntry = changedFileEntry(entry.getFile(), entry.getNewSHA(), currentSHA,
+ file.lastModified(), file.length());
deltaEntries.add(modifiedEntry);
snapshotEntries.add(modifiedEntry);
} else {
@@ -492,7 +508,8 @@ public class DriftDetector implements Runnable {
if (log.isDebugEnabled()) {
log.debug("Adding " + file.getPath() + " to coverage change set for " + schedule);
}
- writer.write(addedFileEntry(relativePath(basedir, file), sha256(file)));
+ writer.write(addedFileEntry(relativePath(basedir, file), sha256(file), file.lastModified(),
+ file.length()));
} catch (IOException e) {
log.error("An error occurred while generating a coverage change set for " + schedule + ": "
+ e.getMessage());
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index c70b546..4241b31 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@ -761,11 +761,11 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
for (Drift drift : snapshot.getDriftInstances()) {
switch (drift.getCategory()) {
case FILE_ADDED:
- writer.write(addedFileEntry(drift.getPath(), drift.getNewDriftFile().getHashId()));
+ writer.write(addedFileEntry(drift.getPath(), drift.getNewDriftFile().getHashId(), -1L, -1L));
break;
case FILE_CHANGED:
writer.write(changedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId(),
- drift.getNewDriftFile().getHashId()));
+ drift.getNewDriftFile().getHashId(), -1L, -1L));
break;
default: // FILE_REMOVED
writer.write(removedFileEntry(drift.getPath(), drift.getOldDriftFile().getHashId()));
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java
index 6e016b6..351f42f 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java
@@ -53,7 +53,7 @@ public class ChangeSetManagerImplTest extends DriftTest {
String serverConfHash = sha256(serverConf);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(config, COVERAGE));
- writer.write(addedFileEntry("conf/server.conf", serverConfHash));
+ writer.write(addedFileEntry("conf/server.conf", serverConfHash, serverConf.lastModified(), serverConf.length()));
writer.close();
ChangeSetReader reader = changeSetMgr.getChangeSetReader(resourceId(), config);
@@ -72,7 +72,7 @@ public class ChangeSetManagerImplTest extends DriftTest {
Headers headers = createHeaders(config, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("conf/server.conf", sha256(serverConf)));
+ writer.write(addedFileEntry("conf/server.conf", sha256(serverConf), serverConf.lastModified(), serverConf.length()));
writer.close();
assertTrue(changeSetMgr.changeSetExists(resourceId(), headers), "Expected to find change set file.");
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
index 4a2b333..dee1c6d 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
@@ -95,7 +95,8 @@ public class DriftDetectorTest extends DriftTest {
File changeSet = changeSet(driftDef.getName(), COVERAGE);
Headers headers = createHeaders(driftDef, COVERAGE);
- List<FileEntry> expected = asList(addedFileEntry("conf/server.conf", sha256(serverConf)));
+ List<FileEntry> expected = asList(addedFileEntry("conf/server.conf", sha256(serverConf),
+ serverConf.lastModified(), serverConf.length()));
assertHeaderEquals(changeSet, headers);
assertFileEntriesMatch("Only files should be included in a change set.", expected, changeSet);
@@ -114,8 +115,9 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File changeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> entries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf)), addedFileEntry(
- "conf/server-2.conf", sha256(server2Conf)));
+ List<FileEntry> entries = asList(
+ addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
+ addedFileEntry("conf/server-2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
assertHeaderEquals(changeSet, createHeaders(def, COVERAGE));
assertFileEntriesMatch("Each file in a directory should be included in a coverage change set", entries,
@@ -137,8 +139,9 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File changeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", sha256(serverConf)), addedFileEntry(
- "lib/server.jar", sha256(serverLib)));
+ List<FileEntry> entries = asList(
+ addedFileEntry("conf/server.conf", sha256(serverConf), serverConf.lastModified(), serverConf.length()),
+ addedFileEntry("lib/server.jar", sha256(serverLib), serverLib.lastModified(), serverLib.length()));
assertHeaderEquals(changeSet, createHeaders(def, COVERAGE));
assertFileEntriesMatch("A coverage change set should include files from multiple, sibling directories",
@@ -160,8 +163,9 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File changeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> entries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf)), addedFileEntry(
- "conf/subconf/server-2.conf", sha256(server2Conf)));
+ List<FileEntry> entries = asList(
+ addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
+ addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
assertHeaderEquals(changeSet, createHeaders(def, COVERAGE));
assertFileEntriesMatch("A coverage change set should include files in nested sub directories", entries,
@@ -296,7 +300,8 @@ public class DriftDetectorTest extends DriftTest {
File server1Conf = createRandomFile(confDir, "server-1.conf");
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf)));
+ writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(),
+ server1Conf.length()));
writer.close();
// Create some drift
@@ -306,7 +311,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File driftChangeSet = changeSet(def.getName(), DRIFT);
- List<FileEntry> driftEntries = asList(addedFileEntry("conf/server-2.conf", sha256(server2Conf)));
+ List<FileEntry> driftEntries = asList(addedFileEntry("conf/server-2.conf", sha256(server2Conf),
+ server2Conf.lastModified(), server2Conf.length()));
// verify that the drift change set was generated
assertTrue(driftChangeSet.exists(), "Expected to find drift change set " + driftChangeSet.getPath());
@@ -314,8 +320,9 @@ public class DriftDetectorTest extends DriftTest {
assertFileEntriesMatch("The drift change set does not match the expected values", driftEntries, driftChangeSet);
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf)),
- addedFileEntry("conf/server-2.conf", sha256(server2Conf)));
+ List<FileEntry> coverageEntries = asList(
+ addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
+ addedFileEntry("conf/server-2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
// verify that the coverage change set was updated
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
@@ -333,19 +340,20 @@ public class DriftDetectorTest extends DriftTest {
String oldHash = sha256(server1Conf);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", oldHash));
+ writer.write(addedFileEntry("conf/server-1.conf", oldHash, server1Conf.lastModified(), server1Conf.length()));
writer.close();
// create some drift
server1Conf.delete();
- server1Conf = createRandomFile(confDir, "server-1.conf");
+ server1Conf = createRandomFile(confDir, "server-1.conf", 48);
String newHash = sha256(server1Conf);
scheduleQueue.addSchedule(new DriftDetectionSchedule(resourceId(), def));
detector.run();
File driftChangeSet = changeSet(def.getName(), DRIFT);
- List<FileEntry> driftEntries = asList(changedFileEntry("conf/server-1.conf", oldHash, newHash));
+ List<FileEntry> driftEntries = asList(changedFileEntry("conf/server-1.conf", oldHash, newHash,
+ server1Conf.lastModified(), server1Conf.length()));
// verify that the drift change set was generated
assertTrue(driftChangeSet.exists(), "Expected to find drift change set " + driftChangeSet.getPath());
@@ -353,7 +361,8 @@ public class DriftDetectorTest extends DriftTest {
assertFileEntriesMatch("The drift change set does not match the expected values", driftEntries, driftChangeSet);
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(changedFileEntry("conf/server-1.conf", oldHash, newHash));
+ List<FileEntry> coverageEntries = asList(changedFileEntry("conf/server-1.conf", oldHash, newHash,
+ server1Conf.lastModified(), server1Conf.length()));
// verify that the coverage change set was updated
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
@@ -370,7 +379,8 @@ public class DriftDetectorTest extends DriftTest {
File server1Conf = createRandomFile(confDir, "server-1.conf");
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf)));
+ writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(),
+ server1Conf.length()));
writer.close();
// create some drift
@@ -381,7 +391,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File driftChangeSet = changeSet(def.getName(), DRIFT);
- List<FileEntry> driftEntries = asList(addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf)));
+ List<FileEntry> driftEntries = asList(addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf),
+ server2Conf.lastModified(), server2Conf.length()));
// verify that the drift change set was generated
assertTrue(driftChangeSet.exists(), "Expected to find drift change set " + driftChangeSet.getPath());
@@ -389,8 +400,9 @@ public class DriftDetectorTest extends DriftTest {
assertFileEntriesMatch("The drift change set does not match the expected values", driftEntries, driftChangeSet);
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf)),
- addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf)));
+ List<FileEntry> coverageEntries = asList(
+ addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
+ addedFileEntry("conf/subconf/server-2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
// verify that the coverage change set was updated
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
@@ -410,8 +422,10 @@ public class DriftDetectorTest extends DriftTest {
String server2ConfHash = sha256(server2Conf);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf)));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash));
+ writer.write(addedFileEntry("conf/server-1.conf", sha256(server1Conf), server1Conf.lastModified(),
+ server1Conf.length()));
+ writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(),
+ server2Conf.length()));
writer.close();
// create some drift
@@ -430,7 +444,8 @@ public class DriftDetectorTest extends DriftTest {
// verify that the coverage change set was updated
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf)));
+ List<FileEntry> coverageEntries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf),
+ server1Conf.lastModified(), server1Conf.length()));
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
assertFileEntriesMatch("The coverage change set was not updated as expected", coverageEntries,
@@ -488,7 +503,7 @@ public class DriftDetectorTest extends DriftTest {
String server1Hash = sha256(server1Conf);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), createHeaders(def, COVERAGE));
- writer.write(addedFileEntry("conf/server-1.conf", server1Hash));
+ writer.write(addedFileEntry("conf/server-1.conf", server1Hash, server1Conf.lastModified(), server1Conf.length()));
writer.close();
// create some drift
@@ -599,7 +614,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File changeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> entries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf)));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server-1.conf", sha256(server1Conf),
+ server1Conf.lastModified(), server1Conf.length()));
assertHeaderEquals(changeSet, createHeaders(def, COVERAGE));
assertFileEntriesMatch("Files that are non-readable should be skipped but other, readable file should still "
@@ -620,7 +636,7 @@ public class DriftDetectorTest extends DriftTest {
// create some drift that includes a new file that is not readable
server1Conf.delete();
- server1Conf = createRandomFile(confDir, "server-1.conf");
+ server1Conf = createRandomFile(confDir, "server-1.conf", 48);
String newServer1Hash = sha256(server1Conf);
File server2Conf = createRandomFile(confDir, "server-2.conf");
@@ -630,7 +646,8 @@ public class DriftDetectorTest extends DriftTest {
detector.run();
File driftChangeSet = changeSet(def.getName(), DRIFT);
- List<FileEntry> driftEntries = asList(changedFileEntry("conf/server-1.conf", oldServer1Hash, newServer1Hash));
+ List<FileEntry> driftEntries = asList(changedFileEntry("conf/server-1.conf", oldServer1Hash, newServer1Hash,
+ server1Conf.lastModified(), server1Conf.length()));
// verify that the drift change set was generated
assertTrue(driftChangeSet.exists(), "Expected to find drift change set " + driftChangeSet.getPath());
@@ -639,7 +656,8 @@ public class DriftDetectorTest extends DriftTest {
// verify that the coverage change set was updated
File coverageChangeSet = changeSet(def.getName(), COVERAGE);
- List<FileEntry> coverageEntries = asList(changedFileEntry("conf/server-1.conf", oldServer1Hash, newServer1Hash));
+ List<FileEntry> coverageEntries = asList(changedFileEntry("conf/server-1.conf", oldServer1Hash, newServer1Hash,
+ server1Conf.lastModified(), server1Conf.length()));
assertHeaderEquals(coverageChangeSet, createHeaders(def, COVERAGE, 1));
assertFileEntriesMatch("The coverage change set was not updated as expected", coverageEntries,
@@ -712,8 +730,8 @@ public class DriftDetectorTest extends DriftTest {
// We always generate/update the current snapshot so we still need to verify that it
// was generated/updated correctly
List<FileEntry> fileEntries = asList(
- addedFileEntry("conf/server1.conf", sha256(server1Conf)),
- addedFileEntry("conf/server2.conf", sha256(server2Conf)));
+ addedFileEntry("conf/server1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
+ addedFileEntry("conf/server2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()));
assertHeaderEquals(currentSnapshot, createHeaders(driftDef, COVERAGE, 1));
assertFileEntriesMatch("The current snapshot file should still get updated even when using a pinned snapshot",
@@ -748,9 +766,9 @@ public class DriftDetectorTest extends DriftTest {
// verify that the current snapshot was updated
List<FileEntry> currentSnapshotEntries = asList(
- addedFileEntry("conf/server1.conf", sha256(server1Conf)),
- addedFileEntry("conf/server2.conf", sha256(server2Conf)),
- addedFileEntry("conf/server3.conf", sha256(server3Conf)));
+ addedFileEntry("conf/server1.conf", sha256(server1Conf), server1Conf.lastModified(), server1Conf.length()),
+ addedFileEntry("conf/server2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()),
+ addedFileEntry("conf/server3.conf", sha256(server3Conf), server3Conf.lastModified(), server3Conf.length()));
assertHeaderEquals(currentSnapshot, createHeaders(driftDef, COVERAGE, 2));
assertFileEntriesMatch("The current snapshot file should still get updated even when using a pinned snapshot",
@@ -759,8 +777,8 @@ public class DriftDetectorTest extends DriftTest {
// verify that the the drift/delta change set was generated
File driftChangeSet = changeSet(driftDef.getName(), DRIFT);
List<FileEntry> driftEntries = asList(
- addedFileEntry("conf/server2.conf", sha256(server2Conf)),
- addedFileEntry("conf/server3.conf", sha256(server3Conf)));
+ addedFileEntry("conf/server2.conf", sha256(server2Conf), server2Conf.lastModified(), server2Conf.length()),
+ addedFileEntry("conf/server3.conf", sha256(server3Conf), server3Conf.lastModified(), server3Conf.length()));
assertHeaderEquals(driftChangeSet, createHeaders(driftDef, DRIFT, 2));
assertFileEntriesMatch("The drift change set was not generated correctly when using a pinned snapshot",
@@ -781,7 +799,8 @@ public class DriftDetectorTest extends DriftTest {
File changeSet = changeSet(driftDef.getName(), COVERAGE);
File pinnedSnapshot = new File(changeSet.getParentFile(), "snapshot.pinned");
- List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", sha256(serverConf)));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", sha256(serverConf),
+ serverConf.lastModified(), serverConf.length()));
assertTrue(changeSet.exists(), "An initial snapshot file should be generated even when it is pinned");
assertHeaderEquals(changeSet, createHeaders(driftDef, COVERAGE));
@@ -878,7 +897,7 @@ public class DriftDetectorTest extends DriftTest {
// generate the pinned snapshot which is version zero
File pinnedSnapshot = pinnedSnapshot(driftDef.getName());
ChangeSetWriter writer = new ChangeSetWriterImpl(pinnedSnapshot, headers);
- writer.write(addedFileEntry("conf/server.conf", serverConfHash));
+ writer.write(addedFileEntry("conf/server.conf", serverConfHash, serverConf.lastModified(), serverConf.length()));
writer.close();
// generate the current snapshot file. we will take a shortcut here by
@@ -910,7 +929,8 @@ public class DriftDetectorTest extends DriftTest {
// verify that that current snapshot has been updated to reflect that
// the resource is back in compliance.
- List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", serverConfHash));
+ List<FileEntry> entries = asList(addedFileEntry("conf/server.conf", serverConfHash,
+ serverConf.lastModified(), serverConf.length()));
assertHeaderEquals(currentSnapshot, createHeaders(driftDef, COVERAGE, 2));
assertFileEntriesMatch("The entries in the current snapshot should match those in the pinned snapshot " +
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
index 5fd6528..b102300 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java
@@ -19,6 +19,11 @@
package org.rhq.core.pc.drift;
+import static org.rhq.common.drift.FileEntry.addedFileEntry;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -32,11 +37,6 @@ import org.rhq.core.domain.drift.DriftChangeSetCategory;
import org.rhq.core.domain.drift.DriftFile;
import org.rhq.core.domain.drift.JPADriftFile;
-import static org.rhq.common.drift.FileEntry.addedFileEntry;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
public class DriftFilesSenderTest extends DriftTest {
DriftClient driftClient;
@@ -69,8 +69,10 @@ public class DriftFilesSenderTest extends DriftTest {
Headers headers = createHeaders(driftDefName, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash));
+ writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(),
+ server1Conf.length()));
+ writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(),
+ server2Conf.length()));
writer.close();
sender.setDriftFiles(driftFiles(server1ConfHash, server2ConfHash));
@@ -105,10 +107,14 @@ public class DriftFilesSenderTest extends DriftTest {
Headers headers = createHeaders(driftDefName, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash));
- writer.write(addedFileEntry("lib/server-1.jar", server1JarHash));
- writer.write(addedFileEntry("lib/server-2.jar", server2JarHash));
+ writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(),
+ server1Conf.length()));
+ writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(),
+ server2Conf.length()));
+ writer.write(addedFileEntry("lib/server-1.jar", server1JarHash, server1Jar.lastModified(),
+ server1Jar.length()));
+ writer.write(addedFileEntry("lib/server-2.jar", server2JarHash, server2Jar.lastModified(),
+ server2Jar.length()));
writer.close();
// Note that the order of the drift files is random. When the server sends a request
@@ -142,8 +148,10 @@ public class DriftFilesSenderTest extends DriftTest {
Headers headers = createHeaders(driftDefName, COVERAGE);
ChangeSetWriter writer = changeSetMgr.getChangeSetWriter(resourceId(), headers);
- writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash));
- writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash));
+ writer.write(addedFileEntry("conf/server-1.conf", server1ConfHash, server1Conf.lastModified(),
+ server1Conf.length()));
+ writer.write(addedFileEntry("conf/server-2.conf", server2ConfHash, server2Conf.lastModified(),
+ server2Conf.length()));
writer.close();
// It is possible that the server can request a file that has been deleted since it
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftTest.java
index 41b725b..2f238f8 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftTest.java
@@ -229,9 +229,13 @@ public class DriftTest {
}
protected File createRandomFile(File dir, String fileName) throws Exception {
+ return createRandomFile(dir, fileName, 32);
+ }
+
+ protected File createRandomFile(File dir, String fileName, int numBytes) throws Exception {
File file = new File(dir, fileName);
FileOutputStream stream = new FileOutputStream(file);
- byte[] bytes = new byte[32];
+ byte[] bytes = new byte[numBytes];
random.nextBytes(bytes);
write(bytes, stream);
stream.close();
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 5dabd97..f7152a9 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -158,7 +158,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
File changeSet1 = new File(changeSetsDir, "changeset-1.txt");
ChangeSetWriter writer = new ChangeSetWriterImpl(changeSet1, headers);
- writer.write(addedFileEntry("test/file-1", file1Hash));
+ writer.write(addedFileEntry("test/file-1", file1Hash, 56789L, 1024L));
writer.close();
File changeSet1Zip = new File(changeSetsDir, "changeset-1.zip");
@@ -188,7 +188,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
File changeSet2 = new File(changeSetsDir, "changeset-2.txt");
writer = new ChangeSetWriterImpl(changeSet2, headers);
- writer.write(changedFileEntry("test/file-1", file1Hash, modifiedFile1Hash));
+ writer.write(changedFileEntry("test/file-1", file1Hash, modifiedFile1Hash, 56789L, 1024L));
writer.close();
File changeSet2Zip = new File(changeSetsDir, "changeset-2.zip");
1
0
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 111 +++++++++-
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 44 ++-
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 5
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 10
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java | 68 ++++++
modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 13 +
6 files changed, 221 insertions(+), 30 deletions(-)
New commits:
commit 01c6420c5e4578b943f89f3130daddfe20488ab5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 15 13:06:55 2012 +0100
BZ 708293 - allow modification of xa-properties.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
index fbf0509..008884b 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
@@ -44,6 +44,7 @@ import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
import org.rhq.modules.plugins.jbossas7.json.ReadChildrenResources;
+import org.rhq.modules.plugins.jbossas7.json.Remove;
import org.rhq.modules.plugins.jbossas7.json.Result;
import org.rhq.modules.plugins.jbossas7.json.WriteAttribute;
@@ -57,6 +58,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
private String namePropLocator;
private String type;
private boolean addNewChildren;
+ private boolean addDeleteModifiedChildren;
/**
* Create a new configuration delegate, that reads the attributes for the resource at address.
@@ -124,6 +126,11 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
namePropLocator=namePropLocator.substring(0,namePropLocator.length()-1);
addNewChildren = true;
}
+ else if (namePropLocator.endsWith("+-")) { // ending in +- -> we need to :add new entries and remove/add to modify
+ namePropLocator=namePropLocator.substring(0,namePropLocator.length()-2);
+ addNewChildren = true;
+ addDeleteModifiedChildren = true;
+ }
else {
addNewChildren = false;
}
@@ -239,25 +246,36 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
if (prop.get(namePropLocator)==null) {
throw new IllegalArgumentException("There is no element in the map with the name " + namePropLocator);
}
- String addrVal= ((PropertySimple)prop.get(namePropLocator)).getStringValue();
+ String key= ((PropertySimple)prop.get(namePropLocator)).getStringValue();
- // determine key from map as propDefName
- String key = prop.getSimpleValue(namePropLocator, null);
- if (key==null) {
- throw new IllegalArgumentException("Map contains no entry with name '" + namePropLocator + "'");
- }
-
Address addr = new Address(address);
- addr.add(type,addrVal);
+ addr.add(type,key);
for (Map.Entry<String,Object> entry : results.entrySet()) {
+
+ if (entry.getValue().equals(key))
+ continue; // skip TODO always or only in the case of degenerated props?
+
+
Operation operation;
- if (!addNewChildren || existingPropNames.contains(key))
- operation = new WriteAttribute(addr,entry.getKey(),entry.getValue());
+ if (!addNewChildren || existingPropNames.contains(key)) {
+ // update existing entry
+ if (addDeleteModifiedChildren) {
+ operation = new Remove(addr);
+ cop.addStep(operation);
+ operation = new Operation("add",addr);
+ operation.addAdditionalProperty("name",key);
+ operation.addAdditionalProperty("value",entry.getValue());
+
+ }
+ else {
+ operation = new WriteAttribute(addr,entry.getKey(),entry.getValue());
+ }
+ }
else {
- Address tmpAddr = new Address(address);
- tmpAddr.add(type, key);
- operation = new Operation("add",tmpAddr);
+ // write new child ( :name+ case )
+
+ operation = new Operation("add",addr);
operation.addAdditionalProperty("name",key);
operation.addAdditionalProperty("value",entry.getValue());
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
index 0543b81..7301824 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
@@ -152,12 +152,11 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
Operation op = new Operation("disable",getAddress());
Result res = getASConnection().execute(op);
if (!res.isSuccess()) {
- report.setErrorMessage("Was not able to disable the datasource for config changes");
+ report.setErrorMessage("Was not able to disable the datasource for config changes: " + res.getFailureDescription());
return;
}
-
- super.updateResourceConfiguration(report); // TODO: Customise this generated block
+ super.updateResourceConfiguration(report);
op = new Operation("enable",getAddress());
res = getASConnection().execute(op);
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 94fe410..4b98af9 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1358,11 +1358,11 @@
<c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="if true no recovery are tried for this connection pool"/>
- <c:group name="children:xa-datasource-properties:key+" displayName="XA Datasource Properties">
- <c:list-property name="*2" displayName="Properties" required="false" readOnly="true">
- <c:map-property name="*:key" displayName="Name" readOnly="true">
- <c:simple-property name="key" displayName="Property-Name" readOnly="true"/>
- <c:simple-property name="value" displayName="Value" readOnly="true"/>
+ <c:group name="children:xa-datasource-properties:key+-" displayName="XA Datasource Properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:key" displayName="Name" readOnly="false">
+ <c:simple-property name="key" displayName="Property-Name" readOnly="false"/>
+ <c:simple-property name="value" displayName="Value" readOnly="false"/>
</c:map-property>
</c:list-property>
</c:group>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index 703722a..97ec48d 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -423,4 +423,72 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
assert step3.getAdditionalProperties().isEmpty();
}
+
+ public void test11() throws Exception {
+
+ ConfigurationDefinition definition = loadDescriptor("test11");
+
+ FakeConnection connection = new FakeConnection();
+ String resultString = loadJsonFromFile("system-props.json");
+
+ ObjectMapper mapper = new ObjectMapper();
+ ComplexResult result = mapper.readValue(resultString,ComplexResult.class);
+ JsonNode json = mapper.valueToTree(result);
+
+ connection.setContent(json);
+
+
+ ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition,connection,null);
+
+ Configuration conf = new Configuration();
+
+ // We have properties 'bar' and 'hello' on the server
+ // bar has a value of 44
+ // update 'bar', add 'hulla' and remove 'hello'
+
+ PropertyList propertyList = new PropertyList("*2");
+ PropertyMap propertyMap = new PropertyMap("*");
+ // add 'hulla'
+ propertyMap.put(new PropertySimple("name","hulla"));
+ propertyMap.put(new PropertySimple("value","hopp"));
+ propertyList.add(propertyMap);
+ propertyMap = new PropertyMap("*");
+ // update 'bar' -> needs to trigger a remove + an :add
+ propertyMap.put(new PropertySimple("name","bar"));
+ propertyMap.put(new PropertySimple("value","42!"));
+ propertyList.add(propertyMap);
+ conf.put(propertyList);
+ // 'hello' is not present -> needs to trigger a :remove for it
+
+
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
+
+ assert cop.numberOfSteps() == 4 : "#Steps should be 4 but were " + cop.numberOfSteps();
+
+ Operation step1 = cop.step(0);
+ Operation step2 = cop.step(1);
+ Operation step3 = cop.step(2);
+ Operation step4 = cop.step(3);
+
+ assert step1.getAddress().size()==1;
+ assert step2.getAddress().size()==1;
+ assert step3.getAddress().size()==1;
+ assert step4.getAddress().size()==1;
+ assert step1.getAddress().get(0).equals("system-property=hulla");
+ assert step2.getAddress().get(0).equals("system-property=bar");
+ assert step3.getAddress().get(0).equals("system-property=bar");
+ assert step4.getAddress().get(0).equals("system-property=hello");
+ assert step1.getOperation().equals("add");
+ assert step2.getOperation().equals("remove");
+ assert step3.getOperation().equals("add");
+ assert step4.getOperation().equals("remove");
+
+ assert step1.getAdditionalProperties().get("name").equals("hulla");
+ assert step1.getAdditionalProperties().get("value").equals("hopp");
+ assert step2.getAdditionalProperties().isEmpty();
+ assert step3.getAdditionalProperties().get("name").equals("bar"); // This is the name of the property
+ assert step3.getAdditionalProperties().get("value").equals("42!");
+ assert step4.getAdditionalProperties().isEmpty();
+
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
index 173d2be..913bcb2 100644
--- a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
@@ -117,6 +117,19 @@
</resource-configuration>
</server>
+ <server class="foo" discovery="foo" name="test11">
+ <resource-configuration>
+ <c:group name="children:system-property:name+-" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ </resource-configuration>
+ </server>
+
<server class="foo" discovery="foo" name="simple1">
<resource-configuration>
commit 2357b9df42a6a646d1aec93341e6c0893afe87a5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Feb 14 14:33:30 2012 +0100
Improved detection for layered products.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
index 46a65a5..a9b41c6 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -59,6 +59,9 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
{
static final String DORG_JBOSS_BOOT_LOG_FILE = "-Dorg.jboss.boot.log.file=";
private static final String JBOSS_EAP_6 = "JBoss Enterprise Application Platform 6";
+ private static final String JBOSS_EDG_6 = "JBoss Enterprise Data Grid 6";
+ private static final String JBOSS_EPP_6 = "JBoss Enterprise Portal Platform 6";
+ private static final String JBOSS_SOA_6 = "JBoss Service Oriented Architecture Platform 6";
private static final String AS7 = "AS7";
private final Log log = LogFactory.getLog(this.getClass());
@@ -84,6 +87,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String homeDir = getHomeDirFromCommandLine(commandLine);
String version = determineServerVersionFromHomeDir(homeDir);
boolean isEAP = false;
+ boolean isEDG = false;
//retrieve specific boot log file. Override for Standalone as server.log is more appropriate
String bootLogFile = getLogFileFromCommandLine(commandLine);
@@ -92,6 +96,10 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
if (homeDir.contains("eap")) {
isEAP=true;
}
+ if (homeDir.contains("edg")) {
+ isEDG=true;
+ }
+
if (psName.equals("HostController")) {
@@ -133,6 +141,8 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
if (isEAP)
description = "Standalone " + JBOSS_EAP_6 + " server";
+ else if (isEDG)
+ description = "Standalone " + JBOSS_EDG_6 + " server";
else
description = "Standalone " + AS7 + " server";
@@ -172,6 +182,12 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
serverName = "EAP " + serverName;
version="EAP " + version;
}
+ else if (isEDG) {
+ serverName = "EDG " + serverName;
+ version="EDG " + version;
+
+ }
+
initLogEventSourcesConfigProp(logFile, config);
@@ -180,6 +196,15 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
config.put(new PropertySimple("port", managmentPort.port));
config.put(new PropertySimple("realm",getManagementSecurtiyRealmFromHostXml()));
+ ProductInfo productInfo = new ProductInfo(managmentPort.host,config.getSimpleValue("user",null),config.getSimpleValue("password",null),managmentPort.port);
+ productInfo = productInfo.getFromRemote();
+ if (productInfo.fromRemote) {
+ version = productInfo.productName + " " + productInfo.productVersion;
+ serverName = productInfo.productName + " " + productInfo.serverName;
+ String tmp = getServerDescr(productInfo.getProductName());
+ description = "Standalone " + tmp +" server";
+ }
+
// String javaClazz = psr.getProcessInfo().getName();
/*
@@ -198,7 +223,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
DiscoveredResourceDetails detail = new DiscoveredResourceDetails(discoveryContext.getResourceType(), // ResourceType
serverNameFull, // key TODO distinguish per domain?
serverName, // Name
- version, // TODO get via API ?
+ version,
description, // Description
config, psr.getProcessInfo());
@@ -214,6 +239,18 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
+ private String getServerDescr(String productName) {
+ if (productName.equals("EAP"))
+ return JBOSS_EAP_6;
+ if (productName.equals("EDG"))
+ return JBOSS_EDG_6;
+ if (productName.equals("SOA"))
+ return JBOSS_SOA_6;
+ if (productName.equals("EPP"))
+ return JBOSS_EPP_6;
+ return AS7;
+ }
+
/**
* Allow to manually add a (remote) AS7
* @param pluginConfiguration the plugin configuration that describes how to discover the Resource being manually
@@ -236,14 +273,9 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
int port = Integer.valueOf(portS);
- ASConnection connection = new ASConnection(hostname,port, user,pass);
- String productVersion = getServerAttribute(connection, "product-version");
- String productName = getServerAttribute(connection,"product-name");
- String releaseVersion = getServerAttribute(connection,"release-version");
- if (productVersion == null)
- productVersion = releaseVersion;
- if (productName==null)
- productName = "AS7";
+ ProductInfo productInfo = new ProductInfo(hostname, user, pass, port).getFromRemote();
+ String productName = productInfo.getProductName();
+ String productVersion = productInfo.getProductVersion();
String resourceKey = hostname + ":" + portS + ":" + productName;
String description;
@@ -393,4 +425,65 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
}
+ private class ProductInfo {
+ private String hostname;
+ private String user;
+ private String pass;
+ private int port;
+ private String productVersion;
+ private String productName;
+ private String releaseVersion;
+ private String releaseCodeName;
+ private boolean fromRemote = false;
+ private String serverName;
+
+ public ProductInfo(String hostname, String user, String pass, int port) {
+ this.hostname = hostname;
+ this.user = user;
+ this.pass = pass;
+ this.port = port;
+ }
+
+ public String getProductVersion() {
+ return productVersion;
+ }
+
+ public String getProductName() {
+ return productName;
+ }
+
+ public ProductInfo getFromRemote() {
+ ASConnection connection = new ASConnection(hostname, port, user, pass);
+ try {
+ productVersion = getServerAttribute(connection, "product-version");
+ productName = getServerAttribute(connection, "product-name");
+ releaseVersion = getServerAttribute(connection,"release-version");
+ releaseCodeName = getServerAttribute(connection,"release-codename");
+ serverName = getServerAttribute(connection,"name");
+ if (productVersion == null)
+ productVersion = releaseVersion;
+ if (productName ==null)
+ productName = "AS7";
+
+ fromRemote = true;
+ }
+ catch (InvalidPluginConfigurationException e) {
+ log.debug("Could not get the product info from [" + hostname + ":" + port +"] - probably a connection failure");
+ }
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return "ProductInfo{" +
+ "hostname='" + hostname + '\'' +
+ ", port=" + port +
+ ", productVersion='" + productVersion + '\'' +
+ ", productName='" + productName + '\'' +
+ ", releaseVersion='" + releaseVersion + '\'' +
+ ", releaseCodeName='" + releaseCodeName + '\'' +
+ ", fromRemote=" + fromRemote +
+ '}';
+ }
+ }
}
1
0
[rhq] Branch 'feature/gwt-upgrade' - 4 commits - modules/enterprise pom.xml
by mike thompson 15 Feb '12
by mike thompson 15 Feb '12
15 Feb '12
modules/enterprise/gui/coregui/pom.xml | 15 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormImplIE6.java | 43 ----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 9 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/Log.java | 87 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCTracker.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRemoteServiceProxy.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRequestCallback.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 3
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 49 +----
modules/enterprise/remoting/pom.xml | 1
pom.xml | 4
69 files changed, 255 insertions(+), 170 deletions(-)
New commits:
commit dffaa28caeccf39c1d0d4e9a726b77969153c9ae
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Feb 14 18:31:49 2012 -0800
Trivial. Added myself to developer roster in pom.xml
diff --git a/pom.xml b/pom.xml
index 44c6b34..5f2ef59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1402,6 +1402,10 @@
<name>Ian Springer</name>
<timezone>-5</timezone>
</developer>
+ <developer>
+ <name>Mike Thompson</name>
+ <timezone>-8</timezone>
+ </developer>
</developers>
<contributors>
commit c74a2c181ef38e217cc5874353c8bcd96ddd2fb1
Merge: d90eca6 1bcc7b0
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Feb 14 18:20:25 2012 -0800
Merge branch 'gwt-logging' into feature/gwt-upgrade
diff --cc modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index aad376e,1fa6cde..b1d20f7
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@@ -23,34 -24,26 +24,20 @@@
<inherits name='ca.nanometrics.gflot.GFlot'/>
- <!--
- <inherits name='com.google.gwt.widgetideas.WidgetIdeas'/>
- -->
- <!-- ============================ gwt-log ============================= -->
+ <!-- ============================ gwt logging ============================= -->
+ <set-property name="gwt.logging.enabled" value="TRUE"/>
+ <!-- FINE ~= DEBUG in gwt-log -->
+ <set-property name="gwt.logging.logLevel" value="FINE"/>
+ <set-property name="gwt.logging.consoleHandler" value="ENABLED" />
+ <set-property name="gwt.logging.developmentModeHandler" value="ENABLED" />
+ <set-property name="gwt.logging.firebugHandler" value="ENABLED" />
+ <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" />
+ <set-property name="gwt.logging.popupHandler" value="DISABLED" />
+ <set-property name="gwt.logging.systemHandler" value="ENABLED" />
+ <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" />
- <!-- For development, a default of 'DEBUG' is recommended. -->
- <!-- <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" />-->
- <inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
- <!-- For production, most teams prefer to set the default log level to 'OFF'. -->
- <!--<inherits name="com.allen_sauer.gwt.log.gwt-log-OFF" />-->
-
- <!--
- Enable experimental WindowLogger, which logs messages to a separate
- popup window. There are currently a couple of restrictions:
-
- 1. When Firefox is configured to open new Windows as new tabs,
- WindowLogger does not work
- 2. In hosted mode, the windows are not automatically closed,
- although you can easily close them manually in the usual way
- -->
- <!-- When enabled FireFox is hard to use due to excessive popup window generation
-
- <set-property name="log_WindowLogger" value="ENABLED" />
- -->
-
- <!--
- You probably will want to disable the default `DivLogger` as well:
- -->
- <set-property name="log_DivLogger" value="DISABLED" />
<replace-with class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl">
<when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/>
commit d90eca63ce7813189bba7ba128407f62bccff660
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Feb 14 15:08:57 2012 -0800
[BZ790621 - Remove IE6 Support from GWT ]
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index b023805..1a82220 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -37,23 +37,22 @@
specify the gwt.userAgent property on the mvn command line (e.g. -Dgwt.userAgent=gecko1_8)
or in your ~/.m2/settings.xml
- As of GWT 2.0.4, the recognized agents (defined in
+ As of GWT 2.4.0, the recognized agents (defined in
gwt-user.jar:com/google/gwt/user/UserAgent.gwt.xml) are as follows:
- ie6: IE6/IE7
- ie8: IE8 and later
+ ie9: IE9 (although for smartgwt we fallback to IE8)
+ ie8: IE8
gecko: FF1 (NOTE: Support for this was dropped in GWT 2.1.)
gecko1_8: FF2 and later
safari: Safari/Chrome
opera: Opera
- *NOTE*: Since we specify the meta "X-UA-Compatible: IE=EmulateIE7" HTTP header in CoreGUI.html, IE8 and later
- will emulate IE7, and so in order to run on IE8 and later, "ie6" must be specified, rather than "ie8".
-
+ *NOTE*: Since we specify the meta "X-UA-Compatible: IE=IE8" HTTP header in CoreGUI.html, IE9 and later
+ will emulate IE8.
Multiple agents can be specified as a comma-delimited list, as demonstrated by the default
value below.
-->
- <gwt.userAgent>ie6,ie8,ie9,gecko1_8,safari,opera</gwt.userAgent>
+ <gwt.userAgent>ie8,ie9,gecko1_8,safari,opera</gwt.userAgent>
<!-- Change this to "true" via the mvn command line or your ~/.m2/settings.xml to speed
up gwt compilation. -->
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormImplIE6.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormImplIE6.java
deleted file mode 100644
index f026085..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormImplIE6.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.components.upload;
-
-import com.google.gwt.dom.client.Element;
-
-public class DynamicCallbackFormImplIE6 extends DynamicCallbackFormImpl {
- @Override
- public native void hookEvents(Element iframe,
- DynamicCallbackFormImplHost listener) /*-{
- if (iframe) {
- iframe.onreadystatechange = function() {
- // If there is no __formAction yet, this is a spurious onreadystatechange
- // generated when the iframe is first added to the DOM.
- if (!iframe.__formAction)
- return;
-
- if (iframe.readyState == 'complete') {
- // If the iframe's contentWindow has not navigated to the expected action
- // url, then it must be an error, so we ignore it.
- listener.@org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImplHost::onFrameLoad()();
- }
- };
- }
- }-*/;
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 2746532..aad376e 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -20,15 +20,9 @@
2) we probably don't want to be defaulting to GWT standards as opposed to SmartGWT.
<inherits name='com.google.gwt.user.theme.standard.Standard'/>
-->
- <!--
- <inherits name="com.smartclient.theme.graphite.Graphite"/>
- -->
<inherits name='ca.nanometrics.gflot.GFlot'/>
- <!--
- <inherits name='com.google.gwt.widgetideas.WidgetIdeas'/>
- -->
<!-- ============================ gwt-log ============================= -->
@@ -62,11 +56,7 @@
<when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/>
</replace-with>
- <replace-with class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImplIE6">
- <when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/>
- <when-property-is name="user.agent" value="ie6"/>
- </replace-with>
-
+
<generate-with class="org.rhq.enterprise.gui.coregui.user.rebind.rpc.TrackingServiceInterfaceProxyGenerator">
<when-type-assignable class="com.google.gwt.user.client.rpc.RemoteService"/>
commit 1bcc7b0bb0004c80f06ef3591f6c8e78f1a37426
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Feb 2 08:41:13 2012 -0800
[BZ786184 Remove gwt-log logging mechanism and replace with standard GWT logging] Using Log adapter to make GWT logging look like gwt-log
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index bcd909f..a2d58d9 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -155,11 +155,13 @@
<version>1.0.0</version>
</dependency>
+ <!--
<dependency>
<groupId>com.google.code.gwt-log</groupId>
<artifactId>gwt-log</artifactId>
<version>3.1.0</version>
</dependency>
+ -->
<!-- for file uploads -->
<dependency>
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index a59f6ef..7f48e95 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.gui.coregui.client;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Element;
@@ -62,6 +62,7 @@ import org.rhq.enterprise.gui.coregui.client.test.TestDataSourceResponseStatisti
import org.rhq.enterprise.gui.coregui.client.test.TestRemoteServiceStatisticsView;
import org.rhq.enterprise.gui.coregui.client.test.TestTopView;
import org.rhq.enterprise.gui.coregui.client.util.ErrorHandler;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenter;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
index 16b1c60..a54324d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
@@ -22,10 +22,11 @@
*/
package org.rhq.enterprise.gui.coregui.client;
+import java.util.logging.Logger;
import java.util.EnumSet;
import java.util.Map;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
@@ -64,6 +65,7 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -77,6 +79,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
*/
public class LoginView extends LocatableCanvas {
+ private static final Logger log = Logger.getLogger("");
private static boolean loginShowing = false;
private LocatableWindow window;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
index 97d784e..4c06d51 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
@@ -24,6 +24,7 @@ import com.smartgwt.client.util.SC;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* @author Joseph Marques
@@ -43,7 +44,7 @@ public class SearchGUI implements EntryPoint {
public void onModuleLoad() {
if (SearchBar.existsOnPage() == false) {
- com.allen_sauer.gwt.log.client.Log.info("Suppressing load of SearchGUI module");
+ Log.info("Suppressing load of SearchGUI module");
return;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java
index 7bdcb6e..fff462a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java
@@ -22,7 +22,7 @@
*/
package org.rhq.enterprise.gui.coregui.client;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback;
@@ -38,6 +38,7 @@ import org.rhq.core.domain.criteria.SubjectCriteria;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences;
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
index 1ebd2a2..859a8ff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
@@ -24,7 +24,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.core.client.JavaScriptObject;
import com.smartgwt.client.core.RefDataClass;
import com.smartgwt.client.data.Record;
@@ -321,7 +321,6 @@ public class PermissionsEditor extends LocatableVStack {
authorizedField.setEditorType(editor);
if (!this.isReadOnly) {
- Log.debug("Non-Readonly field " +name);
grid.setEditEvent(ListGridEditEvent.CLICK);
final Record[] recordBeingEdited = { null };
authorizedField.addRecordClickHandler(new RecordClickHandler() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
index ee000a4..c3f70cf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
@@ -27,7 +27,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.DSRequest;
@@ -45,6 +45,7 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java
index a4da48b..d723494 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -45,6 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.alert.definitions.TemplateAlertDefinitionsView;
import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java
index ea18a4e..14e7a4f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java
@@ -26,7 +26,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -47,6 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.drift.DriftDefinitionTemplatesView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
index eed499f..8681c9e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.Record;
@@ -48,6 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* A form for viewing and/or editing an RHQ user (i.e. a {@link Subject}, and if the user is authenticated via RHQ and
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
index 435f8fe..adb7df0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.core.DataClass;
@@ -62,6 +62,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
index fd88c19..361be3c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.core.DataClass;
import com.smartgwt.client.data.Record;
@@ -55,6 +55,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java
index db1e4ef..21b7906 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.alert;
import java.util.ArrayList;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -41,6 +41,7 @@ import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
/** Customize the AlertDataSource to pull fetch criteria information from
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java
index 9c232db..d49aa8e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java
@@ -19,7 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.components.carousel;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.AnimationEffect;
import com.smartgwt.client.types.VerticalAlignment;
@@ -32,6 +32,7 @@ import org.rhq.enterprise.gui.coregui.client.DetailsView;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableSection;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index 28bd22d..83bd9fd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.AutoFitWidthApproach;
@@ -121,6 +121,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.IsLongValidator;
import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -309,7 +310,7 @@ public class ConfigurationEditor extends LocatableVLayout {
EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition),
new ResourceTypeRepository.TypesLoadedCallback() {
public void onTypesLoaded(Map<Integer, ResourceType> types) {
- com.allen_sauer.gwt.log.client.Log.debug("ConfigDef retrieved in: "
+ Log.debug("ConfigDef retrieved in: "
+ (System.currentTimeMillis() - start));
configurationDefinition = types.get(resourceTypeId).getResourceConfigurationDefinition();
if (configurationDefinition == null) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
index b000631..8e90f8a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
@@ -22,7 +22,7 @@ package org.rhq.enterprise.gui.coregui.client.components.form;
import java.util.EnumSet;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.DSCallback;
import com.smartgwt.client.data.DSRequest;
@@ -47,6 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.DetailsView;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
index 1092d74..16eb4e5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
@@ -22,7 +22,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.components.table;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.types.AnimationEffect;
@@ -43,6 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.DetailsView;
import org.rhq.enterprise.gui.coregui.client.InitializableView;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index ad9e43c..222b5b2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.event.dom.client.KeyCodes;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.DSCallback;
@@ -78,6 +78,7 @@ import org.rhq.enterprise.gui.coregui.client.InitializableView;
import org.rhq.enterprise.gui.coregui.client.RefreshableView;
import org.rhq.enterprise.gui.coregui.client.components.form.SearchBarItem;
import org.rhq.enterprise.gui.coregui.client.util.CriteriaUtility;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java
index c677777..c298839 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.types.VisibilityMode;
import com.smartgwt.client.widgets.Canvas;
@@ -47,6 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.RefreshableView;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
index 34775a2..d2ef13c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
@@ -36,6 +36,7 @@ import com.smartgwt.client.widgets.events.ResizedHandler;
import org.rhq.core.domain.dashboard.Dashboard;
import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -133,7 +134,7 @@ public class PortalLayout extends LocatableHLayout {
};
save(callback);
- com.allen_sauer.gwt.log.client.Log.info("Rearranged column indexes");
+ Log.info("Rearranged column indexes");
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
index b7176a9..8346e2e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
@@ -21,7 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
import java.util.ArrayList;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
@@ -55,6 +55,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigura
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -220,7 +221,7 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout implements C
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving installed bundle deployments for group [" + groupId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyLoading = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
index ba738a2..c826557 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
@@ -63,6 +63,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration.GroupResourceConfigurationDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration.HistoryGroupResourceConfigurationTable;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -300,7 +301,7 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout implement
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving resource group composite for group [" + context.getGroupId() + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyLoading = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
index 863627b..4a1c661 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
@@ -51,6 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigura
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.util.GwtTuple;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -238,7 +239,7 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin
public void onFailure(Throwable caught) {
Log
.debug("Error retrieving recent event counts for group [" + groupId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
setCurrentlyRefreshing(false);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
index 71c2d98..93b7ff4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.ContentsType;
@@ -69,6 +69,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.Abs
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -282,7 +283,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving resource group composite for group [" + groupId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
setRefreshing(false);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
index 155b892..e47c94c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
@@ -21,7 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
import java.util.ArrayList;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
@@ -55,6 +55,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow;
import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -213,7 +214,7 @@ public class GroupOobsPortlet extends LocatableVLayout implements CustomSettings
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving recent out of bound metrics for group [" + groupId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyLoading = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
index c6d8e9d..f717db3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
@@ -61,6 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.history.GroupOperationHistoryDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.history.GroupOperationHistoryListView;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -157,7 +158,7 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving resource group composite for group [" + groupId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyRefreshing = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
index a3352a9..7e7f5f0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
@@ -21,7 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
import java.util.ArrayList;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
@@ -53,6 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigura
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -216,7 +217,7 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout implements CustomSe
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving installed package history for group [" + groupId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyLoading = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
index a9c1dc7..b852454 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -46,6 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
public class RecentlyAddedResourceDS extends DataSource {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
index a66652a..616e552 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
@@ -18,7 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.fields.LinkItem;
@@ -42,6 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupBund
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/**This portlet allows the end user to customize the Bundle Deployment display
@@ -109,7 +110,7 @@ public class ResourceBundleDeploymentsPortlet extends GroupBundleDeploymentsPort
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving installed bundle deployments for resource [" + resourceId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyLoading = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
index 90e2ce3..19b4ce2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource;
import java.util.ArrayList;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -49,6 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -103,7 +104,7 @@ public class ResourceConfigurationUpdatesPortlet extends GroupConfigurationUpdat
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving resource composite for resource [" + resourceId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyLoading = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
index d7219dc..c2c02a3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
@@ -41,6 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupEven
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.util.GwtTuple;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
index dbb0d27..0363d7c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.ContentsType;
import com.smartgwt.client.widgets.Canvas;
@@ -59,6 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.Abs
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -152,7 +153,7 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving resource resource composite for resource [" + resourceId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
setRefreshing(false);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
index 71ba768..5435e46 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
@@ -18,7 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.fields.LinkItem;
@@ -42,6 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow;
import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/**This portlet allows the end user to customize the OOB display
@@ -101,7 +102,7 @@ public class ResourceOobsPortlet extends GroupOobsPortlet {
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving out of bound metrics for resource [" + resourceId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyLoading = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
index c229656..994fe3b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
@@ -18,7 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
@@ -40,6 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupPkgH
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/**This portlet allows the end user to customize the Package History display
@@ -105,7 +106,7 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet {
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving installed package history for group [" + resourceId + "]:"
- + caught.getMessage());
+ + caught.getMessage());
currentlyLoading = false;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
index 75b65fe..33651b0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
@@ -18,7 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.gwt;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.user.client.rpc.RpcRequestBuilder;
import com.google.gwt.user.client.rpc.ServiceDefTarget;
@@ -26,6 +26,7 @@ import com.google.gwt.user.client.rpc.ServiceDefTarget;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* This lookup service retrieves each RPC service and sets a
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java
index 25088bc..7a8f225 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java
@@ -40,6 +40,7 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/**
@@ -101,7 +102,7 @@ public abstract class AbstractMeasurementDataTraitDataSource extends
public void onSuccess(PageList<MeasurementDataTrait> result) {
long fetchDuration = System.currentTimeMillis() - startTime;
- com.allen_sauer.gwt.log.client.Log.info(result.size() + " traits fetched in: " + fetchDuration + "ms");
+ Log.info(result.size() + " traits fetched in: " + fetchDuration + "ms");
dataRetrieved(result, response, request);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
index cade8fe..d95a346 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.smartgwt.client.types.Side;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.layout.Layout;
@@ -41,6 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedE
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedHandler;
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSet;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index a176042..c964196 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -18,7 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.IButton;
@@ -52,6 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfig
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.measurement.GwtMonitorUtils;
import org.rhq.enterprise.gui.coregui.client.util.selenium.*;
@@ -305,7 +306,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving information for group [" + group.getId() + "]:"
- + caught.getMessage());
+ + caught.getMessage());
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java
index 255811e..0b3394a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.TreeSet;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback;
@@ -64,6 +64,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceD
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.AutoGroupTreeNode;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.ResourceTreeNode;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu;
@@ -428,7 +429,7 @@ public class ResourceGroupContextMenu extends LocatableMenu {
final Response response) {
Log
.trace("Successfully submitted request to add graph to view:"
- + url);
+ + url);
//kick off a page reload.
String currentViewPath = History.getToken();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index fbc12cd..f60786e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -23,7 +23,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
@@ -68,6 +68,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.h
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule.GroupOperationScheduleListView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.summary.ActivityView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
// TODO: Re-enable and flesh out Drift support
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index a26f382..7d0d655 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -64,6 +64,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -212,11 +213,11 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
}
- com.allen_sauer.gwt.log.client.Log.debug("Node selected in tree: " + newNode);
+ Log.debug("Node selected in tree: " + newNode);
if (newNode.isCompatibleGroupTopNode()) {
currentNodeId = newNode.getID();
- com.allen_sauer.gwt.log.client.Log.debug("Selecting compatible group [" + currentNodeId
+ Log.debug("Selecting compatible group [" + currentNodeId
+ "]...");
String viewPath = LinkManager.getResourceGroupLink(Integer.parseInt(currentNodeId));
String currentViewPath = History.getToken();
@@ -229,14 +230,14 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
} else if (newNode.isAutoClusterNode()) {
ClusterKey key = newNode.getClusterKey();
- com.allen_sauer.gwt.log.client.Log.debug("Selecting autocluster group [" + key + "]...");
+ Log.debug("Selecting autocluster group [" + key + "]...");
currentNodeId = newNode.getID();
// the user selected a cluster node - let's switch to that cluster group view
selectClusterGroup(key);
} else if (newNode.isMixedGroupTopNode()) {
currentNodeId = newNode.getID();
- com.allen_sauer.gwt.log.client.Log.debug("Selecting mixed group [" + currentNodeId + "]...");
+ Log.debug("Selecting mixed group [" + currentNodeId + "]...");
} else {
// a subcategory node, deselect and reselect the current node
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 3205d28..e4f647c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -23,7 +23,6 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
@@ -72,6 +71,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.ActivityView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.TimelineView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
index a1544fa..69685bc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -50,6 +50,7 @@ import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index 44f3b90..5044c57 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -32,7 +32,7 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback;
@@ -92,6 +92,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceT
import org.rhq.enterprise.gui.coregui.client.inventory.resource.factory.ResourceFactoryCreateWizard;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.factory.ResourceFactoryImportWizard;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java
index c777cb4..0b2d049 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java
@@ -21,7 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configur
import java.util.HashSet;
import java.util.Map;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -41,6 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* A data source that loads information about all the configuration changes that happened
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java
index 6a993a2..b2db1eb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java
@@ -21,7 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventor
import java.util.HashSet;
import java.util.Map;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -42,6 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.AbstractConfigurationHistoryDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* A data source that loads information about all the plugin configuration changes that happened
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java
index 931da57..cfe6141 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -48,6 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
index f7a73b07..8f04710 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -43,6 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* A cache for ResourceTypes and their various fields. Fields are only fetched as needed.
@@ -412,7 +413,7 @@ public class ResourceTypeRepository {
break;
default:
Log.error("ERROR: metadataType " + metadataType.name()
- + " not merged into cached ResourceType.");
+ + " not merged into cached ResourceType.");
}
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
index bf71633..aa1cfff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
@@ -19,7 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.operation;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -55,6 +55,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLPane;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
index d5ab23a..15f16aa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.search;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.event.dom.client.BlurEvent;
import com.google.gwt.event.dom.client.BlurHandler;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -55,6 +55,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid;
import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid.SavedSearchSelectionHandler;
import org.rhq.enterprise.gui.coregui.client.search.suggest.SuggestTextBox_v3;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
index 8e9b7b3..3f18b97 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.search;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.event.dom.client.BlurEvent;
import com.google.gwt.event.dom.client.BlurHandler;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -56,6 +56,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid;
import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid.SavedSearchSelectionHandler;
import org.rhq.enterprise.gui.coregui.client.search.suggest.SuggestTextBox_v3;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
index 0cc7f40..9d92a4d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.event.dom.client.BlurHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -67,6 +67,7 @@ import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.search.AbstractSearchBar;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
public class SuggestTextBox_v3 extends Composite implements HasText, HasAllFocusHandlers, HasValue<String>,
HasSelectionHandlers<Suggestion> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
index cfb022c..30d6ebb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.util;
import java.util.ArrayList;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/Log.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/Log.java
new file mode 100644
index 0000000..1b16eaf
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/Log.java
@@ -0,0 +1,87 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.util;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * A static Log utility class adapter to make the GWT logging (uses jdk logging)
+ * look like gwt-log (uses log4j style).
+ *
+ * @author Mike Thompson
+ */
+public class Log {
+
+ // delegate
+ private static final Logger logger = Logger.getLogger("");
+
+ public static void config(String message) {
+ logger.log(Level.CONFIG, message);
+ }
+
+ public static void fatal(String message) {
+ logger.severe(message);
+ }
+
+ public static void error(String message) {
+ logger.severe(message);
+ }
+
+ public static void error(String message, Throwable caught) {
+ logger.log(Level.SEVERE, message, caught);
+ }
+
+ public static void warn(String message) {
+ logger.warning(message);
+ }
+
+ public static void warn(String message, Throwable caught) {
+ logger.log(Level.WARNING, message, caught);
+ }
+
+ public static void info(String message) {
+ logger.info(message);
+ }
+
+ public static void debug(String message) {
+ logger.fine(message);
+ }
+
+ public static void trace(String message) {
+ logger.finest(message);
+ }
+
+ public static void trace(String message, Throwable caught) {
+ logger.log(Level.FINEST, message, caught);
+ }
+
+ public static boolean isInfoEnabled() {
+ return logger.isLoggable(Level.INFO);
+ }
+
+
+ public static boolean isDebugEnabled() {
+ return logger.isLoggable(Level.FINE);
+ }
+
+ public static boolean isTraceEnabled() {
+ return logger.isLoggable(Level.FINEST);
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
index c12c605..20c3d2a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.user.client.Window;
import com.smartgwt.client.data.Criteria;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java
index 78ae584..24a1077 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java
@@ -33,7 +33,7 @@ public class TreeUtility {
public static void printTree(Tree tree) {
String treeString = getTreeString(tree);
System.out.print(treeString);
- com.allen_sauer.gwt.log.client.Log.info(treeString);
+ Log.info(treeString);
}
public static String getTreeString(Tree tree) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java
index 43d56cb..bb180c8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java
@@ -18,7 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.util;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.ui.Widget;
import com.smartgwt.client.widgets.BaseWidget;
import com.smartgwt.client.widgets.Canvas;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java
index dbba59c..4c781da 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java
@@ -18,11 +18,13 @@
*/
package org.rhq.enterprise.gui.coregui.client.util.message;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
index 16304dc..1731413 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.types.Alignment;
@@ -50,6 +50,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableActio
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCTracker.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCTracker.java
index e1eb7e2..9b7af65 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCTracker.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCTracker.java
@@ -21,11 +21,12 @@ package org.rhq.enterprise.gui.coregui.client.util.rpc;
import java.util.HashSet;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.smartgwt.client.widgets.Img;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRemoteServiceProxy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRemoteServiceProxy.java
index 0724bd7..1cad369 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRemoteServiceProxy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRemoteServiceProxy.java
@@ -18,7 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.util.rpc;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback;
@@ -28,6 +28,7 @@ import com.google.gwt.user.client.rpc.impl.RequestCallbackAdapter.ResponseReader
import com.google.gwt.user.client.rpc.impl.RpcStatsContext;
import com.google.gwt.user.client.rpc.impl.Serializer;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import java.util.HashSet;
import java.util.Set;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRequestCallback.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRequestCallback.java
index 734adda..f461f6e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRequestCallback.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRequestCallback.java
@@ -18,13 +18,14 @@
*/
package org.rhq.enterprise.gui.coregui.client.util.rpc;
-import com.allen_sauer.gwt.log.client.Log;
+import java.util.logging.Logger;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestCallback;
import com.google.gwt.http.client.Response;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
index 81308cc..f68d407 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
@@ -26,13 +26,13 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.server.rpc.RPCRequest;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.util.HibernatePerformanceMonitor;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -66,7 +66,7 @@ public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
Subject subject = subjectManager.getSubjectBySessionId(Integer.parseInt(sid));
sessionSubject.set(subject);
} catch (Exception e) {
- Log.debug("Failed to validate request: sessionId was '" + sid + "', requestURL=" + req.getRequestURL());
+ Log.trace("Failed to validate request: sessionId was '" + sid + "', requestURL=" + req.getRequestURL());
continueProcessing = false;
}
} else {
@@ -120,6 +120,7 @@ public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
id.append("] ");
// log the exception server-side
+ //logger.warning("Sending exception to client: " + id.toString(), t);
Log.warn("Sending exception to client: " + id.toString(), t);
// cannot assume gwt client has our exception classes, only send the messages in a generic runtime exception
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java
index 01921e6..3a55f52 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java
@@ -25,9 +25,9 @@ import java.lang.reflect.Modifier;
import java.util.Collection;
import java.util.Set;
-import com.allen_sauer.gwt.log.client.Log;
import org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
index d124879..25acb43 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
@@ -47,6 +47,7 @@ import org.rhq.core.domain.resource.composite.ResourceLineageComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTService;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
import org.rhq.enterprise.server.discovery.DiscoveryBossLocal;
import org.rhq.enterprise.server.measurement.MeasurementProblemManagerLocal;
@@ -114,7 +115,7 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
- com.allen_sauer.gwt.log.client.Log.info("Loading GWT RPC Services");
+ Log.info("Loading GWT RPC Services");
}
public ResourceGWTServiceImpl() {
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 54f91db..1fa6cde 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -5,6 +5,7 @@
<inherits name='com.google.gwt.user.User'/>
<inherits name='com.google.gwt.i18n.I18N'/>
+ <inherits name="com.google.gwt.logging.Logging"/>
<inherits name='org.rhq.core.RHQDomain'/>
<inherits name='com.smartgwt.SmartGwt' />
@@ -30,33 +31,19 @@
<inherits name='com.google.gwt.widgetideas.WidgetIdeas'/>
-->
- <!-- ============================ gwt-log ============================= -->
+ <!-- ============================ gwt logging ============================= -->
+ <set-property name="gwt.logging.enabled" value="TRUE"/>
+ <!-- FINE ~= DEBUG in gwt-log -->
+ <set-property name="gwt.logging.logLevel" value="FINE"/>
+ <set-property name="gwt.logging.consoleHandler" value="ENABLED" />
+ <set-property name="gwt.logging.developmentModeHandler" value="ENABLED" />
+ <set-property name="gwt.logging.firebugHandler" value="ENABLED" />
+ <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" />
+ <set-property name="gwt.logging.popupHandler" value="DISABLED" />
+ <set-property name="gwt.logging.systemHandler" value="ENABLED" />
+ <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" />
- <!-- For development, a default of 'DEBUG' is recommended. -->
- <!-- <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" />-->
- <inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
- <!-- For production, most teams prefer to set the default log level to 'OFF'. -->
- <!--<inherits name="com.allen_sauer.gwt.log.gwt-log-OFF" />-->
-
- <!--
- Enable experimental WindowLogger, which logs messages to a separate
- popup window. There are currently a couple of restrictions:
-
- 1. When Firefox is configured to open new Windows as new tabs,
- WindowLogger does not work
- 2. In hosted mode, the windows are not automatically closed,
- although you can easily close them manually in the usual way
- -->
- <!-- When enabled FireFox is hard to use due to excessive popup window generation
-
- <set-property name="log_WindowLogger" value="ENABLED" />
- -->
-
- <!--
- You probably will want to disable the default `DivLogger` as well:
- -->
- <set-property name="log_DivLogger" value="DISABLED" />
<replace-with class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl">
<when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 70333b1..22619c3 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -48,6 +48,7 @@
</modules>
</profile>
+
</profiles>
</project>
1
0